From 520cc31f1b3c1c69541611151a64cfd900f2e72e Mon Sep 17 00:00:00 2001 From: halx99 Date: Sat, 7 Nov 2020 10:36:22 +0800 Subject: [PATCH] Add cmake option -DLUA_ENGINE=luajit to switch lua engine to luajit [ci build] --- .github/workflows/win32-ci.yml | 2 +- cocos/CMakeLists.txt | 3 --- external/config.json | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/win32-ci.yml b/.github/workflows/win32-ci.yml index 7a949c83f2..1f9345aa1a 100644 --- a/.github/workflows/win32-ci.yml +++ b/.github/workflows/win32-ci.yml @@ -34,7 +34,7 @@ jobs: # 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. # 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 shell: cmd diff --git a/cocos/CMakeLists.txt b/cocos/CMakeLists.txt index 10e567d8f1..280f2817be 100644 --- a/cocos/CMakeLists.txt +++ b/cocos/CMakeLists.txt @@ -69,9 +69,6 @@ if (NOT DEFINED CC_FORCE_USE_GLES) set(CC_FORCE_USE_GLES FALSE CACHE INTERNAL "Force use GLES" ) 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) include(2d/CMakeLists.txt) diff --git a/external/config.json b/external/config.json index f653984985..934a44d873 100644 --- a/external/config.json +++ b/external/config.json @@ -1,5 +1,5 @@ { - "version": "v86", + "version": "v87", "zip_file_size": "107642814", "repo_name": "engine-x-3rd", "repo_parent": "https://github.com/c4games/",