Commit 0db1bb80 authored by nanahira's avatar nanahira

no static link on dynamic

parent b70fba94
...@@ -110,9 +110,11 @@ project "YGOPro" ...@@ -110,9 +110,11 @@ project "YGOPro"
filter "system:linux" filter "system:linux"
links { "GL", "X11", "Xxf86vm", "dl", "pthread" } links { "GL", "X11", "Xxf86vm", "dl", "pthread" }
linkoptions { "-fopenmp", "-static-libstdc++", "-static-libgcc" } linkoptions { "-fopenmp" }
if OCGCORE_DYNAMIC then if USE_DYNAMIC then
linkoptions { "-Wl,-rpath=./" } linkoptions { "-Wl,-rpath=./" }
else
linkoptions { "-static-libstdc++", "-static-libgcc" }
end end
if USE_AUDIO and AUDIO_LIB == "irrklang" then if USE_AUDIO and AUDIO_LIB == "irrklang" then
links { "IrrKlang" } links { "IrrKlang" }
......
Subproject commit 6c6805a4d97dcebf6f7ae02fe7bdea96782569b9 Subproject commit 8dc2821cc2e4890a8eb79837ca0db38e8ed92761
...@@ -9,10 +9,6 @@ project "lua" ...@@ -9,10 +9,6 @@ project "lua"
removefiles { "src/linit.c" } removefiles { "src/linit.c" }
end end
if SERVER_PRO3_SUPPORT or OCGCORE_DYNAMIC then
defines { "LUA_USE_LONGJMP" }
end
filter "configurations:Debug" filter "configurations:Debug"
defines { "LUA_USE_APICHECK" } defines { "LUA_USE_APICHECK" }
...@@ -24,3 +20,6 @@ project "lua" ...@@ -24,3 +20,6 @@ project "lua"
filter "system:linux" filter "system:linux"
defines { "LUA_USE_LINUX" } defines { "LUA_USE_LINUX" }
if USE_DYNAMIC then
pic "On"
end
...@@ -27,6 +27,7 @@ IRRKLANG_PRO = false ...@@ -27,6 +27,7 @@ IRRKLANG_PRO = false
IRRKLANG_PRO_BUILD_IKPMP3 = false IRRKLANG_PRO_BUILD_IKPMP3 = false
-- ocgcore dynamic -- ocgcore dynamic
OCGCORE_DYNAMIC = false OCGCORE_DYNAMIC = false
USE_DYNAMIC = false
-- Read settings from command line or environment variables -- Read settings from command line or environment variables
...@@ -363,6 +364,10 @@ if GetParam("ocgcore-dynamic") then ...@@ -363,6 +364,10 @@ if GetParam("ocgcore-dynamic") then
OCGCORE_DYNAMIC = true OCGCORE_DYNAMIC = true
end end
if OCGCORE_DYNAMIC then
USE_DYNAMIC = true
end
workspace "YGOPro" workspace "YGOPro"
location "build" location "build"
language "C++" language "C++"
......
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