TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 07:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: recognize --osxtarget 11, --universal should add arm64

Browse Source
This commit is contained in:
rdb 2020-12-15 12:32:40 +01:00
parent 8883bf9bdd
commit 10ef9b3456
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
makepanda/makepanda.py
View File

@ -291,12 +291,17 @@ def parseopts(args):
elif (optimize==""): optimize = "3" elif (optimize==""): optimize = "3"
if OSXTARGET: if OSXTARGET:
parts = OSXTARGET.strip().split('.')
try: try:
maj, min = OSXTARGET.strip().split('.') assert len(parts) <= 2
OSXTARGET = int(maj), int(min) maj = int(parts[0])
assert OSXTARGET[0] >= 10 min = 0
if len(parts) > 1:
min = int(parts[1])
OSXTARGET = maj, min
assert OSXTARGET >= (10, 4)
except: except:
usage("Invalid setting for OSXTARGET") usage("Invalid setting for --osxtarget")
else: else:
OSXTARGET = None OSXTARGET = None
@ -313,14 +318,17 @@ def parseopts(args):
maj, min = platform.mac_ver()[0].split('.')[:2] maj, min = platform.mac_ver()[0].split('.')[:2]
osxver = int(maj), int(min) osxver = int(maj), int(min)
if osxver[0] == 10 and osxver[1] < 15: if osxver < (10, 15):
OSX_ARCHS.append("i386") OSX_ARCHS.append("i386")
if osxver[0] == 10 and osxver[1] < 6: if osxver < (10, 6):
OSX_ARCHS.append("ppc") OSX_ARCHS.append("ppc")
else: else:
OSX_ARCHS.append("x86_64") OSX_ARCHS.append("x86_64")
if osxver >= (11, 0):
OSX_ARCHS.append("arm64")
elif HasTargetArch(): elif HasTargetArch():
OSX_ARCHS.append(GetTargetArch()) OSX_ARCHS.append(GetTargetArch())