aboutsummaryrefslogtreecommitdiff
path: root/sdk/compiler
diff options
context:
space:
mode:
authorBryan Galdrikian <[email protected]>2018-01-23 15:09:19 -0800
committerBryan Galdrikian <[email protected]>2018-01-23 15:09:19 -0800
commit5b173c1082bd932de70b5664dce9b1c95e0ae237 (patch)
tree1f39a99b81be853e31044828ccfe6d04c36a25da /sdk/compiler
parentChanges for 1.1.2 release candidate (diff)
downloadblast-5b173c1082bd932de70b5664dce9b1c95e0ae237.tar.xz
blast-5b173c1082bd932de70b5664dce9b1c95e0ae237.zip
Linux checked and profile builds
New NvBlastExtAuthoringBuildCollisionMesh API buildtools/steps/build_all_linux.sh will be committed separately
Diffstat (limited to 'sdk/compiler')
-rw-r--r--sdk/compiler/cmake/modules/FindPhysXSDK.cmake74
-rw-r--r--sdk/compiler/cmake/modules/FindPxSharedSDK.cmake44
2 files changed, 68 insertions, 50 deletions
diff --git a/sdk/compiler/cmake/modules/FindPhysXSDK.cmake b/sdk/compiler/cmake/modules/FindPhysXSDK.cmake
index 0194edb..fa3ddb1 100644
--- a/sdk/compiler/cmake/modules/FindPhysXSDK.cmake
+++ b/sdk/compiler/cmake/modules/FindPhysXSDK.cmake
@@ -209,51 +209,51 @@ find_library(SIMULATIONCONTROLLER_LIB_CHECKED
)
find_library(PHYSX3_LIB_PROFILE
- NAMES PhysX3PROFILE${PHYSX_ARCH_FILE}
+ NAMES PhysX3PROFILE PhysX3PROFILE${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(PHYSX3EXTENSIONS_LIB_PROFILE
- NAMES PhysX3ExtensionsPROFILE${PHYSX_ARCH_FILE}
+ NAMES PhysX3ExtensionsPROFILE PhysX3ExtensionsPROFILE${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(PHYSX3CHARACTERKINEMATIC_LIB_PROFILE
- NAMES PhysX3CharacterKinematicPROFILE${PHYSX_ARCH_FILE}
+ NAMES PhysX3CharacterKinematicPROFILE PhysX3CharacterKinematicPROFILE${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(PHYSX3COMMON_LIB_PROFILE
- NAMES PhysX3CommonPROFILE${PHYSX_ARCH_FILE}
+ NAMES PhysX3CommonPROFILE PhysX3CommonPROFILE${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(PHYSX3COOKING_LIB_PROFILE
- NAMES PhysX3CookingPROFILE${PHYSX_ARCH_FILE}
+ NAMES PhysX3CookingPROFILE PhysX3CookingPROFILE${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(LOWLEVEL_LIB_PROFILE
- NAMES LowLevelPROFILE${PHYSX_ARCH_FILE}
+ NAMES LowLevelPROFILE LowLevelPROFILE${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(LOWLEVELAABB_LIB_PROFILE
- NAMES LowLevelAABBPROFILE${PHYSX_ARCH_FILE}
+ NAMES LowLevelAABBPROFILE LowLevelAABBPROFILE${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(LOWLEVELCLOTH_LIB_PROFILE
- NAMES LowLevelClothPROFILE${PHYSX_ARCH_FILE}
+ NAMES LowLevelClothPROFILE LowLevelClothPROFILE${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(LOWLEVELDYNAMICS_LIB_PROFILE
- NAMES LowLevelDynamicsPROFILE${PHYSX_ARCH_FILE}
+ NAMES LowLevelDynamicsPROFILE LowLevelDynamicsPROFILE${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(LOWLEVELPARTICLES_LIB_PROFILE
- NAMES LowLevelParticlesPROFILE${PHYSX_ARCH_FILE}
+ NAMES LowLevelParticlesPROFILE LowLevelParticlesPROFILE${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(SCENEQUERY_LIB_PROFILE
- NAMES SceneQueryPROFILE${PHYSX_ARCH_FILE}
+ NAMES SceneQueryPROFILE SceneQueryPROFILE${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(SIMULATIONCONTROLLER_LIB_PROFILE
- NAMES SimulationControllerPROFILE${PHYSX_ARCH_FILE}
+ NAMES SimulationControllerPROFILE SimulationControllerPROFILE${PHYSX_ARCH_FILE}
PATHS ${LIB_PATH}
)
@@ -469,31 +469,31 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PHYSXSDK
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
+ 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}
)
diff --git a/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake b/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake
index ff18af3..da540ec 100644
--- a/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake
+++ b/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake
@@ -99,7 +99,7 @@ find_library(PXTASK_LIB_DEBUG
)
find_library(PSFASTXML_LIB_CHECKED
- NAMES PsFastXmlCHECKED${PXSHARED_ARCH_FILE}
+ NAMES PsFastXmlCHECKED PsFastXmlCHECKED${PXSHARED_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(PXFOUNDATION_LIB_CHECKED
@@ -111,12 +111,12 @@ find_library(PXPVDSDK_LIB_CHECKED
PATHS ${LIB_PATH}
)
find_library(PXTASK_LIB_CHECKED
- NAMES PxTaskCHECKED${PXSHARED_ARCH_FILE}
+ NAMES PxTaskCHECKED PxTaskCHECKED${PXSHARED_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(PSFASTXML_LIB_PROFILE
- NAMES PsFastXmlPROFILE${PXSHARED_ARCH_FILE}
+ NAMES PsFastXmlPROFILE PsFastXmlPROFILE${PXSHARED_ARCH_FILE}
PATHS ${LIB_PATH}
)
find_library(PXFOUNDATION_LIB_PROFILE
@@ -128,7 +128,7 @@ find_library(PXPVDSDK_LIB_PROFILE
PATHS ${LIB_PATH}
)
find_library(PXTASK_LIB_PROFILE
- NAMES PxTaskPROFILE${PXSHARED_ARCH_FILE}
+ NAMES PxTaskPROFILE PxTaskPROFILE${PXSHARED_ARCH_FILE}
PATHS ${LIB_PATH}
)
@@ -201,6 +201,15 @@ if (TARGET_BUILD_PLATFORM STREQUAL "linux")
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}
@@ -209,6 +218,15 @@ if (TARGET_BUILD_PLATFORM STREQUAL "linux")
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
@@ -225,15 +243,15 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PXSHAREDSDK
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
+ 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}