diff options
Diffstat (limited to 'sdk')
22 files changed, 822 insertions, 718 deletions
diff --git a/sdk/CMakeLists.txt b/sdk/CMakeLists.txt index 6d8cd5d..80b6ea3 100755 --- a/sdk/CMakeLists.txt +++ b/sdk/CMakeLists.txt @@ -53,9 +53,9 @@ ENDIF() IF (APPEND_CONFIG_NAME)
MESSAGE("Appending config to output names")
- SET(CMAKE_DEBUG_POSTFIX "DEBUG")
- SET(CMAKE_PROFILE_POSTFIX "PROFILE")
- SET(CMAKE_CHECKED_POSTFIX "CHECKED")
+ SET(CMAKE_DEBUG_POSTFIX "")
+ SET(CMAKE_PROFILE_POSTFIX "")
+ SET(CMAKE_CHECKED_POSTFIX "")
SET(CMAKE_RELEASE_POSTFIX "")
ENDIF()
diff --git a/sdk/compiler/cmake/NvBlast.cmake b/sdk/compiler/cmake/NvBlast.cmake index db10d8f..5353fa4 100755 --- a/sdk/compiler/cmake/NvBlast.cmake +++ b/sdk/compiler/cmake/NvBlast.cmake @@ -90,4 +90,16 @@ SET_TARGET_PROPERTIES(NvBlast PROPERTIES PDB_NAME_CHECKED "NvBlast${CMAKE_CHECKED_POSTFIX}"
PDB_NAME_PROFILE "NvBlast${CMAKE_PROFILE_POSTFIX}"
PDB_NAME_RELEASE "NvBlast${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
diff --git a/sdk/compiler/cmake/NvBlastExtAssetUtils.cmake b/sdk/compiler/cmake/NvBlastExtAssetUtils.cmake index f69d40d..31d847b 100755 --- a/sdk/compiler/cmake/NvBlastExtAssetUtils.cmake +++ b/sdk/compiler/cmake/NvBlastExtAssetUtils.cmake @@ -84,6 +84,18 @@ SET_TARGET_PROPERTIES(NvBlastExtAssetUtils PROPERTIES PDB_NAME_CHECKED "NvBlastExtAssetUtils${CMAKE_CHECKED_POSTFIX}"
PDB_NAME_PROFILE "NvBlastExtAssetUtils${CMAKE_PROFILE_POSTFIX}"
PDB_NAME_RELEASE "NvBlastExtAssetUtils${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
# Do final direct sets after the target has been defined
diff --git a/sdk/compiler/cmake/NvBlastExtAuthoring.cmake b/sdk/compiler/cmake/NvBlastExtAuthoring.cmake index b96f9d2..fec74b8 100755 --- a/sdk/compiler/cmake/NvBlastExtAuthoring.cmake +++ b/sdk/compiler/cmake/NvBlastExtAuthoring.cmake @@ -12,7 +12,8 @@ SET(AUTHORING_EXT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/extensions/authoring/source) SET(COMMON_EXT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/extensions/common/source)
SET(AUTHORING_EXT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/extensions/authoring/include)
-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)
+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)
+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)
FIND_PACKAGE(BoostMultiprecision $ENV{PM_BoostMultiprecision_VERSION} REQUIRED)
# Include here after the directories are defined so that the platform specific file can use the variables.
@@ -126,6 +127,7 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtAuthoring PRIVATE ${PROJECT_SOURCE_DIR}/extensions/RT/source
PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
+ PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
PRIVATE ${BOOSTMULTIPRECISION_INCLUDE_DIRS}
@@ -147,6 +149,18 @@ SET_TARGET_PROPERTIES(NvBlastExtAuthoring PROPERTIES PDB_NAME_CHECKED "NvBlastExtAuthoring${CMAKE_CHECKED_POSTFIX}"
PDB_NAME_PROFILE "NvBlastExtAuthoring${CMAKE_PROFILE_POSTFIX}"
PDB_NAME_RELEASE "NvBlastExtAuthoring${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
# Do final direct sets after the target has been defined
diff --git a/sdk/compiler/cmake/NvBlastExtExporter.cmake b/sdk/compiler/cmake/NvBlastExtExporter.cmake index 69f08cb..8fc10e5 100755 --- a/sdk/compiler/cmake/NvBlastExtExporter.cmake +++ b/sdk/compiler/cmake/NvBlastExtExporter.cmake @@ -11,7 +11,8 @@ SET(EXPORTER_EXT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/extensions/exporter/include) SET(EXT_AUTHORING_INCLUDE_DIR ${BLAST_ROOT_DIR}/sdk/extensions/authoring/include)
SET(TK_INCLUDE_DIR ${BLAST_ROOT_DIR}/sdk/toolkit/include)
-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)
+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)
+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)
FIND_PACKAGE(tinyObjLoader $ENV{PM_tinyObjLoader_VERSION} REQUIRED)
FIND_PACKAGE(FBXSDK $ENV{PM_FBXSDK_VERSION} REQUIRED)
@@ -72,6 +73,7 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtExporter PRIVATE ${EXPORTER_EXT_SOURCE_DIR}
PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
+ PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
PRIVATE ${TINYOBJLOADER_INCLUDE_DIRS}
PRIVATE ${FBXSDK_INCLUDE_DIRS}
@@ -90,6 +92,18 @@ SET_TARGET_PROPERTIES(NvBlastExtExporter PROPERTIES PDB_NAME_CHECKED "NvBlastExtExporter${CMAKE_CHECKED_POSTFIX}"
PDB_NAME_PROFILE "NvBlastExtExporter${CMAKE_PROFILE_POSTFIX}"
PDB_NAME_RELEASE "NvBlastExtExporter${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
# Do final direct sets after the target has been defined
diff --git a/sdk/compiler/cmake/NvBlastExtImport.cmake b/sdk/compiler/cmake/NvBlastExtImport.cmake index f694d98..32ebf80 100755 --- a/sdk/compiler/cmake/NvBlastExtImport.cmake +++ b/sdk/compiler/cmake/NvBlastExtImport.cmake @@ -13,8 +13,8 @@ SET(PHYSX_EXT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/extensions/physx/include) SET(APEX_MODULES_DIR ${PROJECT_SOURCE_DIR}/extensions/import/apexmodules)
-FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED)
-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)
+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)
+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)
# Include here after the directories are defined so that the platform specific file can use the variables.
include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/NvBlastExtImport.cmake)
@@ -77,7 +77,8 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtImport PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
-
+ PUBLIC ${BLAST_ROOT_DIR}/shared/filebuf/include
+
PRIVATE ${APEX_MODULES_DIR}/modules/common/include/autogen
PRIVATE ${APEX_MODULES_DIR}/modules/common/include
PRIVATE ${APEX_MODULES_DIR}/modules/common_legacy/include/autogen
@@ -112,15 +113,21 @@ SET_TARGET_PROPERTIES(NvBlastExtImport PROPERTIES PDB_NAME_CHECKED "NvBlastExtImport${CMAKE_CHECKED_POSTFIX}"
PDB_NAME_PROFILE "NvBlastExtImport${CMAKE_PROFILE_POSTFIX}"
PDB_NAME_RELEASE "NvBlastExtImport${CMAKE_RELEASE_POSTFIX}"
-)
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release")
# Do final direct sets after the target has been defined
TARGET_LINK_LIBRARIES(NvBlastExtImport
PRIVATE NvBlast NvBlastTk NvBlastExtAuthoring
PUBLIC ${BLASTEXT_PLATFORM_LINKED_LIBS}
- PUBLIC $<$<CONFIG:debug>:${PSFASTXML_LIB_DEBUG}>
- PUBLIC $<$<CONFIG:checked>:${PSFASTXML_LIB_CHECKED}>
- PUBLIC $<$<CONFIG:profile>:${PSFASTXML_LIB_PROFILE}>
- PUBLIC $<$<CONFIG:release>:${PSFASTXML_LIB}>
-
)
diff --git a/sdk/compiler/cmake/NvBlastExtPhysX.cmake b/sdk/compiler/cmake/NvBlastExtPhysX.cmake index 00ff02e..0f2d3bb 100755 --- a/sdk/compiler/cmake/NvBlastExtPhysX.cmake +++ b/sdk/compiler/cmake/NvBlastExtPhysX.cmake @@ -10,8 +10,8 @@ SET(PHYSX_EXT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/extensions/physx/source) SET(COMMON_EXT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/extensions/common/include)
SET(PHYSX_EXT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/extensions/physx/include)
-FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED)
-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)
+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)
+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)
# Include here after the directories are defined so that the platform specific file can use the variables.
include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/NvBlastExtPhysX.cmake)
@@ -103,6 +103,7 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtPhysX PUBLIC ${PHYSXSDK_INCLUDE_DIRS}
PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
+ PUBLIC ${BLAST_ROOT_DIR}/shared/filebuf/include
)
TARGET_COMPILE_DEFINITIONS(NvBlastExtPhysX
@@ -119,15 +120,27 @@ SET_TARGET_PROPERTIES(NvBlastExtPhysX PROPERTIES PDB_NAME_CHECKED "NvBlastExtPhysX${CMAKE_CHECKED_POSTFIX}"
PDB_NAME_PROFILE "NvBlastExtPhysX${CMAKE_PROFILE_POSTFIX}"
PDB_NAME_RELEASE "NvBlastExtPhysX${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
# Do final direct sets after the target has been defined
TARGET_LINK_LIBRARIES(NvBlastExtPhysX
PUBLIC NvBlastTk NvBlastExtShaders NvBlastExtStress
- PUBLIC $<$<CONFIG:debug>:${PHYSX3_LIB_DEBUG}> $<$<CONFIG:debug>:${PHYSX3COOKING_LIB_DEBUG}> $<$<CONFIG:debug>:${PHYSX3EXTENSIONS_LIB_DEBUG}> $<$<CONFIG:debug>:${PXFOUNDATION_LIB_DEBUG}>
- PUBLIC $<$<CONFIG:checked>:${PHYSX3_LIB_CHECKED}> $<$<CONFIG:checked>:${PHYSX3COOKING_LIB_CHECKED}> $<$<CONFIG:checked>:${PHYSX3EXTENSIONS_LIB_CHECKED}> $<$<CONFIG:checked>:${PXFOUNDATION_LIB_CHECKED}>
- PUBLIC $<$<CONFIG:profile>:${PHYSX3_LIB_PROFILE}> $<$<CONFIG:profile>:${PHYSX3COOKING_LIB_PROFILE}> $<$<CONFIG:profile>:${PHYSX3EXTENSIONS_LIB_PROFILE}> $<$<CONFIG:profile>:${PXFOUNDATION_LIB_PROFILE}>
- PUBLIC $<$<CONFIG:release>:${PHYSX3_LIB}> $<$<CONFIG:release>:${PHYSX3COOKING_LIB}> $<$<CONFIG:release>:${PHYSX3EXTENSIONS_LIB}> $<$<CONFIG:release>:${PXFOUNDATION_LIB}>
+ PUBLIC $<$<CONFIG:debug>:${PHYSX_LIB_DEBUG}> $<$<CONFIG:debug>:${PHYSXCOOKING_LIB_DEBUG}> $<$<CONFIG:debug>:${PHYSXEXTENSIONS_STATIC_LIB_DEBUG}> $<$<CONFIG:debug>:${PHYSXFOUNDATION_LIB_DEBUG}>
+ PUBLIC $<$<CONFIG:checked>:${PHYSX_LIB_CHECKED}> $<$<CONFIG:checked>:${PHYSXCOOKING_LIB_CHECKED}> $<$<CONFIG:checked>:${PHYSXEXTENSIONS_STATIC_LIB_CHECKED}> $<$<CONFIG:checked>:${PHYSXFOUNDATION_LIB_CHECKED}>
+ PUBLIC $<$<CONFIG:profile>:${PHYSX_LIB_PROFILE}> $<$<CONFIG:profile>:${PHYSXCOOKING_LIB_PROFILE}> $<$<CONFIG:profile>:${PHYSXEXTENSIONS_STATIC_LIB_PROFILE}> $<$<CONFIG:profile>:${PHYSXFOUNDATION_LIB_PROFILE}>
+ PUBLIC $<$<CONFIG:release>:${PHYSX_LIB}> $<$<CONFIG:release>:${PHYSXCOOKING_LIB}> $<$<CONFIG:release>:${PHYSXEXTENSIONS_STATIC_LIB}> $<$<CONFIG:release>:${PHYSXFOUNDATION_LIB}>
PUBLIC ${BLASTEXT_PLATFORM_LINKED_LIBS}
)
diff --git a/sdk/compiler/cmake/NvBlastExtPxSerialization.cmake b/sdk/compiler/cmake/NvBlastExtPxSerialization.cmake index a781d87..e2bd2a1 100755 --- a/sdk/compiler/cmake/NvBlastExtPxSerialization.cmake +++ b/sdk/compiler/cmake/NvBlastExtPxSerialization.cmake @@ -18,8 +18,8 @@ SET(SOLVER_SOURCE_DIR ${PROJECT_SOURCE_DIR}/lowlevel/source) SET(SERIAL_GENERATED_SOURCE_DIR ${SERIAL_EXT_SOURCE_DIR}/generated)
-FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED)
-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)
+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)
+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)
FIND_PACKAGE(CapnProtoSDK $ENV{PM_CapnProto_VERSION} REQUIRED)
# Include here after the directories are defined so that the platform specific file can use the variables.
@@ -172,7 +172,7 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtPxSerialization PRIVATE ${COMMON_SOURCE_DIR}
- PUBLIC ${PHYSXSDK_INCLUDE_DIRS}
+ PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
)
@@ -186,20 +186,32 @@ TARGET_COMPILE_OPTIONS(NvBlastExtPxSerialization PRIVATE ${BLASTEXTPXSERIALIZATION_COMPILE_OPTIONS}
)
-SET_TARGET_PROPERTIES(NvBlastExtPxSerialization PROPERTIES
+SET_TARGET_PROPERTIES(NvBlastExtPxSerialization PROPERTIES
PDB_NAME_DEBUG "NvBlastExtPxSerialization${CMAKE_DEBUG_POSTFIX}"
PDB_NAME_CHECKED "NvBlastExtPxSerialization${CMAKE_CHECKED_POSTFIX}"
PDB_NAME_PROFILE "NvBlastExtPxSerialization${CMAKE_PROFILE_POSTFIX}"
PDB_NAME_RELEASE "NvBlastExtPxSerialization${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
# Do final direct sets after the target has been defined
TARGET_LINK_LIBRARIES(NvBlastExtPxSerialization
PRIVATE NvBlast NvBlastGlobals NvBlastTk NvBlastExtPhysX ${CAPNPROTOSDK_LIBRARIES}
- PUBLIC $<$<CONFIG:debug>:${PHYSX3_LIB_DEBUG}> $<$<CONFIG:debug>:${PHYSX3COOKING_LIB_DEBUG}>
- PUBLIC $<$<CONFIG:checked>:${PHYSX3_LIB_CHECKED}> $<$<CONFIG:checked>:${PHYSX3COOKING_LIB_CHECKED}>
- PUBLIC $<$<CONFIG:profile>:${PHYSX3_LIB_PROFILE}> $<$<CONFIG:profile>:${PHYSX3COOKING_LIB_PROFILE}>
- PUBLIC $<$<CONFIG:release>:${PHYSX3_LIB}> $<$<CONFIG:release>:${PHYSX3COOKING_LIB}>
+ PUBLIC $<$<CONFIG:debug>:${PHYSX_LIB_DEBUG}> $<$<CONFIG:debug>:${PHYSXCOOKING_LIB_DEBUG}>
+ PUBLIC $<$<CONFIG:checked>:${PHYSX_LIB_CHECKED}> $<$<CONFIG:checked>:${PHYSXCOOKING_LIB_CHECKED}>
+ PUBLIC $<$<CONFIG:profile>:${PHYSX_LIB_PROFILE}> $<$<CONFIG:profile>:${PHYSXCOOKING_LIB_PROFILE}>
+ PUBLIC $<$<CONFIG:release>:${PHYSX_LIB}> $<$<CONFIG:release>:${PHYSXCOOKING_LIB}>
)
#Hack for now to force these to build serialially to fix fighting over writing the generated code
diff --git a/sdk/compiler/cmake/NvBlastExtSerialization.cmake b/sdk/compiler/cmake/NvBlastExtSerialization.cmake index a2679bc..0a22aef 100755 --- a/sdk/compiler/cmake/NvBlastExtSerialization.cmake +++ b/sdk/compiler/cmake/NvBlastExtSerialization.cmake @@ -13,7 +13,8 @@ SET(SOLVER_SOURCE_DIR ${PROJECT_SOURCE_DIR}/lowlevel/source) SET(SERIAL_GENERATED_SOURCE_DIR ${SERIAL_EXT_SOURCE_DIR}/generated)
-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)
+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)
+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)
FIND_PACKAGE(CapnProtoSDK $ENV{PM_CapnProto_VERSION} REQUIRED)
# Include here after the directories are defined so that the platform specific file can use the variables.
@@ -129,6 +130,7 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtSerialization PRIVATE ${COMMON_SOURCE_DIR}
PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
+ PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
)
TARGET_COMPILE_DEFINITIONS(NvBlastExtSerialization
@@ -146,6 +148,18 @@ SET_TARGET_PROPERTIES(NvBlastExtSerialization PROPERTIES PDB_NAME_CHECKED "NvBlastExtSerialization${CMAKE_CHECKED_POSTFIX}"
PDB_NAME_PROFILE "NvBlastExtSerialization${CMAKE_PROFILE_POSTFIX}"
PDB_NAME_RELEASE "NvBlastExtSerialization${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
# Do final direct sets after the target has been defined
diff --git a/sdk/compiler/cmake/NvBlastExtShaders.cmake b/sdk/compiler/cmake/NvBlastExtShaders.cmake index 91d2d9b..cde11ac 100755 --- a/sdk/compiler/cmake/NvBlastExtShaders.cmake +++ b/sdk/compiler/cmake/NvBlastExtShaders.cmake @@ -53,6 +53,7 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtShaders PRIVATE ${PROJECT_SOURCE_DIR}/common
PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
+ PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
)
TARGET_COMPILE_DEFINITIONS(NvBlastExtShaders
@@ -69,6 +70,18 @@ SET_TARGET_PROPERTIES(NvBlastExtShaders PROPERTIES PDB_NAME_CHECKED "NvBlastExtShaders${CMAKE_CHECKED_POSTFIX}"
PDB_NAME_PROFILE "NvBlastExtShaders${CMAKE_PROFILE_POSTFIX}"
PDB_NAME_RELEASE "NvBlastExtShaders${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
# Do final direct sets after the target has been defined
diff --git a/sdk/compiler/cmake/NvBlastExtStress.cmake b/sdk/compiler/cmake/NvBlastExtStress.cmake index f5fcd99..b1b641f 100755 --- a/sdk/compiler/cmake/NvBlastExtStress.cmake +++ b/sdk/compiler/cmake/NvBlastExtStress.cmake @@ -10,7 +10,8 @@ SET(STRESS_SOURCE_DIR ${PROJECT_SOURCE_DIR}/extensions/stress/source) SET(EXT_COMMON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/extensions/common/source)
SET(EXT_COMMON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/extensions/common/include)
-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)
+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)
+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)
# Include here after the directories are defined so that the platform specific file can use the variables.
include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/NvBlastExtStress.cmake OPTIONAL)
@@ -55,6 +56,7 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtStress PRIVATE ${COMMON_SOURCE_DIR}
PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
+ PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
)
SET(BLASTEXTSTRESS_COMPILE_DEFS
@@ -82,6 +84,18 @@ SET_TARGET_PROPERTIES(NvBlastExtStress PROPERTIES PDB_NAME_CHECKED "NvBlastExtStress${CMAKE_CHECKED_POSTFIX}"
PDB_NAME_PROFILE "NvBlastExtStress${CMAKE_PROFILE_POSTFIX}"
PDB_NAME_RELEASE "NvBlastExtStress${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
# Do final direct sets after the target has been defined
diff --git a/sdk/compiler/cmake/NvBlastExtTkSerialization.cmake b/sdk/compiler/cmake/NvBlastExtTkSerialization.cmake index 38acb6f..5bc066f 100755 --- a/sdk/compiler/cmake/NvBlastExtTkSerialization.cmake +++ b/sdk/compiler/cmake/NvBlastExtTkSerialization.cmake @@ -16,7 +16,8 @@ SET(SOLVER_SOURCE_DIR ${PROJECT_SOURCE_DIR}/lowlevel/source) SET(SERIAL_GENERATED_SOURCE_DIR ${SERIAL_EXT_SOURCE_DIR}/generated)
-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)
+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)
+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)
FIND_PACKAGE(CapnProtoSDK $ENV{PM_CapnProto_VERSION} REQUIRED)
# Include here after the directories are defined so that the platform specific file can use the variables.
@@ -144,6 +145,7 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastExtTkSerialization PRIVATE ${COMMON_SOURCE_DIR}
PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
+ PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
)
TARGET_COMPILE_DEFINITIONS(NvBlastExtTkSerialization
@@ -161,6 +163,18 @@ SET_TARGET_PROPERTIES(NvBlastExtTkSerialization PROPERTIES PDB_NAME_CHECKED "NvBlastExtTkSerialization${CMAKE_CHECKED_POSTFIX}"
PDB_NAME_PROFILE "NvBlastExtTkSerialization${CMAKE_PROFILE_POSTFIX}"
PDB_NAME_RELEASE "NvBlastExtTkSerialization${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
# Do final direct sets after the target has been defined
diff --git a/sdk/compiler/cmake/NvBlastGlobals.cmake b/sdk/compiler/cmake/NvBlastGlobals.cmake index 92dfc27..d980739 100755 --- a/sdk/compiler/cmake/NvBlastGlobals.cmake +++ b/sdk/compiler/cmake/NvBlastGlobals.cmake @@ -57,6 +57,18 @@ SET_TARGET_PROPERTIES(NvBlastGlobals PROPERTIES PDB_NAME_CHECKED "NvBlastGlobals${CMAKE_CHECKED_POSTFIX}"
PDB_NAME_PROFILE "NvBlastGlobals${CMAKE_PROFILE_POSTFIX}"
PDB_NAME_RELEASE "NvBlastGlobals${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
# Do final direct sets after the target has been defined
diff --git a/sdk/compiler/cmake/NvBlastTk.cmake b/sdk/compiler/cmake/NvBlastTk.cmake index 2eb6a32..c317d78 100755 --- a/sdk/compiler/cmake/NvBlastTk.cmake +++ b/sdk/compiler/cmake/NvBlastTk.cmake @@ -5,7 +5,8 @@ SET(TOOLKIT_DIR ${PROJECT_SOURCE_DIR}/toolkit)
SET(COMMON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/common)
-FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)
+FIND_PACKAGE(PxSharedSDK ${PM_physxsdk_VERSION} REQUIRED)
+FIND_PACKAGE(PhysXSDK ${PM_pxshared_VERSION} REQUIRED)
# Include here after the directories are defined so that the platform specific file can use the variables.
include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/NvBlastTk.cmake)
@@ -92,6 +93,7 @@ TARGET_INCLUDE_DIRECTORIES(NvBlastTk PUBLIC ${PROJECT_SOURCE_DIR}/toolkit/include
PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
+ PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
)
TARGET_COMPILE_DEFINITIONS(NvBlastTk
@@ -107,6 +109,18 @@ SET_TARGET_PROPERTIES(NvBlastTk PROPERTIES PDB_NAME_CHECKED "NvBlastTk${CMAKE_CHECKED_POSTFIX}"
PDB_NAME_PROFILE "NvBlastTk${CMAKE_PROFILE_POSTFIX}"
PDB_NAME_RELEASE "NvBlastTk${CMAKE_RELEASE_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BL_LIB_OUTPUT_DIR}/debug"
+ LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BL_DLL_OUTPUT_DIR}/debug"
+ RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BL_EXE_OUTPUT_DIR}/debug"
+ ARCHIVE_OUTPUT_DIRECTORY_CHECKED "${BL_LIB_OUTPUT_DIR}/checked"
+ LIBRARY_OUTPUT_DIRECTORY_CHECKED "${BL_DLL_OUTPUT_DIR}/checked"
+ RUNTIME_OUTPUT_DIRECTORY_CHECKED "${BL_EXE_OUTPUT_DIR}/checked"
+ ARCHIVE_OUTPUT_DIRECTORY_PROFILE "${BL_LIB_OUTPUT_DIR}/profile"
+ LIBRARY_OUTPUT_DIRECTORY_PROFILE "${BL_DLL_OUTPUT_DIR}/profile"
+ RUNTIME_OUTPUT_DIRECTORY_PROFILE "${BL_EXE_OUTPUT_DIR}/profile"
+ ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BL_LIB_OUTPUT_DIR}/release"
+ LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BL_DLL_OUTPUT_DIR}/release"
+ RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BL_EXE_OUTPUT_DIR}/release"
)
# Do final direct sets after the target has been defined
diff --git a/sdk/compiler/cmake/linux/CMakeLists.txt b/sdk/compiler/cmake/linux/CMakeLists.txt index b3560aa..1569419 100755 --- a/sdk/compiler/cmake/linux/CMakeLists.txt +++ b/sdk/compiler/cmake/linux/CMakeLists.txt @@ -1,6 +1,6 @@ #Platform specific compile flags and project includes
-SET(CMAKE_CXX_FLAGS "-Wextra -Werror -fdiagnostics-show-option -fno-rtti -fno-exceptions -m64 -msse2 -mfpmath=sse -fPIC -ffast-math -fno-exceptions -fno-rtti -Wno-invalid-offsetof -Wno-unknown-pragmas -std=c++0x -Wreorder")
+SET(CMAKE_CXX_FLAGS "-Wextra -Werror -fdiagnostics-show-option -fno-rtti -fno-exceptions -m64 -msse2 -mfpmath=sse -fPIC -ffast-math -fno-exceptions -fno-rtti -Wno-invalid-offsetof -Wno-unknown-pragmas -Wno-uninitialized -std=c++14 -Wreorder")
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -gdwarf-2")
SET(CMAKE_CXX_FLAGS_CHECKED "-O3 -g3 -gdwarf-2 -fno-strict-aliasing")
@@ -22,6 +22,7 @@ INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtShaders.cmake) INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtStress.cmake)
INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtPhysX.cmake)
INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAuthoring.cmake)
+# INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtRT.cmake)
IF(${UE4_LINUX_CROSSCOMPILE})
#This uses the Windows CapnProto exe so it works
diff --git a/sdk/compiler/cmake/modules/FindPhysXSDK.cmake b/sdk/compiler/cmake/modules/FindPhysXSDK.cmake index 7e1f0a9..700d12d 100755 --- a/sdk/compiler/cmake/modules/FindPhysXSDK.cmake +++ b/sdk/compiler/cmake/modules/FindPhysXSDK.cmake @@ -5,364 +5,481 @@ include(FindPackageHandleStandardArgs)
+
MESSAGE("Looking for PhysXSDK ${PhysXSDK_FIND_VERSION} Cached path: ${PHYSXSDK_PATH}")
-find_path(PHYSXSDK_PATH Include/PxActor.h
+find_path(PHYSXSDK_PATH include/PxActor.h
PATHS
- $ENV{PM_PhysX_PATH}
- $ENV{PM_PhysX_PATH}/PhysX_3.4
- ${GW_DEPS_ROOT}/$ENV{PM_PhysX_NAME}/${PhysXSDK_FIND_VERSION}
- ${GW_DEPS_ROOT}/PhysX/${PhysXSDK_FIND_VERSION}
-)
+ $ENV{PM_physxsdk_PATH}
+)
+
+# Is the config defined in the names of binaries or path
+option(PHYSX_DEPS_WITH_CONFIG_NAME "Assume that Physx dependencies contain config in their names" OFF)
+
+if(PHYSX_DEPS_WITH_CONFIG_NAME)
+ SET(DEBUG_CONFIG_SUFFIX "DEBUG")
+ SET(PROFILE_CONFIG_SUFFIX "PROFILE")
+ SET(CHECKED_CONFIG_SUFFIX "CHECKED")
+ SET(RELEASE_CONFIG_SUFFIX "")
+else()
+ SET(DEBUG_CONFIG_PATH_SUFFIX "debug")
+ SET(PROFILE_CONFIG_PATH_SUFFIX "profile")
+ SET(CHECKED_CONFIG_PATH_SUFFIX "checked")
+ SET(RELEASE_CONFIG_PATH_SUFFIX "release")
+endif()
if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
# If the project pulling in this dependency needs the static crt, then append that to the path.
if (STATIC_WINCRT)
- SET(PHYSX_CRT_SUFFIX "-staticcrt")
+ SET(PHYSX_CRT_SUFFIX ".mt")
else()
- SET(PHYSX_CRT_SUFFIX "")
+ SET(PHYSX_CRT_SUFFIX ".md")
endif()
if (CMAKE_CL_64)
- SET(PHYSX_ARCH_FOLDER "win64")
- SET(PHYSX_ARCH_FILE "_x64")
+ SET(PHYSX_ARCH_FILE "_64")
else()
- SET(PHYSX_ARCH_FOLDER "win32")
SET(PHYSX_ARCH_FILE "_x86")
endif()
+ SET(PHYSX_ARCH_FOLDER "win.x86_64.")
+
# What compiler version do we want?
- if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 18.0.0.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.0.0)
- SET(VS_STR "VS2013")
- elseif (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.0.0.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10.0.0)
- SET(VS_STR "VS2015")
- elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.10.0.0)
- SET(VS_STR "VS2017")
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.10.0.0)
+ SET(VS_STR "vc141")
else()
- MESSAGE(FATAL_ERROR "Failed to find compatible PxSharedSDK - Only supporting VS2013 and VS2015")
+ MESSAGE(FATAL_ERROR "Failed to find compatible PhysXSDK - Only supporting VS2017 and higher")
endif()
- SET(LIB_PATH ${PHYSXSDK_PATH}/lib/${VS_STR}${PHYSX_ARCH_FOLDER}-cmake${PHYSX_CRT_SUFFIX} ${PHYSXSDK_PATH}/lib/${VS_STR}${PHYSX_ARCH_FOLDER} ${PHYSXSDK_PATH}/../Lib/${PHYSX_ARCH_FOLDER}/${VS_STR} ${PHYSXSDK_PATH}/../Lib)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
+ SET(LIB_PATH ${PHYSXSDK_PATH}/bin/${PHYSX_ARCH_FOLDER}${VS_STR}${PHYSX_CRT_SUFFIX})
+ # Set library suffix as .lib only since otherwise there would be ambiguity between .dll and .lib files.
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
elseif(TARGET_BUILD_PLATFORM STREQUAL "PS4")
- SET(LIB_PATH ${PHYSXSDK_PATH}/lib/vc14ps4-cmake ${PHYSXSDK_PATH}/../Lib)
+ SET(LIB_PATH ${PHYSXSDK_PATH}/bin/vc14ps4-cmake)
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
SET(CMAKE_FIND_LIBRARY_PREFIXES "lib")
elseif(TARGET_BUILD_PLATFORM STREQUAL "XboxOne")
- SET(LIB_PATH ${PHYSXSDK_PATH}/lib/vc14xboxone-cmake ${PHYSXSDK_PATH}/../lib)
+ SET(LIB_PATH ${PHYSXSDK_PATH}/bin/vc14xboxone-cmake)
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".lib")
SET(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
elseif(TARGET_BUILD_PLATFORM STREQUAL "linux")
- SET(LIB_PATH ${PHYSXSDK_PATH}/lib/linux64-cmake ${PHYSXSDK_PATH}/../Lib)
+ SET(LIB_PATH ${PHYSXSDK_PATH}/bin/linux.clang)
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
SET(CMAKE_FIND_LIBRARY_PREFIXES "lib")
- SET(PHYSX_ARCH_FILE "_x64")
+ SET(PHYSX_ARCH_FILE "_64")
endif()
# Now find all of the PhysX libs in the lib directory
-find_library(PHYSX3_LIB
- NAMES PhysX3 PhysX3${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PHYSX3EXTENSIONS_LIB
- NAMES PhysX3Extensions PhysX3Extensions${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PHYSX3CHARACTERKINEMATIC_LIB
- NAMES PhysX3CharacterKinematic${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PHYSX3COMMON_LIB
- NAMES PhysX3Common${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PHYSX3COOKING_LIB
- NAMES PhysX3Cooking${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVEL_LIB
- NAMES LowLevel LowLevel${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVELAABB_LIB
- NAMES LowLevelAABB LowLevelAABB${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVELCLOTH_LIB
- NAMES LowLevelCloth LowLevelCloth${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVELDYNAMICS_LIB
- NAMES LowLevelDynamics LowLevelDynamics${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVELPARTICLES_LIB
- NAMES LowLevelParticles LowLevelParticles${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(SCENEQUERY_LIB
- NAMES SceneQuery SceneQuery${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(SIMULATIONCONTROLLER_LIB
- NAMES SimulationController SimulationController${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
+if (NOT TARGET_BUILD_PLATFORM STREQUAL "linux")
+ find_library(PHYSX_LIB
+ NAMES PhysX${RELEASE_CONFIG_SUFFIX} PhysX${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOMMON_LIB
+ NAMES PhysXCommon${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOOKING_LIB
+ NAMES PhysXCooking${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXFOUNDATION_LIB
+ NAMES PhysXFoundation${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSX_LIB_DEBUG
+ NAMES PhysX${DEBUG_CONFIG_SUFFIX} PhysX${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOMMON_LIB_DEBUG
+ NAMES PhysXCommon${DEBUG_CONFIG_SUFFIX} PhysXCommon${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOOKING_LIB_DEBUG
+ NAMES PhysXCooking${DEBUG_CONFIG_SUFFIX} PhysXCooking${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXFOUNDATION_LIB_DEBUG
+ NAMES PhysXFoundation${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
+ )
-find_library(PHYSX3_LIB_DEBUG
- NAMES PhysX3DEBUG PhysX3DEBUG${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PHYSX3EXTENSIONS_LIB_DEBUG
- NAMES PhysX3ExtensionsDEBUG PhysX3ExtensionsDEBUG${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PHYSX3CHARACTERKINEMATIC_LIB_DEBUG
- NAMES PhysX3CharacterKinematicDEBUG PhysX3CharacterKinematicDEBUG${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PHYSX3COMMON_LIB_DEBUG
- NAMES PhysX3CommonDEBUG PhysX3CommonDEBUG${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PHYSX3COOKING_LIB_DEBUG
- NAMES PhysX3CookingDEBUG PhysX3CookingDEBUG${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVEL_LIB_DEBUG
- NAMES LowLevelDEBUG LowLevelDEBUG${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVELAABB_LIB_DEBUG
- NAMES LowLevelAABBDEBUG LowLevelAABBDEBUG${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVELCLOTH_LIB_DEBUG
- NAMES LowLevelClothDEBUG LowLevelClothDEBUG${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVELDYNAMICS_LIB_DEBUG
- NAMES LowLevelDynamicsDEBUG LowLevelDynamicsDEBUG${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVELPARTICLES_LIB_DEBUG
- NAMES LowLevelParticlesDEBUG LowLevelParticlesDEBUG${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(SCENEQUERY_LIB_DEBUG
- NAMES SceneQueryDEBUG SceneQueryDEBUG${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(SIMULATIONCONTROLLER_LIB_DEBUG
- NAMES SimulationControllerDEBUG SimulationControllerDEBUG${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
+ find_library(PHYSX_LIB_CHECKED
+ NAMES PhysX${CHECKED_CONFIG_SUFFIX} PhysX${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOMMON_LIB_CHECKED
+ NAMES PhysXCommon${CHECKED_CONFIG_SUFFIX} PhysXCommon${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOOKING_LIB_CHECKED
+ NAMES PhysXCooking${CHECKED_CONFIG_SUFFIX} PhysXCooking${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXFOUNDATION_LIB_CHECKED
+ NAMES PhysXFoundation${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
+ )
-find_library(PHYSX3_LIB_CHECKED
- NAMES PhysX3CHECKED PhysX3CHECKED${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PHYSX3EXTENSIONS_LIB_CHECKED
- NAMES PhysX3ExtensionsCHECKED PhysX3ExtensionsCHECKED${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PHYSX3CHARACTERKINEMATIC_LIB_CHECKED
- NAMES PhysX3CharacterKinematicCHECKED PhysX3CharacterKinematicCHECKED${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PHYSX3COMMON_LIB_CHECKED
- NAMES PhysX3CommonCHECKED PhysX3CommonCHECKED${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PHYSX3COOKING_LIB_CHECKED
- NAMES PhysX3CookingCHECKED PhysX3CookingCHECKED${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVEL_LIB_CHECKED
- NAMES LowLevelCHECKED LowLevelCHECKED${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVELAABB_LIB_CHECKED
- NAMES LowLevelAABBCHECKED LowLevelAABBCHECKED${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVELCLOTH_LIB_CHECKED
- NAMES LowLevelClothCHECKED LowLevelClothCHECKED${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVELDYNAMICS_LIB_CHECKED
- NAMES LowLevelDynamicsCHECKED LowLevelDynamicsCHECKED${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(LOWLEVELPARTICLES_LIB_CHECKED
- NAMES LowLevelParticlesCHECKED LowLevelParticlesCHECKED${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(SCENEQUERY_LIB_CHECKED
- NAMES SceneQueryCHECKED SceneQueryCHECKED${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(SIMULATIONCONTROLLER_LIB_CHECKED
- NAMES SimulationControllerCHECKED SimulationControllerCHECKED${PHYSX_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
+ find_library(PHYSX_LIB_PROFILE
+ NAMES PhysX${PROFILE_CONFIG_SUFFIX} PhysX${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOMMON_LIB_PROFILE
+ NAMES PhysXCommon${PROFILE_CONFIG_SUFFIX} PhysXCommon${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOOKING_LIB_PROFILE
+ NAMES PhysXCooking${PROFILE_CONFIG_SUFFIX} PhysXCooking${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXFOUNDATION_LIB_PROFILE
+ NAMES PhysXFoundation${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
+ )
-find_library(PHYSX3_LIB_PROFILE
- NAMES PhysX3PROFILE PhysX3PROFILE${PHYSX_ARCH_FILE}
+ find_library(PHYSXTASK_STATIC_LIB
+ NAMES PhysXTask_static${RELEASE_CONFIG_SUFFIX} PhysXTask_static${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXTASK_STATIC_LIB_DEBUG
+ NAMES PhysXTask_static${DEBUG_CONFIG_SUFFIX} PhysXTask_static${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXTASK_STATIC_LIB_CHECKED
+ NAMES PhysXTask_static${CHECKED_CONFIG_SUFFIX} PhysXTask_static${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXTASK_STATIC_LIB_PROFILE
+ NAMES PhysXTask_static${PROFILE_CONFIG_SUFFIX} PhysXTask_static${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
+ )
+else()
+ find_library(PHYSX_LIB
+ NAMES PhysX_static${RELEASE_CONFIG_SUFFIX} PhysX_static${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOMMON_LIB
+ NAMES PhysXCommon_static${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOOKING_LIB
+ NAMES PhysXCooking_static${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXFOUNDATION_LIB
+ NAMES PhysXFoundation_static${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
+ )
+
+ find_library(PHYSX_LIB_DEBUG
+ NAMES PhysX_static${DEBUG_CONFIG_SUFFIX} PhysX_static${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOMMON_LIB_DEBUG
+ NAMES PhysXCommon_static${DEBUG_CONFIG_SUFFIX} PhysXCommon_static${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOOKING_LIB_DEBUG
+ NAMES PhysXCooking_static${DEBUG_CONFIG_SUFFIX} PhysXCooking_static${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXFOUNDATION_LIB_DEBUG
+ NAMES PhysXFoundation_static${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
+ )
+
+ find_library(PHYSX_LIB_CHECKED
+ NAMES PhysX_static${CHECKED_CONFIG_SUFFIX} PhysX_static${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOMMON_LIB_CHECKED
+ NAMES PhysXCommon_static${CHECKED_CONFIG_SUFFIX} PhysXCommon_static${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOOKING_LIB_CHECKED
+ NAMES PhysXCooking_static${CHECKED_CONFIG_SUFFIX} PhysXCooking_static${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXFOUNDATION_LIB_CHECKED
+ NAMES PhysXFoundation_static${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
+ )
+
+ find_library(PHYSX_LIB_PROFILE
+ NAMES PhysX_static${PROFILE_CONFIG_SUFFIX} PhysX_static${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOMMON_LIB_PROFILE
+ NAMES PhysXCommon_static${PROFILE_CONFIG_SUFFIX} PhysXCommon_static${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOOKING_LIB_PROFILE
+ NAMES PhysXCooking_static${PROFILE_CONFIG_SUFFIX} PhysXCooking_static${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXFOUNDATION_LIB_PROFILE
+ NAMES PhysXFoundation_static${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
+ )
+endif()
+
+find_library(PHYSXEXTENSIONS_STATIC_LIB
+ NAMES PhysXExtensions_static${RELEASE_CONFIG_SUFFIX} PhysXExtensions_static${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
)
-find_library(PHYSX3EXTENSIONS_LIB_PROFILE
- NAMES PhysX3ExtensionsPROFILE PhysX3ExtensionsPROFILE${PHYSX_ARCH_FILE}
+find_library(PHYSXCHARACTERKINEMATIC_STATIC_LIB
+ NAMES PhysXCharacterKinematic_static${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
)
-find_library(PHYSX3CHARACTERKINEMATIC_LIB_PROFILE
- NAMES PhysX3CharacterKinematicPROFILE PhysX3CharacterKinematicPROFILE${PHYSX_ARCH_FILE}
+find_library(PHYSXPVDSDK_STATIC_LIB
+ NAMES PhysXPvdSDK_static${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
)
-find_library(PHYSX3COMMON_LIB_PROFILE
- NAMES PhysX3CommonPROFILE PhysX3CommonPROFILE${PHYSX_ARCH_FILE}
+
+find_library(PHYSXEXTENSIONS_STATIC_LIB_DEBUG
+ NAMES PhysXExtensions_static${DEBUG_CONFIG_SUFFIX} PhysXExtensions_static${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
)
-find_library(PHYSX3COOKING_LIB_PROFILE
- NAMES PhysX3CookingPROFILE PhysX3CookingPROFILE${PHYSX_ARCH_FILE}
+find_library(PHYSXCHARACTERKINEMATIC_STATIC_LIB_DEBUG
+ NAMES PhysXCharacterKinematic_static${DEBUG_CONFIG_SUFFIX} PhysXCharacterKinematic_static${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
)
-find_library(LOWLEVEL_LIB_PROFILE
- NAMES LowLevelPROFILE LowLevelPROFILE${PHYSX_ARCH_FILE}
+find_library(PHYSXPVDSDK_STATIC_LIB_DEBUG
+ NAMES PhysXPvdSDK_static${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
)
-find_library(LOWLEVELAABB_LIB_PROFILE
- NAMES LowLevelAABBPROFILE LowLevelAABBPROFILE${PHYSX_ARCH_FILE}
+
+find_library(PHYSXEXTENSIONS_STATIC_LIB_CHECKED
+ NAMES PhysXExtensions_static${CHECKED_CONFIG_SUFFIX} PhysXExtensions_static${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
)
-find_library(LOWLEVELCLOTH_LIB_PROFILE
- NAMES LowLevelClothPROFILE LowLevelClothPROFILE${PHYSX_ARCH_FILE}
+find_library(PHYSXCHARACTERKINEMATIC_STATIC_LIB_CHECKED
+ NAMES PhysXCharacterKinematic_static${CHECKED_CONFIG_SUFFIX} PhysXCharacterKinematic_static${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
)
-find_library(LOWLEVELDYNAMICS_LIB_PROFILE
- NAMES LowLevelDynamicsPROFILE LowLevelDynamicsPROFILE${PHYSX_ARCH_FILE}
+find_library(PHYSXPVDSDK_STATIC_LIB_CHECKED
+ NAMES PhysXPvdSDK_static${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
)
-find_library(LOWLEVELPARTICLES_LIB_PROFILE
- NAMES LowLevelParticlesPROFILE LowLevelParticlesPROFILE${PHYSX_ARCH_FILE}
+
+find_library(PHYSXEXTENSIONS_STATIC_LIB_PROFILE
+ NAMES PhysXExtensions_static${PROFILE_CONFIG_SUFFIX} PhysXExtensions_static${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
)
-find_library(SCENEQUERY_LIB_PROFILE
- NAMES SceneQueryPROFILE SceneQueryPROFILE${PHYSX_ARCH_FILE}
+find_library(PHYSXCHARACTERKINEMATIC_STATIC_LIB_PROFILE
+ NAMES PhysXCharacterKinematic_static${PROFILE_CONFIG_SUFFIX} PhysXCharacterKinematic_static${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
)
-find_library(SIMULATIONCONTROLLER_LIB_PROFILE
- NAMES SimulationControllerPROFILE SimulationControllerPROFILE${PHYSX_ARCH_FILE}
+find_library(PHYSXPVDSDK_STATIC_LIB_PROFILE
+ NAMES PhysXPvdSDK_static${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
)
+
if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
- find_library(PHYSX3GPU_LIB
- NAMES PhysX3Gpu${PHYSX_ARCH_FILE}
+ find_library(PHYSXGPU_LIB
+ NAMES PhysXGpu${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3GPU_LIB_DEBUG
- NAMES PhysX3GpuDEBUG${PHYSX_ARCH_FILE}
+ find_library(PHYSXGPU_LIB_DEBUG
+ NAMES PhysXGpu${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
)
+ SET(DLL_PATH ${PHYSXSDK_PATH}/bin/${PHYSX_ARCH_FOLDER}${VS_STR}${PHYSX_CRT_SUFFIX})
+ # Set library suffix as .dll only since otherwise there would be ambiguity between .dll and .lib files.
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
- SET(DLL_PATH ${PHYSXSDK_PATH}/bin/${VS_STR}${PHYSX_ARCH_FOLDER}-cmake${PHYSX_CRT_SUFFIX} ${PHYSXSDK_PATH}/bin/${VS_STR}${PHYSX_ARCH_FOLDER} ${PHYSXSDK_PATH}/../Bin/${PHYSX_ARCH_FOLDER}/${VS_STR} ${PHYSXSDK_PATH}/../Bin)
-
- find_library(PHYSX3_DLL
- NAMES PhysX3${PHYSX_ARCH_FILE}
+ find_library(PHYSX_DLL
+ NAMES PhysX${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3COMMON_DLL
- NAMES PhysX3Common${PHYSX_ARCH_FILE}
+ find_library(PHYSXCOMMON_DLL
+ NAMES PhysXCommon${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3COOKING_DLL
- NAMES PhysX3Cooking${PHYSX_ARCH_FILE}
+ find_library(PHYSXCOOKING_DLL
+ NAMES PhysXCooking${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3GPU_DLL
- NAMES PhysX3Gpu${PHYSX_ARCH_FILE}
+ find_library(PHYSXFOUNDATION_DLL
+ NAMES PhysXFoundation${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXGPU_DLL
+ NAMES PhysXGpu${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
)
-
- find_library(PHYSX3_DLL_DEBUG
- NAMES PhysX3DEBUG${PHYSX_ARCH_FILE}
+
+ find_library(PHYSX_DLL_DEBUG
+ NAMES PhysX${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3COMMON_DLL_DEBUG
- NAMES PhysX3CommonDEBUG${PHYSX_ARCH_FILE}
+ find_library(PHYSXCOMMON_DLL_DEBUG
+ NAMES PhysXCommon${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3COOKING_DLL_DEBUG
- NAMES PhysX3CookingDEBUG${PHYSX_ARCH_FILE}
+ find_library(PHYSXCOOKING_DLL_DEBUG
+ NAMES PhysXCooking${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXFOUNDATION_DLL_DEBUG
+ NAMES PhysXFoundation${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
)
# NOTE - GPU dlls not included in required dlls or libs as they're optional.
- find_library(PHYSX3GPU_DLL_DEBUG
- NAMES PhysX3GpuDEBUG${PHYSX_ARCH_FILE}
+ find_library(PHYSXGPU_DLL_DEBUG
+ NAMES PhysXGpu${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
)
-
- find_library(PHYSX3_DLL_PROFILE
- NAMES PhysX3PROFILE${PHYSX_ARCH_FILE}
+
+
+ find_library(PHYSX_DLL_PROFILE
+ NAMES PhysX${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOMMON_DLL_PROFILE
+ NAMES PhysXCommon${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3COMMON_DLL_PROFILE
- NAMES PhysX3CommonPROFILE${PHYSX_ARCH_FILE}
+ find_library(PHYSXCOOKING_DLL_PROFILE
+ NAMES PhysXCooking${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3COOKING_DLL_PROFILE
- NAMES PhysX3CookingPROFILE${PHYSX_ARCH_FILE}
+ find_library(PHYSXFOUNDATION_DLL_PROFILE
+ NAMES PhysXFoundation${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
)
# NOTE - GPU dlls not included in required dlls or libs as they're optional.
- find_library(PHYSX3GPU_DLL_PROFILE
- NAMES PhysX3GpuPROFILE${PHYSX_ARCH_FILE}
+ find_library(PHYSXGPU_DLL_PROFILE
+ NAMES PhysXGpu${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3_DLL_CHECKED
- NAMES PhysX3CHECKED${PHYSX_ARCH_FILE}
+
+ find_library(PHYSX_DLL_CHECKED
+ NAMES PhysX${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXCOMMON_DLL_CHECKED
+ NAMES PhysXCommon${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3COMMON_DLL_CHECKED
- NAMES PhysX3CommonCHECKED${PHYSX_ARCH_FILE}
+ find_library(PHYSXCOOKING_DLL_CHECKED
+ NAMES PhysXCooking${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3COOKING_DLL_CHECKED
- NAMES PhysX3CookingCHECKED${PHYSX_ARCH_FILE}
+ find_library(PHYSXFOUNDATION_DLL_CHECKED
+ NAMES PhysXFoundation${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
)
# NOTE - GPU dlls not included in required dlls or libs as they're optional.
- find_library(PHYSX3GPU_DLL_CHECKED
- NAMES PhysX3GpuCHECKED${PHYSX_ARCH_FILE}
+ find_library(PHYSXGPU_DLL_CHECKED
+ NAMES PhysXGpu${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
PATHS ${DLL_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
)
+
+ # Restore library suffixes to both .dll and .lib so that it doesn't affect other packages.
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".lib")
+
# Create this list to check for found dlls below
SET(DLL_VAR_LIST
- PHYSX3_DLL
- PHYSX3COMMON_DLL
- PHYSX3COOKING_DLL
-
- PHYSX3_DLL_DEBUG
- PHYSX3COMMON_DLL_DEBUG
- PHYSX3COOKING_DLL_DEBUG
-
- PHYSX3_DLL_PROFILE
- PHYSX3COMMON_DLL_PROFILE
- PHYSX3COOKING_DLL_PROFILE
-
- PHYSX3_DLL_CHECKED
- PHYSX3COMMON_DLL_CHECKED
- PHYSX3COOKING_DLL_CHECKED
-
+ PHYSX_DLL
+ PHYSXCOMMON_DLL
+ PHYSXCOOKING_DLL
+ PHYSXFOUNDATION_DLL
+
+ PHYSX_DLL_DEBUG
+ PHYSXCOMMON_DLL_DEBUG
+ PHYSXCOOKING_DLL_DEBUG
+ PHYSXFOUNDATION_DLL_DEBUG
+
+ PHYSX_DLL_PROFILE
+ PHYSXCOMMON_DLL_PROFILE
+ PHYSXCOOKING_DLL_PROFILE
+ PHYSXFOUNDATION_DLL_PROFILE
+
+ PHYSX_DLL_CHECKED
+ PHYSXCOMMON_DLL_CHECKED
+ PHYSXCOOKING_DLL_CHECKED
+ PHYSXFOUNDATION_DLL_CHECKED
)
endif()
@@ -370,173 +487,279 @@ if (TARGET_BUILD_PLATFORM STREQUAL "linux") SET(BIN_PATH ${PHYSXSDK_PATH}/bin/linux64-cmake ${PHYSXSDK_PATH}/../Bin)
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
- find_library(PHYSX3_LIB
- NAMES PhysX3${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
- )
- find_library(PHYSX3COOKING_LIB
- NAMES PhysX3Cooking${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
+
+ find_library(PHYSX_LIB
+ NAMES PhysX${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3CHARACTERKINEMATIC_LIB
- NAMES PhysX3CharacterKinematic${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
+ find_library(PHYSXCOOKING_LIB
+ NAMES PhysXCooking${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3COMMON_LIB
- NAMES PhysX3Common${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
+ find_library(PHYSXCHARACTERKINEMATIC_STATIC_LIB
+ NAMES PhysXCharacterKinematic_static${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
)
+ find_library(PHYSXCOMMON_LIB
+ NAMES PhysXCommon${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${RELEASE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXFOUNDATION_LIB
+ NAMES PhysXFoundation${RELEASE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ )
- find_library(PHYSX3_LIB_DEBUG
- NAMES PhysX3DEBUG${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
+ find_library(PHYSX_LIB_DEBUG
+ NAMES PhysX${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3COOKING_LIB_DEBUG
- NAMES PhysX3CookingDEBUG${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
+ find_library(PHYSXCOOKING_LIB_DEBUG
+ NAMES PhysXCooking${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3CHARACTERKINEMATIC_LIB_DEBUG
- NAMES PhysX3CharacterKinematicDEBUG${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
- )
- find_library(PHYSX3COMMON_LIB_DEBUG
- NAMES PhysX3CommonDEBUG${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
+ find_library(PHYSXCHARACTERKINEMATIC_STATIC_LIB_DEBUG
+ NAMES PhysXCharacterKinematic_static${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
)
+ find_library(PHYSXCOMMON_LIB_DEBUG
+ NAMES PhysXCommon${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${DEBUG_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXFOUNDATION_LIB_DEBUG
+ NAMES PhysXFoundation${DEBUG_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ )
- find_library(PHYSX3_LIB_CHECKED
- NAMES PhysX3CHECKED${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
+ find_library(PHYSX_LIB_CHECKED
+ NAMES PhysX${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3COOKING_LIB_CHECKED
- NAMES PhysX3CookingCHECKED${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
+ find_library(PHYSXCOOKING_LIB_CHECKED
+ NAMES PhysXCooking${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3CHARACTERKINEMATIC_LIB_CHECKED
- NAMES PhysX3CharacterKinematicCHECKED${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
- )
- find_library(PHYSX3COMMON_LIB_CHECKED
- NAMES PhysX3CommonCHECKED${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
+ find_library(PHYSXCHARACTERKINEMATIC_STATIC_LIB_CHECKED
+ NAMES PhysXCharacterKinematic_static${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
)
+ find_library(PHYSXCOMMON_LIB_CHECKED
+ NAMES PhysXCommon${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${CHECKED_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXFOUNDATION_LIB_CHECKED
+ NAMES PhysXFoundation${CHECKED_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ )
+
- find_library(PHYSX3_LIB_PROFILE
- NAMES PhysX3PROFILE${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
+ find_library(PHYSX_LIB_PROFILE
+ NAMES PhysX${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3COOKING_LIB_PROFILE
- NAMES PhysX3CookingPROFILE${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
+ find_library(PHYSXCOOKING_LIB_PROFILE
+ NAMES PhysXCooking${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3CHARACTERKINEMATIC_LIB_PROFILE
- NAMES PhysX3CharacterKinematicPROFILE${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
+ find_library(PHYSXCHARACTERKINEMATIC_STATIC_LIB_PROFILE
+ NAMES PhysXCharacterKinematic_static${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
)
- find_library(PHYSX3COMMON_LIB_PROFILE
- NAMES PhysX3CommonPROFILE${PHYSX_ARCH_FILE}
- PATHS ${BIN_PATH}
- )
-
+ find_library(PHYSXCOMMON_LIB_PROFILE
+ NAMES PhysXCommon${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ PATH_SUFFIXES ${PROFILE_CONFIG_PATH_SUFFIX}
+ )
+ find_library(PHYSXFOUNDATION_LIB_PROFILE
+ NAMES PhysXFoundation${PROFILE_CONFIG_SUFFIX}${PHYSX_ARCH_FILE}
+ PATHS ${BIN_PATH}
+ )
endif()
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PHYSXSDK
- DEFAULT_MSG
- PHYSXSDK_PATH
-
- PHYSX3_LIB
- PHYSX3EXTENSIONS_LIB
- PHYSX3CHARACTERKINEMATIC_LIB
- PHYSX3COMMON_LIB
- PHYSX3COOKING_LIB
- LOWLEVEL_LIB
- LOWLEVELAABB_LIB
- LOWLEVELCLOTH_LIB
- LOWLEVELDYNAMICS_LIB
- LOWLEVELPARTICLES_LIB
- SCENEQUERY_LIB
- SIMULATIONCONTROLLER_LIB
-
- PHYSX3_LIB_DEBUG
- PHYSX3EXTENSIONS_LIB_DEBUG
- PHYSX3CHARACTERKINEMATIC_LIB_DEBUG
- PHYSX3COMMON_LIB_DEBUG
- PHYSX3COOKING_LIB_DEBUG
- LOWLEVEL_LIB_DEBUG
- LOWLEVELAABB_LIB_DEBUG
- LOWLEVELCLOTH_LIB_DEBUG
- LOWLEVELDYNAMICS_LIB_DEBUG
- LOWLEVELPARTICLES_LIB_DEBUG
- SCENEQUERY_LIB_DEBUG
- SIMULATIONCONTROLLER_LIB_DEBUG
-
- PHYSX3_LIB_CHECKED
- PHYSX3EXTENSIONS_LIB_CHECKED
- PHYSX3CHARACTERKINEMATIC_LIB_CHECKED
- PHYSX3COMMON_LIB_CHECKED
- PHYSX3COOKING_LIB_CHECKED
- LOWLEVEL_LIB_CHECKED
- LOWLEVELAABB_LIB_CHECKED
- LOWLEVELCLOTH_LIB_CHECKED
- LOWLEVELDYNAMICS_LIB_CHECKED
- LOWLEVELPARTICLES_LIB_CHECKED
- SCENEQUERY_LIB_CHECKED
- SIMULATIONCONTROLLER_LIB_CHECKED
-
- PHYSX3_LIB_PROFILE
- PHYSX3EXTENSIONS_LIB_PROFILE
- PHYSX3CHARACTERKINEMATIC_LIB_PROFILE
- PHYSX3COMMON_LIB_PROFILE
- PHYSX3COOKING_LIB_PROFILE
- LOWLEVEL_LIB_PROFILE
- LOWLEVELAABB_LIB_PROFILE
- LOWLEVELCLOTH_LIB_PROFILE
- LOWLEVELDYNAMICS_LIB_PROFILE
- LOWLEVELPARTICLES_LIB_PROFILE
- SCENEQUERY_LIB_PROFILE
- SIMULATIONCONTROLLER_LIB_PROFILE
-
- ${DLL_VAR_LIST}
-)
+if (NOT TARGET_BUILD_PLATFORM STREQUAL "linux")
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PHYSXSDK
+ DEFAULT_MSG
+ PHYSXSDK_PATH
+
+ PHYSX_LIB
+ PHYSXEXTENSIONS_STATIC_LIB
+ PHYSXCHARACTERKINEMATIC_STATIC_LIB
+ PHYSXCOMMON_LIB
+ PHYSXCOOKING_LIB
+ PHYSXFOUNDATION_LIB
+ PHYSXPVDSDK_STATIC_LIB
+ PHYSXTASK_STATIC_LIB
+
+ PHYSX_LIB_DEBUG
+ PHYSXEXTENSIONS_STATIC_LIB_DEBUG
+ PHYSXCHARACTERKINEMATIC_STATIC_LIB_DEBUG
+ PHYSXCOMMON_LIB_DEBUG
+ PHYSXCOOKING_LIB_DEBUG
+ PHYSXFOUNDATION_LIB_DEBUG
+ PHYSXPVDSDK_STATIC_LIB_DEBUG
+ PHYSXTASK_STATIC_LIB_DEBUG
+
+ PHYSX_LIB_CHECKED
+ PHYSXEXTENSIONS_STATIC_LIB_CHECKED
+ PHYSXCHARACTERKINEMATIC_STATIC_LIB_CHECKED
+ PHYSXCOMMON_LIB_CHECKED
+ PHYSXCOOKING_LIB_CHECKED
+ PHYSXFOUNDATION_LIB_CHECKED
+ PHYSXPVDSDK_STATIC_LIB_CHECKED
+ PHYSXTASK_STATIC_LIB_CHECKED
+
+ PHYSX_LIB_PROFILE
+ PHYSXEXTENSIONS_STATIC_LIB_PROFILE
+ PHYSXCHARACTERKINEMATIC_STATIC_LIB_PROFILE
+ PHYSXCOMMON_LIB_PROFILE
+ PHYSXCOOKING_LIB_PROFILE
+ PHYSXFOUNDATION_LIB_PROFILE
+ PHYSXPVDSDK_STATIC_LIB_PROFILE
+ PHYSXTASK_STATIC_LIB_PROFILE
+
+ ${DLL_VAR_LIST}
+ )
+else()
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PHYSXSDK
+ DEFAULT_MSG
+ PHYSXSDK_PATH
+
+ PHYSX_LIB
+ PHYSXEXTENSIONS_STATIC_LIB
+ PHYSXCHARACTERKINEMATIC_STATIC_LIB
+ PHYSXCOMMON_LIB
+ PHYSXCOOKING_LIB
+ PHYSXFOUNDATION_LIB
+ PHYSXPVDSDK_STATIC_LIB
+
+ PHYSX_LIB_DEBUG
+ PHYSXEXTENSIONS_STATIC_LIB_DEBUG
+ PHYSXCHARACTERKINEMATIC_STATIC_LIB_DEBUG
+ PHYSXCOMMON_LIB_DEBUG
+ PHYSXCOOKING_LIB_DEBUG
+ PHYSXFOUNDATION_LIB_DEBUG
+ PHYSXPVDSDK_STATIC_LIB_DEBUG
+
+ PHYSX_LIB_CHECKED
+ PHYSXEXTENSIONS_STATIC_LIB_CHECKED
+ PHYSXCHARACTERKINEMATIC_STATIC_LIB_CHECKED
+ PHYSXCOMMON_LIB_CHECKED
+ PHYSXCOOKING_LIB_CHECKED
+ PHYSXFOUNDATION_LIB_CHECKED
+ PHYSXPVDSDK_STATIC_LIB_CHECKED
+
+ PHYSX_LIB_PROFILE
+ PHYSXEXTENSIONS_STATIC_LIB_PROFILE
+ PHYSXCHARACTERKINEMATIC_STATIC_LIB_PROFILE
+ PHYSXCOMMON_LIB_PROFILE
+ PHYSXCOOKING_LIB_PROFILE
+ PHYSXFOUNDATION_LIB_PROFILE
+ PHYSXPVDSDK_STATIC_LIB_PROFILE
+
+ ${DLL_VAR_LIST}
+ )
+endif()
if (PHYSXSDK_FOUND)
- SET(PHYSXSDK_INCLUDE_DIRS
- ${PHYSXSDK_PATH}/Include
- ${PHYSXSDK_PATH}/Include/common
- ${PHYSXSDK_PATH}/Include/cooking
- ${PHYSXSDK_PATH}/Include/extensions
- ${PHYSXSDK_PATH}/Include/geometry
- ${PHYSXSDK_PATH}/Include/gpu
- ${PHYSXSDK_PATH}/Include/deformable
- ${PHYSXSDK_PATH}/Include/particles
- ${PHYSXSDK_PATH}/Include/characterkinematic
- ${PHYSXSDK_PATH}/Include/characterdynamic
- ${PHYSXSDK_PATH}/Include/vehicle
+ SET(PHYSXSDK_INCLUDE_DIRS
+ ${PHYSXSDK_PATH}/include
+ ${PHYSXSDK_PATH}/include/characterdynamic
+ ${PHYSXSDK_PATH}/include/characterkinematic
+ ${PHYSXSDK_PATH}/include/common
+ ${PHYSXSDK_PATH}/include/cooking
+ ${PHYSXSDK_PATH}/include/deformable
+ ${PHYSXSDK_PATH}/include/extensions
+ ${PHYSXSDK_PATH}/include/filebuf
+ ${PHYSXSDK_PATH}/include/foundation
+ ${PHYSXSDK_PATH}/include/geometry
+ ${PHYSXSDK_PATH}/include/gpu
+ ${PHYSXSDK_PATH}/include/particles
+ ${PHYSXSDK_PATH}/include/pvd
+ ${PHYSXSDK_PATH}/include/task
+ ${PHYSXSDK_PATH}/include/vehicle
+ ${PHYSXSDK_PATH}/source/fastxml/include
+ ${PHYSXSDK_PATH}/source/foundation/include
)
- SET(PHYSXSDK_LIBS_RELEASE ${PHYSX3_LIB} ${PHYSX3EXTENSIONS_LIB} ${PHYSX3CHARACTERKINEMATIC_LIB} ${PHYSX3COMMON_LIB} ${PHYSX3COOKING_LIB} ${PHYSX3GPU_LIB} ${LOWLEVEL_LIB} ${LOWLEVELAABB_LIB} ${LOWLEVELCLOTH_LIB} ${LOWLEVELDYNAMICS_LIB} ${LOWLEVELPARTICLES_LIB} ${SCENEQUERY_LIB} ${SIMULATIONCONTROLLER_LIB}
- CACHE STRING ""
- )
- SET(PHYSXSDK_LIBS_DEBUG ${PHYSX3_LIB_DEBUG} ${PHYSX3EXTENSIONS_LIB_DEBUG} ${PHYSX3CHARACTERKINEMATIC_LIB_DEBUG} ${PHYSX3COMMON_LIB_DEBUG} ${PHYSX3COOKING_LIB_DEBUG} ${PHYSX3GPU_LIB_DEBUG} ${LOWLEVEL_LIB_DEBUG} ${LOWLEVELAABB_LIB_DEBUG} ${LOWLEVELCLOTH_LIB_DEBUG} ${LOWLEVELDYNAMICS_LIB_DEBUG} ${LOWLEVELPARTICLES_LIB_DEBUG} ${SCENEQUERY_LIB_DEBUG} ${SIMULATIONCONTROLLER_LIB_DEBUG}
- CACHE STRING ""
- )
- SET(PHYSXSDK_LIBS_CHECKED ${PHYSX3_LIB_CHECKED} ${PHYSX3EXTENSIONS_LIB_CHECKED} ${PHYSX3CHARACTERKINEMATIC_LIB_CHECKED} ${PHYSX3COMMON_LIB_CHECKED} ${PHYSX3COOKING_LIB_CHECKED} ${PHYSX3GPU_LIB_CHECKED} ${LOWLEVEL_LIB_CHECKED} ${LOWLEVELAABB_LIB_CHECKED} ${LOWLEVELCLOTH_LIB_CHECKED} ${LOWLEVELDYNAMICS_LIB_CHECKED} ${LOWLEVELPARTICLES_LIB_CHECKED} ${SCENEQUERY_LIB_CHECKED} ${SIMULATIONCONTROLLER_LIB_CHECKED}
- CACHE STRING ""
- )
- SET(PHYSXSDK_LIBS_PROFILE ${PHYSX3_LIB_PROFILE} ${PHYSX3EXTENSIONS_LIB_PROFILE} ${PHYSX3CHARACTERKINEMATIC_LIB_PROFILE} ${PHYSX3COMMON_LIB_PROFILE} ${PHYSX3COOKING_LIB_PROFILE} ${PHYSX3GPU_LIB_PROFILE} ${LOWLEVEL_LIB_PROFILE} ${LOWLEVELAABB_LIB_PROFILE} ${LOWLEVELCLOTH_LIB_PROFILE} ${LOWLEVELDYNAMICS_LIB_PROFILE} ${LOWLEVELPARTICLES_LIB_PROFILE} ${SCENEQUERY_LIB_PROFILE} ${SIMULATIONCONTROLLER_LIB_PROFILE}
- CACHE STRING ""
- )
+ if (NOT TARGET_BUILD_PLATFORM STREQUAL "linux")
+ SET(PHYSXSDK_LIBS_RELEASE ${PHYSX_LIB} ${PHYSXEXTENSIONS_STATIC_LIB} ${PHYSXCHARACTERKINEMATIC_STATIC_LIB} ${PHYSXCOMMON_LIB} ${PHYSXCOOKING_LIB} ${PHYSXFOUNDATION_LIB} ${PHYSXPVDSDK_STATIC_LIB} ${PHYSXTASK_STATIC_LIB} ${PHYSXGPU_LIB}
+ CACHE STRING ""
+ )
+ SET(PHYSXSDK_LIBS_DEBUG ${PHYSX_LIB_DEBUG} ${PHYSXEXTENSIONS_STATIC_LIB_DEBUG} ${PHYSXCHARACTERKINEMATIC_STATIC_LIB_DEBUG} ${PHYSXCOMMON_LIB_DEBUG} ${PHYSXCOOKING_LIB_DEBUG} ${PHYSXFOUNDATION_LIB_DEBUG} ${PHYSXPVDSDK_STATIC_LIB_PROFILE} ${PHYSXTASK_STATIC_LIB_PROFILE} ${PHYSXGPU_LIB_DEBUG}
+ CACHE STRING ""
+ )
+ SET(PHYSXSDK_LIBS_CHECKED ${PHYSX_LIB_CHECKED} ${PHYSXEXTENSIONS_STATIC_LIB_CHECKED} ${PHYSXCHARACTERKINEMATIC_STATIC_LIB_CHECKED} ${PHYSXCOMMON_LIB_CHECKED} ${PHYSXCOOKING_LIB_CHECKED} ${PHYSXFOUNDATION_LIB_CHECKED} ${PHYSXPVDSDK_STATIC_LIB_CHECKED} ${PHYSXTASK_STATIC_LIB_CHECKED} ${PHYSXGPU_LIB_CHECKED}
+ CACHE STRING ""
+ )
+ SET(PHYSXSDK_LIBS_PROFILE ${PHYSX_LIB_PROFILE} ${PHYSXEXTENSIONS_STATIC_LIB_PROFILE} ${PHYSXCHARACTERKINEMATIC_STATIC_LIB_PROFILE} ${PHYSXCOMMON_LIB_PROFILE} ${PHYSXCOOKING_LIB_PROFILE} ${PHYSXFOUNDATION_LIB_PROFILE} ${PHYSXPVDSDK_STATIC_LIB_PROFILE} ${PHYSXTASK_STATIC_LIB_PROFILE} ${PHYSXGPU_LIB_PROFILE}
+ CACHE STRING ""
+ )
+
+ #NOTE: This is all dll configs, might need to be split.
+ SET(PHYSXSDK_DLLS
+ $<$<CONFIG:debug>:${PHYSX_DLL_DEBUG}>
+ $<$<CONFIG:debug>:${PHYSXCHARACTERKINEMATIC_DLL_DEBUG}>
+ $<$<CONFIG:debug>:${PHYSXCOMMON_DLL_DEBUG}>
+ $<$<CONFIG:debug>:${PHYSXCOOKING_DLL_DEBUG}>
+ $<$<CONFIG:debug>:${PHYSXFOUNDATION_DLL_DEBUG}>
+ $<$<CONFIG:debug>:${PHYSXGPU_DLL_DEBUG}>
+ $<$<CONFIG:checked>:${PHYSX_DLL_CHECKED}>
+ $<$<CONFIG:checked>:${PHYSXCHARACTERKINEMATIC_DLL_CHECKED}>
+ $<$<CONFIG:checked>:${PHYSXCOMMON_DLL_CHECKED}>
+ $<$<CONFIG:checked>:${PHYSXCOOKING_DLL_CHECKED}>
+ $<$<CONFIG:checked>:${PHYSXFOUNDATION_DLL_CHECKED}>
+ $<$<CONFIG:checked>:${PHYSXGPU_DLL_CHECKED}>
+ $<$<CONFIG:profile>:${PHYSX_DLL_PROFILE}>
+ $<$<CONFIG:profile>:${PHYSXCHARACTERKINEMATIC_DLL_PROFILE}>
+ $<$<CONFIG:profile>:${PHYSXCOMMON_DLL_PROFILE}>
+ $<$<CONFIG:profile>:${PHYSXCOOKING_DLL_PROFILE}>
+ $<$<CONFIG:profile>:${PHYSXFOUNDATION_DLL_PROFILE}>
+ $<$<CONFIG:profile>:${PHYSXGPU_DLL_PROFILE}>
+ $<$<CONFIG:release>:${PHYSX_DLL}>
+ $<$<CONFIG:release>:${PHYSXCHARACTERKINEMATIC_DLL}>
+ $<$<CONFIG:release>:${PHYSXCOMMON_DLL}>
+ $<$<CONFIG:release>:${PHYSXCOOKING_DLL}>
+ $<$<CONFIG:release>:${PHYSXFOUNDATION_DLL}>
+ $<$<CONFIG:release>:${PHYSXGPU_DLL}>
+ )
+ else()
+ SET(PHYSXSDK_LIBS_RELEASE ${PHYSX_LIB} ${PHYSXEXTENSIONS_STATIC_LIB} ${PHYSXCHARACTERKINEMATIC_STATIC_LIB} ${PHYSXCOMMON_LIB} ${PHYSXCOOKING_LIB} ${PHYSXFOUNDATION_LIB} ${PHYSXPVDSDK_STATIC_LIB} ${PHYSXGPU_LIB}
+ CACHE STRING ""
+ )
+ SET(PHYSXSDK_LIBS_DEBUG ${PHYSX_LIB_DEBUG} ${PHYSXEXTENSIONS_STATIC_LIB_DEBUG} ${PHYSXCHARACTERKINEMATIC_STATIC_LIB_DEBUG} ${PHYSXCOMMON_LIB_DEBUG} ${PHYSXCOOKING_LIB_DEBUG} ${PHYSXFOUNDATION_LIB_DEBUG} ${PHYSXPVDSDK_STATIC_LIB_PROFILE} ${PHYSXGPU_LIB_DEBUG}
+ CACHE STRING ""
+ )
+ SET(PHYSXSDK_LIBS_CHECKED ${PHYSX_LIB_CHECKED} ${PHYSXEXTENSIONS_STATIC_LIB_CHECKED} ${PHYSXCHARACTERKINEMATIC_STATIC_LIB_CHECKED} ${PHYSXCOMMON_LIB_CHECKED} ${PHYSXCOOKING_LIB_CHECKED} ${PHYSXFOUNDATION_LIB_CHECKED} ${PHYSXPVDSDK_STATIC_LIB_CHECKED} ${PHYSXGPU_LIB_CHECKED}
+ CACHE STRING ""
+ )
+ SET(PHYSXSDK_LIBS_PROFILE ${PHYSX_LIB_PROFILE} ${PHYSXEXTENSIONS_STATIC_LIB_PROFILE} ${PHYSXCHARACTERKINEMATIC_STATIC_LIB_PROFILE} ${PHYSXCOMMON_LIB_PROFILE} ${PHYSXCOOKING_LIB_PROFILE} ${PHYSXFOUNDATION_LIB_PROFILE} ${PHYSXPVDSDK_STATIC_LIB_PROFILE} ${PHYSXGPU_LIB_PROFILE}
+ CACHE STRING ""
+ )
+
+ SET(PHYSXSDK_DLLS
+ $<$<CONFIG:debug>:${PHYSXGPU_DLL_DEBUG}>
+ $<$<CONFIG:checked>:${PHYSXGPU_DLL_CHECKED}>
+ $<$<CONFIG:profile>:${PHYSXGPU_DLL_PROFILE}>
+ $<$<CONFIG:release>:${PHYSXGPU_DLL}>
+ )
+ endif()
- #NOTE: This is all dll configs, might need to be split.
- SET(PHYSXSDK_DLLS
- ${PHYSX3_DLL} ${PHYSX3CHARACTERKINEMATIC_DLL} ${PHYSX3COMMON_DLL} ${PHYSX3COOKING_DLL} ${PHYSX3GPU_DLL}
- ${PHYSX3_DLL_DEBUG} ${PHYSX3CHARACTERKINEMATIC_DLL_DEBUG} ${PHYSX3COMMON_DLL_DEBUG} ${PHYSX3COOKING_DLL_DEBUG} ${PHYSX3GPU_DLL_DEBUG}
- ${PHYSX3_DLL_PROFILE} ${PHYSX3CHARACTERKINEMATIC_DLL_PROFILE} ${PHYSX3COMMON_DLL_PROFILE} ${PHYSX3COOKING_DLL_PROFILE} ${PHYSX3GPU_DLL_PROFILE}
- ${PHYSX3_DLL_CHECKED} ${PHYSX3CHARACTERKINEMATIC_DLL_CHECKED} ${PHYSX3COMMON_DLL_CHECKED} ${PHYSX3COOKING_DLL_CHECKED} ${PHYSX3GPU_DLL_CHECKED}
- )
-
SET(PHYSXSDK_LIBRARIES "" CACHE STRING "")
foreach(x ${PHYSXSDK_LIBS_RELEASE})
diff --git a/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake b/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake index c3a5da1..ba89d43 100755 --- a/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake +++ b/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake @@ -1,315 +1,26 @@ -# - Try to find PxShared binary SDK
-# - Sets PXSHAREDSDK_LIBS_DEBUG and PXSHAREDSDK_LIBS_RELEASE - lists of the libraries found
+# - Try to find PxShared SDK
# - Sets PXSHAREDSDK_INCLUDE_DIRS
-# - Sets PXSHAREDSDK_DLLS - List of the DLLs to copy to the bin directory of projects that depend on this
include(FindPackageHandleStandardArgs)
-# Find the includes
-
# Always try explicit PATH variable first
find_path(PXSHAREDSDK_PATH include/foundation/Px.h
- PATHS
- $ENV{PM_PxShared_PATH}
- $ENV{PM_PhysX_PATH}/PxShared # multipack
- ${GW_DEPS_ROOT}/$ENV{PM_PxShared_NAME}/${PxSharedSDK_FIND_VERSION}
- ${GW_DEPS_ROOT}/PxShared/${PxSharedSDK_FIND_VERSION}
+ PATHS
+ $ENV{PM_pxshared_PATH}
)
-if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
- # If the project pulling in this dependency needs the static crt, then append that to the path.
- if (STATIC_WINCRT)
- SET(PXSHARED_CRT_SUFFIX "-staticcrt")
- else()
- SET(PXSHARED_CRT_SUFFIX "")
- endif()
-
- if (CMAKE_CL_64)
- SET(PXSHARED_ARCH_FOLDER "win64")
- SET(PXSHARED_ARCH_FILE "_x64")
- else()
- SET(PXSHARED_ARCH_FOLDER "win32")
- SET(PXSHARED_ARCH_FILE "_x86")
- endif()
-
- # What compiler version do we want?
-
- if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 18.0.0.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.0.0)
- SET(VS_STR "VS2013")
- elseif (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.0.0.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10.0.0)
- SET(VS_STR "VS2015")
- elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.10.0.0)
- SET(VS_STR "VS2017")
- else()
- MESSAGE(FATAL_ERROR "Failed to find compatible PxSharedSDK - Only supporting VS2013 and VS2015")
- endif()
-
- SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/${VS_STR}${PXSHARED_ARCH_FOLDER}-cmake${PXSHARED_CRT_SUFFIX} ${PXSHAREDSDK_PATH}/lib/${VS_STR}${PXSHARED_ARCH_FOLDER} ${PXSHAREDSDK_PATH}/../lib/${PXSHARED_ARCH_FOLDER}/${VS_STR} ${PXSHAREDSDK_PATH}/../lib)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
-
-elseif(TARGET_BUILD_PLATFORM STREQUAL "PS4")
- SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/vc14ps4-cmake ${PXSHAREDSDK_PATH}/../lib)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
- SET(CMAKE_FIND_LIBRARY_PREFIXES "lib")
-elseif(TARGET_BUILD_PLATFORM STREQUAL "XboxOne")
- SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/vc14xboxone-cmake ${PXSHAREDSDK_PATH}/../Lib)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".lib")
- SET(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
-elseif(TARGET_BUILD_PLATFORM STREQUAL "linux")
- SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/linux64-cmake ${PXSHAREDSDK_PATH}/../Lib)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
- SET(CMAKE_FIND_LIBRARY_PREFIXES "lib")
- SET(PXSHARED_ARCH_FILE "_x64")
-endif()
-
-
-# Now find all of the PxShared libs in the lib directory
-
-
-find_library(PSFASTXML_LIB
- NAMES PsFastXml PsFastXml${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PXFOUNDATION_LIB
- NAMES PxFoundation${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PXPVDSDK_LIB
- NAMES PxPvdSDK${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PXTASK_LIB
- NAMES PxTask PxTask${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-
-find_library(PSFASTXML_LIB_DEBUG
- NAMES PsFastXmlDEBUG PsFastXmlDEBUG${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PXFOUNDATION_LIB_DEBUG
- NAMES PxFoundationDEBUG${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PXPVDSDK_LIB_DEBUG
- NAMES PxPvdSDKDEBUG${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PXTASK_LIB_DEBUG
- NAMES PxTaskDEBUG PxTaskDEBUG${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-
-find_library(PSFASTXML_LIB_CHECKED
- NAMES PsFastXmlCHECKED PsFastXmlCHECKED${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PXFOUNDATION_LIB_CHECKED
- NAMES PxFoundationCHECKED${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PXPVDSDK_LIB_CHECKED
- NAMES PxPvdSDKCHECKED${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PXTASK_LIB_CHECKED
- NAMES PxTaskCHECKED PxTaskCHECKED${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-
-find_library(PSFASTXML_LIB_PROFILE
- NAMES PsFastXmlPROFILE PsFastXmlPROFILE${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PXFOUNDATION_LIB_PROFILE
- NAMES PxFoundationPROFILE${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PXPVDSDK_LIB_PROFILE
- NAMES PxPvdSDKPROFILE${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-find_library(PXTASK_LIB_PROFILE
- NAMES PxTaskPROFILE PxTaskPROFILE${PXSHARED_ARCH_FILE}
- PATHS ${LIB_PATH}
-)
-
-if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
- SET(DLL_PATH ${PXSHAREDSDK_PATH}/bin/${VS_STR}${PXSHARED_ARCH_FOLDER}-cmake${PXSHARED_CRT_SUFFIX} ${PXSHAREDSDK_PATH}/bin/${VS_STR}${PXSHARED_ARCH_FOLDER} ${PXSHAREDSDK_PATH}/../bin/${PXSHARED_ARCH_FOLDER}/${VS_STR} ${PXSHAREDSDK_PATH}/../bin)
-
- find_library(PXFOUNDATION_DLL
- NAMES PxFoundation${PXSHARED_ARCH_FILE}
- PATHS ${DLL_PATH}
- )
- find_library(PXPVDSDK_DLL
- NAMES PxPvdSDK${PXSHARED_ARCH_FILE}
- PATHS ${DLL_PATH}
- )
-
- find_library(PXFOUNDATION_DLL_DEBUG
- NAMES PxFoundationDEBUG${PXSHARED_ARCH_FILE}
- PATHS ${DLL_PATH}
- )
- find_library(PXPVDSDK_DLL_DEBUG
- NAMES PxPvdSDKDEBUG${PXSHARED_ARCH_FILE}
- PATHS ${DLL_PATH}
- )
-
- find_library(PXFOUNDATION_DLL_CHECKED
- NAMES PxFoundationCHECKED${PXSHARED_ARCH_FILE}
- PATHS ${DLL_PATH}
- )
- find_library(PXPVDSDK_DLL_CHECKED
- NAMES PxPvdSDKCHECKED${PXSHARED_ARCH_FILE}
- PATHS ${DLL_PATH}
- )
-
- find_library(PXFOUNDATION_DLL_PROFILE
- NAMES PxFoundationPROFILE${PXSHARED_ARCH_FILE}
- PATHS ${DLL_PATH}
- )
- find_library(PXPVDSDK_DLL_PROFILE
- NAMES PxPvdSDKPROFILE${PXSHARED_ARCH_FILE}
- PATHS ${DLL_PATH}
- )
-
- #Put the found dll variables in a list if we actually looked for them (windows)
- SET(DLL_VAR_LIST
- PXFOUNDATION_DLL
- PXPVDSDK_DLL
-
- PXFOUNDATION_DLL_DEBUG
- PXPVDSDK_DLL_DEBUG
-
- PXFOUNDATION_DLL_CHECKED
- PXPVDSDK_DLL_CHECKED
-
- PXFOUNDATION_DLL_PROFILE
- PXPVDSDK_DLL_PROFILE
-
- )
-endif()
-
-if (TARGET_BUILD_PLATFORM STREQUAL "linux")
- SET(BIN_PATH ${PXSHAREDSDK_PATH}/bin/linux64-cmake ${PXSHAREDSDK_PATH}/../Bin)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
-
- find_library(PXFOUNDATION_LIB
- NAMES PxFoundation${PXSHARED_ARCH_FILE}
- PATHS ${BIN_PATH}
- )
- find_library(PXPVDSDK_LIB
- NAMES PxPvdSDK${PXSHARED_ARCH_FILE}
- PATHS ${BIN_PATH}
- )
-
- find_library(PXFOUNDATION_LIB_CHECKED
- NAMES PxFoundationCHECKED${PXSHARED_ARCH_FILE}
- PATHS ${BIN_PATH}
- )
- find_library(PXPVDSDK_LIB_CHECKED
- NAMES PxPvdSDKCHECKED${PXSHARED_ARCH_FILE}
- PATHS ${BIN_PATH}
- )
-
- find_library(PXFOUNDATION_LIB_DEBUG
- NAMES PxFoundationDEBUG${PXSHARED_ARCH_FILE}
- PATHS ${BIN_PATH}
- )
- find_library(PXPVDSDK_LIB_DEBUG
- NAMES PxPvdSDKDEBUG${PXSHARED_ARCH_FILE}
- PATHS ${BIN_PATH}
- )
-
- find_library(PXFOUNDATION_LIB_PROFILE
- NAMES PxFoundationPROFILE${PXSHARED_ARCH_FILE}
- PATHS ${BIN_PATH}
- )
- find_library(PXPVDSDK_LIB_PROFILE
- NAMES PxPvdSDKPROFILE${PXSHARED_ARCH_FILE}
- PATHS ${BIN_PATH}
- )
-endif()
-
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PXSHAREDSDK
DEFAULT_MSG
PXSHAREDSDK_PATH
-
- PSFASTXML_LIB
- PXFOUNDATION_LIB
- PXPVDSDK_LIB
- PXTASK_LIB
-
- PSFASTXML_LIB_DEBUG
- PXFOUNDATION_LIB_DEBUG
- PXPVDSDK_LIB_DEBUG
- PXTASK_LIB_DEBUG
-
- PSFASTXML_LIB_CHECKED
- PXFOUNDATION_LIB_CHECKED
- PXPVDSDK_LIB_CHECKED
- PXTASK_LIB_CHECKED
-
- PSFASTXML_LIB_PROFILE
- PXFOUNDATION_LIB_PROFILE
- PXPVDSDK_LIB_PROFILE
- PXTASK_LIB_PROFILE
-
-
- ${DLL_VAR_LIST}
)
if (PXSHAREDSDK_FOUND)
-
# NOTE: This include list is way too long and reaches into too many internals.
# Also may not be good enough for all users.
SET(PXSHAREDSDK_INCLUDE_DIRS
- ${PXSHAREDSDK_PATH}/include
- ${PXSHAREDSDK_PATH}/include/pvd
- ${PXSHAREDSDK_PATH}/include/task
+ ${PXSHAREDSDK_PATH}/include
${PXSHAREDSDK_PATH}/include/filebuf
${PXSHAREDSDK_PATH}/include/foundation
- ${PXSHAREDSDK_PATH}/src/foundation/include
${PXSHAREDSDK_PATH}/src/filebuf/include
- ${PXSHAREDSDK_PATH}/src/fastxml/include
- )
-
- SET(PXSHAREDSDK_LIBS_RELEASE ${PSFASTXML_LIB} ${PXFOUNDATION_LIB} ${PXPVDSDK_LIB} ${PXTASK_LIB}
- CACHE STRING ""
- )
- SET(PXSHAREDSDK_LIBS_DEBUG ${PSFASTXML_LIB_DEBUG} ${PXFOUNDATION_LIB_DEBUG} ${PXPVDSDK_LIB_DEBUG} ${PXTASK_LIB_DEBUG}
- CACHE STRING ""
- )
-
- SET(PXSHAREDSDK_LIBS_CHECKED ${PSFASTXML_LIB_CHECKED} ${PXFOUNDATION_LIB_CHECKED} ${PXPVDSDK_LIB_CHECKED} ${PXTASK_LIB_CHECKED}
- CACHE STRING ""
- )
-
- SET(PXSHAREDSDK_LIBS_PROFILE ${PSFASTXML_LIB_PROFILE} ${PXFOUNDATION_LIB_PROFILE} ${PXPVDSDK_LIB_PROFILE} ${PXTASK_LIB_PROFILE}
- CACHE STRING ""
- )
-
- SET(PXSHAREDSDK_DLLS
- ${PXFOUNDATION_DLL}
- ${PXPVDSDK_DLL}
-
- ${PXFOUNDATION_DLL_DEBUG}
- ${PXPVDSDK_DLL_DEBUG}
-
- ${PXFOUNDATION_DLL_CHECKED}
- ${PXPVDSDK_DLL_CHECKED}
-
- ${PXFOUNDATION_DLL_PROFILE}
- ${PXPVDSDK_DLL_PROFILE}
)
-
- SET(PXSHAREDSDK_LIBRARIES "" CACHE STRING "")
-
- foreach(x ${PXSHAREDSDK_LIBS_RELEASE})
- list(APPEND PXSHAREDSDK_LIBRARIES optimized ${x})
- endforeach()
-
- foreach(x ${PXSHAREDSDK_LIBS_DEBUG})
- list(APPEND PXSHAREDSDK_LIBRARIES debug ${x})
- endforeach()
endif()
diff --git a/sdk/compiler/cmake/windows/CMakeLists.txt b/sdk/compiler/cmake/windows/CMakeLists.txt index ee886ff..836ee96 100755 --- a/sdk/compiler/cmake/windows/CMakeLists.txt +++ b/sdk/compiler/cmake/windows/CMakeLists.txt @@ -59,6 +59,7 @@ INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAuthoring.cmake) INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtImport.cmake)
INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtAssetUtils.cmake)
INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtExporter.cmake)
+# INCLUDE(${PROJECT_CMAKE_FILES_DIR}/NvBlastExtRT.cmake)
SET(SERIALIZATION_INCLUDED 1 PARENT_SCOPE)
diff --git a/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.cpp b/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.cpp index a1fc150..7764f7e 100755 --- a/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.cpp +++ b/sdk/extensions/authoring/source/NvBlastExtAuthoringCutoutImpl.cpp @@ -32,6 +32,7 @@ #include <PxMath.h>
#include <NvBlastPxSharedHelpers.h>
#include "NvBlastExtAuthoringCutoutImpl.h"
+#include <PxAssert.h>
#include <algorithm>
#include <set>
#include <map>
diff --git a/sdk/extensions/import/apexmodules/nvparutils/nvparameterized/NvParameterized.h b/sdk/extensions/import/apexmodules/nvparutils/nvparameterized/NvParameterized.h index 42ebaf5..ee3cc49 100755 --- a/sdk/extensions/import/apexmodules/nvparutils/nvparameterized/NvParameterized.h +++ b/sdk/extensions/import/apexmodules/nvparutils/nvparameterized/NvParameterized.h @@ -54,6 +54,7 @@ #include <stdio.h>
#include <stdarg.h>
#include <new> // for placement new
+#include <PxAssert.h>
PX_PUSH_PACK_DEFAULT
diff --git a/sdk/extensions/import/source/NvBlastExtApexImportTool.cpp b/sdk/extensions/import/source/NvBlastExtApexImportTool.cpp index bc0cd12..bbd9953 100755 --- a/sdk/extensions/import/source/NvBlastExtApexImportTool.cpp +++ b/sdk/extensions/import/source/NvBlastExtApexImportTool.cpp @@ -181,7 +181,7 @@ uint32_t getPartIndex(const DestructibleAssetParameters* prm, uint32_t id) ApexImportTool::ApexImportTool()
{
m_Foundation =
- PxCreateFoundation(PX_FOUNDATION_VERSION, NvBlastGetPxAllocatorCallback(), NvBlastGetPxErrorCallback());
+ PxCreateFoundation(PX_PHYSICS_VERSION, NvBlastGetPxAllocatorCallback(), NvBlastGetPxErrorCallback());
if (!m_Foundation)
{
NVBLAST_LOG_ERROR("Error: failed to create Foundation\n");
diff --git a/sdk/extensions/physx/include/NvBlastExtCustomProfiler.h b/sdk/extensions/physx/include/NvBlastExtCustomProfiler.h index 546850a..8b5c167 100755 --- a/sdk/extensions/physx/include/NvBlastExtCustomProfiler.h +++ b/sdk/extensions/physx/include/NvBlastExtCustomProfiler.h @@ -31,6 +31,7 @@ #include "NvBlastProfiler.h"
#include "PxProfiler.h"
+#include <PxFoundation.h>
#if NV_NVTX
#include "nvToolsExt.h"
|