|
@@ -46,14 +46,11 @@ set(PHYSX3_PATH "${PHYSX3_BASE_PATH}/PhysX_3.4")
|
|
|
# Windows/ Visual Studio
|
|
|
if(MSVC)
|
|
|
if(TORQUE_CPU_X32)
|
|
|
- if(MSVC11)
|
|
|
- set(PHYSX3_LIBPATH_PREFIX vc11win32)
|
|
|
- elseif(MSVC12)
|
|
|
+ if(MSVC_VERSION EQUAL 1800 )
|
|
|
set(PHYSX3_LIBPATH_PREFIX vc12win32)
|
|
|
- elseif(MSVC14)
|
|
|
+ elseif(MSVC_VERSION EQUAL 1900)
|
|
|
set(PHYSX3_LIBPATH_PREFIX vc14win32)
|
|
|
- #VS 2017 uses 14.x toolchain so can't use MSVC15
|
|
|
- elseif(MSVC_VERSION GREATER_OR_EQUAL_TO 1910)
|
|
|
+ elseif(MSVC_VERSION GREATER_EQUAL 1910)
|
|
|
set(PHYSX3_LIBPATH_PREFIX vc15win32)
|
|
|
else()
|
|
|
message(FATAL_ERROR "This version of VS is not supported")
|
|
@@ -62,14 +59,11 @@ if(TORQUE_CPU_X32)
|
|
|
set(PHYSX3_LIBNAME_POSTFIX _x86)
|
|
|
|
|
|
elseif(TORQUE_CPU_X64)
|
|
|
- if(MSVC11)
|
|
|
- set(PHYSX3_LIBPATH_PREFIX vc11win64)
|
|
|
- elseif(MSVC12)
|
|
|
+ if(MSVC_VERSION EQUAL 1800 )
|
|
|
set(PHYSX3_LIBPATH_PREFIX vc12win64)
|
|
|
- elseif(MSVC14)
|
|
|
+ elseif(MSVC_VERSION EQUAL 1900)
|
|
|
set(PHYSX3_LIBPATH_PREFIX vc14win64)
|
|
|
- #VS 2017 uses 14.x toolchain so can't use MSVC15
|
|
|
- elseif(MSVC_VERSION GREATER_OR_EQUAL_TO 1910)
|
|
|
+ elseif(MSVC_VERSION GREATER_EQUAL 1910)
|
|
|
set(PHYSX3_LIBPATH_PREFIX vc15win64)
|
|
|
else()
|
|
|
message(FATAL_ERROR "This version of VS is not supported")
|