Merge branch 'master' into server

gframe/premake5.lua

@@ -166,9 +166,10 @@ end
 
     filter "system:linux"
         links { "dl", "pthread" }
-        linkoptions { "-static-libstdc++", "-static-libgcc" }
-        if OCGCORE_DYNAMIC then
+        if USE_DYNAMIC then
             linkoptions { "-Wl,-rpath=./" }
+        else
+            linkoptions { "-static-libstdc++", "-static-libgcc" }
         end
 if not SERVER_MODE then
         links { "GL", "X11", "Xxf86vm" }

ocgcore @ 8dc2821c

-Subproject commit 6c6805a4d97dcebf6f7ae02fe7bdea96782569b9
+Subproject commit 8dc2821cc2e4890a8eb79837ca0db38e8ed92761

premake/lua/premake5.lua

@@ -9,14 +9,6 @@ project "lua"
         removefiles { "src/linit.c" }
     end
 
-    if SERVER_PRO3_SUPPORT then
-        defines { "LUA_USE_LONGJMP" }
-    end
-
-    if SERVER_PRO3_SUPPORT or OCGCORE_DYNAMIC then
-        defines { "LUA_USE_LONGJMP" }
-    end
-
     filter "configurations:Debug"
         defines { "LUA_USE_APICHECK" }
 
@@ -28,3 +20,6 @@ project "lua"
 
     filter "system:linux"
         defines { "LUA_USE_LINUX" }
+        if USE_DYNAMIC then
+            pic "On"
+        end

premake5.lua

@@ -27,6 +27,7 @@ IRRKLANG_PRO = false
 IRRKLANG_PRO_BUILD_IKPMP3 = false
 -- ocgcore dynamic
 OCGCORE_DYNAMIC = false
+USE_DYNAMIC = false
 
 SERVER_MODE = true
 SERVER_ZIP_SUPPORT = false
@@ -408,6 +409,14 @@ if GetParam("ocgcore-dynamic") then
     OCGCORE_DYNAMIC = true
 end
 
+if OCGCORE_DYNAMIC then
+    USE_DYNAMIC = true
+end
+
+if SERVER_PRO3_SUPPORT then
+    USE_DYNAMIC = true
+end
+
 workspace "YGOPro"
     location "build"
     language "C++"
@@ -423,6 +432,10 @@ workspace "YGOPro"
         ApplyBoolean(boolOption)
     end
 
+    if SERVER_PRO3_SUPPORT then
+        defines { "LUA_USE_LONGJMP" }
+    end
+
     filter "system:windows"
         systemversion "latest"
         startproject "YGOPro"