From c1a6111753e7d8c0fef590dcd11b98684ca255e2 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 29 Oct 2009 13:49:44 +0000 Subject: [PATCH] More OSX universal binary and crosscompilation stuff. Added -mmacosx-version-min --- makepanda/makepanda.py | 8 ++++++-- makepanda/makepandacore.py | 11 +---------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 99c049d397..fc9050e52e 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -596,7 +596,9 @@ def CompileCxx(obj,src,opts): if (opt=="ALWAYS") or (opts.count(opt)): cmd += ' -D' + var + '=' + val for x in ipath: cmd += ' -I' + x if (sys.platform == "darwin"): - cmd += " -isysroot " + SDK["MACOSX"] + if (OSXTARGET != None): + cmd += " -isysroot " + SDK["MACOSX"] + cmd += " -mmacosx-version-min=" + OSXTARGET if (not RTDIST and int(platform.mac_ver()[0][3]) >= 6): cmd += " -arch x86_64 -arch i386" elif (not RTDIST): @@ -836,7 +838,9 @@ def CompileLink(dll, obj, opts): if (not sys.platform.startswith("freebsd")): cmd += " -ldl" if (sys.platform == "darwin"): - cmd += " -isysroot " + SDK["MACOSX"] + " -Wl,-syslibroot," + SDK["MACOSX"] + if (OSXTARGET != None): + cmd += " -isysroot " + SDK["MACOSX"] + " -Wl,-syslibroot," + SDK["MACOSX"] + cmd += " -mmacosx-version-min=" + OSXTARGET if (not RTDIST and int(platform.mac_ver()[0][3]) >= 6): cmd += " -arch x86_64 -arch i386" elif (not RTDIST): diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index e73e61bd45..3b0cd15f6d 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -1296,16 +1296,7 @@ def SdkLocateMacOSX(osxtarget=None): else: exit("Couldn't find any MacOSX SDK for OSX version %s!" % osxtarget) else: - if (os.path.exists("/Developer/SDKs/MacOSX10.6.sdk")): - SDK["MACOSX"] = "/Developer/SDKs/MacOSX10.6.sdk" - elif (os.path.exists("/Developer/SDKs/MacOSX10.5.sdk")): - SDK["MACOSX"] = "/Developer/SDKs/MacOSX10.5.sdk" - elif (os.path.exists("/Developer/SDKs/MacOSX10.4u.sdk")): - SDK["MACOSX"] = "/Developer/SDKs/MacOSX10.4u.sdk" - elif (os.path.exists("/Developer/SDKs/MacOSX10.4.0.sdk")): - SDK["MACOSX"] = "/Developer/SDKs/MacOSX10.4.0.sdk" - else: - exit("Could not find any MacOSX SDK") + SDK["MACOSX"] = "" ######################################################################## ##