Add msvcr dynamic library (#185 )

* Add msvcr dynamic library Issue: https://github.com/cocos-creator/3d-tasks/issues/8920 * msvcr110 is Microsoft Visual C++ Redistributable 2012 * msvcr120 is Microsoft Visual C++ Redistributable 2013 * MSVCP140(D).dll, vcruntime(d).dll is in Microsoft Visual C++ Redistributable 2015 Simulator usually runs on Win32 platform so no need for x64. And x64 platform runs without msvcr110+ * add x64 * Revert "Add msvcr dynamic library" This reverts commit f5c8d60d05.
Merge pull request #180 from cocos-creator/3d-gfx
2021-09-07 10:20:05 +08:00 · 2021-08-17 10:57:55 +08:00 · 2021-08-16 15:40:19 +08:00 · 2021-08-13 18:43:47 +08:00 · 2021-08-12 14:32:25 +08:00
42 changed files with 29 additions and 122 deletions
@@ -150,12 +150,7 @@ set_target_properties(SPIRV-Tools-opt PROPERTIES
  IMPORTED_LOCATION ${platform_spec_path}/glslang/libSPIRV-Tools-opt.a
 )

-add_library(SPVRemapper STATIC IMPORTED GLOBAL)
-set_target_properties(SPVRemapper PROPERTIES
-  IMPORTED_LOCATION ${platform_spec_path}/glslang/libSPVRemapper.a
-)
-
-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-opt SPIRV-Tools GenericCodeGen)

 ############################# TBB #############################

@@ -163,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)
@@ -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)
@@ -96,57 +96,13 @@ endif()

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

-add_library(GenericCodeGen STATIC IMPORTED GLOBAL)
-set_target_properties(GenericCodeGen PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libGenericCodeGen.a
-)
-
-add_library(glslang STATIC IMPORTED GLOBAL)
-set_target_properties(glslang PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libglslang.a
-)
-
-add_library(glslang-default-resource-limits STATIC IMPORTED GLOBAL)
-set_target_properties(glslang-default-resource-limits PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libglslang-default-resource-limits.a
-)
-
-add_library(MachineIndependent STATIC IMPORTED GLOBAL)
-set_target_properties(MachineIndependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libMachineIndependent.a
-)
-
-add_library(OGLCompiler STATIC IMPORTED GLOBAL)
-set_target_properties(OGLCompiler PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libOGLCompiler.a
-)
-
-add_library(OSDependent STATIC IMPORTED GLOBAL)
-set_target_properties(OSDependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libOSDependent.a
-)
-
-add_library(SPIRV STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPIRV.a
-)
-
-add_library(SPIRV-Tools STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPIRV-Tools.a
-)
-
-add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools-opt PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPIRV-Tools-opt.a
-)
-
-add_library(SPVRemapper STATIC IMPORTED GLOBAL)
-set_target_properties(SPVRemapper PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPVRemapper.a
-)
-
-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 GenericCodeGen)
+foreach(gl IN LISTS glslang_libs_name)
+  add_library(${gl} STATIC IMPORTED GLOBAL)
+  set_target_properties(${gl} PROPERTIES
+    IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/lib${gl}.a
+  )
+endforeach()

 ############################# SPIRV-Cross #############################

@@ -170,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)
@@ -143,12 +143,8 @@ set_target_properties(SPIRV-Tools-opt PROPERTIES
  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPIRV-Tools-opt.a
 )

-add_library(SPVRemapper STATIC IMPORTED GLOBAL)
-set_target_properties(SPVRemapper PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPVRemapper.a
-)

-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt SPVRemapper GenericCodeGen)
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt GenericCodeGen)

 ############################# SPIRV-Cross #############################

@@ -172,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)
@@ -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,7 +200,7 @@ endif()

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

-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt SPVRemapper GenericCodeGen)
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt GenericCodeGen)
 foreach(gl IN LISTS glslang_libs_name)
  add_library(${gl} STATIC IMPORTED GLOBAL)
  set_target_properties(${gl} PROPERTIES
@@ -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}
@@ -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,7 +200,7 @@ endif()

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

-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt SPVRemapper GenericCodeGen)
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt GenericCodeGen)
 foreach(gl IN LISTS glslang_libs_name)
  add_library(${gl} STATIC IMPORTED GLOBAL)
  set_target_properties(${gl} PROPERTIES
@@ -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}
Author	SHA1	Message	Date
timlyeeeandGitHub	91ced4772c	Add msvcr dynamic library (#185 ) * Add msvcr dynamic library Issue: https://github.com/cocos-creator/3d-tasks/issues/8920 * msvcr110 is Microsoft Visual C++ Redistributable 2012 * msvcr120 is Microsoft Visual C++ Redistributable 2013 * MSVCP140(D).dll, vcruntime(d).dll is in Microsoft Visual C++ Redistributable 2015 Simulator usually runs on Win32 platform so no need for x64. And x64 platform runs without msvcr110+ * add x64 * Revert "Add msvcr dynamic library" This reverts commit `f5c8d60d05`.	2021-09-07 10:20:05 +08:00
minggoandGitHub	61a9b31c19	Merge pull request #180 from cocos-creator/3d-gfx 3d gfx	2021-08-17 10:57:55 +08:00
李吉林 GitHub lijilin	05bf167704	vk use tbb but tbbmalloc (#179 ) Co-authored-by: lijilin <jilin.li@cocos.com>	2021-08-16 15:40:19 +08:00
timlyeee GitHub LX	f931b3637d	Fix spirv issue (#178 ) * modify spirv * update Spirv * issue: https://github.com/cocos-creator/3d-tasks/issues/8671 * Update Android Co-authored-by: LX <codingboeuf@jizamaoxuewangdeMacBook-Air.local>	2021-08-13 18:43:47 +08:00
李吉林 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