Skip to content

Commit 8ed58df

Browse files
rossbridgerrossbridger
committed
Upgrade PhysX5 to 5.5.0 on windows/linux platform.
Signed-off-by: Ross Charles Campbell <[email protected]>
1 parent c28365b commit 8ed58df

File tree

6 files changed

+17
-10
lines changed

6 files changed

+17
-10
lines changed

‎package-system/PhysX5/FindPhysX5.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ set(IMPORTED_PHYSICS_LIBS_SUFFIX
5252
PhysX_static_64
5353
PhysXPvdSDK_static_64
5454
PhysXVehicle_static_64
55+
PhysXVehicle2_static_64
5556
PhysXCharacterKinematic_static_64
5657
PhysXExtensions_static_64
5758
PhysXCooking_static_64

‎package-system/PhysX5/FindPhysX5_ios.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ set(PATH_TO_LIBS ${_PACKAGE_DIR}/bin/static/$<IF:$<CONFIG:profile>,${PHYSX_PROFI
3535
set(${MY_NAME}_LIBRARIES
3636
${PATH_TO_LIBS}/libPhysXCharacterKinematic_static_64.a
3737
${PATH_TO_LIBS}/libPhysXVehicle_static_64.a
38+
${PATH_TO_LIBS}/libPhysXVehicle2_static_64.a
3839
${PATH_TO_LIBS}/libPhysXExtensions_static_64.a
3940
${PATH_TO_LIBS}/libPhysXPvdSDK_static_64.a
4041
${PATH_TO_LIBS}/libPhysX_static_64.a

‎package-system/PhysX5/build_package_image.py‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ def __init__(self, workingDir: pathlib.Path, basePackageSystemDir: pathlib.Path,
3131
self._env = dict(os.environ)
3232
self._env.update(
3333
GW_DEPS_ROOT=str(workingDir),
34+
PM_PACKAGES_ROOT=str(workingDir / 'packman-repo'),
3435
)
3536

3637
self.check_call = functools.partial(subprocess.check_call,
@@ -42,9 +43,9 @@ def __init__(self, workingDir: pathlib.Path, basePackageSystemDir: pathlib.Path,
4243
# bin folder names yet, so they appear as UNKNOWN.
4344
self.platform_params = {
4445
# system-name : (build preset, bin folder name, install folder name, is multiconfig)
45-
'windows' : ('vc16win64', 'win.x86_64.vc142.md', 'vc16win64', True),
46-
'linux' : ('linux', 'linux.clang', 'linux', False),
47-
'linux-aarch64' : ('linux-aarch64', 'linux.aarch64', 'linux-aarch64', False),
46+
'windows' : ('vc17win64', 'win.x86_64.vc143.md', 'vc17win64', True),
47+
'linux' : ('linux-gcc', 'linux.x86_64', 'linux', False),
48+
'linux-aarch64' : ('linux-aarch64-gcc', 'linux.aarch64', 'linux-aarch64', False),
4849
'mac' : ('mac64', 'mac.x86_64', 'mac64', True),
4950
'ios' : ('ios64', 'UNKNOWN', 'ios64', True),
5051
'android' : ('android-arm64-v8a', 'UNKNOWN', "android-29", False)
@@ -174,6 +175,10 @@ def build(self, buildAsStaticLibs):
174175
if self._hostPlatformLower == 'windows':
175176
update_pacman_call = [ str(packman_dir / 'packman.cmd'), 'update', '-y']
176177
else:
178+
# Make sure packman has the executable permission
179+
self.check_call(
180+
['chmod', '+x', str(packman_dir / 'packman')]
181+
)
177182
update_pacman_call = [ str(packman_dir / 'packman'), 'update', '-y']
178183

179184
check_call_packman_update(update_pacman_call)
@@ -368,7 +373,7 @@ def main():
368373
elif args.platformName == 'android':
369374
commit = '8ac3e3601d1333ae2a967995f49b338d4e188215' # Commit of PR 40 on top of 5.1.1 version
370375
else:
371-
commit = '0bbcff3d0c541325f4d14c36ee18f24e22e35e6e' # Commit for 5.1.1 version
376+
commit = 'dd587fedd79836442a4117164ea8c46685453c34' # Commit for 5.5.0 version
372377

373378
tempdir = Path(tempdir)
374379
builder = PhysXBuilder(workingDir=tempdir,

‎package_build_list_host_linux-aarch64.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"OpenSSL-1.1.1t-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenSSL --platform-name Linux-aarch64 --clean",
3030
"OpenXR-1.0.22-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenXR --platform-name Linux-aarch64 --clean",
3131
"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",
32-
"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",
32+
"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",
3333
"png-1.6.37-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Linux-aarch64 --clean",
3434
"poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri/build_package_image.py --platform-name linux-aarch64",
3535
"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",
@@ -70,7 +70,7 @@
7070
"OpenSSL-1.1.1t-rev1-linux-aarch64": "package-system/OpenSSL/temp/OpenSSL-linux-aarch64",
7171
"OpenXR-1.0.22-rev2-linux-aarch64": "package-system/OpenXR/temp/OpenXR-linux-aarch64",
7272
"PhysX-4.1.2.29882248-rev8-linux-aarch64": "package-system/PhysX-linux-aarch64",
73-
"PhysX-5.1.1-rev4-linux-aarch64": "package-system/PhysX5/temp/PhysX5-linux-aarch64",
73+
"PhysX-5.5.0-rev1-linux-aarch64": "package-system/PhysX5/temp/PhysX5-linux-aarch64",
7474
"png-1.6.37-rev2-linux-aarch64": "package-system/libpng/temp/png-linux-aarch64",
7575
"poly2tri-7f0487a-rev1-linux-aarch64": "package-system/poly2tri-linux-aarch64",
7676
"pyside2-5.15.2.1-py3.10-rev7-linux-aarch64": "package-system/pyside2/temp/pyside2-linux-aarch64",

‎package_build_list_host_linux.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"OpenSSL-1.1.1t-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenSSL --platform-name Linux --clean",
3030
"OpenSSL-1.1.1t-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenSSL --platform-name Linux-aarch64 --clean",
3131
"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",
32-
"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",
32+
"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",
3333
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux": "package-system/NvCloth/build_package_image.py --platform-name linux",
3434
"poly2tri-7f0487a-rev1-linux": "package-system/poly2tri/build_package_image.py --platform-name linux",
3535
"v-hacd-2.3-1a49edf-rev1-linux": "package-system/v-hacd/build_package_image.py --platform-name linux",
@@ -89,7 +89,7 @@
8989
"python-3.10.13-rev2-linux": "package-system/python/temp/python-linux",
9090
"python-3.10.13-rev2-linux-aarch64": "package-system/python/temp/python-linux-aarch64",
9191
"PhysX-4.1.2.29882248-rev8-linux": "package-system/PhysX-linux",
92-
"PhysX-5.1.1-rev4-linux": "package-system/PhysX5/temp/PhysX5-linux",
92+
"PhysX-5.5.0-rev1-linux": "package-system/PhysX5/temp/PhysX5-linux",
9393
"NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux": "package-system/NvCloth-linux",
9494
"mikkelsen-1.0.0.4-linux": "package-system/mikkelsen-linux",
9595
"poly2tri-7f0487a-rev1-linux": "package-system/poly2tri-linux",

‎package_build_list_host_windows.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"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",
4545
"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",
4646
"PhysX-5.1.1-rev4-android": "package-system/PhysX5/build_package_image.py --package-name PhysX-5.1.1 --package-rev rev4 --platform android",
47-
"PhysX-5.1.1-rev4-windows": "package-system/PhysX5/build_package_image.py --package-name PhysX-5.1.1 --package-rev rev4 --platform windows",
47+
"PhysX-5.5.0-rev1-windows": "package-system/PhysX5/build_package_image.py --package-name PhysX-5.5.0 --package-rev rev1 --platform windows",
4848
"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",
4949
"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",
5050
"poly2tri-7f0487a-rev1-windows": "package-system/poly2tri/build_package_image.py --platform-name windows",
@@ -113,7 +113,7 @@
113113
"PhysX-4.1.2.29882248-rev8-android": "package-system/PhysX-android",
114114
"PhysX-4.1.2.29882248-rev8-windows": "package-system/PhysX-windows",
115115
"PhysX-5.1.1-rev4-android": "package-system/PhysX5/temp/PhysX5-android",
116-
"PhysX-5.1.1-rev4-windows": "package-system/PhysX5/temp/PhysX5-windows",
116+
"PhysX-5.5.0-rev1-windows": "package-system/PhysX5/temp/PhysX5-windows",
117117
"png-1.6.37-rev2-android": "package-system/libpng/temp/png-android",
118118
"png-1.6.37-rev2-windows": "package-system/libpng/temp/png-windows",
119119
"poly2tri-7f0487a-rev1-windows": "package-system/poly2tri-windows",

0 commit comments

Comments
 (0)