Merge remote-tracking branch 'nvidia/4.1' into emscripten_wip

Author: vincentfretin

LICENSE.md

@@ -0,0 +1,27 @@
+# NVIDIA PhysX SDK 4.1
+
+Copyright (c) 2021 NVIDIA Corporation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+ * Neither the name of NVIDIA CORPORATION nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,6 +1,6 @@
 # NVIDIA PhysX SDK 4.1
 
-Copyright (c) 2019 NVIDIA Corporation. All rights reserved.
+Copyright (c) 2021 NVIDIA Corporation. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -26,6 +26,11 @@ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+## PhysX 5 Now Available
+
+The NVIDIA PhysX SDK version 5 is now available [here](https://github.com/NVIDIA-Omniverse/PhysX).
+This repository will continue to be available to support legacy users.  We encourage all new projects to start on the new release.
+
 ## Introduction
 
 Welcome to the NVIDIA PhysX SDK source code repository. This depot includes the PhysX SDK and the Kapla Demo application.

externals/cmakemodules/GetCompilerAndPlatform.cmake

@@ -68,6 +68,8 @@ FUNCTION(GetCompiler _ret)
 		SET(COMPILER_SUFFIX "vc140")
 	ELSEIF (XBOXONE_MSVC_VERSION EQUAL 141)
 		SET(COMPILER_SUFFIX "vc141")
+	ELSEIF (XBOXSERIESX_MSVC_VERSION EQUAL 141)
+		SET(COMPILER_SUFFIX "vc141")
 	ELSE()
 		# add clang!
 		SET(COMPILER_SUFFIX "")
@@ -108,6 +110,8 @@ FUNCTION (GetPlatformBinName PLATFORM_BIN_NAME LIBPATH_SUFFIX)
 		SET(RETVAL "ps4")
 	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "xboxone")
 		SET(RETVAL "xboxone.${COMPILER}")
+	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "xboxseriesx")
+		SET(RETVAL "xboxseriesx.${COMPILER}")
 	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "switch")
 		IF (${CMAKE_GENERATOR_PLATFORM} STREQUAL "NX32")
 			SET(RETVAL "switch32")
@@ -119,10 +123,10 @@ FUNCTION (GetPlatformBinName PLATFORM_BIN_NAME LIBPATH_SUFFIX)
 	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "emscripten")
 	        SET(RETVAL "emscripten")
 	ELSEIF(TARGET_BUILD_PLATFORM STREQUAL "linux")
-		IF (${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-unknown-linux-gnu" OR ${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "x86_64-linux-gnu")
-			SET(RETVAL "linux.clang")	
-		ELSEIF(${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "aarch64-unknown-linux-gnueabi" OR ${CMAKE_LIBRARY_ARCHITECTURE} STREQUAL "aarch64-linux-gnu")
-			SET(RETVAL "linux.aarch64")	
+		IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+			SET(RETVAL "linux.clang")
+		ELSEIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
+			SET(RETVAL "linux.aarch64")
 		ENDIF()
 	ENDIF()
 

externals/cmakemodules/linux/LinuxCrossToolchain.aarch64-unknown-linux-gnueabihf.cmake

@@ -3,11 +3,12 @@ IF(NOT $ENV{PM_PACKAGES_ROOT} EQUAL "")
 
 	INCLUDE(CMakeForceCompiler)
 
-	SET(LINUX_ROOT $ENV{PM_PACKAGES_ROOT}/clang-crosscompile/5.0.0/aarch64-unknown-linux-gnueabi)
+	SET(LINUX_ROOT $ENV{PM_CLANGCROSSCOMPILE_PATH}/aarch64-unknown-linux-gnueabi)
 	STRING(REGEX REPLACE "\\\\" "/" LINUX_ROOT ${LINUX_ROOT})
 
 	message (STATUS "LINUX_ROOT is '${LINUX_ROOT}'")
 	SET(ARCHITECTURE_TRIPLE aarch64-unknown-linux-gnueabi)
+	SET(CMAKE_SYSTEM_PROCESSOR aarch64)
 
 	SET(CMAKE_CROSSCOMPILING TRUE)
 	SET(CMAKE_SYSTEM_NAME Linux)
@@ -34,7 +35,7 @@ IF(NOT $ENV{PM_PACKAGES_ROOT} EQUAL "")
 	#set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 	#set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
-	SET(CMAKE_MAKE_PROGRAM "$ENV{PM_PACKAGES_ROOT}/MinGW/0.6.2/bin/mingw32-make.exe")
+	SET(CMAKE_MAKE_PROGRAM "$ENV{PM_MINGW_PATH}/bin/mingw32-make.exe")
 ELSE()
 	MESSAGE("PM_PACKAGES_ROOT  variable not defined!")
 ENDIF()

externals/cmakemodules/linux/LinuxCrossToolchain.arm-unknown-linux-gnueabihf.cmake

@@ -7,6 +7,7 @@ IF(NOT $ENV{LINUX_ROOT} EQUAL "")
 
 	message (STATUS "LINUX_ROOT is '${LINUX_ROOT}'")
 	SET(ARCHITECTURE_TRIPLE arm-unknown-linux-gnueabihf)
+	SET(CMAKE_SYSTEM_PROCESSOR aarch64)
 
 	SET(CMAKE_CROSSCOMPILING TRUE)
 	SET(CMAKE_SYSTEM_NAME Linux)