diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index cf28a6d1d2..76e67f932c 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -808,8 +808,8 @@ def CompileLink(dll, obj, opts): base = os.path.basename(x) if (base[-3:]==".so") and (base[:3]=="lib"): cmd += ' -l' + base[3:-3] - elif (base[-2:]==".a") and (base[:3]=="lib"): - cmd += ' -l' + base[3:-2] + elif (base[-2:]==".a") and (base[:3]=="lib") and (sys.platform != "darwin"): + cmd += ' -l:lib' + base[3:] else: cmd += ' ' + x for (opt, dir) in LIBDIRECTORIES: diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index dffe0b9fcf..e130651b16 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -910,7 +910,7 @@ def SdkLocatePython(): pv = os.readlink("%s/System/Library/Frameworks/Python.framework/Versions/Current" % SDK["MACOSX"]) SDK["PYTHON"] = SDK["MACOSX"] + "/System/Library/Frameworks/Python.framework/Headers" SDK["PYTHONVERSION"] = "python " +pv - SDK["PYTHONEXEC"] = SDK["MACOSX"] + "/System/Library/Frameworks/Python.framework/Versions/Current/bin/python" + SDK["PYTHONEXEC"] = "/System/Library/Frameworks/Python.framework/Versions/Current/bin/python" else: exit("Could not find the python framework!")