NVIDIAGameWorks
diff --git a/‎externals/README.md‎
Lines changed: 1 addition & 0 deletions b/‎externals/README.md‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎externals/cmakemodules/GetCompilerAndPlatform.cmake‎
Lines changed: 5 additions & 135 deletions b/‎externals/cmakemodules/GetCompilerAndPlatform.cmake‎
Lines changed: 5 additions & 135 deletions
diff --git a/‎…include/pipeline/PxcCCDStateStreamPair.h‎ ‎…makemodules/template/PxIncludeTemplate.h‎physx/source/lowlevel/common/include/pipeline/PxcCCDStateStreamPair.h renamed to externals/cmakemodules/template/PxIncludeTemplate.h
Lines changed: 8 additions & 3 deletions b/‎…include/pipeline/PxcCCDStateStreamPair.h‎ ‎…makemodules/template/PxIncludeTemplate.h‎physx/source/lowlevel/common/include/pipeline/PxcCCDStateStreamPair.h renamed to externals/cmakemodules/template/PxIncludeTemplate.h
Lines changed: 8 additions & 3 deletions
diff --git a/‎kaplademo/source/demoFramework/RawLoader.cpp‎
Lines changed: 1 addition & 0 deletions b/‎kaplademo/source/demoFramework/RawLoader.cpp‎
Lines changed: 1 addition & 0 deletions
@@ -8,5 +8,6 @@ Hewlett-Packard Company,
 The Khronos Group Inc.,
 Pawel Olszta,
 VMWare,
+Kitware Inc.,
 and the clang and glew development teams.
 
@@ -10,114 +10,7 @@ FUNCTION(CompilerDumpVersion _OUTPUT_VERSION)
   SET(${_OUTPUT_VERSION} ${COMPILER_VERSION})
 ENDFUNCTION()
 
-FUNCTION(GetAndroidNDKVersion out_NDK_Version)
-	IF (CM_ANDROID_NDK_VERSION STREQUAL "13.2")
-		SET(_NDK_Version "ndk13b")		
-	ELSE()
-		MESSAGE("Unknown android NDK: ${CM_ANDROID_NDK_VERSION}, please update GetCompilerAndPlatform.cmake")
-	ENDIF()	
-	
-	SET(${out_NDK_Version} ${_NDK_Version} PARENT_SCOPE)
-ENDFUNCTION()
-
-FUNCTION(GetCompilerAndPlatform _ret)
-
-	SET(RETVAL "UNKNOWN")
-	
-	IF(CMAKE_CXX_COMPILER_ID STREQUAL "Intel"
-		OR CMAKE_CXX_COMPILER MATCHES "icl"
-		OR CMAKE_CXX_COMPILER MATCHES "icpc")
-		IF(WIN32)
-			SET (COMPILER_SUFFIX "iw")
-		ELSE()
-			SET (COMPILER_SUFFIX "il")
-		ENDIF()
-	ELSEIF (GHSMULTI)
-		SET(COMPILER_SUFFIX "ghs")
-	ELSEIF (MSVC_VERSION GREATER_EQUAL 1910)
-		SET(COMPILER_SUFFIX "vc141")
-	ELSEIF (MSVC14)
-		SET(COMPILER_SUFFIX "vc140")
-	ELSEIF (MSVC12)
-		SET(COMPILER_SUFFIX "vc120")
-	ELSEIF (MSVC11)
-		SET(COMPILER_SUFFIX "vc110")
-	ELSEIF (MSVC10)
-		SET(COMPILER_SUFFIX "vc100")
-	ELSEIF (MSVC90)
-		SET(COMPILER_SUFFIX "vc90")
-	ELSEIF (MSVC80)
-		SET(COMPILER_SUFFIX "vc80")
-	ELSEIF (MSVC71)
-		SET(COMPILER_SUFFIX "vc71")
-	ELSEIF (MSVC70) # Good luck!
-		SET(COMPILER_SUFFIX "vc7") # yes, this is correct
-	ELSEIF (MSVC60) # Good luck!
-		SET(COMPILER_SUFFIX "vc6") # yes, this is correct
-	ELSEIF (BORLAND)
-		SET(COMPILER_SUFFIX "bcb")
-	ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
-		SET(COMPILER_SUFFIX "sw")
-	ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "XL")
-		SET(COMPILER_SUFFIX "xlc")
-	ELSEIF (MINGW)
-		CompilerDumpVersion(_COMPILER_VERSION)
-		SET(COMPILER_SUFFIX "mgw${_COMPILER_VERSION}")
-	ELSEIF (UNIX)
-		IF (CMAKE_COMPILER_IS_GNUCXX)
-			CompilerDumpVersion(_COMPILER_VERSION)
-			IF(APPLE)
-		      		# on Mac OS X/Darwin is "xgcc".
-		      		SET(COMPILER_SUFFIX "xgcc${_COMPILER_VERSION}")
-			ELSE()
-		  		SET(COMPILER_SUFFIX "gcc${_COMPILER_VERSION}")
-			ENDIF()
-		ENDIF()
-	ELSE()
-		# add clang!
-		SET(COMPILER_SUFFIX "")
-	ENDIF()
-	
-	IF(TARGET_BUILD_PLATFORM STREQUAL "windows")
-		SET(RETVAL "win-${COMPILER_SUFFIX}")
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "uwp")
-		SET(RETVAL "uwp-${COMPILER_SUFFIX}")
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "mac")
-		SET(RETVAL "osx-clang") # Probably not right
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "ios")
-		SET(RETVAL "ios-clang") # Probably not right
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "ps4")
-		SET(RETVAL "ps4-clang")
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "xboxone")
-		IF(DEFINED CMAKE_VS150PATH)
-			SET(RETVAL "xboxone-vc15")
-		ELSE()
-		SET(RETVAL "xboxone-vc14")
-		ENDIF()		
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "switch")
-		IF(CMAKE_GENERATOR_PLATFORM STREQUAL "NX64")
-			SET(RETVAL "switch64-vc14")
-		ELSEIF()
-			SET(RETVAL "switch32-vc14")
-		ENDIF()
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "android")
-		GetAndroidNDKVersion(NDK_COMP_VERSION)		
-		SET(RETVAL "android${ANDROID_NATIVE_API_LEVEL}-${NDK_COMP_VERSION}")		
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "linux")
-		IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-		  # using Clang	  
-		  SET(RETVAL "linux-clang")	
-		ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-		  # using GCC
-		  SET(RETVAL "linux-gcc")	
-		ENDIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")		
-	ENDIF()
-	SET(${_ret} ${RETVAL} PARENT_SCOPE)
-	
-ENDFUNCTION()
-
 FUNCTION(GetCompiler _ret)
