mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-02 01:44:06 -04:00
More OSX universal binary and crosscompilation stuff. Added -mmacosx-version-min
This commit is contained in:
parent
86aa00e1b9
commit
c1a6111753
@ -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):
|
||||
|
@ -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"] = ""
|
||||
|
||||
########################################################################
|
||||
##
|
||||
|
Loading…
x
Reference in New Issue
Block a user