Fix errors and improvements for Physx SDK package (#66)

- Fixed physx build script (missing comma and misspelled library)
- Added "checked" configuration so customers can use it to look for errors in PhysX.
- Using clearer names "static" and "shared" for static and dynamic versions of the library.

Signed-off-by: moraaar [email protected]

package-system/PhysX/Build-physx-profile-config.patch

@@ -110,7 +110,7 @@ index 3b905cc0..42bd05c2 100644
  )
  
  if(NOT DEFINED RELEASE_CONFIGURATION)
-@@ -31,12 +32,17 @@ set(OPTIONS
+@@ -31,12 +32,22 @@ set(OPTIONS
  )
  
  set(OPTIONS_RELEASE
@@ -122,6 +122,11 @@ index 3b905cc0..42bd05c2 100644
 +set(OPTIONS_PROFILE
 +    "-DPX_OUTPUT_BIN_DIR=${CURRENT_PACKAGES_DIR}/build_output/profile"
 +    "-DPX_OUTPUT_LIB_DIR=${CURRENT_PACKAGES_DIR}/build_output/profile"
++    "-DNV_USE_DEBUG_WINCRT=ON"
++)
++set(OPTIONS_CHECKED
++    "-DPX_OUTPUT_BIN_DIR=${CURRENT_PACKAGES_DIR}/build_output/checked"
++    "-DPX_OUTPUT_LIB_DIR=${CURRENT_PACKAGES_DIR}/build_output/checked"
 +    "-DNV_USE_DEBUG_WINCRT=ON"
  )
  set(OPTIONS_DEBUG
@@ -132,7 +137,7 @@ index 3b905cc0..42bd05c2 100644
      "-DNV_USE_DEBUG_WINCRT=ON"
  )
  
-@@ -50,6 +56,11 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_FREEBSD)
+@@ -50,6 +61,11 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_FREEBSD)
      list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=linux")
  elseif(VCPKG_TARGET_IS_ANDROID)
      list(APPEND OPTIONS "-DTARGET_BUILD_PLATFORM=android")
@@ -144,15 +149,16 @@ index 3b905cc0..42bd05c2 100644
  else()
      message(FATAL_ERROR "Unhandled or unsupported target platform.")
  endif()
