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

Fix lua build for win64 and 1 warning

This commit is contained in:
halx99 2021-08-27 11:41:11 +08:00
parent 5d0565b900
commit fa1f2f2d33
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/base/ccMacros.h
View File

@ -45,7 +45,7 @@ extern bool CC_DLL cc_assert_script_compatible(const char* msg);
{ \ { \
if (!(cond)) \ if (!(cond)) \
{ \ { \
if (!cc_assert_script_compatible(msg) && strlen(msg)) \ if (msg && *msg && !cc_assert_script_compatible(msg)) \
cocos2d::log("Assert failed: %s", msg); \ cocos2d::log("Assert failed: %s", msg); \
CC_ASSERT(cond); \ CC_ASSERT(cond); \
} \ } \

4
extensions/scripting/lua-bindings/CMakeLists.txt
View File

@ -161,6 +161,10 @@ add_library(${ADXE_LUA_LIB} STATIC ${lua_bindings_files})
target_link_libraries(${ADXE_LUA_LIB} ${ADXE_CORE_LIB}) target_link_libraries(${ADXE_LUA_LIB} ${ADXE_CORE_LIB})
add_dependencies(${ADXE_LUA_LIB} ${ADXE_CORE_LIB}) add_dependencies(${ADXE_LUA_LIB} ${ADXE_CORE_LIB})
if(MSVC)
target_compile_options(${ADXE_LUA_LIB} PRIVATE /bigobj)
endif()
get_target_property(lua_ext_depend thirdparty CC_LUA_DEPEND) get_target_property(lua_ext_depend thirdparty CC_LUA_DEPEND)
target_link_libraries(${ADXE_LUA_LIB} ${lua_ext_depend}) target_link_libraries(${ADXE_LUA_LIB} ${lua_ext_depend})