afeica
/
cocos-engine-external
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #182 from cocos-creator/v3.4.0 

V3.4.0
This commit is contained in:
minggo 2021-08-21 16:36:13 +08:00 committed by GitHub
parent 00dee102a5 61a9b31c19
commit 8e3daf142e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 18 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/CMakeLists.txt
View File

@ -158,15 +158,7 @@ add_library(tbb STATIC IMPORTED GLOBAL)
set_target_properties(tbb PROPERTIES set_target_properties(tbb PROPERTIES
IMPORTED_LOCATION ${platform_spec_path}/libtbb_static.a IMPORTED_LOCATION ${platform_spec_path}/libtbb_static.a
) )
add_library(tbbmalloc STATIC IMPORTED GLOBAL) set(tbb_libs_name tbb)
set_target_properties(tbbmalloc PROPERTIES
IMPORTED_LOCATION ${platform_spec_path}/libtbbmalloc_static.a
)
add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL)
set_target_properties(tbbmalloc_proxy PROPERTIES
IMPORTED_LOCATION ${platform_spec_path}/libtbbmalloc_proxy_static.a
)
set(tbb_libs_name tbbmalloc_proxy tbbmalloc tbb)
if(USE_PHYSICS_PHYSX) if(USE_PHYSICS_PHYSX)
set(PhysXSDK PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXExtensions PhysX PhysXPvdSDK PhysXCommon PhysXFoundation) set(PhysXSDK PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXExtensions PhysX PhysXPvdSDK PhysXCommon PhysXFoundation)

10
ios-m1-simulator/CMakeLists.txt
View File

@ -174,15 +174,7 @@ add_library(tbb STATIC IMPORTED GLOBAL)
set_target_properties(tbb PROPERTIES set_target_properties(tbb PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a
) )
add_library(tbbmalloc STATIC IMPORTED GLOBAL) set(tbb_libs_name tbb)
set_target_properties(tbbmalloc PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_static.a
)
add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL)
set_target_properties(tbbmalloc_proxy PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_proxy_static.a
)
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
## PHYSICS_PHYSX do not support simulator ## PHYSICS_PHYSX do not support simulator
# if(USE_PHYSICS_PHYSX) # if(USE_PHYSICS_PHYSX)

10
ios/CMakeLists.txt
View File

@ -126,15 +126,7 @@ add_library(tbb STATIC IMPORTED GLOBAL)
set_target_properties(tbb PROPERTIES set_target_properties(tbb PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a
) )
add_library(tbbmalloc STATIC IMPORTED GLOBAL) set(tbb_libs_name tbb)
set_target_properties(tbbmalloc PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_static.a
)
add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL)
set_target_properties(tbbmalloc_proxy PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_proxy_static.a
)
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
if(USE_PHYSICS_PHYSX) if(USE_PHYSICS_PHYSX)
set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK) set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK)

10
mac/CMakeLists.txt
View File

@ -168,15 +168,7 @@ add_library(tbb STATIC IMPORTED GLOBAL)
set_target_properties(tbb PROPERTIES set_target_properties(tbb PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a
) )
add_library(tbbmalloc STATIC IMPORTED GLOBAL) set(tbb_libs_name tbb)
set_target_properties(tbbmalloc PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_static.a
)
add_library(tbbmalloc_proxy STATIC IMPORTED GLOBAL)
set_target_properties(tbbmalloc_proxy PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_proxy_static.a
)
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
if(USE_PHYSICS_PHYSX) if(USE_PHYSICS_PHYSX)
set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK) set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK)

18
win32/CMakeLists.txt
View File

@ -159,6 +159,11 @@ set_target_properties(SDL2Main PROPERTIES
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/SDL2Main.lib IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/SDL2Main.lib
) )
add_library(tcmalloc SHARED IMPORTED GLOBAL)
set_target_properties(tcmalloc PROPERTIES
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/libtcmalloc_minimal.lib
)
set(se_libs_name) set(se_libs_name)
if(USE_SE_V8) if(USE_SE_V8)
@ -211,17 +216,7 @@ set_target_properties(tbb PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.lib IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.lib
) )
add_library(tbbmalloc SHARED IMPORTED GLOBAL) set(tbb_libs_name tbb)
set_target_properties(tbbmalloc PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc.dll
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc.lib
)
add_library(tbbmalloc_proxy SHARED IMPORTED GLOBAL)
set_target_properties(tbbmalloc_proxy PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.dll
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.lib
)
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb) list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb)
@ -260,6 +255,7 @@ list(APPEND CC_EXTERNAL_LIBS
websockets websockets
SDL2 SDL2
SDL2Main SDL2Main
tcmalloc
${glslang_libs_name} ${glslang_libs_name}
${tbb_libs_name} ${tbb_libs_name}
${PhysXSDK} ${PhysXSDK}

BIN
win32/libs/libtcmalloc_minimal.dll Normal file
View File

Binary file not shown.

BIN
win32/libs/libtcmalloc_minimal.lib Normal file
View File

Binary file not shown.

18
win64/CMakeLists.txt
View File

@ -159,6 +159,11 @@ set_target_properties(SDL2Main PROPERTIES
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/SDL2Main.lib IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/SDL2Main.lib
) )
add_library(tcmalloc SHARED IMPORTED GLOBAL)
set_target_properties(tcmalloc PROPERTIES
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/libtcmalloc_minimal.lib
)
set(se_libs_name) set(se_libs_name)
if(USE_SE_V8) if(USE_SE_V8)
@ -210,17 +215,7 @@ set_target_properties(tbb PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.lib IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.lib
) )
add_library(tbbmalloc SHARED IMPORTED GLOBAL) set(tbb_libs_name tbb)
set_target_properties(tbbmalloc PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc.dll
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc.lib
)
add_library(tbbmalloc_proxy SHARED IMPORTED GLOBAL)
set_target_properties(tbbmalloc_proxy PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.dll
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.lib
)
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb) list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb)
@ -258,6 +253,7 @@ list(APPEND CC_EXTERNAL_LIBS
websockets websockets
SDL2 SDL2
SDL2Main SDL2Main
tcmalloc
${glslang_libs_name} ${glslang_libs_name}
${tbb_libs_name} ${tbb_libs_name}
${PhysXSDK} ${PhysXSDK}

BIN
win64/libs/libtcmalloc_minimal.dll Normal file
View File

Binary file not shown.

BIN
win64/libs/libtcmalloc_minimal.lib Normal file
View File

Binary file not shown.