Browse Source

Fixed physx3 linux cmake build

Tim 7 years ago
parent
commit
5e01ac380c
1 changed files with 6 additions and 7 deletions
  1. 6 7
      Tools/CMake/modules/module_physx3.cmake

+ 6 - 7
Tools/CMake/modules/module_physx3.cmake

@@ -108,6 +108,7 @@ if( WIN32 )
    FIND_PHYSX3_LIBRARY(PVD PxPvdSDK 1 ${PHYSX3_BASE_PATH}/PxShared/Lib/)
    FIND_PHYSX3_LIBRARY(PVD PxPvdSDK 1 ${PHYSX3_BASE_PATH}/PxShared/Lib/)
 
 
    if(NOT PHYSX3_CORE_LIBRARY)
    if(NOT PHYSX3_CORE_LIBRARY)
+      message(FATAL_ERROR "Could not find core PhysX lib")
       return()
       return()
    endif()
    endif()
 
 
@@ -153,29 +154,29 @@ elseif(UNIX)
 	  FIND_PHYSX3_LIBRARY(CHARACTER PhysX3CharacterKinematic 0 ${PHYSX3_PATH}/Lib/)
 	  FIND_PHYSX3_LIBRARY(CHARACTER PhysX3CharacterKinematic 0 ${PHYSX3_PATH}/Lib/)
       FIND_PHYSX3_LIBRARY(FOUNDATION PxFoundation 0 ${PHYSX3_BASE_PATH}/PxShared/lib/)
       FIND_PHYSX3_LIBRARY(FOUNDATION PxFoundation 0 ${PHYSX3_BASE_PATH}/PxShared/lib/)
       FIND_PHYSX3_LIBRARY(PVD PxPvdSDK 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(CORE PhysX3 1 ${PHYSX3_PATH}/Bin/)
       FIND_PHYSX3_LIBRARY(COMMON PhysX3Common 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(CHARACTER PhysX3CharacterKinematic 1 ${PHYSX3_PATH}/Bin/)
       FIND_PHYSX3_LIBRARY(COOKING PhysX3Cooking 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(FOUNDATION PxFoundation 1 ${PHYSX3_BASE_PATH}/PxShared/bin/)
       FIND_PHYSX3_LIBRARY(PVD PxPvdSDK 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/)
 	  FIND_PHYSX3_LIBRARY(XML PsFastXml 0 ${PHYSX3_BASE_PATH}/PxShared/lib/)
    endif()
    endif()
 
 
    if(NOT PHYSX3_CORE_LIBRARY)
    if(NOT PHYSX3_CORE_LIBRARY)
+      message(FATAL_ERROR "Could not find core PhysX lib")
       return()
       return()
    endif()
    endif()
 
 
    #Add the libs
    #Add the libs
    set(PHYSX_LIBRARIES
    set(PHYSX_LIBRARIES
       ${PHYSX3_CORE_LIBRARY}
       ${PHYSX3_CORE_LIBRARY}
-      ${PHYSX3_GPU_LIBRARY}
       ${PHYSX3_CHARACTER_LIBRARY}
       ${PHYSX3_CHARACTER_LIBRARY}
       ${PHYSX3_COOKING_LIBRARY}
       ${PHYSX3_COOKING_LIBRARY}
       ${PHYSX3_COMMON_LIBRARY}
       ${PHYSX3_COMMON_LIBRARY}
+      ${PHYSX3_GPU_LIBRARY}
       ${PHYSX3_EXTENSIONS_LIBRARY}
       ${PHYSX3_EXTENSIONS_LIBRARY}
       ${PHYSX3_CONTROLLER_LIBRARY}
       ${PHYSX3_CONTROLLER_LIBRARY}
       ${PHYSX3_SCENEQUERY_LIBRARY}
       ${PHYSX3_SCENEQUERY_LIBRARY}
@@ -184,7 +185,6 @@ elseif(UNIX)
       ${PHYSX3_LOWLEVEL_DYNAMICS_LIBRARY}
       ${PHYSX3_LOWLEVEL_DYNAMICS_LIBRARY}
       ${PHYSX3_LOWLEVEL_CLOTH_LIBRARY}
       ${PHYSX3_LOWLEVEL_CLOTH_LIBRARY}
       ${PHYSX3_LOWLEVEL_PARTICLES_LIBRARY}
       ${PHYSX3_LOWLEVEL_PARTICLES_LIBRARY}
-      ${PHYSX3_CUDA_LIBRARY}
       ${PHYSX3_TASK_LIBRARY}
       ${PHYSX3_TASK_LIBRARY}
       ${PHYSX3_XML_LIBRARY}
       ${PHYSX3_XML_LIBRARY}
       ${PHYSX3_FOUNDATION_LIBRARY}
       ${PHYSX3_FOUNDATION_LIBRARY}
@@ -193,10 +193,10 @@ elseif(UNIX)
 
 
    set(PHYSX_LIBRARIES_DEBUG
    set(PHYSX_LIBRARIES_DEBUG
       ${PHYSX3_CORE_LIBRARY_DEBUG}
       ${PHYSX3_CORE_LIBRARY_DEBUG}
-      ${PHYSX3_GPU_LIBRARY_DEBUG}
       ${PHYSX3_CHARACTER_LIBRARY_DEBUG}
       ${PHYSX3_CHARACTER_LIBRARY_DEBUG}
       ${PHYSX3_COOKING_LIBRARY_DEBUG}
       ${PHYSX3_COOKING_LIBRARY_DEBUG}
       ${PHYSX3_COMMON_LIBRARY_DEBUG}
       ${PHYSX3_COMMON_LIBRARY_DEBUG}
+      ${PHYSX3_GPU_LIBRARY_DEBUG}
       ${PHYSX3_EXTENSIONS_LIBRARY_DEBUG}
       ${PHYSX3_EXTENSIONS_LIBRARY_DEBUG}
       ${PHYSX3_CONTROLLER_LIBRARY_DEBUG}
       ${PHYSX3_CONTROLLER_LIBRARY_DEBUG}
       ${PHYSX3_SCENEQUERY_LIBRARY_DEBUG}
       ${PHYSX3_SCENEQUERY_LIBRARY_DEBUG}
@@ -205,7 +205,6 @@ elseif(UNIX)
       ${PHYSX3_LOWLEVEL_DYNAMICS_LIBRARY_DEBUG}
       ${PHYSX3_LOWLEVEL_DYNAMICS_LIBRARY_DEBUG}
       ${PHYSX3_LOWLEVEL_CLOTH_LIBRARY_DEBUG}
       ${PHYSX3_LOWLEVEL_CLOTH_LIBRARY_DEBUG}
       ${PHYSX3_LOWLEVEL_PARTICLES_LIBRARY_DEBUG}
       ${PHYSX3_LOWLEVEL_PARTICLES_LIBRARY_DEBUG}
-      ${PHYSX3_CUDA_LIBRARY_DEBUG}
       ${PHYSX3_TASK_LIBRARY_DEBUG}
       ${PHYSX3_TASK_LIBRARY_DEBUG}
       ${PHYSX3_XML_LIBRARY_DEBUG}
       ${PHYSX3_XML_LIBRARY_DEBUG}
       ${PHYSX3_FOUNDATION_LIBRARY_DEBUG}
       ${PHYSX3_FOUNDATION_LIBRARY_DEBUG}