Merge branch 'master' into server

gframe/premake5.lua

@@ -28,7 +28,7 @@ end
         defines { "SERVER_PRO3_SUPPORT" }
     end
     includedirs { "../ocgcore" }
-    links { "ocgcore", "clzma", LUA_LIB_NAME, "sqlite3", "event" }
+    links { "ocgcore", "clzma", "sqlite3", "event" }
     if SERVER_ZIP_SUPPORT then
         defines { "SERVER_ZIP_SUPPORT" }
         links { "irrlicht", "cspmemvfs" }
@@ -50,10 +50,13 @@ project "ygopro"
 
     files { "*.cpp", "*.h" }
     includedirs { "../ocgcore" }
-    links { "ocgcore", "clzma", "cspmemvfs", LUA_LIB_NAME, "sqlite3", "irrlicht", "freetype", "event" }
+    links { "ocgcore", "clzma", "cspmemvfs", "sqlite3", "irrlicht", "freetype", "event" }
 end
+    if not OCGCORE_DYNAMIC then
+        links { LUA_LIB_NAME }
+    end
 
-    if not BUILD_LUA then
+    if not BUILD_LUA and not OCGCORE_DYNAMIC then
         libdirs { LUA_LIB_DIR }
     end
 

ocgcore @ 6c6805a4

-Subproject commit 239f3c20066452fc9b425b9daa0db0db04a4940e
+Subproject commit 6c6805a4d97dcebf6f7ae02fe7bdea96782569b9