Changes for 1.1.2 release candidate

See README.md, docs/release_notes.txt

8 files changed, 187 insertions, 193 deletions

diff --git a/sdk/compiler/cmake/NvBlastExtAuthoring.cmake b/sdk/compiler/cmake/NvBlastExtAuthoring.cmake
index 00ecfc1..c0818c2 100644
--- a/sdk/compiler/cmake/NvBlastExtAuthoring.cmake
+++ b/sdk/compiler/cmake/NvBlastExtAuthoring.cmake
@@ -29,8 +29,9 @@ SET(PUBLIC_FILES
 	${AUTHORING_EXT_INCLUDE_DIR}/NvBlastExtAuthoringFractureTool.h
 	${AUTHORING_EXT_INCLUDE_DIR}/NvBlastExtAuthoringMesh.h
 	${AUTHORING_EXT_INCLUDE_DIR}/NvBlastExtAuthoringTypes.h
-	${AUTHORING_EXT_INCLUDE_DIR}/NvBlastExtAuthoring.h     	
+	${AUTHORING_EXT_INCLUDE_DIR}/NvBlastExtAuthoring.h
 	${AUTHORING_EXT_INCLUDE_DIR}/NvBlastExtAuthoringMeshCleaner.h
+	${AUTHORING_EXT_INCLUDE_DIR}/NvBlastExtAuthoringCutout.h
 )
 
 SET(EXT_AUTHORING_FILES
@@ -60,6 +61,8 @@ SET(EXT_AUTHORING_FILES
 	${AUTHORING_EXT_SOURCE_DIR}/NvBlastExtAuthoring.cpp
 	${AUTHORING_EXT_SOURCE_DIR}/NvBlastExtAuthoringMeshCleanerImpl.h
 	${AUTHORING_EXT_SOURCE_DIR}/NvBlastExtAuthoringMeshCleanerImpl.cpp
+	${AUTHORING_EXT_SOURCE_DIR}/NvBlastExtAuthoringCutoutImpl.h
+	${AUTHORING_EXT_SOURCE_DIR}/NvBlastExtAuthoringCutoutImpl.cpp
 )
 
 SET(VHACD_SOURCE_FILES
diff --git a/sdk/compiler/cmake/modules/FindApexSDK.cmake b/sdk/compiler/cmake/modules/FindApexSDK.cmake
index 9910236..cc45e53 100644
--- a/sdk/compiler/cmake/modules/FindApexSDK.cmake
+++ b/sdk/compiler/cmake/modules/FindApexSDK.cmake
@@ -7,9 +7,10 @@ include(FindPackageHandleStandardArgs)
 
 # Find the includes
 
-# TODO: Do the version stuff properly!
 find_path(APEXSDK_PATH include/Apex.h
 	PATHS 
+	$ENV{PM_Apex_PATH}
+	$ENV{PM_PhysX_PATH}/APEX_1.4 # multipack
 	${GW_DEPS_ROOT}/$ENV{PM_Apex_NAME}/${ApexSDK_FIND_VERSION}
 	${GW_DEPS_ROOT}/Apex/${ApexSDK_FIND_VERSION}
 )
@@ -33,14 +34,14 @@ 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 ${APEXSDK_PATH}/lib/${VS_STR}${APEX_ARCH_FOLDER}-cmake${PHYSX_CRT_SUFFIX})
+	SET(LIB_PATH ${APEXSDK_PATH}/lib/${VS_STR}${APEX_ARCH_FOLDER}-cmake${PHYSX_CRT_SUFFIX} ${APEXSDK_PATH}/lib/${VS_STR}${APEX_ARCH_FOLDER}-NoPhysX ${APEXSDK_PATH}/../Lib/${APEX_ARCH_FOLDER}/${VS_STR} ${APEXSDK_PATH}/../Lib)
 	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
 
 elseif(TARGET_BUILD_PLATFORM STREQUAL "PS4")
@@ -58,232 +59,232 @@ elseif(TARGET_BUILD_PLATFORM STREQUAL "linux")
 endif()
 
 find_library(APEXCLOTHING_LIB
-	NAMES APEX_Clothing${APEX_ARCH_FILE}
+	NAMES APEX_Clothing APEX_Clothing${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXDESTRUCTIBLE_LIB
-	NAMES APEX_Destructible${APEX_ARCH_FILE}
+	NAMES APEX_Destructible APEX_Destructible${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXLEGACY_LIB
-	NAMES APEX_Legacy${APEX_ARCH_FILE}
+	NAMES APEX_Legacy APEX_Legacy${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXLOADER_LIB
-	NAMES APEX_Loader${APEX_ARCH_FILE}
+	NAMES APEX_Loader APEX_Loader${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXCOMMON_LIB
-	NAMES APEXCommon${APEX_ARCH_FILE}
+	NAMES APEXCommon APEXCommon${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXFRAMEWORK_LIB
-	NAMES APEXFramework${APEX_ARCH_FILE}
+	NAMES APEXFramework APEXFramework${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXSHARED_LIB
-	NAMES APEXShared${APEX_ARCH_FILE}
+	NAMES APEXShared APEXShared${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 
 find_library(APEXCLOTHING_LIB_DEBUG
-	NAMES APEX_ClothingDEBUG${APEX_ARCH_FILE}
+	NAMES APEX_ClothingDEBUG APEX_ClothingDEBUG${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXDESTRUCTIBLE_LIB_DEBUG
-	NAMES APEX_DestructibleDEBUG${APEX_ARCH_FILE}
+	NAMES APEX_DestructibleDEBUG APEX_DestructibleDEBUG${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXLEGACY_LIB_DEBUG
-	NAMES APEX_LegacyDEBUG${APEX_ARCH_FILE}
+	NAMES APEX_LegacyDEBUG APEX_LegacyDEBUG${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXLOADER_LIB_DEBUG
-	NAMES APEX_LoaderDEBUG${APEX_ARCH_FILE}
+	NAMES APEX_LoaderDEBUG APEX_LoaderDEBUG${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXCOMMON_LIB_DEBUG
-	NAMES APEXCommonDEBUG${APEX_ARCH_FILE}
+	NAMES APEXCommonDEBUG APEXCommonDEBUG${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXFRAMEWORK_LIB_DEBUG
-	NAMES APEXFrameworkDEBUG${APEX_ARCH_FILE}
+	NAMES APEXFrameworkDEBUG APEXFrameworkDEBUG${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXSHARED_LIB_DEBUG
-	NAMES APEXSharedDEBUG${APEX_ARCH_FILE}
+	NAMES APEXSharedDEBUG APEXSharedDEBUG${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 
 find_library(APEXCLOTHING_LIB_CHECKED
-	NAMES APEX_ClothingCHECKED${APEX_ARCH_FILE}
+	NAMES APEX_ClothingCHECKED APEX_ClothingCHECKED${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXDESTRUCTIBLE_LIB_CHECKED
-	NAMES APEX_DestructibleCHECKED${APEX_ARCH_FILE}
+	NAMES APEX_DestructibleCHECKED APEX_DestructibleCHECKED${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXLEGACY_LIB_CHECKED
-	NAMES APEX_LegacyCHECKED${APEX_ARCH_FILE}
+	NAMES APEX_LegacyCHECKED APEX_LegacyCHECKED${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXLOADER_LIB_CHECKED
-	NAMES APEX_LoaderCHECKED${APEX_ARCH_FILE}
+	NAMES APEX_LoaderCHECKED APEX_LoaderCHECKED${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXCOMMON_LIB_CHECKED
-	NAMES APEXCommonCHECKED${APEX_ARCH_FILE}
+	NAMES APEXCommonCHECKED APEXCommonCHECKED${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXFRAMEWORK_LIB_CHECKED
-	NAMES APEXFrameworkCHECKED${APEX_ARCH_FILE}
+	NAMES APEXFrameworkCHECKED APEXFrameworkCHECKED${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXSHARED_LIB_CHECKED
-	NAMES APEXSharedCHECKED${APEX_ARCH_FILE}
+	NAMES APEXSharedCHECKED APEXSharedCHECKED${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 
 find_library(APEXCLOTHING_LIB_PROFILE
-	NAMES APEX_ClothingPROFILE${APEX_ARCH_FILE}
+	NAMES APEX_ClothingPROFILE APEX_ClothingPROFILE${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXDESTRUCTIBLE_LIB_PROFILE
-	NAMES APEX_DestructiblePROFILE${APEX_ARCH_FILE}
+	NAMES APEX_DestructiblePROFILE APEX_DestructiblePROFILE${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXLEGACY_LIB_PROFILE
-	NAMES APEX_LegacyPROFILE${APEX_ARCH_FILE}
+	NAMES APEX_LegacyPROFILE APEX_LegacyPROFILE${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXLOADER_LIB_PROFILE
-	NAMES APEX_LoaderPROFILE${APEX_ARCH_FILE}
+	NAMES APEX_LoaderPROFILE APEX_LoaderPROFILE${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXCOMMON_LIB_PROFILE
-	NAMES APEXCommonPROFILE${APEX_ARCH_FILE}
+	NAMES APEXCommonPROFILE APEXCommonPROFILE${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXFRAMEWORK_LIB_PROFILE
-	NAMES APEXFrameworkPROFILE${APEX_ARCH_FILE}
+	NAMES APEXFrameworkPROFILE APEXFrameworkPROFILE${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(APEXSHARED_LIB_PROFILE
-	NAMES APEXSharedPROFILE${APEX_ARCH_FILE}
+	NAMES APEXSharedPROFILE APEXSharedPROFILE${APEX_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 
 
 if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
 
-	SET(DLL_PATH ${APEXSDK_PATH}/bin/${VS_STR}${APEX_ARCH_FOLDER}-cmake${APEX_CRT_SUFFIX})
+	SET(DLL_PATH ${APEXSDK_PATH}/bin/${VS_STR}${APEX_ARCH_FOLDER}-cmake${APEX_CRT_SUFFIX} ${APEXSDK_PATH}/bin/${VS_STR}${APEX_ARCH_FOLDER}-NoPhysX ${APEXSDK_PATH}/../Bin/${APEX_ARCH_FOLDER}/${VS_STR} ${APEXSDK_PATH}/../Bin)
 
-	find_library(APEXCLOTHING_DLL
-		NAMES APEX_Clothing${APEX_ARCH_FILE}
-		PATHS ${DLL_PATH}
-	)
-	find_library(APEXDESTRUCTIBLE_DLL
-		NAMES APEX_Destructible${APEX_ARCH_FILE}
-		PATHS ${DLL_PATH}
-	)
+#	find_library(APEXCLOTHING_DLL
+#		NAMES APEX_Clothing APEX_Clothing${APEX_ARCH_FILE}
+#		PATHS ${DLL_PATH}
+#	)
+#	find_library(APEXDESTRUCTIBLE_DLL
+#		NAMES APEX_Destructible APEX_Destructible${APEX_ARCH_FILE}
+#		PATHS ${DLL_PATH}
+#	)
 	find_library(APEXLEGACY_DLL
-		NAMES APEX_Legacy${APEX_ARCH_FILE}
+		NAMES APEX_Legacy APEX_Legacy${APEX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
 	find_library(APEXLOADER_DLL
-		NAMES APEX_Loader${APEX_ARCH_FILE}
+		NAMES APEX_Loader APEX_Loader${APEX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
 	find_library(APEXFRAMEWORK_DLL
-		NAMES APEXFramework${APEX_ARCH_FILE}
+		NAMES APEXFramework APEXFramework${APEX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
 
-	find_library(APEXCLOTHING_DLL_DEBUG
-		NAMES APEX_ClothingDEBUG${APEX_ARCH_FILE}
-		PATHS ${DLL_PATH}
-	)
-	find_library(APEXDESTRUCTIBLE_DLL_DEBUG
-		NAMES APEX_DestructibleDEBUG${APEX_ARCH_FILE}
-		PATHS ${DLL_PATH}
-	)
+#	find_library(APEXCLOTHING_DLL_DEBUG
+#		NAMES APEX_ClothingDEBUG APEX_ClothingDEBUG${APEX_ARCH_FILE}
+#		PATHS ${DLL_PATH}
+#	)
+#	find_library(APEXDESTRUCTIBLE_DLL_DEBUG
+#		NAMES APEX_DestructibleDEBUG APEX_DestructibleDEBUG${APEX_ARCH_FILE}
+#		PATHS ${DLL_PATH}
+#	)
 	find_library(APEXLEGACY_DLL_DEBUG
-		NAMES APEX_LegacyDEBUG${APEX_ARCH_FILE}
+		NAMES APEX_LegacyDEBUG APEX_LegacyDEBUG${APEX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
 	find_library(APEXLOADER_DLL_DEBUG
-		NAMES APEX_LoaderDEBUG${APEX_ARCH_FILE}
+		NAMES APEX_LoaderDEBUG APEX_LoaderDEBUG${APEX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
 	find_library(APEXFRAMEWORK_DLL_DEBUG
-		NAMES APEXFrameworkDEBUG${APEX_ARCH_FILE}
+		NAMES APEXFrameworkDEBUG APEXFrameworkDEBUG${APEX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
 
-	find_library(APEXCLOTHING_DLL_CHECKED
-		NAMES APEX_ClothingCHECKED${APEX_ARCH_FILE}
-		PATHS ${DLL_PATH}
-	)
-	find_library(APEXDESTRUCTIBLE_DLL_CHECKED
-		NAMES APEX_DestructibleCHECKED${APEX_ARCH_FILE}
-		PATHS ${DLL_PATH}
-	)
+#	find_library(APEXCLOTHING_DLL_CHECKED
+#		NAMES APEX_ClothingCHECKED APEX_ClothingCHECKED${APEX_ARCH_FILE}
+#		PATHS ${DLL_PATH}
+#	)
+#	find_library(APEXDESTRUCTIBLE_DLL_CHECKED
+#		NAMES APEX_DestructibleCHECKED APEX_DestructibleCHECKED${APEX_ARCH_FILE}
+#		PATHS ${DLL_PATH}
+#	)
 	find_library(APEXLEGACY_DLL_CHECKED
-		NAMES APEX_LegacyCHECKED${APEX_ARCH_FILE}
+		NAMES APEX_LegacyCHECKED APEX_LegacyCHECKED${APEX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
 	find_library(APEXLOADER_DLL_CHECKED
-		NAMES APEX_LoaderCHECKED${APEX_ARCH_FILE}
+		NAMES APEX_LoaderCHECKED APEX_LoaderCHECKED${APEX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
 	find_library(APEXFRAMEWORK_DLL_CHECKED
-		NAMES APEXFrameworkCHECKED${APEX_ARCH_FILE}
+		NAMES APEXFrameworkCHECKED APEXFrameworkCHECKED${APEX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
 
-	find_library(APEXCLOTHING_DLL_PROFILE
-		NAMES APEX_ClothingPROFILE${APEX_ARCH_FILE}
-		PATHS ${DLL_PATH}
-	)
-	find_library(APEXDESTRUCTIBLE_DLL_PROFILE
-		NAMES APEX_DestructiblePROFILE${APEX_ARCH_FILE}
-		PATHS ${DLL_PATH}
-	)
+#	find_library(APEXCLOTHING_DLL_PROFILE
+#		NAMES APEX_ClothingPROFILE APEX_ClothingPROFILE${APEX_ARCH_FILE}
+#		PATHS ${DLL_PATH}
+#	)
+#	find_library(APEXDESTRUCTIBLE_DLL_PROFILE
+#		NAMES APEX_DestructiblePROFILE APEX_DestructiblePROFILE${APEX_ARCH_FILE}
+#		PATHS ${DLL_PATH}
+#	)
 	find_library(APEXLEGACY_DLL_PROFILE
-		NAMES APEX_LegacyPROFILE${APEX_ARCH_FILE}
+		NAMES APEX_LegacyPROFILE APEX_LegacyPROFILE${APEX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
 	find_library(APEXLOADER_DLL_PROFILE
-		NAMES APEX_LoaderPROFILE${APEX_ARCH_FILE}
+		NAMES APEX_LoaderPROFILE APEX_LoaderPROFILE${APEX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
 	find_library(APEXFRAMEWORK_DLL_PROFILE
-		NAMES APEXFrameworkPROFILE${APEX_ARCH_FILE}
+		NAMES APEXFrameworkPROFILE APEXFrameworkPROFILE${APEX_ARCH_FILE}
 		PATHS ${DLL_PATH}
 	)
 	
 	
 	SET(DLL_VAR_LIST 
-		APEXCLOTHING_DLL 
-		APEXDESTRUCTIBLE_DLL 
+		#APEXCLOTHING_DLL 
+		#APEXDESTRUCTIBLE_DLL 
 		APEXLEGACY_DLL 
 		APEXLOADER_DLL 
 		APEXFRAMEWORK_DLL 
 	
-		APEXCLOTHING_DLL_DEBUG 
-		APEXDESTRUCTIBLE_DLL_DEBUG 
+		#APEXCLOTHING_DLL_DEBUG 
+		#APEXDESTRUCTIBLE_DLL_DEBUG 
 		APEXLEGACY_DLL_DEBUG 
 		APEXLOADER_DLL_DEBUG 
 		APEXFRAMEWORK_DLL_DEBUG
 		
-		APEXCLOTHING_DLL_CHECKED 
-		APEXDESTRUCTIBLE_DLL_CHECKED 
+		#APEXCLOTHING_DLL_CHECKED 
+		#APEXDESTRUCTIBLE_DLL_CHECKED 
 		APEXLEGACY_DLL_CHECKED 
 		APEXLOADER_DLL_CHECKED 
 		APEXFRAMEWORK_DLL_CHECKED
 
-		APEXCLOTHING_DLL_PROFILE 
-		APEXDESTRUCTIBLE_DLL_PROFILE 
+		#APEXCLOTHING_DLL_PROFILE 
+		#APEXDESTRUCTIBLE_DLL_PROFILE 
 		APEXLEGACY_DLL_PROFILE 
 		APEXLOADER_DLL_PROFILE 
 		APEXFRAMEWORK_DLL_PROFILE
@@ -295,32 +296,32 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(APEXSDK
 	DEFAULT_MSG
 	APEXSDK_PATH
 
-	APEXCLOTHING_LIB
-	APEXDESTRUCTIBLE_LIB
+	#APEXCLOTHING_LIB
+	#APEXDESTRUCTIBLE_LIB
 	APEXLEGACY_LIB
 	APEXLOADER_LIB
 	APEXCOMMON_LIB
 	APEXFRAMEWORK_LIB
 	APEXSHARED_LIB
 	
-	APEXCLOTHING_LIB_DEBUG
-	APEXDESTRUCTIBLE_LIB_DEBUG
+	#APEXCLOTHING_LIB_DEBUG
+	#APEXDESTRUCTIBLE_LIB_DEBUG
 	APEXLEGACY_LIB_DEBUG
 	APEXLOADER_LIB_DEBUG
 	APEXCOMMON_LIB_DEBUG
 	APEXFRAMEWORK_LIB_DEBUG
 	APEXSHARED_LIB_DEBUG
 
-	APEXCLOTHING_LIB_CHECKED
-	APEXDESTRUCTIBLE_LIB_CHECKED
+	#APEXCLOTHING_LIB_CHECKED
+	#APEXDESTRUCTIBLE_LIB_CHECKED
 	APEXLEGACY_LIB_CHECKED
 	APEXLOADER_LIB_CHECKED
 	APEXCOMMON_LIB_CHECKED
 	APEXFRAMEWORK_LIB_CHECKED
 	APEXSHARED_LIB_CHECKED
 
-	APEXCLOTHING_LIB_PROFILE
-	APEXDESTRUCTIBLE_LIB_PROFILE
+	#APEXCLOTHING_LIB_PROFILE
+	#APEXDESTRUCTIBLE_LIB_PROFILE
 	APEXLEGACY_LIB_PROFILE
 	APEXLOADER_LIB_PROFILE
 	APEXCOMMON_LIB_PROFILE
@@ -347,41 +348,41 @@ if (APEXSDK_FOUND)
 		${APEXSDK_PATH}/shared/general/RenderDebug/public
 	)
 	
-	SET(APEXSDK_LIBS_RELEASE ${APEXCLOTHING_LIB} ${APEXDESTRUCTIBLE_LIB} ${APEXLEGACY_LIB} ${APEXLOADER_LIB} ${APEXCOMMON_LIB} ${APEXFRAMEWORK_LIB} ${APEXSHARED_LIB}
+	SET(APEXSDK_LIBS_RELEASE ${APEXLEGACY_LIB} ${APEXLOADER_LIB} ${APEXCOMMON_LIB} ${APEXFRAMEWORK_LIB} ${APEXSHARED_LIB}
 		CACHE STRING ""
 	)
-	SET(APEXSDK_LIBS_DEBUG ${APEXCLOTHING_LIB_DEBUG} ${APEXDESTRUCTIBLE_LIB_DEBUG} ${APEXLEGACY_LIB_DEBUG} ${APEXLOADER_LIB_DEBUG} ${APEXCOMMON_LIB_DEBUG} ${APEXFRAMEWORK_LIB_DEBUG} ${APEXSHARED_LIB_DEBUG}
+	SET(APEXSDK_LIBS_DEBUG ${APEXLEGACY_LIB_DEBUG} ${APEXLOADER_LIB_DEBUG} ${APEXCOMMON_LIB_DEBUG} ${APEXFRAMEWORK_LIB_DEBUG} ${APEXSHARED_LIB_DEBUG}
 		CACHE STRING ""
 	)
-	SET(APEXSDK_LIBS_CHECKED ${APEXCLOTHING_LIB_CHECKED} ${APEXDESTRUCTIBLE_LIB_CHECKED} ${APEXLEGACY_LIB_CHECKED} ${APEXLOADER_LIB_CHECKED} ${APEXCOMMON_LIB_CHECKED} ${APEXFRAMEWORK_LIB_CHECKED} ${APEXSHARED_LIB_CHECKED}
+	SET(APEXSDK_LIBS_CHECKED ${APEXLEGACY_LIB_CHECKED} ${APEXLOADER_LIB_CHECKED} ${APEXCOMMON_LIB_CHECKED} ${APEXFRAMEWORK_LIB_CHECKED} ${APEXSHARED_LIB_CHECKED}
 		CACHE STRING ""
 	)
-	SET(APEXSDK_LIBS_PROFILE ${APEXCLOTHING_LIB_PROFILE} ${APEXDESTRUCTIBLE_LIB_PROFILE} ${APEXLEGACY_LIB_PROFILE} ${APEXLOADER_LIB_PROFILE} ${APEXCOMMON_LIB_PROFILE} ${APEXFRAMEWORK_LIB_PROFILE} ${APEXSHARED_LIB_PROFILE}
+	SET(APEXSDK_LIBS_PROFILE ${APEXLEGACY_LIB_PROFILE} ${APEXLOADER_LIB_PROFILE} ${APEXCOMMON_LIB_PROFILE} ${APEXFRAMEWORK_LIB_PROFILE} ${APEXSHARED_LIB_PROFILE}
 		CACHE STRING ""
 	)
 
 	
 	SET(APEXSDK_DLLS 
-		${APEXCLOTHING_DLL} 
-		${APEXDESTRUCTIBLE_DLL} 
+		#${APEXCLOTHING_DLL} 
+		#${APEXDESTRUCTIBLE_DLL} 
 		${APEXLEGACY_DLL} 
 		${APEXLOADER_DLL} 
 		${APEXFRAMEWORK_DLL} 
 		
-		${APEXCLOTHING_DLL_DEBUG} 
-		${APEXDESTRUCTIBLE_DLL_DEBUG} 
+		#${APEXCLOTHING_DLL_DEBUG} 
+		#${APEXDESTRUCTIBLE_DLL_DEBUG} 
 		${APEXLEGACY_DLL_DEBUG} 
 		${APEXLOADER_DLL_DEBUG} 
 		${APEXFRAMEWORK_DLL_DEBUG}
 		
-		${APEXCLOTHING_DLL_CHECKED} 
-		${APEXDESTRUCTIBLE_DLL_CHECKED} 
+		#${APEXCLOTHING_DLL_CHECKED} 
+		#${APEXDESTRUCTIBLE_DLL_CHECKED} 
 		${APEXLEGACY_DLL_CHECKED} 
 		${APEXLOADER_DLL_CHECKED} 
 		${APEXFRAMEWORK_DLL_CHECKED}
 
-		${APEXCLOTHING_DLL_PROFILE} 
-		${APEXDESTRUCTIBLE_DLL_PROFILE} 
+		#${APEXCLOTHING_DLL_PROFILE} 
+		#${APEXDESTRUCTIBLE_DLL_PROFILE} 
 		${APEXLEGACY_DLL_PROFILE} 
 		${APEXLOADER_DLL_PROFILE} 
 		${APEXFRAMEWORK_DLL_PROFILE}
diff --git a/sdk/compiler/cmake/modules/FindBoostMultiprecision.cmake b/sdk/compiler/cmake/modules/FindBoostMultiprecision.cmake
index 84373ab..cea6142 100644
--- a/sdk/compiler/cmake/modules/FindBoostMultiprecision.cmake
+++ b/sdk/compiler/cmake/modules/FindBoostMultiprecision.cmake
@@ -8,6 +8,7 @@ INCLUDE(FindPackageHandleStandardArgs)
 #TODO: Proper version support
 FIND_PATH(		BOOSTMULTIPRECISION_PATH boost/multiprecision
 				PATHS 
+				$ENV{PM_BoostMultiprecision_PATH}
 				${GW_DEPS_ROOT}/BoostMultiprecision/${BoostMultiprecision_FIND_VERSION}
 				)
 
diff --git a/sdk/compiler/cmake/modules/FindCapnProtoSDK.cmake b/sdk/compiler/cmake/modules/FindCapnProtoSDK.cmake
index 9e2cd60..1813e87 100644
--- a/sdk/compiler/cmake/modules/FindCapnProtoSDK.cmake
+++ b/sdk/compiler/cmake/modules/FindCapnProtoSDK.cmake
@@ -9,7 +9,9 @@ include(FindPackageHandleStandardArgs)
 
 # TODO: Do the version stuff properly!
 find_path(CAPNPROTOSDK_PATH src/capnp/message.h
-	PATHS ${GW_DEPS_ROOT}/$ENV{PM_CapnProto_NAME}/${CapnProtoSDK_FIND_VERSION}
+	PATHS 
+	$ENV{PM_CapnProto_PATH}
+	${GW_DEPS_ROOT}/$ENV{PM_CapnProto_NAME}/${CapnProtoSDK_FIND_VERSION}
 )
 
 if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
diff --git a/sdk/compiler/cmake/modules/FindFBXSDK.cmake b/sdk/compiler/cmake/modules/FindFBXSDK.cmake
index 7e1bfb4..5b6b0a4 100644
--- a/sdk/compiler/cmake/modules/FindFBXSDK.cmake
+++ b/sdk/compiler/cmake/modules/FindFBXSDK.cmake
@@ -10,7 +10,9 @@ include(FindPackageHandleStandardArgs)
 
 # TODO: Do the version stuff properly!
 find_path(FBXSDK_PATH include/fbxsdk.h
-	PATHS ${GW_DEPS_ROOT}/FBXSDK/${FBXSDK_FIND_VERSION}
+	PATHS 
+	$ENV{PM_FBXSDK_PATH}
+	${GW_DEPS_ROOT}/FBXSDK/${FBXSDK_FIND_VERSION}
 )
 
 if (STATIC_WINCRT)
diff --git a/sdk/compiler/cmake/modules/FindGoogleTestNV.cmake b/sdk/compiler/cmake/modules/FindGoogleTestNV.cmake
index 50e7edd..7f2dde4 100644
--- a/sdk/compiler/cmake/modules/FindGoogleTestNV.cmake
+++ b/sdk/compiler/cmake/modules/FindGoogleTestNV.cmake
@@ -8,7 +8,9 @@ include(FindPackageHandleStandardArgs)
 
 # TODO: Do the version stuff properly!
 find_path(GOOGLETEST_PATH include/gtest/gtest.h
-	PATHS ${GW_DEPS_ROOT}/$ENV{PM_googletest_NAME}/${GoogleTestNV_FIND_VERSION}
+	PATHS 
+	$ENV{PM_googletest_PATH}
+	${GW_DEPS_ROOT}/$ENV{PM_googletest_NAME}/${GoogleTestNV_FIND_VERSION}
 )
 
 if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
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
diff --git a/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake b/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake
index 0f67f5c..ff18af3 100644
--- a/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake
+++ b/sdk/compiler/cmake/modules/FindPxSharedSDK.cmake
@@ -7,9 +7,11 @@ include(FindPackageHandleStandardArgs)
 
 # Find the includes
 
-# TODO: Do the version stuff properly!
+# Always try explicit PATH variable first
 find_path(PXSHAREDSDK_PATH include/foundation/Px.h
 	PATHS 
+	$ENV{PM_PxShared_PATH}
+	$ENV{PM_PhysX_PATH}/PxShared # multipack
 	${GW_DEPS_ROOT}/$ENV{PM_PxShared_NAME}/${PxSharedSDK_FIND_VERSION}
 	${GW_DEPS_ROOT}/PxShared/${PxSharedSDK_FIND_VERSION}
 )
@@ -33,37 +35,37 @@ 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 ${PXSHAREDSDK_PATH}/lib/${VS_STR}${PXSHARED_ARCH_FOLDER}-cmake${PXSHARED_CRT_SUFFIX})
+	SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/${VS_STR}${PXSHARED_ARCH_FOLDER}-cmake${PXSHARED_CRT_SUFFIX} ${PXSHAREDSDK_PATH}/lib/${VS_STR}${PXSHARED_ARCH_FOLDER} ${PXSHAREDSDK_PATH}/../lib/${PXSHARED_ARCH_FOLDER}/${VS_STR} ${PXSHAREDSDK_PATH}/../lib)
 	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
 
 elseif(TARGET_BUILD_PLATFORM STREQUAL "PS4")
-	SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/vc14ps4-cmake)
+	SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/vc14ps4-cmake ${PXSHAREDSDK_PATH}/../lib)
 	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
 	SET(CMAKE_FIND_LIBRARY_PREFIXES "lib")
 elseif(TARGET_BUILD_PLATFORM STREQUAL "XboxOne")
-	SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/vc14xboxone-cmake)
-	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-	SET(CMAKE_FIND_LIBRARY_PREFIXES "lib")
+	SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/vc14xboxone-cmake ${PXSHAREDSDK_PATH}/../Lib)
+	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".lib")
+	SET(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
 elseif(TARGET_BUILD_PLATFORM STREQUAL "linux")
-	SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/linux64-cmake)
+	SET(LIB_PATH ${PXSHAREDSDK_PATH}/lib/linux64-cmake ${PXSHAREDSDK_PATH}/../Lib)
 	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
 	SET(CMAKE_FIND_LIBRARY_PREFIXES "lib")
 	SET(PXSHARED_ARCH_FILE "_x64")
 endif()
 
 
-# Now find all of the PhysX libs in the lib directory
+# Now find all of the PxShared libs in the lib directory
 
 
 find_library(PSFASTXML_LIB
-	NAMES PsFastXml${PXSHARED_ARCH_FILE}
+	NAMES PsFastXml PsFastXml${PXSHARED_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(PXFOUNDATION_LIB
@@ -75,12 +77,12 @@ find_library(PXPVDSDK_LIB
 	PATHS ${LIB_PATH}
 )
 find_library(PXTASK_LIB
-	NAMES PxTask${PXSHARED_ARCH_FILE}
+	NAMES PxTask PxTask${PXSHARED_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 
 find_library(PSFASTXML_LIB_DEBUG
-	NAMES PsFastXmlDEBUG${PXSHARED_ARCH_FILE}
+	NAMES PsFastXmlDEBUG PsFastXmlDEBUG${PXSHARED_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 find_library(PXFOUNDATION_LIB_DEBUG
@@ -92,7 +94,7 @@ find_library(PXPVDSDK_LIB_DEBUG
 	PATHS ${LIB_PATH}
 )
 find_library(PXTASK_LIB_DEBUG
-	NAMES PxTaskDEBUG${PXSHARED_ARCH_FILE}
+	NAMES PxTaskDEBUG PxTaskDEBUG${PXSHARED_ARCH_FILE}
 	PATHS ${LIB_PATH}
 )
 
@@ -131,7 +133,7 @@ find_library(PXTASK_LIB_PROFILE
 )
 
 if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
-	SET(DLL_PATH ${PXSHAREDSDK_PATH}/bin/${VS_STR}${PXSHARED_ARCH_FOLDER}-cmake${PXSHARED_CRT_SUFFIX})
+	SET(DLL_PATH ${PXSHAREDSDK_PATH}/bin/${VS_STR}${PXSHARED_ARCH_FOLDER}-cmake${PXSHARED_CRT_SUFFIX} ${PXSHAREDSDK_PATH}/bin/${VS_STR}${PXSHARED_ARCH_FOLDER} ${PXSHAREDSDK_PATH}/../bin/${PXSHARED_ARCH_FOLDER}/${VS_STR} ${PXSHAREDSDK_PATH}/../bin)
 
 	find_library(PXFOUNDATION_DLL
 		NAMES PxFoundation${PXSHARED_ARCH_FILE}
@@ -187,7 +189,7 @@ if (TARGET_BUILD_PLATFORM STREQUAL "Windows")
 endif()
 
 if (TARGET_BUILD_PLATFORM STREQUAL "linux")
-	SET(BIN_PATH ${PXSHAREDSDK_PATH}/bin/linux64-cmake)
+	SET(BIN_PATH ${PXSHAREDSDK_PATH}/bin/linux64-cmake ${PXSHAREDSDK_PATH}/../Bin)
 	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
 
     find_library(PXFOUNDATION_LIB