diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index b1f2f315..0b864d4c 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -158,7 +158,7 @@ set_target_properties(SPVRemapper PROPERTIES set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools SPVRemapper GenericCodeGen) ############################# TBB ############################# - +if(USE_JOB_SYSTEM_TBB) add_library(tbb STATIC IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${platform_spec_path}/libtbb_static.a @@ -172,6 +172,9 @@ set_target_properties(tbbmalloc_proxy PROPERTIES IMPORTED_LOCATION ${platform_spec_path}/libtbbmalloc_proxy_static.a ) set(tbb_libs_name tbbmalloc_proxy tbbmalloc tbb) +else() + set(tbb_libs_name) +endif() 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..00d50424 100644 --- a/ios-m1-simulator/CMakeLists.txt +++ b/ios-m1-simulator/CMakeLists.txt @@ -169,7 +169,7 @@ set_target_properties(spirv-cross-glsl PROPERTIES set(spirv-cross_libs_name spirv-cross-core spirv-cross-glsl spirv-cross-msl) ############################# TBB ############################# - +if(USE_JOB_SYSTEM_TBB) add_library(tbb STATIC IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a @@ -183,6 +183,9 @@ 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) +else() + set(tbb_libs_name) +endif() ## PHYSICS_PHYSX do not support simulator # if(USE_PHYSICS_PHYSX) diff --git a/ios/CMakeLists.txt b/ios/CMakeLists.txt index f3e75d9d..4dd81988 100644 --- a/ios/CMakeLists.txt +++ b/ios/CMakeLists.txt @@ -165,7 +165,7 @@ set_target_properties(spirv-cross-glsl PROPERTIES set(spirv-cross_libs_name spirv-cross-core spirv-cross-glsl spirv-cross-msl) ############################# TBB ############################# - +if(USE_JOB_SYSTEM_TBB) add_library(tbb STATIC IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a @@ -179,6 +179,9 @@ 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) +else() + set(tbb_libs_name) +endif() 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 5db52a27..4dfba354 100644 --- a/mac/CMakeLists.txt +++ b/mac/CMakeLists.txt @@ -167,7 +167,7 @@ set_target_properties(spirv-cross-glsl PROPERTIES set(spirv-cross_libs_name spirv-cross-core spirv-cross-glsl spirv-cross-msl) ############################# TBB ############################# - +if(USE_JOB_SYSTEM_TBB) add_library(tbb STATIC IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a @@ -181,6 +181,9 @@ 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) +else() + set(tbb_libs_name) +endif() 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 c2d89aba..8dedaf8b 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) @@ -205,7 +210,7 @@ foreach(gl IN LISTS glslang_libs_name) endforeach() ############################# TBB ############################# - +if(USE_JOB_SYSTEM_TBB) add_library(tbb SHARED IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll @@ -222,6 +227,9 @@ set_target_properties(tbbmalloc_proxy PROPERTIES IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.lib ) set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy) +else() + set(tbb_libs_name) +endif() list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb) @@ -260,6 +268,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 dccf1273..5f7477f3 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) @@ -204,7 +209,7 @@ foreach(gl IN LISTS glslang_libs_name) ) endforeach() ############################# TBB ############################# - +if(USE_JOB_SYSTEM_TBB) add_library(tbb SHARED IMPORTED GLOBAL) set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll @@ -221,6 +226,9 @@ set_target_properties(tbbmalloc_proxy PROPERTIES IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.lib ) set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy) +else() + set(tbb_libs_name) +endif() list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb) @@ -258,6 +266,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