-
 	SET(COMPILER_SUFFIX "UNKNOWN")
 
 	IF(CMAKE_CXX_COMPILER_ID STREQUAL "Intel"
@@ -169,6 +62,10 @@ FUNCTION(GetCompiler _ret)
 		  		SET(COMPILER_SUFFIX "gcc${_COMPILER_VERSION}")
 			ENDIF()
 		ENDIF()
+	ELSEIF (XBOXONE_MSVC_VERSION EQUAL 140)
+		SET(COMPILER_SUFFIX "vc140")
+	ELSEIF (XBOXONE_MSVC_VERSION EQUAL 141)
+		SET(COMPILER_SUFFIX "vc141")
 	ELSE()
 		# add clang!
 		SET(COMPILER_SUFFIX "")
@@ -177,33 +74,6 @@ FUNCTION(GetCompiler _ret)
 	SET(${_ret} ${COMPILER_SUFFIX} PARENT_SCOPE)	
 ENDFUNCTION()
 
-FUNCTION(GetPlatform _ret)
-
-	SET(RETVAL "UNKNOWN")
-		
-	IF(TARGET_BUILD_PLATFORM STREQUAL "windows")
-		SET(RETVAL "win")
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "uwp")
-		SET(RETVAL "uwp")
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "mac")
-		SET(RETVAL "osx") # Probably not right
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "ios")
-		SET(RETVAL "ios") # Probably not right
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "ps4")
-		SET(RETVAL "ps4")
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "xboxone")
-		SET(RETVAL "xboxone")
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "switch")
-		SET(RETVAL "switch")
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "android")		
-		SET(RETVAL "android")		
-	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "linux")
-		  SET(RETVAL "linux")	
-	ENDIF()
-	SET(${_ret} ${RETVAL} PARENT_SCOPE)
-	
-ENDFUNCTION()
-
 FUNCTION(GetStaticCRTString _ret)
 	IF(NOT TARGET_BUILD_PLATFORM STREQUAL "windows")
 		return()
@@ -237,7 +107,7 @@ FUNCTION (GetPlatformBinName PLATFORM_BIN_NAME LIBPATH_SUFFIX)
 	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "xboxone")
 		SET(RETVAL "xboxone.${COMPILER}")
 	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "switch")
-		SET(RETVAL "switch")
+		SET(RETVAL "switch64")
 	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "android")		
 		SET(RETVAL "android.arm.fp-soft")		
 	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "linux")
 
@@ -23,7 +23,12 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
-// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved.
-// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
-// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.  
+// Copyright (c) 2008-2019 NVIDIA Corporation. All rights reserved.
 
+
+#ifndef PX_${HEADER_GUARD_NAME}
+#define PX_${HEADER_GUARD_NAME}
+
+${HEADER_CONTENT}
+
+#endif  // PX_${HEADER_GUARD_NAME}
@@ -32,6 +32,7 @@
 
 #include <stdio.h>
 #include "foundation/PxPreprocessor.h"
+#include "foundation/PxAssert.h"
 #include "RawLoader.h"
 #include "PxTkFile.h"