Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
  minggoandGitHub
|
8fef1505b4 | ||
 James Chen
|
772894d6a0 | ||
|
minggoandGitHub
|
d30c066419 | ||
|
James Chen
|
ab15deb121 | ||
 江战andGitHub
|
0fd7ff8de9 | ||
 Patrice Jiang
|
651482be4f | ||
|
James ChenandGitHub
|
b701539f22 |
@@ -84,7 +84,8 @@ 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 v8_inspector)
|
||||
set(se_libs_name v8_monolith)
|
||||
set(se_libs_include ${platform_spec_path}/include/v8)
|
||||
endif()
|
||||
|
||||
if(USE_WEBSOCKET_SERVER)
|
||||
@@ -160,7 +161,9 @@ 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()
|
||||
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
Vendored
-1
@@ -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;
|
||||
|
||||
Binary file not shown.
+1107772
-1012647
File diff suppressed because one or more lines are too long
+3550
-1996
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
@@ -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()
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ add_definitions(-DCC_SWAPPY_ENABLED)
|
||||
endif()
|
||||
|
||||
|
||||
if(ANDROID)
|
||||
if(ANDROID AND (NOT SURFACE_LESS_SERVICE))
|
||||
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
|
||||
|
||||
+5
-5
@@ -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)
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user