-@@ -82,6 +92,7 @@ vcpkg_cmake_configure(
+@@ -82,6 +98,8 @@ vcpkg_cmake_configure(
      OPTIONS ${OPTIONS}
      OPTIONS_DEBUG ${OPTIONS_DEBUG}
      OPTIONS_RELEASE ${OPTIONS_RELEASE}
 +    OPTIONS_PROFILE ${OPTIONS_PROFILE}
++    OPTIONS_CHECKED ${OPTIONS_CHECKED}
  )
  vcpkg_cmake_install()
  
-@@ -91,12 +103,25 @@ vcpkg_cmake_install()
+@@ -91,12 +109,25 @@ vcpkg_cmake_install()
  function(fixup_physx_artifacts)
      macro(_fixup _IN_DIRECTORY _OUT_DIRECTORY)
          foreach(_SUFFIX IN LISTS _fpa_SUFFIXES)
@@ -181,15 +187,16 @@ index 3b905cc0..42bd05c2 100644
              endif()
          endforeach()
      endmacro()
-@@ -104,6 +129,7 @@ function(fixup_physx_artifacts)
+@@ -104,6 +135,8 @@ function(fixup_physx_artifacts)
      cmake_parse_arguments(_fpa "" "DIRECTORY" "SUFFIXES" ${ARGN})
      _fixup("bin" ${_fpa_DIRECTORY})
      _fixup("debug/bin" "debug/${_fpa_DIRECTORY}")
 +    _fixup("profile/bin" "profile/${_fpa_DIRECTORY}")
++    _fixup("checked/bin" "checked/${_fpa_DIRECTORY}")
  endfunction()
  
  fixup_physx_artifacts(
-@@ -112,22 +138,25 @@ fixup_physx_artifacts(
+@@ -112,22 +145,27 @@ fixup_physx_artifacts(
  )
  fixup_physx_artifacts(
      DIRECTORY "bin"
@@ -204,12 +211,14 @@ index 3b905cc0..42bd05c2 100644
          "${CURRENT_PACKAGES_DIR}/bin/"
          "${CURRENT_PACKAGES_DIR}/debug/bin/"
 +        "${CURRENT_PACKAGES_DIR}/profile/bin/"
++        "${CURRENT_PACKAGES_DIR}/checked/bin/"
      )
  else()
      file(GLOB PHYSX_ARTIFACTS LIST_DIRECTORIES true
          "${CURRENT_PACKAGES_DIR}/bin/*"
          "${CURRENT_PACKAGES_DIR}/debug/bin/*"
 +        "${CURRENT_PACKAGES_DIR}/profile/bin/*"
++        "${CURRENT_PACKAGES_DIR}/checked/bin/*"
      )
      foreach(_ARTIFACT IN LISTS PHYSX_ARTIFACTS)
 -        if(IS_DIRECTORY ${_ARTIFACT})
@@ -217,37 +226,42 @@ index 3b905cc0..42bd05c2 100644
              file(REMOVE_RECURSE ${_ARTIFACT})
          endif()
      endforeach()
-@@ -136,6 +165,20 @@ endif()
+@@ -136,6 +174,25 @@ endif()
  file(REMOVE_RECURSE
      "${CURRENT_PACKAGES_DIR}/debug/include"
      "${CURRENT_PACKAGES_DIR}/debug/source"
 +    "${CURRENT_PACKAGES_DIR}/profile/include"
 +    "${CURRENT_PACKAGES_DIR}/profile/source"
++    "${CURRENT_PACKAGES_DIR}/checked/include"
++    "${CURRENT_PACKAGES_DIR}/checked/source"
      "${CURRENT_PACKAGES_DIR}/source"
  )
  file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 +    file(INSTALL ${SOURCE_PATH}/physx/bin/win.x86_64.vc142.mt/debug/PhysXDevice64.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
 +    file(INSTALL ${SOURCE_PATH}/physx/bin/win.x86_64.vc142.mt/profile/PhysXDevice64.dll DESTINATION ${CURRENT_PACKAGES_DIR}/profile/bin)
++    file(INSTALL ${SOURCE_PATH}/physx/bin/win.x86_64.vc142.mt/checked/PhysXDevice64.dll DESTINATION ${CURRENT_PACKAGES_DIR}/checked/bin)
 +    file(INSTALL ${SOURCE_PATH}/physx/bin/win.x86_64.vc142.mt/release/PhysXDevice64.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
 +    file(INSTALL ${SOURCE_PATH}/physx/bin/win.x86_64.vc140.mt/debug/PhysXGpu_64.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
 +    file(INSTALL ${SOURCE_PATH}/physx/bin/win.x86_64.vc140.mt/profile/PhysXGpu_64.dll DESTINATION ${CURRENT_PACKAGES_DIR}/profile/bin)
++    file(INSTALL ${SOURCE_PATH}/physx/bin/win.x86_64.vc140.mt/checked/PhysXGpu_64.dll DESTINATION ${CURRENT_PACKAGES_DIR}/checked/bin)
 +    file(INSTALL ${SOURCE_PATH}/physx/bin/win.x86_64.vc140.mt/release/PhysXGpu_64.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
 +elseif(VCPKG_TARGET_IS_LINUX AND NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 +    file(INSTALL ${SOURCE_PATH}/physx/bin/linux.clang/debug/libPhysXGpu_64.so DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
 +    file(INSTALL ${SOURCE_PATH}/physx/bin/linux.clang/profile/libPhysXGpu_64.so DESTINATION ${CURRENT_PACKAGES_DIR}/profile/bin)
++    file(INSTALL ${SOURCE_PATH}/physx/bin/linux.clang/checked/libPhysXGpu_64.so DESTINATION ${CURRENT_PACKAGES_DIR}/checked/bin)
 +    file(INSTALL ${SOURCE_PATH}/physx/bin/linux.clang/release/libPhysXGpu_64.so DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
 +endif()
 diff --git a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake b/ports/vcpkg-cmake/vcpkg_cmake_build.cmake
 index ef27a6c9..533343aa 100644
 --- a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake
 +++ b/ports/vcpkg-cmake/vcpkg_cmake_build.cmake
-@@ -71,11 +71,14 @@ function(vcpkg_cmake_build)
+@@ -71,11 +71,17 @@ function(vcpkg_cmake_build)
          set(target_args "--target" "${arg_TARGET}")
      endif()
  
 -    foreach(buildtype IN ITEMS debug release)
-+    foreach(buildtype IN ITEMS debug profile release)
++    foreach(buildtype IN ITEMS debug profile checked release)
          if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL buildtype)
              if(buildtype STREQUAL "debug")
                  set(short_buildtype "dbg")
@@ -255,15 +269,20 @@ index ef27a6c9..533343aa 100644
 +            elseif(buildtype STREQUAL "profile")
 +                set(short_buildtype "profile")
 +                set(cmake_config "Profile")
++            elseif(buildtype STREQUAL "checked")
++                set(short_buildtype "checked")
++                set(cmake_config "Checked")
              else()
                  set(short_buildtype "rel")
                  set(cmake_config "Release")
-@@ -87,6 +90,8 @@ function(vcpkg_cmake_build)
+@@ -87,6 +93,10 @@ function(vcpkg_cmake_build)
                  set(env_path_backup "$ENV{PATH}")
                  if(buildtype STREQUAL "debug")
                      vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin")
 +                elseif(buildtype STREQUAL "profile")
 +                    vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/profile/bin")
++                elseif(buildtype STREQUAL "checked")
++                    vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/checked/bin")
                  else()
                      vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin")
                  endif()
@@ -276,11 +295,11 @@ index 3b7d31ef..8ce2e5da 100644
          "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;WINDOWS_USE_MSBUILD;NO_CHARSET_FLAG"
          "SOURCE_PATH;GENERATOR;LOGFILE_BASE"
 -        "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE"
-+        "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;OPTIONS_PROFILE"
++        "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;OPTIONS_PROFILE;OPTIONS_CHECKED"
      )
  
      if(DEFINED CACHE{Z_VCPKG_CMAKE_GENERATOR})
-@@ -385,6 +385,22 @@ function(vcpkg_cmake_configure)
+@@ -385,6 +385,38 @@ function(vcpkg_cmake_configure)
                  LOGNAME "${arg_LOGFILE_BASE}-rel"
              )
          endif()
@@ -299,6 +318,22 @@ index 3b7d31ef..8ce2e5da 100644
 +                WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-profile"
 +                LOGNAME "${arg_LOGFILE_BASE}-profile"
 +            )
++        endif()
++
++        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "checked")
++            message(STATUS "Configuring ${TARGET_TRIPLET}-checked")
++            file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-checked")
++            vcpkg_execute_required_process(
++                COMMAND
++                    "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}"
++                    ${arg_OPTIONS}
++                    ${arg_OPTIONS_CHECKED}
++                    -G "${generator}"
++                    "-DCMAKE_BUILD_TYPE=Checked"
++                    "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}"
++                WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-checked"
++                LOGNAME "${arg_LOGFILE_BASE}-checked"
++            )
 +        endif()
      endif()
  

package-system/PhysX/FindPhysX.cmake.template

@@ -12,7 +12,7 @@ if (TARGET $${TARGET_WITH_NAMESPACE})
     return()
 endif()
 
-set(_PACKAGE_DIR $${CMAKE_CURRENT_LIST_DIR}/PhysX/$$<IF:$$<BOOL:$${LY_MONOLITHIC_GAME}>,physx,pxshared>/)
+set(_PACKAGE_DIR $${CMAKE_CURRENT_LIST_DIR}/PhysX/$$<IF:$$<BOOL:$${LY_MONOLITHIC_GAME}>,static,shared>)
 
 set($${MY_NAME}_INCLUDE_DIR
     $${_PACKAGE_DIR}/include
@@ -22,8 +22,16 @@ set($${MY_NAME}_INCLUDE_DIR
 
 set($${MY_NAME}_COMPILE_DEFINITIONS $$<$$<BOOL:$${LY_MONOLITHIC_GAME}>:PX_PHYSX_STATIC_LIB>)
 
-set(PATH_TO_STATIC_LIBS $${_PACKAGE_DIR}/$$<IF:$$<CONFIG:debug>,debug/,$$<$$<CONFIG:profile>:profile/>>lib)
-set(PATH_TO_SHARED_LIBS $${_PACKAGE_DIR}/$$<IF:$$<CONFIG:debug>,debug/,$$<$$<CONFIG:profile>:profile/>>bin)
+# LY_PHYSX_PROFILE_USE_CHECKED_LIBS allows to override what PhysX configuration to use on O3DE profile.
+set(LY_PHYSX_PROFILE_USE_CHECKED_LIBS OFF CACHE BOOL "When ON it uses PhysX SDK checked libraries on O3DE profile configuration")
+if(LY_PHYSX_PROFILE_USE_CHECKED_LIBS)
+    set(PHYSX_PROFILE_CONFIG "checked")
+else()
+    set(PHYSX_PROFILE_CONFIG "profile")
+endif()
+
+set(PATH_TO_STATIC_LIBS $${_PACKAGE_DIR}/$$<IF:$$<CONFIG:debug>,debug,$$<$$<CONFIG:profile>:$${PHYSX_PROFILE_CONFIG}>>/lib)
+set(PATH_TO_SHARED_LIBS $${_PACKAGE_DIR}/$$<IF:$$<CONFIG:debug>,debug,$$<$$<CONFIG:profile>:$${PHYSX_PROFILE_CONFIG}>>/bin)
 if(DEFINED CMAKE_IMPORT_LIBRARY_SUFFIX)
     set(PATH_TO_IMPORT_LIBS $${PATH_TO_STATIC_LIBS})
     set(import_lib_prefix $${CMAKE_IMPORT_LIBRARY_PREFIX})

package-system/PhysX/FindPhysX_ios.cmake.template

@@ -12,7 +12,7 @@ if (TARGET $${TARGET_WITH_NAMESPACE})
     return()
 endif()
 
-set(_PACKAGE_DIR $${CMAKE_CURRENT_LIST_DIR}/PhysX/$$<IF:$$<BOOL:$${LY_MONOLITHIC_GAME}>,physx,pxshared>/)
+set(_PACKAGE_DIR $${CMAKE_CURRENT_LIST_DIR}/PhysX/$$<IF:$$<BOOL:$${LY_MONOLITHIC_GAME}>,static,shared>)
 
 set($${MY_NAME}_INCLUDE_DIR
     $${_PACKAGE_DIR}/include
@@ -22,14 +22,25 @@ set($${MY_NAME}_INCLUDE_DIR
 
 set($${MY_NAME}_COMPILE_DEFINITIONS $$<$$<BOOL:$${LY_MONOLITHIC_GAME}>:PX_PHYSX_STATIC_LIB>)
 
-set(PATH_TO_STATIC_LIBS $${_PACKAGE_DIR}/$$<IF:$$<CONFIG:debug>,debug,$$<$$<CONFIG:profile>:profile>>/lib)
-# Frameworks are added and managed by XCode during the build process.
-# At the moment $$<CONFIG> does not get replaced for "debug", "profile" or
-# "release" for frameworks when added to XCode, so it's not able to find
-# the frameworks since their path is wrong. To workaround this, for now it
-# will only use the release version of the library.
-set(PATH_TO_SHARED_LIBS $${_PACKAGE_DIR}/bin)
+# LY_PHYSX_PROFILE_USE_CHECKED_LIBS allows to override what PhysX configuration to use on O3DE profile.
+set(LY_PHYSX_PROFILE_USE_CHECKED_LIBS OFF CACHE BOOL "When ON it uses PhysX SDK checked libraries on O3DE profile configuration")
+if(LY_PHYSX_PROFILE_USE_CHECKED_LIBS)
+    set(PHYSX_PROFILE_CONFIG "checked")
+else()
+    set(PHYSX_PROFILE_CONFIG "profile")
+endif()
 
+if(LY_MONOLITHIC_GAME)
+    set(PATH_TO_STATIC_LIBS $${_PACKAGE_DIR}/$$<IF:$$<CONFIG:debug>,debug,$$<$$<CONFIG:profile>:$${PHYSX_PROFILE_CONFIG}>>/lib)
+else()
+    # Frameworks are added and managed by XCode during the build process.
+    # At the moment $$<CONFIG> does not get replaced for "debug", "profile" or
+    # "release" for frameworks when added to XCode, so it's not able to find
+    # the frameworks since their path is wrong. To workaround this, for now it
+    # will only use the release version of the library.
+    set(PATH_TO_STATIC_LIBS $${_PACKAGE_DIR}/lib)
+    set(PATH_TO_SHARED_LIBS $${_PACKAGE_DIR}/bin)
+endif()
 
 set($${MY_NAME}_LIBRARIES
     $${PATH_TO_STATIC_LIBS}/libPhysXCharacterKinematic_static_64.a

package-system/PhysX/build_package_image.py

@@ -40,13 +40,13 @@ def main():
 
     extraLibsPerPlatform = {
         'linux': {
-            'EXTRA_SHARED_LIBS': '${CMAKE_CURRENT_LIST_DIR}/PhysX/pxshared/$<IF:$<CONFIG:debug>,debug/,$<$<CONFIG:profile>:profile/>>bin/libPhysXGpu_64.so',
+            'EXTRA_SHARED_LIBS': '${PATH_TO_SHARED_LIBS}/libPhysXGpu_64.so',
             'EXTRA_STATIC_LIBS_NON_MONOLITHIC': '',
         },
         'windows': {
             'EXTRA_SHARED_LIBS': '\n'.join((
-                '${CMAKE_CURRENT_LIST_DIR}/PhysX/pxshared/$<IF:$<CONFIG:debug>,debug/,$<$<CONFIG:profile>:profile/>>bin/PhysXDevice64.dll'
-                '${CMAKE_CURRENT_LIST_DIR}/PhysX/pxshared/$<IF:$<CONFIG:debug>,debug/,$<$<CONFIG:profile>:profile/>>bin/PhysGpu_64.dll'
+                '${PATH_TO_SHARED_LIBS}/PhysXDevice64.dll',
+                '${PATH_TO_SHARED_LIBS}/PhysXGpu_64.dll'
             )),
             'EXTRA_STATIC_LIBS_NON_MONOLITHIC': '\n'.join((
                 '${PATH_TO_STATIC_LIBS}/LowLevel_static_64.lib',
@@ -91,9 +91,9 @@ def main():
             builder.build()
 
             if maybeStatic:
-                subdir = 'physx'
+                subdir = 'static'
             else:
-                subdir = 'pxshared'
+                subdir = 'shared'
             builder.copyBuildOutputTo(
                 outputDir,
                 extraFiles={
@@ -107,7 +107,7 @@ def main():
                 builder.writePackageInfoFile(
                     outputDir,
                     settings={
-                        'PackageName': f'PhysX-4.1.2.29882248-rev3-{args.platformName}',
+                        'PackageName': f'PhysX-4.1.2.29882248-rev4-{args.platformName}',
                         'URL': 'https://github.com/NVIDIAGameWorks/PhysX',
                         'License': 'BSD-3-Clause',
                         'LicenseFile': 'PhysX/LICENSE.md'

package_build_list_host_darwin.json

@@ -24,8 +24,8 @@
         "OpenSSL-1.1.1b-rev2-mac": "package-system/OpenSSL/build_package_image.py",
         "OpenSSL-1.1.1b-rev2-ios": "package-system/OpenSSL/build_package_image.py --platform ios",
         "ilmbase-2.3.0-rev4-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenEXR --platform-name Mac --package-root ../../package-system --clean",
-        "PhysX-4.1.2.29882248-rev3-mac": "package-system/PhysX/build_package_image.py --platform mac",
-        "PhysX-4.1.2.29882248-rev3-ios": "package-system/PhysX/build_package_image.py --platform ios",
+        "PhysX-4.1.2.29882248-rev4-mac": "package-system/PhysX/build_package_image.py --platform mac",
+        "PhysX-4.1.2.29882248-rev4-ios": "package-system/PhysX/build_package_image.py --platform ios",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-mac": "package-system/NvCloth/build_package_image.py --platform-name mac",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-ios": "package-system/NvCloth/build_package_image.py --platform-name ios",
         "poly2tri-7f0487a-rev1-mac": "package-system/poly2tri/build_package_image.py --platform-name mac",
@@ -72,8 +72,8 @@
         "tiff-4.2.0.15-rev3-ios": "package-system/tiff-ios",
         "python-3.7.10-rev1-darwin": "package-system/python/darwin_x64/package",
         "asn1-0.9.27-rev2-ios": "package-system/asn1-ios",
-        "PhysX-4.1.2.29882248-rev3-mac": "package-system/PhysX-mac",
-        "PhysX-4.1.2.29882248-rev3-ios": "package-system/PhysX-ios",
+        "PhysX-4.1.2.29882248-rev4-mac": "package-system/PhysX-mac",
+        "PhysX-4.1.2.29882248-rev4-ios": "package-system/PhysX-ios",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-mac": "package-system/NvCloth-mac",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-ios": "package-system/NvCloth-ios",
         "mikkelsen-1.0.0.4-mac": "package-system/mikkelsen-mac",

package_build_list_host_linux.json

@@ -17,7 +17,7 @@
         "OpenMesh-8.1-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenMesh --platform-name Linux --package-root ../../package-system --clean",
         "OpenSSL-1.1.1b-rev2-linux": "package-system/OpenSSL/build_package_image.py",
         "ilmbase-2.3.0-rev4-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenEXR --platform-name Linux --package-root ../../package-system --clean",
-        "PhysX-4.1.2.29882248-rev3-linux": "package-system/PhysX/build_package_image.py --platform-name linux",
+        "PhysX-4.1.2.29882248-rev4-linux": "package-system/PhysX/build_package_image.py --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",
@@ -55,7 +55,7 @@
         "azslc-1.7.34-rev1-linux": "package-system/azslc-linux",
         "tiff-4.2.0.15-rev3-linux": "package-system/tiff-linux",
         "python-3.7.10-rev2-linux": "package-system/python/linux_x64/package",
-        "PhysX-4.1.2.29882248-rev3-linux": "package-system/PhysX-linux",
+        "PhysX-4.1.2.29882248-rev4-linux": "package-system/PhysX-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",

package_build_list_host_windows.json

@@ -33,8 +33,8 @@
         "astc-encoder-3.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Windows --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Windows --package-root ../../package-system --clean",
         "azslc-1.7.34-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Windows --package-root ../../package-system --clean",
-        "PhysX-4.1.2.29882248-rev3-windows": "package-system/PhysX/build_package_image.py --platform windows",
-        "PhysX-4.1.2.29882248-rev3-android": "package-system/PhysX/build_package_image.py --platform android",
+        "PhysX-4.1.2.29882248-rev4-windows": "package-system/PhysX/build_package_image.py --platform windows",
+        "PhysX-4.1.2.29882248-rev4-android": "package-system/PhysX/build_package_image.py --platform android",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-windows": "package-system/NvCloth/build_package_image.py --platform-name windows",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-android": "package-system/NvCloth/build_package_image.py --platform-name android",
         "poly2tri-7f0487a-rev1-windows": "package-system/poly2tri/build_package_image.py --platform-name windows",
@@ -84,8 +84,8 @@
     "md5-2.0-multiplatform": "package-system/md5-multiplatform",
     "RapidJSON-1.1.0-multiplatform": "package-system/RapidJSON-multiplatform",
     "RapidXML-1.13-multiplatform": "package-system/RapidXML-multiplatform",
-    "PhysX-4.1.2.29882248-rev3-windows" : "package-system/PhysX-windows",
-    "PhysX-4.1.2.29882248-rev3-android" : "package-system/PhysX-android",
+    "PhysX-4.1.2.29882248-rev4-windows" : "package-system/PhysX-windows",
+    "PhysX-4.1.2.29882248-rev4-android" : "package-system/PhysX-android",
     "NvCloth-v1.1.6-4-gd243404-pr58-rev1-windows": "package-system/NvCloth-windows",
     "NvCloth-v1.1.6-4-gd243404-pr58-rev1-android": "package-system/NvCloth-android",
     "mikkelsen-1.0.0.4-windows": "package-system/mikkelsen-windows",