add tcmalloc & USE_JOB_SYSTEM_TBB (#172)

Co-authored-by: lijilin <jilin.li@cocos.com>

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)

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)

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)

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)

sources/CMakeLists.txt

@@ -16,18 +16,17 @@ set(CC_TINYDIR_SOURCES
   ${CMAKE_CURRENT_LIST_DIR}/tinydir/tinydir.h
 )
 
-set(CC_FS_SOURCES
+set(CC_UTILS_SOURCES
   ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.c
   ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTF.h
   ${CMAKE_CURRENT_LIST_DIR}/ConvertUTF/ConvertUTFWrapper.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.h
 )
 
 
 set(CC_EXTERNAL_SOURCES
 
-  ${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.cpp
-  ${CMAKE_CURRENT_LIST_DIR}/xxtea/xxtea.h
-
   ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.c
   ${CMAKE_CURRENT_LIST_DIR}/tommyds/tommy.h
 )
@@ -36,7 +35,7 @@ if(NOT USE_MODULES)
   list(APPEND CC_EXTERNAL_SOURCES 
     ${CC_UNZIP_SOURCES}
     ${CC_TINYDIR_SOURCES}
-    ${CC_FS_SOURCES}
+    ${CC_UTILS_SOURCES}
   )
 endif()
 

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}

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}