Changes for 1.1.2 release candidate

See README.md, docs/release_notes.txt

1 files changed, 49 insertions, 68 deletions

diff --git a/sdk/compiler/cmake/modules/FindPhysXSDK.cmake b/sdk/compiler/cmake/modules/FindPhysXSDK.cmake
index 4b9176f..0194edb 100644
--- a/sdk/compiler/cmake/modules/FindPhysXSDK.cmake
+++ b/sdk/compiler/cmake/modules/FindPhysXSDK.cmake
@@ -6,9 +6,10 @@
 include(FindPackageHandleStandardArgs)
 
 MESSAGE("Looking for PhysXSDK ${PhysXSDK_FIND_VERSION} Cached path: ${PHYSXSDK_PATH}")
-# TODO: Do the version stuff properly!
 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}
 )
@@ -32,26 +33,26 @@ if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
 	# 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 "vc12")
+		SET(VS_STR "VS2013")
 	elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.0.0.0)
-		SET(VS_STR "vc14")
+		SET(VS_STR "VS2015")
 	else()
 		MESSAGE(FATAL_ERROR "Failed to find compatible PxSharedSDK - Only supporting VS2013 and VS2015")
 	endif()
 	
-	SET(LIB_PATH ${PHYSXSDK_PATH}/lib/${VS_STR}${PHYSX_ARCH_FOLDER}-cmake${PHYSX_CRT_SUFFIX})
+	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")
 
 elseif(TARGET_BUILD_PLATFORM STREQUAL "PS4")
-	SET(LIB_PATH ${PHYSXSDK_PATH}/lib/vc14ps4-cmake)
+	SET(LIB_PATH ${PHYSXSDK_PATH}/lib/vc14ps4-cmake ${PHYSXSDK_PATH}/../Lib)
 	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)
-	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-	SET(CMAKE_FIND_LIBRARY_PREFIXES "lib")
+	SET(LIB_PATH ${PHYSXSDK_PATH}/lib/vc14xboxone-cmake ${PHYSXSDK_PATH}/../lib)
+	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)
+	SET(LIB_PATH ${PHYSXSDK_PATH}/lib/linux64-cmake ${PHYSXSDK_PATH}/../Lib)
 	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
 	SET(CMAKE_FIND_LIBRARY_PREFIXES "lib")
 	SET(PHYSX_ARCH_FILE "_x64")
