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

makepanda: update CommandLineTools paths for newer XCode versions

Browse Source
This commit is contained in:
rdb 2019-12-18 08:42:43 -05:00
parent 4c62260291
commit 0456fdcd92
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/makepanda.py
View File

@ -2044,6 +2044,8 @@ def CompileRsrc(target, src, opts):
ipath = GetListOption(opts, "DIR:") ipath = GetListOption(opts, "DIR:")
if os.path.isfile("/usr/bin/Rez"): if os.path.isfile("/usr/bin/Rez"):
cmd = "Rez -useDF" cmd = "Rez -useDF"
elif os.path.isfile("/Library/Developer/CommandLineTools/usr/bin/Rez"):
cmd = "/Library/Developer/CommandLineTools/usr/bin/Rez -useDF"
else: else:
cmd = "/Developer/Tools/Rez -useDF" cmd = "/Developer/Tools/Rez -useDF"
cmd += " -o " + BracketNameWithQuotes(target) cmd += " -o " + BracketNameWithQuotes(target)

4
makepanda/makepandacore.py
View File

@ -2383,7 +2383,9 @@ def SdkLocateMacOSX(osxtarget = None):
if (GetHost() != "darwin"): return if (GetHost() != "darwin"): return
if (osxtarget != None): if (osxtarget != None):
sdkname = "MacOSX%d.%d" % osxtarget sdkname = "MacOSX%d.%d" % osxtarget
if (os.path.exists("/Developer/SDKs/%su.sdk" % sdkname)): if (os.path.exists("/Library/Developer/CommandLineTools/SDKs/%s.sdk" % sdkname)):
SDK["MACOSX"] = "/Library/Developer/CommandLineTools/SDKs/%s.sdk" % sdkname
elif (os.path.exists("/Developer/SDKs/%su.sdk" % sdkname)):
SDK["MACOSX"] = "/Developer/SDKs/%su.sdk" % sdkname SDK["MACOSX"] = "/Developer/SDKs/%su.sdk" % sdkname
elif (os.path.exists("/Developer/SDKs/%s.sdk" % sdkname)): elif (os.path.exists("/Developer/SDKs/%s.sdk" % sdkname)):
SDK["MACOSX"] = "/Developer/SDKs/%s.sdk" % sdkname SDK["MACOSX"] = "/Developer/SDKs/%s.sdk" % sdkname