Merge pull request #394 from cocos/v3.8.1

sync V3.8.1 to develop
This commit is contained in:
Santy-Wang 2023-08-03 18:31:41 +08:00 committed by GitHub
commit 9b5264d916
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 20 additions and 16 deletions

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -72,6 +72,13 @@ set_target_properties(curl PROPERTIES
IMPORTED_LOCATION ${ohos_lib_dir}/libcurl.a 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) set(se_libs_name)
if(USE_SE_V8) if(USE_SE_V8)
@ -122,9 +129,6 @@ endif()
if(USE_SOCKET) if(USE_SOCKET)
list(APPEND CC_EXTERNAL_LIBS list(APPEND CC_EXTERNAL_LIBS
websockets websockets
mbedtls
mbedcrypto
mbedx509
) )
endif() endif()

View File

@ -40,7 +40,7 @@ png
openharmony: 1.6.37 openharmony: 1.6.37
sdl sdl
win32: 2.0.10 win32: 2.0.10
win64: 2.0.14 win64: 2.28.1
linux: 2.0.20 linux: 2.0.20
jpeg jpeg
@ -139,7 +139,7 @@ glslang (Built using https://github.com/YunHsiao/glslang/tree/build)
linux: 11.5.0 linux: 11.5.0
openharmony:11.5.0 (commit: 1978c76) 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 ) 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.5 (commit: 42543c0) win64: cocos-v1.1.6 (commit: f52be17)
mac: cocos-v1.1.5 (commit: 42543c0) mac: cocos-v1.1.6 (commit: f52be17)
linux: cocos-v1.1.5 (commit: 42543c0) linux: cocos-v1.1.6 (commit: f52be17)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.