Merge pull request #362 from cocos/v3.8.0

V3.8.0

emscripten/bullet/bullet.d.ts

@@ -255,7 +255,6 @@ 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;

emscripten/external-wasm.d.ts

@@ -1,23 +1,7 @@
 declare module 'external:emscripten/*.wasm' {
     /**
-     * This is a wasm url relative from build output chunk.
+     * This is a url relative from build output chunk.
      */
     const wasmPath: string;
     export default wasmPath;
 }
-
-declare module 'external:emscripten/*.wasm.fallback' {
-    /**
-     * This is a wasm fallback url relative from build output chunk.
-     */
-    const wasmFallbackPath: string;
-    export default wasmFallbackPath;
-}
-
-declare module 'external:emscripten/*.js.mem' {
-    /**
-     * This is a js.mem url relative from build output chunk.
-     */
-    const jsMemPath: string;
-    export default jsMemPath;
-}

emscripten/spine/spine.d.ts

@@ -2,7 +2,7 @@ declare module 'external:emscripten/spine/spine.asm.js' {
     export default SpineWasm;
 }
 
-declare module 'external:emscripten/spine/spine.wasm.js' {
+declare module 'external:emscripten/spine/spine.js' {
     export default SpineWasm;
 }
 
@@ -10,7 +10,10 @@ declare module 'external:emscripten/spine/spine.wasm.js' {
 declare function SpineWasm (moduleOptions?: any): Promise<void>;
 
 declare namespace SpineWasm {
+    type ptr = number;
     interface instance {
+        spine: any;
+        memory: any;
         spineWasmInit(): void;
         spineWasmDestroy(): void;
     }

openharmony/CMakeLists.txt

@@ -72,13 +72,6 @@ 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)
@@ -129,6 +122,9 @@ endif()
 if(USE_SOCKET)
     list(APPEND CC_EXTERNAL_LIBS
         websockets
+        mbedtls
+        mbedcrypto
+        mbedx509
     )
 endif()
 

versions.txt

@@ -40,7 +40,7 @@ png
     openharmony: 1.6.37
 sdl
     win32: 2.0.10
-    win64: 2.28.1
+    win64: 2.0.14
     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.6 )
-    win64:      cocos-v1.1.6 (commit: f52be17)
-    mac:        cocos-v1.1.6 (commit: f52be17)
-    linux:      cocos-v1.1.6 (commit: f52be17)
+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)