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-06-30 14:45:08 +08:00 · 2023-06-27 11:02:50 +08:00 · 2023-06-13 10:08:14 +08:00 · 2023-06-02 14:55:25 +08:00
17 changed files with 1111478 additions and 1014715 deletions
@@ -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()

@@ -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.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
zhakesiandGitHub	6e292f061a	update spine wasm (#374 )	2023-06-30 14:45:08 +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