diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index b6a66a0d..43dfe2be 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -158,15 +158,7 @@ add_library(tbb STATIC IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${platform_spec_path}/libtbb_static.a ) -add_library(tbbmalloc STATIC IMPORTED GLOBAL) -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) +set(tbb_libs_name tbb) if(USE_PHYSICS_PHYSX) set(PhysXSDK PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXExtensions PhysX PhysXPvdSDK PhysXCommon PhysXFoundation) diff --git a/ios-m1-simulator/CMakeLists.txt b/ios-m1-simulator/CMakeLists.txt index 8fe1db56..f56b4bde 100644 --- a/ios-m1-simulator/CMakeLists.txt +++ b/ios-m1-simulator/CMakeLists.txt @@ -174,15 +174,7 @@ add_library(tbb STATIC IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a ) -add_library(tbbmalloc STATIC IMPORTED GLOBAL) -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) +set(tbb_libs_name tbb) ## PHYSICS_PHYSX do not support simulator # if(USE_PHYSICS_PHYSX) diff --git a/ios/CMakeLists.txt b/ios/CMakeLists.txt index b5ac4e61..71cce239 100644 --- a/ios/CMakeLists.txt +++ b/ios/CMakeLists.txt @@ -126,15 +126,7 @@ add_library(tbb STATIC IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a ) -add_library(tbbmalloc STATIC IMPORTED GLOBAL) -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) +set(tbb_libs_name tbb) if(USE_PHYSICS_PHYSX) set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK) diff --git a/mac/CMakeLists.txt b/mac/CMakeLists.txt index 5832af3a..d578ccac 100644 --- a/mac/CMakeLists.txt +++ b/mac/CMakeLists.txt @@ -168,15 +168,7 @@ add_library(tbb STATIC IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a ) -add_library(tbbmalloc STATIC IMPORTED GLOBAL) -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) +set(tbb_libs_name tbb) if(USE_PHYSICS_PHYSX) set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK) diff --git a/win32/CMakeLists.txt b/win32/CMakeLists.txt index 880db456..42ab6b59 100644 --- a/win32/CMakeLists.txt +++ b/win32/CMakeLists.txt @@ -159,6 +159,11 @@ set_target_properties(SDL2Main PROPERTIES 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) if(USE_SE_V8) @@ -211,17 +216,7 @@ set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.lib ) -add_library(tbbmalloc SHARED IMPORTED GLOBAL) -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) +set(tbb_libs_name tbb) list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb) @@ -260,6 +255,7 @@ list(APPEND CC_EXTERNAL_LIBS websockets SDL2 SDL2Main + tcmalloc ${glslang_libs_name} ${tbb_libs_name} ${PhysXSDK} diff --git a/win32/libs/libtcmalloc_minimal.dll b/win32/libs/libtcmalloc_minimal.dll new file mode 100644 index 00000000..99d488fe Binary files /dev/null and b/win32/libs/libtcmalloc_minimal.dll differ diff --git a/win32/libs/libtcmalloc_minimal.lib b/win32/libs/libtcmalloc_minimal.lib new file mode 100644 index 00000000..3a45655f Binary files /dev/null and b/win32/libs/libtcmalloc_minimal.lib differ diff --git a/win64/CMakeLists.txt b/win64/CMakeLists.txt index bf1619f1..d2c88693 100644 --- a/win64/CMakeLists.txt +++ b/win64/CMakeLists.txt @@ -159,6 +159,11 @@ set_target_properties(SDL2Main PROPERTIES 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) if(USE_SE_V8) @@ -210,17 +215,7 @@ set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.lib ) -add_library(tbbmalloc SHARED IMPORTED GLOBAL) -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) +set(tbb_libs_name tbb) list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb) @@ -258,6 +253,7 @@ list(APPEND CC_EXTERNAL_LIBS websockets SDL2 SDL2Main + tcmalloc ${glslang_libs_name} ${tbb_libs_name} ${PhysXSDK} diff --git a/win64/libs/libtcmalloc_minimal.dll b/win64/libs/libtcmalloc_minimal.dll new file mode 100644 index 00000000..b8c6cfa1 Binary files /dev/null and b/win64/libs/libtcmalloc_minimal.dll differ diff --git a/win64/libs/libtcmalloc_minimal.lib b/win64/libs/libtcmalloc_minimal.lib new file mode 100644 index 00000000..12477668 Binary files /dev/null and b/win64/libs/libtcmalloc_minimal.lib differ