Merge pull request #387 from minggo/develop-merge-v3.8.1

Develop merge v3.8.1
Merge branch 'v3.8.1' into develop-merge-v3.8.1
2023-07-13 14:12:52 +08:00 · 2023-07-13 11:59:22 +08:00 · 2023-07-12 15:16:03 +08:00 · 2023-07-11 18:22:53 +08:00 · 2023-07-04 18:31:15 +08:00 · 2023-07-03 14:29:57 +08:00
12 changed files with 19 additions and 21 deletions
@@ -84,8 +84,7 @@ 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)
-    set(se_libs_include ${platform_spec_path}/include/v8)
+    set(se_libs_name v8_monolith v8_inspector)
 endif()

 if(USE_WEBSOCKET_SERVER)
@@ -161,9 +160,7 @@ 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()


@@ -255,6 +255,7 @@ declare namespace Bullet {
        // CharacterController
        ControllerHitReport_new(): ptr;
        CharacterController_getGhostObject(ptrCCT: ptr): ptr;
+        CharacterController_getCollisionShape(ptrCCT: ptr): ptr;
        ControllerHit_getCurrentController(p: ptr): ptr;
        ControllerHit_getHitWorldPos(p: ptr): ptr;
        ControllerHit_getHitWorldNormal(p: ptr): ptr;
@@ -54,7 +54,7 @@ add_definitions(-DCC_SWAPPY_ENABLED)
 endif()


-if(ANDROID AND (NOT SURFACE_LESS_SERVICE))
+if(ANDROID)
    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
@@ -139,7 +139,7 @@ glslang (Built using https://github.com/YunHsiao/glslang/tree/build)
    linux:      11.5.0
    openharmony:11.5.0 (commit: 1978c76)
    
-swig ( Built using https://github.com/cocos/swig/tree/cocos-se, executable files are downloaded from https://github.com/cocos/swig/releases/tag/cocos-v1.1.4 )
-    win64:      cocos-v1.1.4 (commit: 9807544)
-    mac:        cocos-v1.1.4 (commit: 9807544)
-    linux:      cocos-v1.1.4 (commit: 9807544)
+swig ( Built using https://github.com/cocos/swig/tree/cocos-se, executable files are downloaded from https://github.com/cocos/swig/releases/tag/cocos-v1.1.5 )
+    win64:      cocos-v1.1.5 (commit: 42543c0)
+    mac:        cocos-v1.1.5 (commit: 42543c0)
+    linux:      cocos-v1.1.5 (commit: 42543c0)
Author	SHA1	Message	Date
minggoandGitHub	7983e5d777	Merge pull request #387 from minggo/develop-merge-v3.8.1 Develop merge v3.8.1	2023-07-13 14:12:52 +08:00
minggo	109587f1dd	Merge branch 'v3.8.1' into develop-merge-v3.8.1	2023-07-13 11:59:22 +08:00
minggoandGitHub	4063971d00	Merge pull request #385 from cocos/v3.8.0 V3.8.0	2023-07-12 15:16:03 +08:00
Santy-WangandGitHub	80ca0b1f3c	update spine wasm for changing skin (#384 )	2023-07-11 18:22:53 +08:00
Ling ZhanandGitHub	4296d772c0	bullet wasm update (#378 )	2023-07-04 18:31:15 +08:00
minggoandGitHub	8bfff93881	Merge pull request #377 from cocos/v3.8.0 V3.8.0	2023-07-03 14:29:57 +08:00
zhakesiandGitHub	6e292f061a	update spine wasm (#374 )	2023-06-30 14:45:08 +08:00
James ChenandGitHub	e1ee5ad00a	Update swig to v1.1.5, fix https://github.com/cocos/cocos-engine/issues/15583 (#373 )	2023-06-30 10:36:46 +08:00
minggoandGitHub	161b2ca59a	Merge pull request #372 from cocos/v3.8.0 V3.8.0	2023-06-27 11:02:50 +08:00
minggoandGitHub	998ab5a93c	Merge pull request #362 from cocos/v3.8.0 V3.8.0	2023-06-13 10:08:14 +08:00
qiuguohuaandGitHub	bc4dcfbabe	Fix harmonyos platform compilation failure. (#356 )	2023-06-02 14:55:25 +08:00