9 files changed, 18 insertions, 13 deletions
diff --git a/PxShared/src/foundation/include/PsAllocator.h b/PxShared/src/foundation/include/PsAllocator.h
index cbf32d3..f988b6c 100644
--- a/PxShared/src/foundation/include/PsAllocator.h
+++ b/PxShared/src/foundation/include/PsAllocator.h
@@ -108,7 +108,7 @@
 #elif PX_XBOXONE
 #include <malloc.h>
 #define PxAlloca(x) alloca(x)
-#elif PX_NX
+#elif PX_SWITCH
 #include <malloc.h>
 #define PxAlloca(x) alloca(x)
 #endif
diff --git a/PxShared/src/foundation/include/PsAoS.h b/PxShared/src/foundation/include/PsAoS.h
index 641a40a..5a7c82d 100644
--- a/PxShared/src/foundation/include/PsAoS.h
+++ b/PxShared/src/foundation/include/PsAoS.h
@@ -34,7 +34,7 @@
 
 #if PX_WINDOWS && !PX_NEON
 #include "windows/PsWindowsAoS.h"
-#elif(PX_UNIX_FAMILY || PX_PS4 || PX_NX)
+#elif(PX_UNIX_FAMILY || PX_PS4 || PX_SWITCH)
 #include "unix/PsUnixAoS.h"
 #elif PX_XBOXONE
 #include "XboxOne/PsXboxOneAoS.h"
diff --git a/PxShared/src/foundation/include/PsInlineAoS.h b/PxShared/src/foundation/include/PsInlineAoS.h
index 6d43607..6ae15cf 100644
--- a/PxShared/src/foundation/include/PsInlineAoS.h
+++ b/PxShared/src/foundation/include/PsInlineAoS.h
@@ -35,7 +35,7 @@
 #if PX_WINDOWS
 #include "windows/PsWindowsTrigConstants.h"
 #include "windows/PsWindowsInlineAoS.h"
-#elif(PX_UNIX_FAMILY || PX_PS4 || PX_NX)
+#elif(PX_UNIX_FAMILY || PX_PS4 || PX_SWITCH)
 #include "unix/PsUnixTrigConstants.h"
 #include "unix/PsUnixInlineAoS.h"
 #elif PX_XBOXONE
diff --git a/PxShared/src/foundation/include/PsIntrinsics.h b/PxShared/src/foundation/include/PsIntrinsics.h
index 1e1b9d1..38b91ba 100644
--- a/PxShared/src/foundation/include/PsIntrinsics.h
+++ b/PxShared/src/foundation/include/PsIntrinsics.h
@@ -38,8 +38,8 @@
 #include "unix/PsUnixIntrinsics.h"
 #elif PX_XBOXONE
 #include "XboxOne/PsXboxOneIntrinsics.h"
-#elif PX_NX
-#include "nx/PsNXIntrinsics.h"
+#elif PX_SWITCH
+#include "switch/PsSwitchIntrinsics.h"
 #else
 #error "Platform not supported!"
 #endif
diff --git a/PxShared/src/foundation/include/PsThread.h b/PxShared/src/foundation/include/PsThread.h
index 8ba553a..4e7c104 100644
--- a/PxShared/src/foundation/include/PsThread.h
+++ b/PxShared/src/foundation/include/PsThread.h
@@ -41,7 +41,7 @@
 
 #if PX_WINDOWS_FAMILY || PX_XBOXONE
 #define PxSpinLockPause() __asm pause
-#elif PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY || PX_NX
+#elif PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY || PX_SWITCH
 #define PxSpinLockPause() asm("nop")
 #else
 #error "Platform not supported!"
@@ -173,7 +173,7 @@ class PX_FOUNDATION_API ThreadImpl
 	Change the affinity mask for this thread. The mask is a platform
 	specific value.
 
-	On Windows, Linux, PS4, XboxOne and NX platforms, each set mask bit represents
+	On Windows, Linux, PS4, XboxOne and Switch platforms, each set mask bit represents
 	the index of a logical processor that the OS may schedule thread execution on.
 	Bits outside the range of valid logical processors may be ignored or cause
 	the function to return an error.
