Merge branch 'master' into server

.gitignore

@@ -14,6 +14,7 @@ build
 /sqlite3
 /irrklang
 /irrlicht*
+/lua
 
 # gframe additionals
 /gframe/ygopro.ico

gframe/premake4.lua

@@ -36,7 +36,7 @@ project "ygopro"
         buildoptions { "-std=c++14", "-fno-rtti" }
     configuration "not windows"
         links { "event_pthreads", "dl", "pthread" }
-        if os.getenv("YGOPRO_BUILD_LUA") then
+        if BUILD_LUA then
             links { "lua" }
         else
             links { "lua5.3-c++" }

ocgcore @ e081bea3

-Subproject commit 1cfec8c52c9f2f531b1f0cc373620728dba3c0ee
+Subproject commit e081bea359916a94dd7897ff234b4d40f2db0aa6

premake5.lua

@@ -2,6 +2,9 @@ solution "ygo"
     location "build"
     language "C++"
     objdir "obj"
+    if os.ishost("linux") and os.getenv("YGOPRO_BUILD_LUA") then
+        BUILD_LUA=true
+    end
 
     configurations { "Release", "Debug" }
 if os.getenv("YGOPRO_NO_LUA_SAFE") then
@@ -86,6 +89,6 @@ end
     include "sqlite3"
     end
 
-    if os.getenv("YGOPRO_BUILD_LUA") then
+    if os.ishost("macosx") or BUILD_LUA then
         include "lua"
     end

script @ 25bcf78b

-Subproject commit cf96f6036abe927a23ac0bb2b7d4cc46ce41ff9f
+Subproject commit 25bcf78bcdd61e183855e68bc46294b25dd28eac