Merge branch 'master' into develop

premake/dll.lua

@@ -70,7 +70,7 @@ workspace "ocgcoredll"
         linkoptions { "-static-libstdc++", "-static-libgcc" }
 
     filter "system:emscripten"
-        defines { "LUA_USE_LONGJMP", "LUA_USE_C89" }
+        defines { "LUA_USE_C89" }
         pic "On"
 
 filter {}

premake/lua.lua

@@ -8,6 +8,8 @@ project "lua"
     files { "src/*.c", "src/*.h" }
     removefiles { "src/lua.c", "src/luac.c", "src/onelua.c" }
 
+    defines { "LUA_USE_LONGJMP" }
+
     if not GetParam("no-lua-safe") then
         removefiles { "src/linit.c" }
     end