Merge pull request #383 from dumganhar/v3.8.0-hmi

v3.8.0-hmi merges v3.8.0
Merge branch 'v3.8.0' of github.com:cocos/cocos-engine-external into v3.8.0-hmi
2023-07-11 17:43:38 +08:00 · 2023-07-11 17:39:43 +08:00 · 2023-07-11 13:45:30 +08:00 · 2023-07-07 16:51:41 +08:00 · 2023-07-07 16:31:43 +08:00 · 2023-07-06 17:32:33 +08:00
9 changed files with 16 additions and 33 deletions
@@ -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()


@@ -6,10 +6,6 @@ declare module 'external:emscripten/spine/spine.wasm.js' {
    export default SpineWasm;
 }

-declare module 'external:emscripten/spine/spine.wasm.fallback.js' {
-    export default SpineWasm;
-}
-
 // tslint:disable
 declare function SpineWasm (moduleOptions?: any): Promise<void>;

@@ -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/system_utils.cpp
Author	SHA1	Message	Date
minggoandGitHub	8fef1505b4	Merge pull request #383 from dumganhar/v3.8.0-hmi v3.8.0-hmi merges v3.8.0	2023-07-11 17:43:38 +08:00
James Chen	772894d6a0	Merge branch 'v3.8.0' of github.com:cocos/cocos-engine-external into v3.8.0-hmi	2023-07-11 17:39:43 +08:00
Santy-WangandGitHub	5fc3b6118c	update spine wasm (#381 )	2023-07-11 13:45:30 +08:00
江战andGitHub	60b1792049	Merge pull request #380 from Canvasfull/v3.8.0-spine-15 update spine wasm & asm fix interface.	2023-07-07 16:51:41 +08:00
Canvas	e24d2a019b	update spine wasm & asm fix interface.	2023-07-07 16:31:43 +08:00
James ChenandGitHub	53b03aa1de	Update spine, build it on Mac to resolve low FPS (#379 )	2023-07-06 17:32:33 +08:00
CanvasandGitHub	40df568df1	fix spine animation editor display exception. (#376 )	2023-07-02 20:19:36 +08:00
zhakesiandGitHub	2a80c4c6db	update spine wasm (#375 )	2023-06-30 14:59:08 +08:00
minggoandGitHub	d30c066419	Merge pull request #357 from dumganhar/v3.8.0-hmi v3.8.0-hmi branch merges v3.7.2-hmi	2023-06-05 16:41:52 +08:00
James Chen	ab15deb121	Merge branch 'v3.8.0' of github.com:cocos/cocos-engine-external into v3.7.2-hmi	2023-06-05 13:51:02 +08:00
江战andGitHub	0fd7ff8de9	Merge pull request #344 from PatriceJiang/v3.7.2-hmi support dynamic library loading	2023-04-24 14:34:43 +08:00
Patrice Jiang	651482be4f	support dynamic library loading	2023-04-20 16:24:56 +08:00
James ChenandGitHub	b701539f22	Update sources/CMakeLists.txt, add configuration for surfaceless mode (#341 )	2023-04-17 16:06:37 +08:00