diff --git a/PxShared/src/foundation/include/PsVecMath.h b/PxShared/src/foundation/include/PsVecMath.h
index 4e891d8..ffd2de8 100644
--- a/PxShared/src/foundation/include/PsVecMath.h
+++ b/PxShared/src/foundation/include/PsVecMath.h
@@ -54,7 +54,7 @@
 #define COMPILE_VECTOR_INTRINSICS 1
 #elif PX_IOS&& PX_NEON
 #define COMPILE_VECTOR_INTRINSICS 1
-#elif PX_NX
+#elif PX_SWITCH
 #define COMPILE_VECTOR_INTRINSICS 1
 #else
 #define COMPILE_VECTOR_INTRINSICS 0
diff --git a/PxShared/src/foundation/include/PsVecMathAoSScalarInline.h b/PxShared/src/foundation/include/PsVecMathAoSScalarInline.h
index 9bef465..f5dea7b 100644
--- a/PxShared/src/foundation/include/PsVecMathAoSScalarInline.h
+++ b/PxShared/src/foundation/include/PsVecMathAoSScalarInline.h
@@ -40,8 +40,13 @@
 
 #define BOOL_TO_U16(b) (PxU16)(- PxI32(b))
 
+#define PX_VECMATH_ASSERT_ENABLED 0
 
+#if PX_VECMATH_ASSERT_ENABLED
 #define VECMATHAOS_ASSERT(x) { PX_ASSERT(x); }
+#else
+#define VECMATHAOS_ASSERT(x)
+#endif
 
 /////////////////////////////////////////////////////////////////////
 ////INTERNAL USE ONLY AND TESTS
@@ -1479,7 +1484,7 @@ PX_FORCE_INLINE BoolV BOr(const BoolV a, const BoolV b)
 
 PX_FORCE_INLINE PxU32 BAllEq(const BoolV a, const BoolV b)
 {
-	return (a.ux == b.ux && a.uy == b.uy && a.uz == b.uz && a.uw == b.uw ? TRUE_TO_U32 : FALSE_TO_U32);
+	return (a.ux == b.ux && a.uy == b.uy && a.uz == b.uz && a.uw == b.uw ? 1 : 0);
 }
 
 PX_FORCE_INLINE PxU32 BAllEqTTTT(const BoolV a)
diff --git a/PxShared/src/foundation/include/unix/neon/PsUnixNeonInlineAoS.h b/PxShared/src/foundation/include/unix/neon/PsUnixNeonInlineAoS.h
index 2a0578d..a97f821 100644
--- a/PxShared/src/foundation/include/unix/neon/PsUnixNeonInlineAoS.h
+++ b/PxShared/src/foundation/include/unix/neon/PsUnixNeonInlineAoS.h
@@ -42,7 +42,7 @@
 
 // "exact"
 #define VRECIPQ recipq_newton<4>
-#if PX_NX
+#if PX_SWITCH
 // StabilizationTests.AveragePoint needs more precision to succeed.
 #define VRECIP recip_newton<5> 
 #else
diff --git a/PxShared/src/foundation/src/PsAssert.cpp b/PxShared/src/foundation/src/PsAssert.cpp
index 3070383..295a81e 100644
--- a/PxShared/src/foundation/src/PsAssert.cpp
+++ b/PxShared/src/foundation/src/PsAssert.cpp
@@ -34,8 +34,8 @@
 
 #if PX_WINDOWS_FAMILY
 #include <crtdbg.h>
-#elif PX_NX
-#include "nx/PsNXAbort.h"
+#elif PX_SWITCH
+#include "switch/PsSwitchAbort.h"
 #endif
 
 namespace
@@ -63,7 +63,7 @@ class DefaultAssertHandler : public physx::PxAssertHandler
 		__debugbreak();
 #elif PX_WINDOWS_FAMILY&& PX_CHECKED
 		__debugbreak();
-#elif PX_NX
+#elif PX_SWITCH
 		abort(buffer);
 #else
 		abort();