From b701539f22b4f6727fcc9d54f2bf7c46a7e81c27 Mon Sep 17 00:00:00 2001 From: James Chen Date: Mon, 17 Apr 2023 16:06:37 +0800 Subject: [PATCH 1/2] Update sources/CMakeLists.txt, add configuration for surfaceless mode (#341) --- sources/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 7c1488d9..287629a1 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -54,7 +54,7 @@ add_definitions(-DCC_SWAPPY_ENABLED) endif() -if(ANDROID) +if(ANDROID AND (NOT SURFACE_LESS_SERVICE)) set(CC_GAME_ACTIVITY_SOURCES ${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp ${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/native_app_glue/android_native_app_glue.c From 651482be4f0d9c13409f3b9582adb05024a54a9a Mon Sep 17 00:00:00 2001 From: Patrice Jiang <397136899@qq.com> Date: Thu, 13 Apr 2023 12:10:49 +0800 Subject: [PATCH 2/2] support dynamic library loading --- android/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index e179f9fc..64b18a51 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -84,7 +84,8 @@ if(USE_SE_V8) IMPORTED_LOCATION ${platform_spec_path}/v8/libinspector.a INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/v8 ) - set(se_libs_name v8_monolith v8_inspector) + set(se_libs_name v8_monolith) + set(se_libs_include ${platform_spec_path}/include/v8) endif() if(USE_WEBSOCKET_SERVER) @@ -160,7 +161,9 @@ endif() set(ZLIB z) if(NOT USE_MODULES) - list(APPEND CC_EXTERNAL_LIBS ${ZLIB} ${se_libs_name}) + list(APPEND CC_EXTERNAL_LIBS ${ZLIB} + ${se_libs_name} + ) endif()