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

Add cmake option -DLUA_ENGINE=luajit to switch lua engine to luajit [ci build]

This commit is contained in:
halx99 2020-11-07 10:36:22 +08:00
parent 1d4527772e
commit 520cc31f1b
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/win32-ci.yml vendored
View File

@ -34,7 +34,7 @@ jobs:
# Note the current convention is to use the -S and -B options here to specify source # Note the current convention is to use the -S and -B options here to specify source
# and build directories, but this is only available with CMake 3.13 and higher. # and build directories, but this is only available with CMake 3.13 and higher.
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12 # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
run: cmake -S %GITHUB_WORKSPACE% -B %GITHUB_WORKSPACE%/build_x86 -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -A Win32 -DBUILD_EXTENSION_IMGUIEXT=ON run: cmake -S %GITHUB_WORKSPACE% -B %GITHUB_WORKSPACE%/build_x86 -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -A Win32 -DBUILD_EXTENSION_IMGUIEXT=ON -DLUA_ENGINE=luajit
- name: Build - name: Build
shell: cmd shell: cmd

3
cocos/CMakeLists.txt
View File

@ -69,9 +69,6 @@ if (NOT DEFINED CC_FORCE_USE_GLES)
set(CC_FORCE_USE_GLES FALSE CACHE INTERNAL "Force use GLES" ) set(CC_FORCE_USE_GLES FALSE CACHE INTERNAL "Force use GLES" )
endif() endif()
set(LUA_ENGINE "plainlua" CACHE INTERNAL "The lua core lib, luajit or plainlua")
set(LUA_VERSION "5.3.6" CACHE INTERNAL "The plainlua version")
project(cocos2d_libs) project(cocos2d_libs)
include(2d/CMakeLists.txt) include(2d/CMakeLists.txt)

2
external/config.json vendored
View File

@ -1,5 +1,5 @@
{ {
"version": "v86", "version": "v87",
"zip_file_size": "107642814", "zip_file_size": "107642814",
"repo_name": "engine-x-3rd", "repo_name": "engine-x-3rd",
"repo_parent": "https://github.com/c4games/", "repo_parent": "https://github.com/c4games/",