From c0f298e37d824187ed2fbd67db1cd5b168ee07ca Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 3 Feb 2018 13:40:33 +1000 Subject: [PATCH] Fixed physx3 linux cmake build --- Tools/CMake/modules/module_physx3.cmake | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Tools/CMake/modules/module_physx3.cmake b/Tools/CMake/modules/module_physx3.cmake index 56984649f..a2dd3fdd3 100644 --- a/Tools/CMake/modules/module_physx3.cmake +++ b/Tools/CMake/modules/module_physx3.cmake @@ -108,6 +108,7 @@ if( WIN32 ) FIND_PHYSX3_LIBRARY(PVD PxPvdSDK 1 ${PHYSX3_BASE_PATH}/PxShared/Lib/) if(NOT PHYSX3_CORE_LIBRARY) + message(FATAL_ERROR "Could not find core PhysX lib") return() endif() @@ -153,29 +154,29 @@ elseif(UNIX) FIND_PHYSX3_LIBRARY(CHARACTER PhysX3CharacterKinematic 0 ${PHYSX3_PATH}/Lib/) FIND_PHYSX3_LIBRARY(FOUNDATION PxFoundation 0 ${PHYSX3_BASE_PATH}/PxShared/lib/) FIND_PHYSX3_LIBRARY(PVD PxPvdSDK 0 ${PHYSX3_BASE_PATH}/PxShared/lib/) - elseif() #linux + else() #linux FIND_PHYSX3_LIBRARY(CORE PhysX3 1 ${PHYSX3_PATH}/Bin/) FIND_PHYSX3_LIBRARY(COMMON PhysX3Common 1 ${PHYSX3_PATH}/Bin/) + FIND_PHYSX3_LIBRARY(GPU PhysX3Gpu 1 ${PHYSX3_PATH}/Bin/) FIND_PHYSX3_LIBRARY(CHARACTER PhysX3CharacterKinematic 1 ${PHYSX3_PATH}/Bin/) FIND_PHYSX3_LIBRARY(COOKING PhysX3Cooking 1 ${PHYSX3_PATH}/Bin/) FIND_PHYSX3_LIBRARY(FOUNDATION PxFoundation 1 ${PHYSX3_BASE_PATH}/PxShared/bin/) FIND_PHYSX3_LIBRARY(PVD PxPvdSDK 1 ${PHYSX3_BASE_PATH}/PxShared/bin/) - FIND_PHYSX3_LIBRARY(CUDA PxCudaContextManager 0 ${PHYSX3_BASE_PATH}/PxShared/lib/) - FIND_PHYSX3_LIBRARY(GPU PhysX3Gpu 1 ${PHYSX3_PATH}/Bin/) FIND_PHYSX3_LIBRARY(XML PsFastXml 0 ${PHYSX3_BASE_PATH}/PxShared/lib/) endif() if(NOT PHYSX3_CORE_LIBRARY) + message(FATAL_ERROR "Could not find core PhysX lib") return() endif() #Add the libs set(PHYSX_LIBRARIES ${PHYSX3_CORE_LIBRARY} - ${PHYSX3_GPU_LIBRARY} ${PHYSX3_CHARACTER_LIBRARY} ${PHYSX3_COOKING_LIBRARY} ${PHYSX3_COMMON_LIBRARY} + ${PHYSX3_GPU_LIBRARY} ${PHYSX3_EXTENSIONS_LIBRARY} ${PHYSX3_CONTROLLER_LIBRARY} ${PHYSX3_SCENEQUERY_LIBRARY} @@ -184,7 +185,6 @@ elseif(UNIX) ${PHYSX3_LOWLEVEL_DYNAMICS_LIBRARY} ${PHYSX3_LOWLEVEL_CLOTH_LIBRARY} ${PHYSX3_LOWLEVEL_PARTICLES_LIBRARY} - ${PHYSX3_CUDA_LIBRARY} ${PHYSX3_TASK_LIBRARY} ${PHYSX3_XML_LIBRARY} ${PHYSX3_FOUNDATION_LIBRARY} @@ -193,10 +193,10 @@ elseif(UNIX) set(PHYSX_LIBRARIES_DEBUG ${PHYSX3_CORE_LIBRARY_DEBUG} - ${PHYSX3_GPU_LIBRARY_DEBUG} ${PHYSX3_CHARACTER_LIBRARY_DEBUG} ${PHYSX3_COOKING_LIBRARY_DEBUG} ${PHYSX3_COMMON_LIBRARY_DEBUG} + ${PHYSX3_GPU_LIBRARY_DEBUG} ${PHYSX3_EXTENSIONS_LIBRARY_DEBUG} ${PHYSX3_CONTROLLER_LIBRARY_DEBUG} ${PHYSX3_SCENEQUERY_LIBRARY_DEBUG} @@ -205,7 +205,6 @@ elseif(UNIX) ${PHYSX3_LOWLEVEL_DYNAMICS_LIBRARY_DEBUG} ${PHYSX3_LOWLEVEL_CLOTH_LIBRARY_DEBUG} ${PHYSX3_LOWLEVEL_PARTICLES_LIBRARY_DEBUG} - ${PHYSX3_CUDA_LIBRARY_DEBUG} ${PHYSX3_TASK_LIBRARY_DEBUG} ${PHYSX3_XML_LIBRARY_DEBUG} ${PHYSX3_FOUNDATION_LIBRARY_DEBUG}