add tcmalloc & USE_JOB_SYSTEM_TBB (#172 )

Co-authored-by: lijilin <jilin.li@cocos.com>
Merge pull request #174 from PatriceJiang/3.3-fix-bindings
2021-08-12 14:32:25 +08:00 · 2021-08-11 15:16:51 +08:00 · 2021-08-11 15:15:23 +08:00 · 2021-08-11 14:50:17 +08:00 · 2021-08-11 14:48:23 +08:00 · 2021-08-06 10:25:24 +08:00
79 changed files with 58 additions and 122 deletions
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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()

@@ -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)
@@ -195,64 +200,17 @@ endif()

 ############################# glslang #############################

-add_library(GenericCodeGen STATIC IMPORTED GLOBAL)
-set_target_properties(GenericCodeGen PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/GenericCodeGen.lib
-)
-
-add_library(glslang SHARED IMPORTED GLOBAL)
-set_target_properties(glslang PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.lib
-)
-
-add_library(glslang-default-resource-limits SHARED IMPORTED GLOBAL)
-set_target_properties(glslang-default-resource-limits PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.lib
-)
-
-add_library(MachineIndependent STATIC IMPORTED GLOBAL)
-set_target_properties(MachineIndependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/MachineIndependent.lib
-)
-
-add_library(OGLCompiler STATIC IMPORTED GLOBAL)
-set_target_properties(OGLCompiler PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OGLCompiler.lib
-)
-
-add_library(OSDependent STATIC IMPORTED GLOBAL)
-set_target_properties(OSDependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OSDependent.lib
-)
-
-add_library(SPIRV SHARED IMPORTED GLOBAL)
-set_target_properties(SPIRV PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.dll 
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.lib
-)
-
-add_library(SPIRV-Tools STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools.lib
-)
-
-add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools-opt PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools-opt.lib
-)
-
-add_library(SPVRemapper SHARED IMPORTED GLOBAL)
-set_target_properties(SPVRemapper PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.lib
-)
-
-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools SPVRemapper GenericCodeGen)
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt SPVRemapper GenericCodeGen)
+foreach(gl IN LISTS glslang_libs_name)
+  add_library(${gl} STATIC IMPORTED GLOBAL)
+  set_target_properties(${gl} PROPERTIES
+    IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}d.lib
+    IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}.lib
+  )
+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
@@ -269,9 +227,14 @@ 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)

+######################## PhysX ##############################
+
 if(USE_PHYSICS_PHYSX)
  set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK)
  foreach(PX IN LISTS PhysXSDK)
@@ -305,6 +268,7 @@ list(APPEND CC_EXTERNAL_LIBS
    websockets
    SDL2
    SDL2Main
+    tcmalloc
    ${glslang_libs_name}
    ${tbb_libs_name}
    ${PhysXSDK}
@@ -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)
@@ -195,64 +200,16 @@ endif()

 ############################# glslang #############################

-add_library(GenericCodeGen STATIC IMPORTED GLOBAL)
-set_target_properties(GenericCodeGen PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/GenericCodeGen.lib
-)
-
-add_library(glslang SHARED IMPORTED GLOBAL)
-set_target_properties(glslang PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.lib
-)
-
-add_library(glslang-default-resource-limits SHARED IMPORTED GLOBAL)
-set_target_properties(glslang-default-resource-limits PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.lib
-)
-
-add_library(MachineIndependent STATIC IMPORTED GLOBAL)
-set_target_properties(MachineIndependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/MachineIndependent.lib
-)
-
-add_library(OGLCompiler STATIC IMPORTED GLOBAL)
-set_target_properties(OGLCompiler PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OGLCompiler.lib
-)
-
-add_library(OSDependent STATIC IMPORTED GLOBAL)
-set_target_properties(OSDependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OSDependent.lib
-)
-
-add_library(SPIRV SHARED IMPORTED GLOBAL)
-set_target_properties(SPIRV PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.dll 
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.lib
-)
-
-add_library(SPIRV-Tools STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools.lib
-)
-
-add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools-opt PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools-opt.lib
-)
-
-add_library(SPVRemapper SHARED IMPORTED GLOBAL)
-set_target_properties(SPVRemapper PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.lib
-)
-
-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools SPVRemapper GenericCodeGen)
-
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt SPVRemapper GenericCodeGen)
+foreach(gl IN LISTS glslang_libs_name)
+  add_library(${gl} STATIC IMPORTED GLOBAL)
+  set_target_properties(${gl} PROPERTIES
+    IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}d.lib
+    IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}.lib
+  )
+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
@@ -269,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)

@@ -306,6 +266,7 @@ list(APPEND CC_EXTERNAL_LIBS
    websockets
    SDL2
    SDL2Main
+    tcmalloc
    ${glslang_libs_name}
    ${tbb_libs_name}
    ${PhysXSDK}
Author	SHA1	Message	Date
李吉林 GitHub lijilin	fc76ca7afe	add tcmalloc & USE_JOB_SYSTEM_TBB (#172 ) Co-authored-by: lijilin <jilin.li@cocos.com>	2021-08-12 14:32:25 +08:00
江战andGitHub	674cc1fb78	Merge pull request #174 from PatriceJiang/3.3-fix-bindings bugfix: rename variable	2021-08-11 15:16:51 +08:00
Arnold	c51a7e1c57	fix 2	2021-08-11 15:15:23 +08:00
江战andGitHub	303041611f	Merge pull request #173 from PatriceJiang/3.3-fix-bindings Rename vars	2021-08-11 14:50:17 +08:00
Arnold	866613b6dd	move tea to ccutils	2021-08-11 14:48:23 +08:00
江战andGitHub	29c1e7be47	Merge pull request #171 from timlyeee/v3d-gfx-arm64 add x86_64 glslang for ios	2021-08-06 10:25:24 +08:00
LX	f1aa69a54d	add x86_64 glslang for ios	2021-08-06 10:19:40 +08:00
江战andGitHub	b0dcf214d6	Merge pull request #170 from timlyeee/v3d-gfx-arm64 add glslang arm64 libs and lipo together	2021-08-05 15:42:41 +08:00
LX	064445e8a5	add glslang arm64 libs and lipo together	2021-08-05 14:55:13 +08:00
timlyeeeandGitHub	1129f869f0	recreate glslang static libs (#169 ) * recreate glslang static libs * re-add glslang static libs * delete opt libs as it's too larg, also modified cmake list * keep unified glslang version 11.5.0 * (no branch):	2021-08-04 17:45:38 +08:00