Merge pull request #394 from cocos/v3.8.1

sync V3.8.1 to develop
cocos · Aug 3, 2023 · 9b5264d · 9b5264d
2 parents 7983e5d + beb685b
commit 9b5264d
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 16 deletions.
diff --git a/emscripten/spine/spine.asm.js b/emscripten/spine/spine.asm.js
diff --git a/emscripten/spine/spine.js.mem b/emscripten/spine/spine.js.mem
diff --git a/emscripten/spine/spine.wasm b/emscripten/spine/spine.wasm
diff --git a/linux/bin/swig/bin/swig b/linux/bin/swig/bin/swig
diff --git a/mac/bin/swig/bin/swig b/mac/bin/swig/bin/swig
diff --git a/openharmony/CMakeLists.txt b/openharmony/CMakeLists.txt
@@ -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()
 

diff --git a/versions.txt b/versions.txt
@@ -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.5 )
-    win64:      cocos-v1.1.5 (commit: 42543c0)
-    mac:        cocos-v1.1.5 (commit: 42543c0)
-    linux:      cocos-v1.1.5 (commit: 42543c0)
+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)
diff --git a/win64/bin/swig/bin/swig.exe b/win64/bin/swig/bin/swig.exe
diff --git a/win64/libs/SDL2.dll b/win64/libs/SDL2.dll
diff --git a/win64/libs/SDL2.lib b/win64/libs/SDL2.lib
diff --git a/win64/libs/SDL2main.lib b/win64/libs/SDL2main.lib