mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 02:42:49 -04:00
Fix cross-compilation on OSX Leopard
This commit is contained in:
parent
44f1ad47ec
commit
788541d38b
@ -583,7 +583,7 @@ def CompileCxx(obj,src,opts):
|
|||||||
for x in ipath: cmd += ' -I' + x
|
for x in ipath: cmd += ' -I' + x
|
||||||
if (sys.platform == "darwin" and not RTDIST):
|
if (sys.platform == "darwin" and not RTDIST):
|
||||||
if (int(platform.mac_ver()[0][3]) >= 6):
|
if (int(platform.mac_ver()[0][3]) >= 6):
|
||||||
cmd += " -isysroot " + SDK["MACOSX"] + " -arch x86_64"
|
cmd += " -isysroot " + SDK["MACOSX"] + " -arch x86_64 -arch i386"
|
||||||
else:
|
else:
|
||||||
cmd += " -isysroot " + SDK["MACOSX"] + " -arch i386"
|
cmd += " -isysroot " + SDK["MACOSX"] + " -arch i386"
|
||||||
if ("NOPPC" not in opts): cmd += " -arch ppc"
|
if ("NOPPC" not in opts): cmd += " -arch ppc"
|
||||||
@ -821,7 +821,11 @@ def CompileLink(dll, obj, opts):
|
|||||||
if (not sys.platform.startswith("freebsd")):
|
if (not sys.platform.startswith("freebsd")):
|
||||||
cmd += " -ldl"
|
cmd += " -ldl"
|
||||||
if (sys.platform == "darwin" and not RTDIST):
|
if (sys.platform == "darwin" and not RTDIST):
|
||||||
cmd += " -isysroot " + SDK["MACOSX"] + " -Wl,-syslibroot," + SDK["MACOSX"] + " -arch i386"
|
cmd += " -isysroot " + SDK["MACOSX"] + " -Wl,-syslibroot," + SDK["MACOSX"]
|
||||||
|
if (int(platform.mac_ver()[0][3]) >= 6):
|
||||||
|
cmd += " -arch x86_64 -arch i386"
|
||||||
|
else:
|
||||||
|
cmd += " -arch i386"
|
||||||
if ("NOPPC" not in opts): cmd += " -arch ppc"
|
if ("NOPPC" not in opts): cmd += " -arch ppc"
|
||||||
|
|
||||||
oscmd(cmd)
|
oscmd(cmd)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user