Commit e8b22a2a authored by nanahira's avatar nanahira

Merge branch 'develop' into server-develop

parents d076faba a10ced79
Pipeline #41404 canceled with stages
in 14 seconds
...@@ -79,6 +79,9 @@ build ...@@ -79,6 +79,9 @@ build
/premake4.exe /premake4.exe
/premake5* /premake5*
/premake5.exe /premake5.exe
/*.so
/*.dll
/*.dylib
# others # others
*.log *.log
......
Subproject commit 4cc32e4e481efaaea46f2a76f7c5ac3267cc2e9a Subproject commit bb55bc97d852740c3f8381ba7ad9dce25408c5b2
...@@ -25,6 +25,8 @@ MINIAUDIO_BUILD_OPUS_VORBIS = os.istarget("windows") ...@@ -25,6 +25,8 @@ MINIAUDIO_BUILD_OPUS_VORBIS = os.istarget("windows")
-- BUILD_IRRKLANG is impossible because irrKlang is not open source -- BUILD_IRRKLANG is impossible because irrKlang is not open source
IRRKLANG_PRO = false IRRKLANG_PRO = false
IRRKLANG_PRO_BUILD_IKPMP3 = false IRRKLANG_PRO_BUILD_IKPMP3 = false
-- ocgcore dynamic
OCGCORE_DYNAMIC = false
SERVER_MODE = true SERVER_MODE = true
SERVER_ZIP_SUPPORT = false SERVER_ZIP_SUPPORT = false
...@@ -92,6 +94,7 @@ newoption { trigger = 'build-ikpmp3', category = "YGOPro - irrklang - ikpmp3", d ...@@ -92,6 +94,7 @@ newoption { trigger = 'build-ikpmp3', category = "YGOPro - irrklang - ikpmp3", d
newoption { trigger = "mac-arm", category = "YGOPro", description = "Compile for Apple Silicon Mac" } newoption { trigger = "mac-arm", category = "YGOPro", description = "Compile for Apple Silicon Mac" }
newoption { trigger = "mac-intel", category = "YGOPro", description = "Compile for Intel Mac" } newoption { trigger = "mac-intel", category = "YGOPro", description = "Compile for Intel Mac" }
newoption { trigger = "ocgcore-dynamic", category = "YGOPro - ocgcore", description = "Build ocgcore as dynamic library" }
newoption { trigger = "server-mode", category = "YGOPro - server", description = "" } newoption { trigger = "server-mode", category = "YGOPro - server", description = "" }
newoption { trigger = "server-zip-support", category = "YGOPro - server", description = "" } newoption { trigger = "server-zip-support", category = "YGOPro - server", description = "" }
...@@ -401,18 +404,8 @@ if os.istarget("macosx") then ...@@ -401,18 +404,8 @@ if os.istarget("macosx") then
end end
end end
function getGlibcVersion() if GetParam("ocgcore-dynamic") then
local output = os.outputof("getconf GNU_LIBC_VERSION") OCGCORE_DYNAMIC = true
local major, minor, patch = output:match("glibc (%d+)%.(%d+)%.?(%d*)")
if major and minor then
major = tonumber(major)
minor = tonumber(minor)
patch = tonumber(patch) or 0
return (major << 16) | (minor << 8) | patch
end
return 0
end end
workspace "YGOPro" workspace "YGOPro"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment