Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f7a71ec36a | ||
|
|
756cbedc19 |
@@ -158,7 +158,15 @@ add_library(tbb STATIC IMPORTED GLOBAL)
|
||||
set_target_properties(tbb PROPERTIES
|
||||
IMPORTED_LOCATION ${platform_spec_path}/libtbb_static.a
|
||||
)
|
||||
set(tbb_libs_name tbb)
|
||||
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)
|
||||
|
||||
if(USE_PHYSICS_PHYSX)
|
||||
set(PhysXSDK PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXExtensions PhysX PhysXPvdSDK PhysXCommon PhysXFoundation)
|
||||
|
||||
@@ -174,7 +174,15 @@ add_library(tbb STATIC IMPORTED GLOBAL)
|
||||
set_target_properties(tbb PROPERTIES
|
||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a
|
||||
)
|
||||
set(tbb_libs_name tbb)
|
||||
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)
|
||||
|
||||
## PHYSICS_PHYSX do not support simulator
|
||||
# if(USE_PHYSICS_PHYSX)
|
||||
|
||||
+9
-1
@@ -126,7 +126,15 @@ add_library(tbb STATIC IMPORTED GLOBAL)
|
||||
set_target_properties(tbb PROPERTIES
|
||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a
|
||||
)
|
||||
set(tbb_libs_name tbb)
|
||||
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)
|
||||
|
||||
if(USE_PHYSICS_PHYSX)
|
||||
set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK)
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
+9
-1
@@ -168,7 +168,15 @@ add_library(tbb STATIC IMPORTED GLOBAL)
|
||||
set_target_properties(tbb PROPERTIES
|
||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libtbb_static.a
|
||||
)
|
||||
set(tbb_libs_name tbb)
|
||||
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)
|
||||
|
||||
if(USE_PHYSICS_PHYSX)
|
||||
set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK)
|
||||
|
||||
+11
-7
@@ -159,11 +159,6 @@ 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)
|
||||
@@ -216,7 +211,17 @@ set_target_properties(tbb PROPERTIES
|
||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll
|
||||
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.lib
|
||||
)
|
||||
set(tbb_libs_name tbb)
|
||||
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)
|
||||
|
||||
list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb)
|
||||
|
||||
@@ -255,7 +260,6 @@ list(APPEND CC_EXTERNAL_LIBS
|
||||
websockets
|
||||
SDL2
|
||||
SDL2Main
|
||||
tcmalloc
|
||||
${glslang_libs_name}
|
||||
${tbb_libs_name}
|
||||
${PhysXSDK}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
+11
-7
@@ -159,11 +159,6 @@ 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)
|
||||
@@ -215,7 +210,17 @@ set_target_properties(tbb PROPERTIES
|
||||
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.dll
|
||||
IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/tbb.lib
|
||||
)
|
||||
set(tbb_libs_name tbb)
|
||||
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)
|
||||
|
||||
list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb)
|
||||
|
||||
@@ -253,7 +258,6 @@ list(APPEND CC_EXTERNAL_LIBS
|
||||
websockets
|
||||
SDL2
|
||||
SDL2Main
|
||||
tcmalloc
|
||||
${glslang_libs_name}
|
||||
${tbb_libs_name}
|
||||
${PhysXSDK}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user