Commit a10ced79 authored by nanahira's avatar nanahira

Merge branch 'master' into develop

parents eb5e058e e4e4eca1
Pipeline #41401 canceled with stages
in 31 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
......
...@@ -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
-- Read settings from command line or environment variables -- Read settings from command line or environment variables
...@@ -85,6 +87,7 @@ newoption { trigger = 'build-ikpmp3', category = "YGOPro - irrklang - ikpmp3", d ...@@ -85,6 +87,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" }
-- koishipro specific -- koishipro specific
...@@ -356,18 +359,8 @@ if os.istarget("macosx") then ...@@ -356,18 +359,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