add tcmalloc & USE_JOB_SYSTEM_TBB (#172)
Co-authored-by: lijilin <jilin.li@cocos.com>
This commit is contained in:
parent
674cc1fb78
commit
fc76ca7afe
|
|
@ -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)
|
set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools SPVRemapper GenericCodeGen)
|
||||||
|
|
||||||
############################# TBB #############################
|
############################# TBB #############################
|
||||||
|
if(USE_JOB_SYSTEM_TBB)
|
||||||
add_library(tbb STATIC IMPORTED GLOBAL)
|
add_library(tbb STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(tbb PROPERTIES
|
set_target_properties(tbb PROPERTIES
|
||||||
IMPORTED_LOCATION ${platform_spec_path}/libtbb_static.a
|
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
|
IMPORTED_LOCATION ${platform_spec_path}/libtbbmalloc_proxy_static.a
|
||||||
)
|
)
|
||||||
set(tbb_libs_name tbbmalloc_proxy tbbmalloc tbb)
|
set(tbb_libs_name tbbmalloc_proxy tbbmalloc tbb)
|
||||||
|
else()
|
||||||
|
set(tbb_libs_name)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(USE_PHYSICS_PHYSX)
|
if(USE_PHYSICS_PHYSX)
|
||||||
set(PhysXSDK PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXExtensions PhysX PhysXPvdSDK PhysXCommon PhysXFoundation)
|
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)
|
set(spirv-cross_libs_name spirv-cross-core spirv-cross-glsl spirv-cross-msl)
|
||||||
|
|
||||||
############################# TBB #############################
|
############################# TBB #############################
|
||||||
|
if(USE_JOB_SYSTEM_TBB)
|
||||||
add_library(tbb STATIC IMPORTED GLOBAL)
|
add_library(tbb STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(tbb PROPERTIES
|
set_target_properties(tbb PROPERTIES
|
||||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a
|
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
|
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_proxy_static.a
|
||||||
)
|
)
|
||||||
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
|
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
|
||||||
|
else()
|
||||||
|
set(tbb_libs_name)
|
||||||
|
endif()
|
||||||
|
|
||||||
## PHYSICS_PHYSX do not support simulator
|
## PHYSICS_PHYSX do not support simulator
|
||||||
# if(USE_PHYSICS_PHYSX)
|
# 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)
|
set(spirv-cross_libs_name spirv-cross-core spirv-cross-glsl spirv-cross-msl)
|
||||||
|
|
||||||
############################# TBB #############################
|
############################# TBB #############################
|
||||||
|
if(USE_JOB_SYSTEM_TBB)
|
||||||
add_library(tbb STATIC IMPORTED GLOBAL)
|
add_library(tbb STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(tbb PROPERTIES
|
set_target_properties(tbb PROPERTIES
|
||||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a
|
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
|
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_proxy_static.a
|
||||||
)
|
)
|
||||||
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
|
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
|
||||||
|
else()
|
||||||
|
set(tbb_libs_name)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(USE_PHYSICS_PHYSX)
|
if(USE_PHYSICS_PHYSX)
|
||||||
set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK)
|
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)
|
set(spirv-cross_libs_name spirv-cross-core spirv-cross-glsl spirv-cross-msl)
|
||||||
|
|
||||||
############################# TBB #############################
|
############################# TBB #############################
|
||||||
|
if(USE_JOB_SYSTEM_TBB)
|
||||||
add_library(tbb STATIC IMPORTED GLOBAL)
|
add_library(tbb STATIC IMPORTED GLOBAL)
|
||||||
set_target_properties(tbb PROPERTIES
|
set_target_properties(tbb PROPERTIES
|
||||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a
|
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
|
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbbmalloc_proxy_static.a
|
||||||
)
|
)
|
||||||
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
|
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
|
||||||
|
else()
|
||||||
|
set(tbb_libs_name)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(USE_PHYSICS_PHYSX)
|
if(USE_PHYSICS_PHYSX)
|
||||||
set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK)
|
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
|
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)
|
set(se_libs_name)
|
||||||
|
|
||||||
if(USE_SE_V8)
|
if(USE_SE_V8)
|
||||||
|
|
@ -205,7 +210,7 @@ foreach(gl IN LISTS glslang_libs_name)
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
############################# TBB #############################
|
############################# TBB #############################
|
||||||
|
if(USE_JOB_SYSTEM_TBB)
|
||||||
add_library(tbb SHARED IMPORTED GLOBAL)
|
add_library(tbb SHARED IMPORTED GLOBAL)
|
||||||
set_target_properties(tbb PROPERTIES
|
set_target_properties(tbb PROPERTIES
|
||||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll
|
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
|
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.lib
|
||||||
)
|
)
|
||||||
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
|
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
|
||||||
|
else()
|
||||||
|
set(tbb_libs_name)
|
||||||
|
endif()
|
||||||
|
|
||||||
list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb)
|
list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb)
|
||||||
|
|
||||||
|
|
@ -260,6 +268,7 @@ list(APPEND CC_EXTERNAL_LIBS
|
||||||
websockets
|
websockets
|
||||||
SDL2
|
SDL2
|
||||||
SDL2Main
|
SDL2Main
|
||||||
|
tcmalloc
|
||||||
${glslang_libs_name}
|
${glslang_libs_name}
|
||||||
${tbb_libs_name}
|
${tbb_libs_name}
|
||||||
${PhysXSDK}
|
${PhysXSDK}
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -159,6 +159,11 @@ set_target_properties(SDL2Main PROPERTIES
|
||||||
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/SDL2Main.lib
|
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)
|
set(se_libs_name)
|
||||||
|
|
||||||
if(USE_SE_V8)
|
if(USE_SE_V8)
|
||||||
|
|
@ -204,7 +209,7 @@ foreach(gl IN LISTS glslang_libs_name)
|
||||||
)
|
)
|
||||||
endforeach()
|
endforeach()
|
||||||
############################# TBB #############################
|
############################# TBB #############################
|
||||||
|
if(USE_JOB_SYSTEM_TBB)
|
||||||
add_library(tbb SHARED IMPORTED GLOBAL)
|
add_library(tbb SHARED IMPORTED GLOBAL)
|
||||||
set_target_properties(tbb PROPERTIES
|
set_target_properties(tbb PROPERTIES
|
||||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll
|
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
|
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbbmalloc_proxy.lib
|
||||||
)
|
)
|
||||||
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
|
set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
|
||||||
|
else()
|
||||||
|
set(tbb_libs_name)
|
||||||
|
endif()
|
||||||
|
|
||||||
list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb)
|
list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb)
|
||||||
|
|
||||||
|
|
@ -258,6 +266,7 @@ list(APPEND CC_EXTERNAL_LIBS
|
||||||
websockets
|
websockets
|
||||||
SDL2
|
SDL2
|
||||||
SDL2Main
|
SDL2Main
|
||||||
|
tcmalloc
|
||||||
${glslang_libs_name}
|
${glslang_libs_name}
|
||||||
${tbb_libs_name}
|
${tbb_libs_name}
|
||||||
${PhysXSDK}
|
${PhysXSDK}
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue