3 files changed, 12 insertions, 144 deletions
diff --git a/PxShared/include/foundation/PxIntrinsics.h b/PxShared/include/foundation/PxIntrinsics.h
index 471f934..b4aff28 100644
--- a/PxShared/include/foundation/PxIntrinsics.h
+++ b/PxShared/include/foundation/PxIntrinsics.h
@@ -38,8 +38,8 @@
 #include "foundation/unix/PxUnixIntrinsics.h"
 #elif PX_XBOXONE
 #include "foundation/XboxOne/PxXboxOneIntrinsics.h"
-#elif PX_NX
-#include "foundation/nx/PxNXIntrinsics.h"
+#elif PX_SWITCH
+#include "foundation/switch/PxSwitchIntrinsics.h"
 #else
 #error "Platform not supported!"
 #endif
diff --git a/PxShared/include/foundation/PxPreprocessor.h b/PxShared/include/foundation/PxPreprocessor.h
index 446ca76..9b6e0f4 100644
--- a/PxShared/include/foundation/PxPreprocessor.h
+++ b/PxShared/include/foundation/PxPreprocessor.h
@@ -88,7 +88,7 @@ Operating system defines, see http://sourceforge.net/p/predef/wiki/OperatingSyst
 #elif defined(__ORBIS__)
 #define PX_PS4 1
 #elif defined(__NX__)
-#define PX_NX 1
+#define PX_SWITCH 1
 #else
 #error "Unknown operating system"
 #endif
@@ -161,8 +161,8 @@ define anything not defined on this platform to 0
 #ifndef PX_PS4
 #define PX_PS4 0
 #endif
-#ifndef PX_NX
-#define PX_NX 0
+#ifndef PX_SWITCH
+#define PX_SWITCH 0
 #endif
 #ifndef PX_X64
 #define PX_X64 0
@@ -425,7 +425,7 @@ General defines
 */
 
 // static assert
-#if(defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) || (PX_PS4) || (PX_APPLE_FAMILY) || (PX_NX) || (PX_CLANG && PX_ARM)
+#if(defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))) || (PX_PS4) || (PX_APPLE_FAMILY) || (PX_SWITCH) || (PX_CLANG && PX_ARM)
 #define PX_COMPILE_TIME_ASSERT(exp) typedef char PxCompileTimeAssert_Dummy[(exp) ? 1 : -1] __attribute__((unused))
 #else
 #define PX_COMPILE_TIME_ASSERT(exp) typedef char PxCompileTimeAssert_Dummy[(exp) ? 1 : -1]
@@ -532,5 +532,11 @@ protected:
 
 #define PX_SUPPORT_COMPUTE_PHYSX 0
 
+#ifndef PX_SUPPORT_EXTERN_TEMPLATE
+#define PX_SUPPORT_EXTERN_TEMPLATE ((!PX_ANDROID) && (PX_VC != 11))
+#else
+#define PX_SUPPORT_EXTERN_TEMPLATE 0
+#endif
+
 /** @} */
 #endif // #ifndef PXFOUNDATION_PXPREPROCESSOR_H
diff --git a/PxShared/include/foundation/nx/PxNXIntrinsics.h b/PxShared/include/foundation/nx/PxNXIntrinsics.h
deleted file mode 100644
index adf3bf5..0000000
--- a/PxShared/include/foundation/nx/PxNXIntrinsics.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2008-2015, NVIDIA CORPORATION.  All rights reserved.
- *
- * NVIDIA CORPORATION and its licensors retain all intellectual property
- * and proprietary rights in and to this software, related documentation
- * and any modifications thereto.  Any use, reproduction, disclosure or
- * distribution of this software and related documentation without an express
- * license agreement from NVIDIA CORPORATION is strictly prohibited.
- */
-// Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved.
-// Copyright (c) 2001-2004 NovodeX AG. All rights reserved.  
-
-
-#ifndef PX_FOUNDATION_PX_NX_INTRINSICS_H
-#define PX_FOUNDATION_PX_NX_INTRINSICS_H
-
-#include "foundation/Px.h"
-#include "foundation/PxAssert.h"
-
-#if !PX_NX
-	#error "This file should only be included by NX builds!!"
-#endif
-
-#include <math.h>
-#include <float.h>
-
-#include "nn/cstd/cstd_CMath.h"
-
-#if !PX_DOXYGEN
-namespace physx
-{
-namespace intrinsics
-{
-#endif
-
-	//! \brief platform-specific absolute value
-	PX_CUDA_CALLABLE PX_FORCE_INLINE float abs(float a)						{	return ::fabsf(a);	}
-
-	//! \brief platform-specific select float
-	PX_CUDA_CALLABLE PX_FORCE_INLINE float fsel(float a, float b, float c)	{	return (a >= 0.0f) ? b : c;	}
-
-	//! \brief platform-specific sign
-	PX_CUDA_CALLABLE PX_FORCE_INLINE float sign(float a)					{	return (a >= 0.0f) ? 1.0f : -1.0f; }
-
-	//! \brief platform-specific reciprocal
-	PX_CUDA_CALLABLE PX_FORCE_INLINE float recip(float a)					{	return 1.0f/a;			}
-
-	//! \brief platform-specific reciprocal estimate
-	PX_CUDA_CALLABLE PX_FORCE_INLINE float recipFast(float a)				{	return 1.0f/a;			}
-
-	//! \brief platform-specific square root
-	PX_CUDA_CALLABLE PX_FORCE_INLINE float sqrt(float a)					{	return ::sqrtf(a);	}
-
-	//! \brief platform-specific reciprocal square root
-	PX_CUDA_CALLABLE PX_FORCE_INLINE float recipSqrt(float a)				{   return 1.0f/::sqrtf(a); }
-
-	//! \brief platform-specific reciprocal square root estimate
-	PX_CUDA_CALLABLE PX_FORCE_INLINE float recipSqrtFast(float a)			{	return 1.0f/::sqrtf(a); }
-
-	//! \brief platform-specific sine
-	PX_CUDA_CALLABLE PX_FORCE_INLINE float sin(float a)						{   return ::sinf(a); }
-
-	//! \brief platform-specific cosine
-	PX_CUDA_CALLABLE PX_FORCE_INLINE float cos(float a)						{   return ::cosf(a); }
-
-	//! \brief platform-specific minimum
-	PX_CUDA_CALLABLE PX_FORCE_INLINE float selectMin(float a, float b)		{	return a<b ? a : b;	}
-
-	//! \brief platform-specific maximum
-	PX_CUDA_CALLABLE PX_FORCE_INLINE float selectMax(float a, float b)		{	return a>b ? a : b; }
-
-	//! \brief platform-specific finiteness check
-	PX_CUDA_CALLABLE PX_FORCE_INLINE bool isFinite(float a)
-	{
-#ifdef __CUDACC__
-		return isfinite(a) ? true : false;
-#else
-		return !nn::cstd::IsNan(a) && !nn::cstd::IsInf(a);
-#endif
-	}
-
-	//! \brief platform-specific finiteness check
-	PX_CUDA_CALLABLE PX_FORCE_INLINE bool isFinite(double a)
-	{
-#ifdef __CUDACC__
-		return isfinite(a) ? true : false;
-#else
-		return !nn::cstd::IsNan(a) && !nn::cstd::IsInf(a);
-#endif
-	}
-
-	/*!
-	Sets \c count bytes starting at \c dst to zero.
-	*/
-	PX_FORCE_INLINE void* memZero(void* PX_RESTRICT dest, uint32_t count)
-	{
-		return memset(dest, 0, count);
-	}
-
-	/*!
-	Sets \c count bytes starting at \c dst to \c c.
-	*/
-	PX_FORCE_INLINE void* memSet(void* PX_RESTRICT dest, int32_t c, uint32_t count)
-	{
-		return memset(dest, c, count);
-	}
-
-	/*!
-	Copies \c count bytes from \c src to \c dst. User memMove if regions overlap.
-	*/
-	PX_FORCE_INLINE void* memCopy(void* PX_RESTRICT dest, const void* PX_RESTRICT src, uint32_t count)
-	{
-		return memcpy(dest, src, count);
-	}
-
-	/*!
-	Copies \c count bytes from \c src to \c dst. Supports overlapping regions.
-	*/
-	PX_FORCE_INLINE void* memMove(void* PX_RESTRICT dest, const void* PX_RESTRICT src, uint32_t count)
-	{
-		return memmove(dest, src, count);
-	}
-
-	/*!
-	Set 128B to zero starting at \c dst+offset. Must be aligned.
-	*/
-	PX_FORCE_INLINE void memZero128(void* PX_RESTRICT dest, uint32_t offset = 0)
-	{
-		PX_ASSERT(((size_t(dest)+offset) & 0x7f) == 0);
-		memSet((char* PX_RESTRICT)dest+offset, 0, 128);
-	}
-
-#if !PX_DOXYGEN
-} // namespace intrinsics
-} // namespace physx
-#endif
-
-#endif