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

fix cjson can't use

This commit is contained in:
halx99 2020-11-11 15:21:29 +08:00
parent 9da0c223c6
commit 5a4d0139c5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,7 +194,10 @@ if(WINDOWS)
target_compile_definitions(${ENGINEX_LUA_LIB} PUBLIC _USRLUASTATIC)
endif()
target_compile_definitions(${ENGINEX_LUA_LIB} PUBLIC LUA_COMPAT_MODULE)
target_compile_definitions(${ENGINEX_LUA_LIB}
PUBLIC LUA_COMPAT_MODULE
PRIVATE ENABLE_CJSON_GLOBAL=1
)
set_target_properties(${ENGINEX_LUA_LIB}
PROPERTIES

2
tools/travis-scripts/run-script.sh
View File

@ -68,7 +68,7 @@ function build_ios()
cd $COCOS2DX_ROOT
# mkdir -p build
cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=cmake/ios.mini.cmake -DCMAKE_OSX_SYSROOT=iphonesimulator -DBUILD_EXT_ALSOFT=ON
cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=cmake/ios.mini.cmake -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_ARCHITECTURES=x86_64 -DBUILD_EXT_ALSOFT=ON
# cmake .. -GXcode -DCMAKE_TOOLCHAIN_FILE=../cmake/ios.toolchain.cmake -DCMAKE_SYSTEM_NAME=iOS -DPLATFORM=OS -DENABLE_ARC=0 # too much logs on console when "cmake --build ."
cmake --build build --config Release --target cpp-tests -- -quiet -jobs $NUM_OF_CORES -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)"