Compare commits
4
Commits
3d-v3.3.2
...
v3d-gfx-72
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
91ced4772c | ||
|
|
61a9b31c19 | ||
|
|
05bf167704 | ||
|
|
fc76ca7afe |
@@ -158,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)
|
||||
|
||||
+1
-9
@@ -126,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)
|
||||
|
||||
+1
-9
@@ -168,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)
|
||||
|
||||
+7
-11
@@ -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)
|
||||
@@ -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}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
+7
-11
@@ -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)
|
||||
@@ -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}
|
||||
|
||||
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