@@ -60,11 +61,11 @@ endif()
 # Now find all of the PhysX libs in the lib directory
 
 find_library(PHYSX3_LIB
-	NAMES PhysX3${PHYSX_ARCH_FILE}
+	NAMES PhysX3 PhysX3${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(PHYSX3EXTENSIONS_LIB
-	NAMES PhysX3Extensions${PHYSX_ARCH_FILE}
+	NAMES PhysX3Extensions PhysX3Extensions${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(PHYSX3CHARACTERKINEMATIC_LIB
@@ -80,130 +81,130 @@ find_library(PHYSX3COOKING_LIB
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVEL_LIB
-	NAMES LowLevel${PHYSX_ARCH_FILE}
+	NAMES LowLevel LowLevel${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVELAABB_LIB
-	NAMES LowLevelAABB${PHYSX_ARCH_FILE}
+	NAMES LowLevelAABB LowLevelAABB${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVELCLOTH_LIB
-	NAMES LowLevelCloth${PHYSX_ARCH_FILE}
+	NAMES LowLevelCloth LowLevelCloth${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVELDYNAMICS_LIB
-	NAMES LowLevelDynamics${PHYSX_ARCH_FILE}
+	NAMES LowLevelDynamics LowLevelDynamics${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVELPARTICLES_LIB
-	NAMES LowLevelParticles${PHYSX_ARCH_FILE}
+	NAMES LowLevelParticles LowLevelParticles${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(SCENEQUERY_LIB
-	NAMES SceneQuery${PHYSX_ARCH_FILE}
+	NAMES SceneQuery SceneQuery${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(SIMULATIONCONTROLLER_LIB
-	NAMES SimulationController${PHYSX_ARCH_FILE}
+	NAMES SimulationController SimulationController${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 
 
 find_library(PHYSX3_LIB_DEBUG
-	NAMES PhysX3DEBUG${PHYSX_ARCH_FILE}
+	NAMES PhysX3DEBUG PhysX3DEBUG${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(PHYSX3EXTENSIONS_LIB_DEBUG
-	NAMES PhysX3ExtensionsDEBUG${PHYSX_ARCH_FILE}
+	NAMES PhysX3ExtensionsDEBUG PhysX3ExtensionsDEBUG${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(PHYSX3CHARACTERKINEMATIC_LIB_DEBUG
-	NAMES PhysX3CharacterKinematicDEBUG${PHYSX_ARCH_FILE}
+	NAMES PhysX3CharacterKinematicDEBUG PhysX3CharacterKinematicDEBUG${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(PHYSX3COMMON_LIB_DEBUG
-	NAMES PhysX3CommonDEBUG${PHYSX_ARCH_FILE}
+	NAMES PhysX3CommonDEBUG PhysX3CommonDEBUG${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(PHYSX3COOKING_LIB_DEBUG
-	NAMES PhysX3CookingDEBUG${PHYSX_ARCH_FILE}
+	NAMES PhysX3CookingDEBUG PhysX3CookingDEBUG${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVEL_LIB_DEBUG
-	NAMES LowLevelDEBUG${PHYSX_ARCH_FILE}
+	NAMES LowLevelDEBUG LowLevelDEBUG${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVELAABB_LIB_DEBUG
-	NAMES LowLevelAABBDEBUG${PHYSX_ARCH_FILE}
+	NAMES LowLevelAABBDEBUG LowLevelAABBDEBUG${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVELCLOTH_LIB_DEBUG
-	NAMES LowLevelClothDEBUG${PHYSX_ARCH_FILE}
+	NAMES LowLevelClothDEBUG LowLevelClothDEBUG${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVELDYNAMICS_LIB_DEBUG
-	NAMES LowLevelDynamicsDEBUG${PHYSX_ARCH_FILE}
+	NAMES LowLevelDynamicsDEBUG LowLevelDynamicsDEBUG${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVELPARTICLES_LIB_DEBUG
-	NAMES LowLevelParticlesDEBUG${PHYSX_ARCH_FILE}
+	NAMES LowLevelParticlesDEBUG LowLevelParticlesDEBUG${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(SCENEQUERY_LIB_DEBUG
-	NAMES SceneQueryDEBUG${PHYSX_ARCH_FILE}
+	NAMES SceneQueryDEBUG SceneQueryDEBUG${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(SIMULATIONCONTROLLER_LIB_DEBUG
-	NAMES SimulationControllerDEBUG${PHYSX_ARCH_FILE}
+	NAMES SimulationControllerDEBUG SimulationControllerDEBUG${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 
 find_library(PHYSX3_LIB_CHECKED
-	NAMES PhysX3CHECKED${PHYSX_ARCH_FILE}
+	NAMES PhysX3CHECKED PhysX3CHECKED${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(PHYSX3EXTENSIONS_LIB_CHECKED
-	NAMES PhysX3ExtensionsCHECKED${PHYSX_ARCH_FILE}
+	NAMES PhysX3ExtensionsCHECKED PhysX3ExtensionsCHECKED${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(PHYSX3CHARACTERKINEMATIC_LIB_CHECKED
-	NAMES PhysX3CharacterKinematicCHECKED${PHYSX_ARCH_FILE}
+	NAMES PhysX3CharacterKinematicCHECKED PhysX3CharacterKinematicCHECKED${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(PHYSX3COMMON_LIB_CHECKED
-	NAMES PhysX3CommonCHECKED${PHYSX_ARCH_FILE}
+	NAMES PhysX3CommonCHECKED PhysX3CommonCHECKED${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(PHYSX3COOKING_LIB_CHECKED
-	NAMES PhysX3CookingCHECKED${PHYSX_ARCH_FILE}
+	NAMES PhysX3CookingCHECKED PhysX3CookingCHECKED${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVEL_LIB_CHECKED
-	NAMES LowLevelCHECKED${PHYSX_ARCH_FILE}
+	NAMES LowLevelCHECKED LowLevelCHECKED${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVELAABB_LIB_CHECKED
-	NAMES LowLevelAABBCHECKED${PHYSX_ARCH_FILE}
+	NAMES LowLevelAABBCHECKED LowLevelAABBCHECKED${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVELCLOTH_LIB_CHECKED
-	NAMES LowLevelClothCHECKED${PHYSX_ARCH_FILE}
+	NAMES LowLevelClothCHECKED LowLevelClothCHECKED${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVELDYNAMICS_LIB_CHECKED
-	NAMES LowLevelDynamicsCHECKED${PHYSX_ARCH_FILE}
+	NAMES LowLevelDynamicsCHECKED LowLevelDynamicsCHECKED${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(LOWLEVELPARTICLES_LIB_CHECKED
-	NAMES LowLevelParticlesCHECKED${PHYSX_ARCH_FILE}
+	NAMES LowLevelParticlesCHECKED LowLevelParticlesCHECKED${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(SCENEQUERY_LIB_CHECKED
-	NAMES SceneQueryCHECKED${PHYSX_ARCH_FILE}
+	NAMES SceneQueryCHECKED SceneQueryCHECKED${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(SIMULATIONCONTROLLER_LIB_CHECKED
-	NAMES SimulationControllerCHECKED${PHYSX_ARCH_FILE}
+	NAMES SimulationControllerCHECKED SimulationControllerCHECKED${PHYSX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 
@@ -268,16 +269,12 @@ if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
 	)
 
 
-	SET(DLL_PATH ${PHYSXSDK_PATH}/bin/${VS_STR}${PHYSX_ARCH_FOLDER}-cmake${PHYSX_CRT_SUFFIX})
+	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}
 		PATHS ${DLL_PATH}
 	)
-	find_library(PHYSX3CHARACTERKINEMATIC_DLL
-		NAMES PhysX3CharacterKinematic${PHYSX_ARCH_FILE}
-		PATHS ${DLL_PATH}
-	)
 	find_library(PHYSX3COMMON_DLL
 		NAMES PhysX3Common${PHYSX_ARCH_FILE}
 		PATHS ${DLL_PATH}
@@ -296,10 +293,6 @@ if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
 		NAMES PhysX3DEBUG${PHYSX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
-	find_library(PHYSX3CHARACTERKINEMATIC_DLL_DEBUG
-		NAMES PhysX3CharacterKinematicDEBUG${PHYSX_ARCH_FILE}
-		PATHS ${DLL_PATH}
-	)
 	find_library(PHYSX3COMMON_DLL_DEBUG
 		NAMES PhysX3CommonDEBUG${PHYSX_ARCH_FILE}
 		PATHS ${DLL_PATH}
@@ -318,10 +311,6 @@ if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
 		NAMES PhysX3PROFILE${PHYSX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
-	find_library(PHYSX3CHARACTERKINEMATIC_DLL_PROFILE
-		NAMES PhysX3CharacterKinematicPROFILE${PHYSX_ARCH_FILE}
-		PATHS ${DLL_PATH}
-	)
 	find_library(PHYSX3COMMON_DLL_PROFILE
 		NAMES PhysX3CommonPROFILE${PHYSX_ARCH_FILE}
 		PATHS ${DLL_PATH}
@@ -340,10 +329,6 @@ if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
 		NAMES PhysX3CHECKED${PHYSX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
-	find_library(PHYSX3CHARACTERKINEMATIC_DLL_CHECKED
-		NAMES PhysX3CharacterKinematicCHECKED${PHYSX_ARCH_FILE}
-		PATHS ${DLL_PATH}
-	)
 	find_library(PHYSX3COMMON_DLL_CHECKED
 		NAMES PhysX3CommonCHECKED${PHYSX_ARCH_FILE}
 		PATHS ${DLL_PATH}
@@ -361,30 +346,26 @@ if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
 	# Create this list to check for found dlls below
 	SET(DLL_VAR_LIST 
 		PHYSX3_DLL 
-		PHYSX3CHARACTERKINEMATIC_DLL 
-		PHYSX3COMMON_DLL 
+		PHYSX3COMMON_DLL
 		PHYSX3COOKING_DLL 
 
 		PHYSX3_DLL_DEBUG 
-		PHYSX3CHARACTERKINEMATIC_DLL_DEBUG 
-		PHYSX3COMMON_DLL_DEBUG 
+		PHYSX3COMMON_DLL_DEBUG
 		PHYSX3COOKING_DLL_DEBUG
 
 		PHYSX3_DLL_PROFILE 
-		PHYSX3CHARACTERKINEMATIC_DLL_PROFILE 
-		PHYSX3COMMON_DLL_PROFILE 
+		PHYSX3COMMON_DLL_PROFILE
 		PHYSX3COOKING_DLL_PROFILE
 
 		PHYSX3_DLL_CHECKED 
-		PHYSX3CHARACTERKINEMATIC_DLL_CHECKED 
-		PHYSX3COMMON_DLL_CHECKED 
+		PHYSX3COMMON_DLL_CHECKED
 		PHYSX3COOKING_DLL_CHECKED
 
 	)
 endif()
 
 if (TARGET_BUILD_PLATFORM STREQUAL "linux")
-	SET(BIN_PATH ${PHYSXSDK_PATH}/bin/linux64-cmake)
+	SET(BIN_PATH ${PHYSXSDK_PATH}/bin/linux64-cmake ${PHYSXSDK_PATH}/../Bin)
 	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
 
     find_library(PHYSX3_LIB