Merge pull request #394 from cocos/v3.8.1

sync V3.8.1 to develop
Updated version of SDL to fix clicking inside the window and releasing outside the window not getting the correct mouse events. (#393 )
2023-08-03 18:31:41 +08:00 · 2023-07-31 11:21:29 +08:00 · 2023-07-21 14:50:26 +08:00 · 2023-07-21 11:29:25 +08:00 · 2023-07-18 11:33:41 +08:00 · 2023-07-15 12:43:40 +08:00
17 changed files with 28 additions and 26 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;
@@ -72,6 +72,13 @@ set_target_properties(curl PROPERTIES
  IMPORTED_LOCATION ${ohos_lib_dir}/libcurl.a
 )

+# curl needs to link the following libraries.  
+list(APPEND CC_EXTERNAL_LIBS
+    mbedtls
+    mbedcrypto
+    mbedx509
+)
+
 set(se_libs_name)

 if(USE_SE_V8)
@@ -122,9 +129,6 @@ endif()
 if(USE_SOCKET)
    list(APPEND CC_EXTERNAL_LIBS
        websockets
-        mbedtls
-        mbedcrypto
-        mbedx509
    )
 endif()

@@ -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
@@ -40,7 +40,7 @@ png
    openharmony: 1.6.37
 sdl
    win32: 2.0.10
-    win64: 2.0.14
+    win64: 2.28.1
    linux: 2.0.20

 jpeg
@@ -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.6 )
+    win64:      cocos-v1.1.6 (commit: f52be17)
+    mac:        cocos-v1.1.6 (commit: f52be17)
+    linux:      cocos-v1.1.6 (commit: f52be17)
Author	SHA1	Message	Date
Santy-WangandGitHub	9b5264d916	Merge pull request #394 from cocos/v3.8.1 sync V3.8.1 to develop	2023-08-03 18:31:41 +08:00
qiuguohuaandGitHub	beb685b3a1	Updated version of SDL to fix clicking inside the window and releasing outside the window not getting the correct mouse events. (#393 )	2023-07-31 11:21:29 +08:00
江战andGitHub	f290ea0ae2	Merge pull request #391 from qiuguohua/openharmony Solve unchecked websocket link failure issue.	2023-07-21 14:50:26 +08:00
qiuguohua	38354f3cc7	Solve unchecked websocket link failure issue.	2023-07-21 11:29:25 +08:00
minggoandGitHub	547332b8be	Merge pull request #390 from cocos/v3.8.0 update spine wasm & asm to add skin 'getAttachment(index, name)' API.…	2023-07-18 11:33:41 +08:00
CanvasandGitHub	823bc20c60	update spine wasm & asm to add skin 'getAttachment(index, name)' API. (#389 ) * update spine wasm & asm to add skin 'getAttachment(index, name)' API. * fix wechat low performance issue.	2023-07-15 12:43:40 +08:00
James ChenandGitHub	06c42fcd05	Update swig, fix: the generated glue code is wrong if rename an inner class (#388 )	2023-07-13 16:02:45 +08:00
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