Upgrade PhysX5 to 5.5.0 on windows/linux platform.

Signed-off-by: Ross Charles Campbell <[email protected]>
o3de · Feb 4, 2025 · ee318d3 · ee318d3
1 parent da28801
commit ee318d3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/package-system/PhysX5/FindPhysX5.cmake b/package-system/PhysX5/FindPhysX5.cmake
@@ -52,6 +52,7 @@ set(IMPORTED_PHYSICS_LIBS_SUFFIX
     PhysX_static_64
     PhysXPvdSDK_static_64
     PhysXVehicle_static_64
+    PhysXVehicle2_static_64
     PhysXCharacterKinematic_static_64
     PhysXExtensions_static_64
     PhysXCooking_static_64

diff --git a/package-system/PhysX5/FindPhysX5_ios.cmake b/package-system/PhysX5/FindPhysX5_ios.cmake
@@ -35,6 +35,7 @@ set(PATH_TO_LIBS ${_PACKAGE_DIR}/bin/static/$<IF:$<CONFIG:profile>,${PHYSX_PROFI
 set(${MY_NAME}_LIBRARIES
     ${PATH_TO_LIBS}/libPhysXCharacterKinematic_static_64.a
     ${PATH_TO_LIBS}/libPhysXVehicle_static_64.a
+    ${PATH_TO_LIBS}/libPhysXVehicle2_static_64.a
     ${PATH_TO_LIBS}/libPhysXExtensions_static_64.a
     ${PATH_TO_LIBS}/libPhysXPvdSDK_static_64.a
     ${PATH_TO_LIBS}/libPhysX_static_64.a

diff --git a/package-system/PhysX5/build_package_image.py b/package-system/PhysX5/build_package_image.py
@@ -368,7 +368,7 @@ def main():
         elif args.platformName == 'android':
             commit = '8ac3e3601d1333ae2a967995f49b338d4e188215' # Commit of PR 40 on top of 5.1.1 version
         else:
-            commit = '0bbcff3d0c541325f4d14c36ee18f24e22e35e6e' # Commit for 5.1.1 version
+            commit = 'dd587fedd79836442a4117164ea8c46685453c34' # Commit for 5.5.0 version
 
         tempdir = Path(tempdir)
         builder = PhysXBuilder(workingDir=tempdir,

diff --git a/package_build_list_host_linux-aarch64.json b/package_build_list_host_linux-aarch64.json
@@ -29,7 +29,7 @@
         "OpenSSL-1.1.1t-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenSSL --platform-name Linux-aarch64 --clean",
         "OpenXR-1.0.22-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenXR --platform-name Linux-aarch64 --clean",
         "PhysX-4.1.2.29882248-rev8-linux-aarch64": "package-system/PhysX/build_package_image.py --package-name PhysX-4.1.2.29882248 --package-rev rev8 --platform-name linux-aarch64",
-        "PhysX-5.1.1-rev4-linux-aarch64": "package-system/PhysX5/build_package_image.py --package-name PhysX-5.1.1 --package-rev rev4 --platform-name linux-aarch64",
+        "PhysX-5.5.0-rev1-linux-aarch64": "package-system/PhysX5/build_package_image.py --package-name PhysX-5.5.0 --package-rev rev1 --platform-name linux-aarch64",
         "png-1.6.37-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Linux-aarch64 --clean",
         "poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri/build_package_image.py --platform-name linux-aarch64",
         "pyside2-5.15.2.1-py3.10-rev7-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2 --platform-name Linux-aarch64 --clean",

diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json
@@ -29,7 +29,7 @@
         "OpenSSL-1.1.1t-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenSSL --platform-name Linux --clean",
         "OpenSSL-1.1.1t-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenSSL --platform-name Linux-aarch64 --clean",
         "PhysX-4.1.2.29882248-rev8-linux": "package-system/PhysX/build_package_image.py --package-name PhysX-4.1.2.29882248 --package-rev rev8 --platform-name linux",
-        "PhysX-5.1.1-rev4-linux": "package-system/PhysX5/build_package_image.py --package-name PhysX-5.1.1 --package-rev rev4 --platform-name linux",
+        "PhysX-5.5.0-rev1-linux": "package-system/PhysX5/build_package_image.py --package-name PhysX-5.5.0 --package-rev rev1 --platform-name linux",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux": "package-system/NvCloth/build_package_image.py --platform-name linux",
         "poly2tri-7f0487a-rev1-linux": "package-system/poly2tri/build_package_image.py --platform-name linux",
         "v-hacd-2.3-1a49edf-rev1-linux": "package-system/v-hacd/build_package_image.py --platform-name linux",
@@ -89,7 +89,7 @@
         "python-3.10.13-rev2-linux": "package-system/python/temp/python-linux",
         "python-3.10.13-rev2-linux-aarch64": "package-system/python/temp/python-linux-aarch64",
         "PhysX-4.1.2.29882248-rev8-linux": "package-system/PhysX-linux",
-        "PhysX-5.1.1-rev4-linux": "package-system/PhysX5/temp/PhysX5-linux",
+        "PhysX-5.5.0-rev1-linux": "package-system/PhysX5/temp/PhysX5-linux",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux": "package-system/NvCloth-linux",
         "mikkelsen-1.0.0.4-linux": "package-system/mikkelsen-linux",
         "poly2tri-7f0487a-rev1-linux": "package-system/poly2tri-linux",

diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json
@@ -44,7 +44,7 @@
         "PhysX-4.1.2.29882248-rev8-android": "package-system/PhysX/build_package_image.py --package-name PhysX-4.1.2.29882248 --package-rev rev8 --platform android",
         "PhysX-4.1.2.29882248-rev8-windows": "package-system/PhysX/build_package_image.py --package-name PhysX-4.1.2.29882248 --package-rev rev8 --platform windows",
         "PhysX-5.1.1-rev4-android": "package-system/PhysX5/build_package_image.py --package-name PhysX-5.1.1 --package-rev rev4 --platform android",
-        "PhysX-5.1.1-rev4-windows": "package-system/PhysX5/build_package_image.py --package-name PhysX-5.1.1 --package-rev rev4 --platform windows",
+        "PhysX-5.5.0-rev1-windows": "package-system/PhysX5/build_package_image.py --package-name PhysX-5.5.0 --package-rev rev1 --platform windows",
         "png-1.6.37-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Android --package-root ../../package-system/libpng/temp --clean",
         "png-1.6.37-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Windows --package-root ../../package-system/libpng/temp --clean",
         "poly2tri-7f0487a-rev1-windows": "package-system/poly2tri/build_package_image.py --platform-name windows",
@@ -113,7 +113,7 @@
     "PhysX-4.1.2.29882248-rev8-android": "package-system/PhysX-android",
     "PhysX-4.1.2.29882248-rev8-windows": "package-system/PhysX-windows",
     "PhysX-5.1.1-rev4-android": "package-system/PhysX5/temp/PhysX5-android",
-    "PhysX-5.1.1-rev4-windows": "package-system/PhysX5/temp/PhysX5-windows",
+    "PhysX-5.5.0-rev1-windows": "package-system/PhysX5/temp/PhysX5-windows",
     "png-1.6.37-rev2-android": "package-system/libpng/temp/png-android",
     "png-1.6.37-rev2-windows": "package-system/libpng/temp/png-windows",
     "poly2tri-7f0487a-rev1-windows": "package-system/poly2tri-windows",