TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: Fix version checks for macOS 11.0 Big Sur

Browse Source 
Fixes #1056
This commit is contained in:
rdb 2020-11-25 01:17:43 +01:00
parent 61a089ad59
commit aace94a521
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makepanda/makepackage.py
View File

@ -167,8 +167,8 @@ deps: {DEPENDS}
MACOS_SCRIPT_PREFIX = \ MACOS_SCRIPT_PREFIX = \
"""#!/bin/bash """#!/bin/bash
IFS=. IFS=.
read -a version_info <<< "`sw_vers -productVersion`'" read -a version_info <<< "`sw_vers -productVersion`"
if (( ${version_info[1]} < 15 )); then if (( ${version_info[0]} == 10 && ${version_info[1]} < 15 )); then
""" """
MACOS_SCRIPT_POSTFIX = \ MACOS_SCRIPT_POSTFIX = \

9
makepanda/makepanda.py
View File

@ -294,7 +294,7 @@ def parseopts(args):
try: try:
maj, min = OSXTARGET.strip().split('.') maj, min = OSXTARGET.strip().split('.')
OSXTARGET = int(maj), int(min) OSXTARGET = int(maj), int(min)
assert OSXTARGET[0] == 10 assert OSXTARGET[0] >= 10
except: except:
usage("Invalid setting for OSXTARGET") usage("Invalid setting for OSXTARGET")
else: else:
@ -313,10 +313,10 @@ 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[1] < 15: if osxver[0] == 10 and osxver[1] < 15:
OSX_ARCHS.append("i386") OSX_ARCHS.append("i386")
if osxver[1] < 6: if osxver[0] == 10 and osxver[1] < 6:
OSX_ARCHS.append("ppc") OSX_ARCHS.append("ppc")
else: else:
OSX_ARCHS.append("x86_64") OSX_ARCHS.append("x86_64")
@ -2645,9 +2645,6 @@ def WriteConfigSettings():
dtool_config["HAVE_VIDEO4LINUX"] = 'UNDEF' dtool_config["HAVE_VIDEO4LINUX"] = 'UNDEF'
dtool_config["PHAVE_LINUX_INPUT_H"] = 'UNDEF' dtool_config["PHAVE_LINUX_INPUT_H"] = 'UNDEF'
dtool_config["IS_OSX"] = '1' dtool_config["IS_OSX"] = '1'
# 10.4 had a broken ucontext implementation
if int(platform.mac_ver()[0][3]) <= 4:
dtool_config["PHAVE_UCONTEXT_H"] = 'UNDEF'
if (GetTarget() == "freebsd"): if (GetTarget() == "freebsd"):
dtool_config["IS_LINUX"] = 'UNDEF' dtool_config["IS_LINUX"] = 'UNDEF'