diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXFoundation_static_64.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXFoundation_static_64.a
index dedea10bc..19216936b 100644
--- a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXFoundation_static_64.a
+++ b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXFoundation_static_64.a
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:426053c4e44445b7d4e57d843b7d12f48c93b85ae3a29086e2f29f5965986fad
+oid sha256:6738a094c3dbe50a5820c83944b3992211bd3e372b1ccfbd2f3acb0541c04d2b
size 570452
diff --git a/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXVehicle2_static_64.a b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXVehicle2_static_64.a
new file mode 100644
index 000000000..edb89c6a0
--- /dev/null
+++ b/Source/Platforms/Android/Binaries/ThirdParty/ARM64/libPhysXVehicle2_static_64.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bbb5ba66f5e47ee53fd099c805e94d66f47cb66c44ec2339f06b66ea89c6100
+size 1543576
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/FastXml_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/FastXml_64.pdb
index 1d188f62f..43a87a79d 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/FastXml_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/FastXml_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6ca4be11982ae6754b9927fc8d4ab3c04d29a530b146416ec9bce6b6b11baa1c
+oid sha256:132883c177c47a532afd6fa33b5a2f498cd310001400062a6df33743c4d5e784
size 118784
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelAABB_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelAABB_64.pdb
index cceac7991..819f1d896 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelAABB_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelAABB_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:04a182876dfbe9e27831c45f11aa5f4e165a21d7bced5d1e792594944708a0fc
+oid sha256:7668042f2a51ef982925d28ec57efe89f3adfc0f0bdd45c0d836ea810010d0a1
size 593920
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelDynamics_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelDynamics_64.pdb
index 1ad63a052..e96418eed 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelDynamics_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevelDynamics_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a6e8036243ae74ed8c6db612af90b3e0b0dfc8ba926ca8abc93954f24c6d92bf
+oid sha256:f5eb77e8531012b27e7616f097e17bd15a0d30f0314f311bacefa67610eb873c
size 1339392
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevel_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevel_64.pdb
index df91b0910..a6f6b58f8 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevel_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/LowLevel_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:dcdd2cabfaeb8fe69c47fbf8c0aa15741d2ed5d4b97df406059fd4ecaec167be
+oid sha256:c5ed568ad39c0d14de2e51b413657cc965ee2e831b4b6bc7e6418d16fa697163
size 1257472
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.lib
index 36ce33a1a..c9e7b5dfe 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.lib
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:74d822966f60d0c76952b8927786e54cbcff7bed06f35e3a89b04d3cbd57959d
+oid sha256:603e6025b22349137e7244bf6ca4056e09e6947660469269da1944d9f92e02fb
size 1306220
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.pdb
index f0650f66f..b82c855c8 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCharacterKinematic_static_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8b163820ce99f7c7a0b7444ed18238b674c2b9b3eec2bfbf4bafc61c6c39e134
+oid sha256:1c870f987df7407b2edc5615a5fb4d3cb942af801d0260a13de1d27e52eac4fb
size 675840
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.lib
index 59cd9616a..56a97a846 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.lib
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7577901f23a10372b22a72f98a616d2793873461ca8b508dd4c83baee2d243d4
+oid sha256:d2b2093cf1f72c4135f653875f0fe0fa33d6696d34c29b6ac8d4ac3bb7aa92c1
size 26130976
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.pdb
index 7093de251..4c3883939 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCommon_static_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2c57ca4b4ef8bdc4a9da435d722ccfe8c6dec0b3611e02ba1c8a3c1bf91fff4e
+oid sha256:e0c09e6550a0ab319a7cde6382cc31ba31113d54d8d779444435e56213d07285
size 1822720
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.lib
index 967d6f078..7a47a2ddb 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.lib
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bfb03f07fe8baf770491faa0f48994d55bf023345d3a8851bcbaa71fc0d6c418
+oid sha256:ea85451d201ceeea71fd46bb01b5dc3501a05c77538bb85ae665ec6c0385c350
size 130200
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.pdb
index 9f67a1bc7..c79307c68 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXCooking_static_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f079a31113ae7f2647dac3555c5ffb6110760063f7f2d248f799336575bf1776
+oid sha256:7f18f710748a40b3be245f1027748ed6c9fe6058e049c3926632c0658dd983f4
size 397312
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.lib
index 1b2702b2d..7d543561d 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.lib
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:84e255cd3a6e8a7b5138c93e12f9213e5123fbcb0f26be3e5a15ad94dc8c3ec5
+oid sha256:f880ee07970656a19ac9a811f16be3edeed06834886606f2385bbcce9389ea4c
size 17300374
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.pdb
index 54ec4f8ef..b6401abd3 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXExtensions_static_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d42a14cffa11e040c488f3fb4361cd25255af86c35becab87fa1e1a0c7ed1349
+oid sha256:abd53b7899e7bce0b2180189d8c28df8b38107bb90cdd6078069c9d869169d9a
size 5156864
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.lib
index 74d36375a..dcb1935ee 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.lib
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:45d16f65aa7d8df12881163048ae62b3d59a343c553c7332a9c60047e1b52889
+oid sha256:3f84c317ca2181e564fd7f6814898f9a1c738e3f157e5974da1fcf72d6abe8f9
size 585126
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.pdb
index e038fe7a6..f784a8e8e 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXFoundation_static_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ffcde8e421c8423431c07d2ba94faa7b496c24005274943b9399c5b6794855a6
+oid sha256:4c4094a92b9252e8f0dee08600ef5f93fa01abb9b21fe4a2944114d41cd143ec
size 299008
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.lib
index 648d5813a..52b0147b0 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.lib
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e01a533081a79800fd43ad4dd4104de99c1d0de8046c4e6647aab20f809a7bfd
+oid sha256:747ed5f9e098e9c8e0a75cdfdfd09e82b338904b5916cc60df45d585f398b215
size 2073834
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.pdb
index ca3aa2cae..3778728ef 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXPvdSDK_static_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3c02b1dd54bc27adeeade030dfcecf4d97c2da7f04a9b99978be62985dd332ad
+oid sha256:227c4cddf1a1326c6f6a9cfb106c592f75433fcf047971f63c8bc992c6f16369
size 946176
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXTask_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXTask_64.pdb
index 9f54b50fc..ed9215af3 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXTask_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXTask_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:68944495400735cd79292544cbcf19e67329dfbe441148a9250d0f54c2218808
+oid sha256:ea9f74cc743bf588cbb9e6a5dbe544551eefe6be2ffa1c0232908159f3fd2612
size 143360
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.lib
new file mode 100644
index 000000000..1c7cb3bc0
--- /dev/null
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c0c1865cba540abc026208ebf09653bb30f1ab9f800d65d53ea716e9b21ba64
+size 1125480
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.pdb
new file mode 100644
index 000000000..11ae60a06
--- /dev/null
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle2_static_64.pdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f83d273d0419023214b3f5094bfc23bd567c495bcf262fb6b2d696427a390f19
+size 733184
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.lib
index 4203b02c1..c71216d38 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.lib
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7b91aa1f8b5708720b2f5034278e29963a58d5e9c77ce34c06d48d716de99615
+oid sha256:64d9bd9c981905263b5d10ab9a9b2153785b58d6405ad99ed5119d4b70b55f51
size 5843352
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.pdb
index fe9c50972..67447c121 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysXVehicle_static_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:84bace49f8b29a5c2f5d712e5c4b450bee2c43f22fee259943b37c3371932fdc
+oid sha256:eba825400abc8140c3d496ff0ad6df25ae9b4d4d2acb63db81171250d874e8b9
size 3862528
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.lib
index 5b2e0edad..8a0399bd7 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.lib
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.lib
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8e7beea7fa52be9afb7a70a497bede747b993066ccd398572be79c88ec1684da
+oid sha256:8311b062fb2153604f3eddee2d2a5720beb7f571159e8b1ed8c9fa89d3a3d6c5
size 34826088
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.pdb
index a530874e9..6b3fbcb2d 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/PhysX_static_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b9b08c8d24258dc2cd8fbfaa49c188f922ab81646c52bb1d81f15b95263b1a58
+oid sha256:a332f82798acafc6423c40e09223d7781abc43fbe5cbe1aed9069937ed7de180
size 4558848
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SceneQuery_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SceneQuery_64.pdb
index af64dd315..c6196ff06 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SceneQuery_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SceneQuery_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:35e45499935f1fe2526d20c3fef136de9daf11b5dfa4a562c69b71e78a6ed09f
+oid sha256:ac1251babb3766e7e9bc2efc40873b43aa1ae55b331918c9dc790f82b9e77d4f
size 544768
diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SimulationController_64.pdb b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SimulationController_64.pdb
index 02bbdeded..92b08e4bc 100644
--- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/SimulationController_64.pdb
+++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/SimulationController_64.pdb
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8d3e81616d41ec4ef1cbbce89198408e8da614b0466f910ee5f095e09f48fbf6
+oid sha256:b11081d87071515d65544c9265b9bd09bb66af0810fbd6ec03bd28512892466b
size 2699264
diff --git a/Source/ThirdParty/PhysX/PhysX.Build.cs b/Source/ThirdParty/PhysX/PhysX.Build.cs
index 631fbccf9..ffd9035f5 100644
--- a/Source/ThirdParty/PhysX/PhysX.Build.cs
+++ b/Source/ThirdParty/PhysX/PhysX.Build.cs
@@ -104,6 +104,7 @@ public class PhysX : DepsModule
if (useVehicle)
{
AddLib(options, depsRoot, string.Format("PhysXVehicle_static{0}", archPostFix));
+ //AddLib(options, depsRoot, string.Format("PhysXVehicle2_static{0}", archPostFix));
}
}
}
diff --git a/Source/ThirdParty/PhysX/foundation/PxMathIntrinsics.h b/Source/ThirdParty/PhysX/foundation/PxMathIntrinsics.h
index 8c56ce578..0a82e3479 100644
--- a/Source/ThirdParty/PhysX/foundation/PxMathIntrinsics.h
+++ b/Source/ThirdParty/PhysX/foundation/PxMathIntrinsics.h
@@ -33,7 +33,7 @@
#if PX_WINDOWS_FAMILY
#include "foundation/windows/PxWindowsMathIntrinsics.h"
-#elif(PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY)
+#elif (PX_LINUX || PX_ANDROID || PX_PS4 || PX_PS5 || PX_APPLE_FAMILY)
#include "foundation/unix/PxUnixMathIntrinsics.h"
#elif PX_SWITCH
#include "foundation/switch/PxSwitchMathIntrinsics.h"
diff --git a/Source/ThirdParty/PhysX/foundation/PxPreprocessor.h b/Source/ThirdParty/PhysX/foundation/PxPreprocessor.h
index ab37b6ac4..5dc1217d8 100644
--- a/Source/ThirdParty/PhysX/foundation/PxPreprocessor.h
+++ b/Source/ThirdParty/PhysX/foundation/PxPreprocessor.h
@@ -455,7 +455,7 @@ General defines
// check that exactly one of NDEBUG and _DEBUG is defined
#if !defined(NDEBUG) ^ defined(_DEBUG)
- #error Exactly one of NDEBUG and _DEBUG needs to be defined!
+ #undef _DEBUG
#endif
// make sure PX_CHECKED is defined in all _DEBUG configurations as well
diff --git a/Source/ThirdParty/PhysX/foundation/unix/PxUnixMathIntrinsics.h b/Source/ThirdParty/PhysX/foundation/unix/PxUnixMathIntrinsics.h
index 4e6ab96b9..4a343dc7d 100644
--- a/Source/ThirdParty/PhysX/foundation/unix/PxUnixMathIntrinsics.h
+++ b/Source/ThirdParty/PhysX/foundation/unix/PxUnixMathIntrinsics.h
@@ -32,7 +32,7 @@
#include "foundation/Px.h"
#include "foundation/PxAssert.h"
-#if !(PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY)
+#if !(PX_LINUX || PX_ANDROID || PX_PS4 || PX_PS5 || PX_APPLE_FAMILY)
#error "This file should only be included by Unix builds!!"
#endif
diff --git a/Source/Tools/Flax.Build/Deploy/VCEnvironment.cs b/Source/Tools/Flax.Build/Deploy/VCEnvironment.cs
index d3f8eda9b..b0f16186e 100644
--- a/Source/Tools/Flax.Build/Deploy/VCEnvironment.cs
+++ b/Source/Tools/Flax.Build/Deploy/VCEnvironment.cs
@@ -230,9 +230,11 @@ namespace Flax.Deploy
/// Configuration to build.
/// Platform to build.
/// Custom build properties mapping (property=value).
- public static void BuildSolution(string solutionFile, string buildConfig, string buildPlatform, Dictionary props = null)
+ /// Custom MSBuild executable path.
+ public static void BuildSolution(string solutionFile, string buildConfig, string buildPlatform, Dictionary props = null, string msBuild = null)
{
- var msBuild = MSBuildPath;
+ if (msBuild == null)
+ msBuild = MSBuildPath;
if (string.IsNullOrEmpty(msBuild))
{
throw new Exception(string.Format("Unable to find msbuild.exe at: \"{0}\"", msBuild));
diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs b/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs
index 5f02dc086..0883dbef4 100644
--- a/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/PhysX.cs
@@ -7,6 +7,7 @@ using System.Linq;
using System.Xml;
using Flax.Build;
using Flax.Build.Platforms;
+using Flax.Build.Projects.VisualStudio;
using Flax.Deploy;
namespace Flax.Deps.Dependencies
@@ -134,7 +135,6 @@ namespace Flax.Deps.Dependencies
break;
default: throw new InvalidArchitectureException(architecture);
}
-
switch (architecture)
{
case TargetArchitecture.x86:
@@ -144,7 +144,7 @@ namespace Flax.Deps.Dependencies
buildPlatform = architecture.ToString();
break;
}
-
+ var msBuildProps = new Dictionary();
switch (targetPlatform)
{
case TargetPlatform.Windows:
@@ -185,6 +185,8 @@ namespace Flax.Deps.Dependencies
buildPlatform = "NX64";
suppressBitsPostfix = true;
binariesPrefix = "lib";
+ envVars.Add("NintendoSdkRoot", Sdk.Get("SwitchSdk").RootPath + '\\');
+ msBuildProps.Add("NintendoSdkRoot", envVars["NintendoSdkRoot"]);
break;
case TargetPlatform.Mac:
switch (architecture)
@@ -205,11 +207,44 @@ namespace Flax.Deps.Dependencies
}
// Setup build environment variables for PhysX build system
+ string msBuild = null;
switch (BuildPlatform)
{
case TargetPlatform.Windows:
{
- var msBuild = VCEnvironment.MSBuildPath;
+ msBuild = VCEnvironment.MSBuildPath;
+
+ // Some consoles don't support the latest Visual Studio 2022
+ var vsVersion = VisualStudioVersion.VisualStudio2022;
+ switch (targetPlatform)
+ {
+ case TargetPlatform.PS4:
+ vsVersion = VisualStudioVersion.VisualStudio2017;
+ break;
+ case TargetPlatform.PS5:
+ case TargetPlatform.Switch:
+ vsVersion = VisualStudioVersion.VisualStudio2019;
+ break;
+ }
+ if (vsVersion != VisualStudioVersion.VisualStudio2022)
+ {
+ // TODO: override VS version in cmake_generate_projects.py too
+ var visualStudioInstances = VisualStudioInstance.GetInstances();
+ foreach (var visualStudioInstance in visualStudioInstances)
+ {
+ if (visualStudioInstance.Version <= vsVersion)
+ {
+ var toolPath = Path.Combine(visualStudioInstance.Path, "MSBuild\\Current\\Bin\\MSBuild.exe");
+ if (!File.Exists(toolPath))
+ toolPath = Path.Combine(visualStudioInstance.Path, "MSBuild\\15.0\\Bin\\MSBuild.exe");
+ if (File.Exists(toolPath))
+ {
+ msBuild = toolPath;
+ break;
+ }
+ }
+ }
+ }
if (File.Exists(msBuild))
{
envVars.Add("PATH", Path.GetDirectoryName(msBuild));
@@ -233,13 +268,14 @@ namespace Flax.Deps.Dependencies
Log.Info("Building PhysX version " + File.ReadAllText(Path.Combine(root, "physx", "version.txt")) + " to " + binariesSubDir);
// Generate project files
- Utilities.Run(projectGenPath, preset, null, projectGenDir, Utilities.RunOptions.Default, envVars);
+ Utilities.Run(projectGenPath, preset, null, projectGenDir, Utilities.RunOptions.ThrowExceptionOnError, envVars);
switch (targetPlatform)
{
case TargetPlatform.PS4:
case TargetPlatform.PS5:
- // Hack: PS4 uses .o extension for compiler output files but CMake uses .obj even if CMAKE_CXX_OUTPUT_EXTENSION/CMAKE_C_OUTPUT_EXTENSION are specified
+ case TargetPlatform.Switch:
+ // Hack: Platform compiler uses .o extension for compiler output files but CMake uses .obj even if CMAKE_CXX_OUTPUT_EXTENSION/CMAKE_C_OUTPUT_EXTENSION are specified
Utilities.ReplaceInFiles(Path.Combine(root, "physx\\compiler\\" + binariesSubDir), "*.vcxproj", SearchOption.AllDirectories, ".obj", ".o");
break;
case TargetPlatform.XboxOne:
@@ -260,6 +296,7 @@ namespace Flax.Deps.Dependencies
"PhysXFoundation",
"PhysXPvdSDK",
"PhysXVehicle",
+ "PhysXVehicle2",
};
var dstBinaries = GetThirdPartyFolder(options, targetPlatform, architecture);
var srcBinaries = Path.Combine(root, "physx", "bin", binariesSubDir, configuration);
@@ -269,10 +306,10 @@ namespace Flax.Deps.Dependencies
switch (targetPlatform)
{
case TargetPlatform.Android:
- Utilities.Run("cmake", "--build .", null, Path.Combine(root, "physx\\compiler\\android-release"), Utilities.RunOptions.None, envVars);
+ Utilities.Run("cmake", "--build .", null, Path.Combine(root, "physx\\compiler\\android-" + configuration), Utilities.RunOptions.None, envVars);
break;
default:
- VCEnvironment.BuildSolution(Path.Combine(solutionFilesRoot, preset, "PhysXSDK.sln"), configuration, buildPlatform);
+ VCEnvironment.BuildSolution(Path.Combine(solutionFilesRoot, preset, "PhysXSDK.sln"), configuration, buildPlatform, msBuildProps, msBuild);
break;
}
break;