Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix LuaJit Compilations (#2159)

This commit is contained in:
Purple 2024-09-16 20:53:41 +06:00 committed by GitHub
parent 46332b544b
commit 96be23ebd4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/lua/lua-cjson/CMakeLists.txt vendored
View File

@ -17,7 +17,7 @@ add_library(${target_name} STATIC
if(NOT AX_USE_LUAJIT)
target_include_directories(${target_name} PRIVATE ../${AX_LUA_ENGINE})
else()
target_include_directories(${target_name} PRIVATE ../${AX_LUA_ENGINE}/include)
target_include_directories(${target_name} PRIVATE ../${AX_LUA_ENGINE}/_x/include)
endif()
target_include_directories(${target_name} PUBLIC .)

2
3rdparty/lua/tolua/CMakeLists.txt vendored
View File

@ -19,7 +19,7 @@ add_library(${target_name} STATIC
if(NOT AX_USE_LUAJIT)
target_include_directories(${target_name} PRIVATE ../${AX_LUA_ENGINE})
else()
target_include_directories(${target_name} PRIVATE ../${AX_LUA_ENGINE}/include)
target_include_directories(${target_name} PRIVATE ../${AX_LUA_ENGINE}/_x/include)
endif()
target_include_directories(${target_name} PUBLIC .)

12
extensions/scripting/lua-bindings/manual/LuaBasicConversions.cpp
View File

@ -3098,7 +3098,8 @@ bool luaval_to_stageUniformLocation(lua_State* L, int pos, ax::backend::StageUni
pos -= 1; // since we'll be pushing keys for table access
lua_pushstring(L, "location");
if (lua_gettable(L, pos) == LUA_TNIL)
lua_gettable(L, pos);
if (lua_isnil(L, -1))
{
AXASSERT(false, "invalidate UniformLocation value");
}
@ -3106,7 +3107,8 @@ bool luaval_to_stageUniformLocation(lua_State* L, int pos, ax::backend::StageUni
lua_pop(L, 1);
lua_pushstring(L, "offset");
if (lua_gettable(L, pos) == LUA_TNIL)
lua_gettable(L, pos);
if (lua_isnil(L, -1))
{
AXASSERT(false, "invalidate UniformLocation value");
}
@ -3138,7 +3140,8 @@ bool luaval_to_uniformLocation(lua_State* L, int pos, ax::backend::UniformLocati
return false;
lua_pushstring(L, "vertStage");
if (lua_gettable(L, pos) == LUA_TNIL)
lua_gettable(L, pos);
if (lua_isnil(L, -1))
{
AXASSERT(false, "invalidate UniformLocation value");
}
@ -3146,7 +3149,8 @@ bool luaval_to_uniformLocation(lua_State* L, int pos, ax::backend::UniformLocati
lua_pop(L, 1);
lua_pushstring(L, "fragStage");
if (lua_gettable(L, pos) == LUA_TNIL)
lua_gettable(L, pos);
if (lua_isnil(L, -1))
{
AXASSERT(false, "invalidate UniformLocation value");
}