[lua android] use luajit & template cmake update (cocos2d#19239)

* [lua android] use luajit & template cmake update * update external to v150 * update external to 151
huangwei1024 · Jun 20, 2019 · 3e0408e · 3e0408e
1 parent 0f10909
commit 3e0408e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/cocos/scripting/lua-bindings/proj.android/CMakeLists.txt b/cocos/scripting/lua-bindings/proj.android/CMakeLists.txt
@@ -14,7 +14,7 @@ add_library(${target_name} STATIC
   ${${target_name}_src}
 )
 
-get_target_property(lua_header ext_lua INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(lua_header ext_luajit INTERFACE_INCLUDE_DIRECTORIES)
 get_target_property(tolua_header ext_tolua INTERFACE_INCLUDE_DIRECTORIES)
 target_include_directories(${target_name}
   PRIVATE ../../..

diff --git a/external/config.json b/external/config.json
@@ -1,6 +1,6 @@
 {
-    "version": "v3-deps-148",
-    "zip_file_size": "146254799",
+    "version": "v3-deps-151",
+    "zip_file_size": "146180003",
     "repo_name": "cocos2d-x-3rd-party-libs-bin",
     "repo_parent": "https://github.com/cocos2d/",
     "move_dirs": {

diff --git a/templates/js-template-default/CMakeLists.txt b/templates/js-template-default/CMakeLists.txt
@@ -119,6 +119,8 @@ else()
     add_library(${APP_NAME} SHARED ${APP_SRC})
     add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos/platform/android ${ENGINE_BINARY_PATH}/cocos/platform)
     target_link_libraries(${APP_NAME} -Wl,--whole-archive cpp_android_spec -Wl,--no-whole-archive)
+    add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos/scripting/js-bindings/proj.android ${ENGINE_BINARY_PATH}/cocos/js-android)
+    target_link_libraries(${APP_NAME} -Wl,--whole-archive js_android_spec -Wl,--no-whole-archive)
 endif()
 
 target_link_libraries(${APP_NAME} jscocos2d)

diff --git a/templates/lua-template-default/CMakeLists.txt b/templates/lua-template-default/CMakeLists.txt
@@ -137,6 +137,8 @@ else()
     add_library(${APP_NAME} SHARED ${APP_SRC})
     add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos/platform/android ${ENGINE_BINARY_PATH}/cocos/platform)
     target_link_libraries(${APP_NAME} -Wl,--whole-archive cpp_android_spec -Wl,--no-whole-archive)
+    add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos/scripting/lua-bindings/proj.android ${ENGINE_BINARY_PATH}/cocos/lua-android)
+    target_link_libraries(${APP_NAME} -Wl,--whole-archive lua_android_spec -Wl,--no-whole-archive)
 endif()
 
 target_link_libraries(${APP_NAME} luacocos2d)