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

Sync SharedLoader template.

This commit is contained in:
halx99 2020-10-19 19:19:17 +08:00
parent 919d48d68e
commit bacba846af
17 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/config.json vendored
View File

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

2
templates/cpp-template-default/CMakeLists.txt
View File

@ -133,7 +133,7 @@ else()
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)
config_android_shared_libs("org.cocos2dx.${APP_NAME}" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
endif()
target_link_libraries(${APP_NAME} ${EGNX_CORE_LIB})

1
templates/cpp-template-default/proj.android/app/src/org/cocos2dx/cpp/AppActivity.java
View File

@ -26,6 +26,7 @@ package org.cocos2dx.cpp;
import android.os.Bundle;
import org.cocos2dx.lib.Cocos2dxActivity;
import org.cocos2dx.lib.SharedLoader;
import android.os.Build;
import android.view.WindowManager;
import android.view.WindowManager.LayoutParams;

1
templates/cpp-template-default/proj.android/settings.gradle
View File

@ -1,3 +1,4 @@
import java.nio.file.Paths
include ':libcocos2dx'
project(':libcocos2dx').projectDir = new File(Paths.get("${System.env.COCOS2DX_ROOT}/cocos/platform/android/libcocos2dx").toUri())
include ':HelloCpp'

2
templates/lua-template-default/CMakeLists.txt
View File

@ -127,7 +127,7 @@ else()
add_subdirectory(${COCOS2DX_ROOT_PATH}/extensions/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)
config_android_shared_libs("org.cocos2dx.${APP_NAME}" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/frameworks/runtime-src/proj.android/app/src")
endif()
target_link_libraries(${APP_NAME} luacocos2d)

1
templates/lua-template-default/frameworks/runtime-src/proj.android/app/src/org/cocos2dx/lua/AppActivity.java
View File

@ -28,6 +28,7 @@ package org.cocos2dx.lua;
import android.os.Bundle;
import org.cocos2dx.lib.Cocos2dxActivity;
import org.cocos2dx.lib.SharedLoader;
public class AppActivity extends Cocos2dxActivity{
static {

1
templates/lua-template-default/frameworks/runtime-src/proj.android/settings.gradle
View File

@ -1,3 +1,4 @@
import java.nio.file.Paths
include ':libcocos2dx'
project(':libcocos2dx').projectDir = new File(Paths.get("${System.env.COCOS2DX_ROOT}/cocos/platform/android/libcocos2dx").toUri())
include ':HelloLua'

2
tests/cpp-empty-test/CMakeLists.txt
View File

@ -130,7 +130,7 @@ else()
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)
config_android_shared_libs("org.cocos2dx.${APP_NAME}" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
endif()
target_link_libraries(${APP_NAME} ${EGNX_CORE_LIB})

1
tests/cpp-empty-test/proj.android/app/src/org/cocos2dx/cpp_empty_test/AppActivity.java
View File

@ -27,6 +27,7 @@ package org.cocos2dx.cpp_empty_test;
import android.os.Bundle;
import org.cocos2dx.lib.Cocos2dxActivity;
import org.cocos2dx.lib.SharedLoader;
public class AppActivity extends Cocos2dxActivity {
static {

2
tests/cpp-tests/CMakeLists.txt
View File

@ -397,7 +397,7 @@ else()
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)
config_android_shared_libs("org.cocos2dx.${APP_NAME}" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
endif()
target_link_libraries(${APP_NAME} ${EGNX_CORE_LIB})

1
tests/cpp-tests/proj.android/app/src/org/cocos2dx/cpp_tests/AppActivity.java
View File

@ -27,6 +27,7 @@ package org.cocos2dx.cpp_tests;
import android.os.Bundle;
import org.cocos2dx.lib.Cocos2dxActivity;
import org.cocos2dx.lib.SharedLoader;
public class AppActivity extends Cocos2dxActivity {
static {

2
tests/fairygui-tests/CMakeLists.txt
View File

@ -119,7 +119,7 @@ else()
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)
config_android_shared_libs("org.cocos2dx.${APP_NAME}" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
endif()
target_link_libraries(${APP_NAME} ${EGNX_CORE_LIB})

1
tests/fairygui-tests/proj.android/app/src/org/cocos2dx/fairygui_tests/AppActivity.java
View File

@ -27,6 +27,7 @@ package org.cocos2dx.fairygui_tests;
import android.os.Bundle;
import org.cocos2dx.lib.Cocos2dxActivity;
import org.cocos2dx.lib.SharedLoader;
public class AppActivity extends Cocos2dxActivity {
static {

2
tests/lua-empty-test/project/CMakeLists.txt
View File

@ -103,7 +103,7 @@ else()
add_subdirectory(${COCOS2DX_ROOT_PATH}/extensions/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)
config_android_shared_libs("org.cocos2dx.${APP_NAME}" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
endif()
target_link_libraries(${APP_NAME} luacocos2d)

1
tests/lua-empty-test/project/proj.android/app/src/org/cocos2dx/lua_empty_test/AppActivity.java
View File

@ -28,6 +28,7 @@ package org.cocos2dx.lua_empty_test;
import android.os.Bundle;
import org.cocos2dx.lib.Cocos2dxActivity;
import org.cocos2dx.lib.SharedLoader;
public class AppActivity extends Cocos2dxActivity {
static {

2
tests/lua-tests/project/CMakeLists.txt
View File

@ -116,7 +116,7 @@ else()
target_link_libraries(${APP_NAME} -Wl,--whole-archive lua_android_spec -Wl,--no-whole-archive)
endif()
config_android_shared_libs("org.cocos2dx.${APP_NAME}" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
config_android_shared_libs("org.cocos2dx.lib" "${CMAKE_CURRENT_SOURCE_DIR}/proj.android/app/src")
endif()
target_link_libraries(${APP_NAME} luacocos2d)
target_include_directories(${APP_NAME} PRIVATE Classes)

1
tests/lua-tests/project/proj.android/app/src/org/cocos2dx/lua_tests/AppActivity.java
View File

@ -27,6 +27,7 @@ package org.cocos2dx.lua_tests;
import android.os.Bundle;
import org.cocos2dx.lib.Cocos2dxActivity;
import org.cocos2dx.lib.SharedLoader;
import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
public class AppActivity extends Cocos2dxActivity{