Skip to content

Commit bbee8bd

Browse files
authored
Fix PhysX find cmake file to avoid pointing to 'static/bin' folder, which doesn't exist. (#71)
This fixes O3DE when building monolithically. Signed-off-by: moraaar <moraaar@amazon.com>
1 parent 2ee9b00 commit bbee8bd

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

package-system/PhysX/FindPhysX.cmake.template

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ if (TARGET $${TARGET_WITH_NAMESPACE})
1313
endif()
1414

1515
set(_PACKAGE_DIR $${CMAKE_CURRENT_LIST_DIR}/PhysX/$$<IF:$$<BOOL:$${LY_MONOLITHIC_GAME}>,static,shared>)
16+
set(_PACKAGE_DIR_SHARED $${CMAKE_CURRENT_LIST_DIR}/PhysX/shared)
1617

1718
set($${MY_NAME}_INCLUDE_DIR
1819
$${_PACKAGE_DIR}/include
@@ -31,7 +32,8 @@ else()
3132
endif()
3233

3334
set(PATH_TO_STATIC_LIBS $${_PACKAGE_DIR}/$$<IF:$$<CONFIG:debug>,debug,$$<$$<CONFIG:profile>:$${PHYSX_PROFILE_CONFIG}>>/lib)
34-
set(PATH_TO_SHARED_LIBS $${_PACKAGE_DIR}/$$<IF:$$<CONFIG:debug>,debug,$$<$$<CONFIG:profile>:$${PHYSX_PROFILE_CONFIG}>>/bin)
35+
set(PATH_TO_SHARED_LIBS $${_PACKAGE_DIR_SHARED}/$$<IF:$$<CONFIG:debug>,debug,$$<$$<CONFIG:profile>:$${PHYSX_PROFILE_CONFIG}>>/bin)
36+
3537
if(DEFINED CMAKE_IMPORT_LIBRARY_SUFFIX)
3638
set(PATH_TO_IMPORT_LIBS $${PATH_TO_STATIC_LIBS})
3739
set(import_lib_prefix $${CMAKE_IMPORT_LIBRARY_PREFIX})

package-system/PhysX/build_package_image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def main():
107107
builder.writePackageInfoFile(
108108
outputDir,
109109
settings={
110-
'PackageName': f'PhysX-4.1.2.29882248-rev4-{args.platformName}',
110+
'PackageName': f'PhysX-4.1.2.29882248-rev5-{args.platformName}',
111111
'URL': 'https://github.com/NVIDIAGameWorks/PhysX',
112112
'License': 'BSD-3-Clause',
113113
'LicenseFile': 'PhysX/LICENSE.md'

package_build_list_host_darwin.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"OpenSSL-1.1.1b-rev2-mac": "package-system/OpenSSL/build_package_image.py",
2525
"OpenSSL-1.1.1b-rev2-ios": "package-system/OpenSSL/build_package_image.py --platform ios",
2626
"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",
27-
"PhysX-4.1.2.29882248-rev4-mac": "package-system/PhysX/build_package_image.py --platform mac",
28-
"PhysX-4.1.2.29882248-rev4-ios": "package-system/PhysX/build_package_image.py --platform ios",
27+
"PhysX-4.1.2.29882248-rev5-mac": "package-system/PhysX/build_package_image.py --platform mac",
28+
"PhysX-4.1.2.29882248-rev5-ios": "package-system/PhysX/build_package_image.py --platform ios",
2929
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-mac": "package-system/NvCloth/build_package_image.py --platform-name mac",
3030
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-ios": "package-system/NvCloth/build_package_image.py --platform-name ios",
3131
"poly2tri-7f0487a-rev1-mac": "package-system/poly2tri/build_package_image.py --platform-name mac",
@@ -72,8 +72,8 @@
7272
"tiff-4.2.0.15-rev3-ios": "package-system/tiff-ios",
7373
"python-3.7.10-rev1-darwin": "package-system/python/darwin_x64/package",
7474
"asn1-0.9.27-rev2-ios": "package-system/asn1-ios",
75-
"PhysX-4.1.2.29882248-rev4-mac": "package-system/PhysX-mac",
76-
"PhysX-4.1.2.29882248-rev4-ios": "package-system/PhysX-ios",
75+
"PhysX-4.1.2.29882248-rev5-mac": "package-system/PhysX-mac",
76+
"PhysX-4.1.2.29882248-rev5-ios": "package-system/PhysX-ios",
7777
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-mac": "package-system/NvCloth-mac",
7878
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-ios": "package-system/NvCloth-ios",
7979
"mikkelsen-1.0.0.4-mac": "package-system/mikkelsen-mac",

package_build_list_host_linux.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"OpenSSL-1.1.1b-rev2-linux": "package-system/OpenSSL/build_package_image.py",
1919
"pyside2-5.15.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/pyside2-qt --platform-name Linux --package-root ../../package-system --clean",
2020
"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",
21-
"PhysX-4.1.2.29882248-rev4-linux": "package-system/PhysX/build_package_image.py --platform-name linux",
21+
"PhysX-4.1.2.29882248-rev5-linux": "package-system/PhysX/build_package_image.py --platform-name linux",
2222
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux": "package-system/NvCloth/build_package_image.py --platform-name linux",
2323
"poly2tri-7f0487a-rev1-linux": "package-system/poly2tri/build_package_image.py --platform-name linux",
2424
"v-hacd-2.3-1a49edf-rev1-linux": "package-system/v-hacd/build_package_image.py --platform-name linux",
@@ -57,7 +57,7 @@
5757
"azslc-1.7.34-rev1-linux": "package-system/azslc-linux",
5858
"tiff-4.2.0.15-rev3-linux": "package-system/tiff-linux",
5959
"python-3.7.10-rev2-linux": "package-system/python/linux_x64/package",
60-
"PhysX-4.1.2.29882248-rev4-linux": "package-system/PhysX-linux",
60+
"PhysX-4.1.2.29882248-rev5-linux": "package-system/PhysX-linux",
6161
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux": "package-system/NvCloth-linux",
6262
"mikkelsen-1.0.0.4-linux": "package-system/mikkelsen-linux",
6363
"poly2tri-7f0487a-rev1-linux": "package-system/poly2tri-linux",

package_build_list_host_windows.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"astc-encoder-3.2-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Windows --package-root ../../package-system --clean",
3434
"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",
3535
"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",
36-
"PhysX-4.1.2.29882248-rev4-windows": "package-system/PhysX/build_package_image.py --platform windows",
37-
"PhysX-4.1.2.29882248-rev4-android": "package-system/PhysX/build_package_image.py --platform android",
36+
"PhysX-4.1.2.29882248-rev5-windows": "package-system/PhysX/build_package_image.py --platform windows",
37+
"PhysX-4.1.2.29882248-rev5-android": "package-system/PhysX/build_package_image.py --platform android",
3838
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-windows": "package-system/NvCloth/build_package_image.py --platform-name windows",
3939
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-android": "package-system/NvCloth/build_package_image.py --platform-name android",
4040
"poly2tri-7f0487a-rev1-windows": "package-system/poly2tri/build_package_image.py --platform-name windows",
@@ -85,8 +85,8 @@
8585
"md5-2.0-multiplatform": "package-system/md5-multiplatform",
8686
"RapidJSON-1.1.0-multiplatform": "package-system/RapidJSON-multiplatform",
8787
"RapidXML-1.13-multiplatform": "package-system/RapidXML-multiplatform",
88-
"PhysX-4.1.2.29882248-rev4-windows" : "package-system/PhysX-windows",
89-
"PhysX-4.1.2.29882248-rev4-android" : "package-system/PhysX-android",
88+
"PhysX-4.1.2.29882248-rev5-windows" : "package-system/PhysX-windows",
89+
"PhysX-4.1.2.29882248-rev5-android" : "package-system/PhysX-android",
9090
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-windows": "package-system/NvCloth-windows",
9191
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-android": "package-system/NvCloth-android",
9292
"mikkelsen-1.0.0.4-windows": "package-system/mikkelsen-windows",

0 commit comments

Comments
 (0)