Przeglądaj źródła

Fix some OSX build issues

rdb 16 lat temu
rodzic
commit
5c96de62f3
2 zmienionych plików z 3 dodań i 3 usunięć
  1. 2 2
      makepanda/makepanda.py
  2. 1 1
      makepanda/makepandacore.py

+ 2 - 2
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:

+ 1 - 1
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!")