diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index f62ffda6b2..884b79733a 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -2044,6 +2044,8 @@ def CompileRsrc(target, src, opts): ipath = GetListOption(opts, "DIR:") if os.path.isfile("/usr/bin/Rez"): cmd = "Rez -useDF" + elif os.path.isfile("/Library/Developer/CommandLineTools/usr/bin/Rez"): + cmd = "/Library/Developer/CommandLineTools/usr/bin/Rez -useDF" else: cmd = "/Developer/Tools/Rez -useDF" cmd += " -o " + BracketNameWithQuotes(target) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 18be690671..d450926df4 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -2383,7 +2383,9 @@ def SdkLocateMacOSX(osxtarget = None): if (GetHost() != "darwin"): return if (osxtarget != None): 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 elif (os.path.exists("/Developer/SDKs/%s.sdk" % sdkname)): SDK["MACOSX"] = "/Developer/SDKs/%s.sdk" % sdkname