mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-02 09:52:27 -04:00
Fix some OSX build issues
This commit is contained in:
parent
4804133efa
commit
5c96de62f3
@ -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:
|
||||
|
@ -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!")
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user