TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: Rename aarch64 thirdparty dir to arm64 for consistency

Browse Source
This commit is contained in:
rdb 2021-03-21 15:50:00 +01:00
parent 2531f09024
commit 1654860f36
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
makepanda/makepandacore.py
View File

@ -1338,22 +1338,22 @@ def GetThirdpartyDir():
THIRDPARTYDIR = base + "/darwin-libs-a/" THIRDPARTYDIR = base + "/darwin-libs-a/"
elif (target == 'linux'): elif (target == 'linux'):
if (target_arch.startswith("arm")): if target_arch in ("aarch64", "arm64"):
THIRDPARTYDIR = base + "/linux-libs-arm64/"
elif target_arch.startswith("arm"):
THIRDPARTYDIR = base + "/linux-libs-arm/" THIRDPARTYDIR = base + "/linux-libs-arm/"
elif (target_arch in ("x86_64", "amd64")): elif (target_arch in ("x86_64", "amd64")):
THIRDPARTYDIR = base + "/linux-libs-x64/" THIRDPARTYDIR = base + "/linux-libs-x64/"
elif target_arch == "aarch64":
THIRDPARTYDIR = base + "/linux-libs-aarch64/"
else: else:
THIRDPARTYDIR = base + "/linux-libs-a/" THIRDPARTYDIR = base + "/linux-libs-a/"
elif (target == 'freebsd'): elif (target == 'freebsd'):
if (target_arch.startswith("arm")): if target_arch in ("aarch64", "arm64"):
THIRDPARTYDIR = base + "/freebsd-libs-arm64/"
elif target_arch.startswith("arm"):
THIRDPARTYDIR = base + "/freebsd-libs-arm/" THIRDPARTYDIR = base + "/freebsd-libs-arm/"
elif (target_arch in ("x86_64", "amd64")): elif (target_arch in ("x86_64", "amd64")):
THIRDPARTYDIR = base + "/freebsd-libs-x64/" THIRDPARTYDIR = base + "/freebsd-libs-x64/"
elif target_arch == "aarch64":
THIRDPARTYDIR = base + "/freebsd-libs-aarch64/"
else: else:
THIRDPARTYDIR = base + "/freebsd-libs-a/" THIRDPARTYDIR = base + "/freebsd-libs-a/"