diff --git a/cocos/scripting/lua-bindings/proj.android/CMakeLists.txt b/cocos/scripting/lua-bindings/proj.android/CMakeLists.txt index 298bf5b06cdc..5206af046cdf 100644 --- 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 index 73143dfae6e7..14250b0bfca8 100644 --- 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 index 45c971c39a11..b8a982bd324a 100644 --- 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 index 4b5d81934aae..0a0846b1b498 100644 --- 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)