mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-30 08:44:19 -04:00
Don't compile Maya 2012-2015 plugins in 32-bit mode on Mac OS X
This commit is contained in:
rdb
parent
e9493361fc
commit
7e2bbda123
@ -1155,7 +1155,7 @@ def CompileCxx(obj,src,opts):
|
||||
cmd += " -mmacosx-version-min=%d.%d" % (OSXTARGET)
|
||||
|
||||
for arch in OSX_ARCHS:
|
||||
if 'NOARCH:' + arch.upper() not in OPTS:
|
||||
if 'NOARCH:' + arch.upper() not in opts:
|
||||
cmd += " -arch %s" % arch
|
||||
|
||||
if "SYSROOT" in SDK:
|
||||
@ -1610,7 +1610,7 @@ def CompileLink(dll, obj, opts):
|
||||
cmd += " -mmacosx-version-min=%d.%d" % (OSXTARGET)
|
||||
|
||||
for arch in OSX_ARCHS:
|
||||
if 'NOARCH:' + arch.upper() not in OPTS:
|
||||
if 'NOARCH:' + arch.upper() not in opts:
|
||||
cmd += " -arch %s" % arch
|
||||
|
||||
if "SYSROOT" in SDK:
|
||||
@ -1651,7 +1651,8 @@ def CompileLink(dll, obj, opts):
|
||||
oscmd('%s --strip-unneeded %s' % (GetStrip(), BracketNameWithQuotes(new_path)))
|
||||
|
||||
elif (GetOptimizeOption(opts)==4 and GetTarget() == 'linux'):
|
||||
oscmd(GetStrip() + " --strip-unneeded " + BracketNameWithQuotes(dll))
|
||||
#oscmd(GetStrip() + " --strip-unneeded " + BracketNameWithQuotes(dll))
|
||||
pass
|
||||
|
||||
os.system("chmod +x " + BracketNameWithQuotes(dll))
|
||||
|
||||
@ -5879,9 +5880,18 @@ if (PkgSkip("PANDATOOL")==0):
|
||||
#
|
||||
|
||||
for VER in MAYAVERSIONS:
|
||||
VNUM=VER[4:]
|
||||
if (PkgSkip(VER)==0) and (PkgSkip("PANDATOOL")==0):
|
||||
OPTS=['DIR:pandatool/src/mayaprogs', 'DIR:pandatool/src/maya', 'DIR:pandatool/src/mayaegg', 'DIR:pandatool/src/cvscopy', 'BUILDING:MISC', VER]
|
||||
VNUM = VER[4:]
|
||||
if not PkgSkip(VER) and not PkgSkip("PANDATOOL"):
|
||||
if GetTarget() == 'darwin' and int(VNUM) >= 2012:
|
||||
VER_OPTS = ['NOARCH:PPC', 'NOARCH:I386', VER]
|
||||
if len(OSX_ARCHS) != 0 and 'x86_64' not in OSX_ARCHS:
|
||||
continue
|
||||
elif GetTarget() == 'darwin' and int(VNUM) >= 2009:
|
||||
VER_OPTS = ['NOARCH:PPC', VER]
|
||||
else:
|
||||
VER_OPTS = [VER]
|
||||
|
||||
OPTS=['DIR:pandatool/src/mayaprogs', 'DIR:pandatool/src/maya', 'DIR:pandatool/src/mayaegg', 'DIR:pandatool/src/cvscopy', 'BUILDING:MISC'] + VER_OPTS
|
||||
TargetAdd('mayaeggimport'+VNUM+'_mayaeggimport.obj', opts=OPTS, input='mayaEggImport.cxx')
|
||||
TargetAdd('mayaeggimport'+VNUM+'.mll', input='mayaegg'+VNUM+'_loader.obj')
|
||||
TargetAdd('mayaeggimport'+VNUM+'.mll', input='mayaeggimport'+VNUM+'_mayaeggimport.obj')
|
||||
@ -5889,7 +5899,7 @@ for VER in MAYAVERSIONS:
|
||||
TargetAdd('mayaeggimport'+VNUM+'.mll', input=COMMON_PANDA_LIBS)
|
||||
if GetTarget() == 'windows':
|
||||
TargetAdd('mayaeggimport'+VNUM+'.mll', input='libp3pystub.lib')
|
||||
TargetAdd('mayaeggimport'+VNUM+'.mll', opts=['ADVAPI', VER])
|
||||
TargetAdd('mayaeggimport'+VNUM+'.mll', opts=['ADVAPI']+VER_OPTS)
|
||||
|
||||
TargetAdd('mayaloader'+VNUM+'_config_mayaloader.obj', opts=OPTS, input='config_mayaloader.cxx')
|
||||
TargetAdd('libp3mayaloader'+VNUM+'.dll', input='mayaloader'+VNUM+'_config_mayaloader.obj')
|
||||
@ -5913,7 +5923,7 @@ for VER in MAYAVERSIONS:
|
||||
TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libp3pandatoolbase.lib')
|
||||
TargetAdd('libp3mayaloader'+VNUM+'.dll', input='libpandaegg.dll')
|
||||
TargetAdd('libp3mayaloader'+VNUM+'.dll', input=COMMON_PANDA_LIBS)
|
||||
TargetAdd('libp3mayaloader'+VNUM+'.dll', opts=['ADVAPI', VER])
|
||||
TargetAdd('libp3mayaloader'+VNUM+'.dll', opts=['ADVAPI']+VER_OPTS)
|
||||
|
||||
TargetAdd('mayapview'+VNUM+'_mayaPview.obj', opts=OPTS, input='mayaPview.cxx')
|
||||
TargetAdd('libmayapview'+VNUM+'.mll', input='mayapview'+VNUM+'_mayaPview.obj')
|
||||
@ -5924,7 +5934,7 @@ for VER in MAYAVERSIONS:
|
||||
TargetAdd('libmayapview'+VNUM+'.mll', input=COMMON_EGG2X_LIBS_PYSTUB)
|
||||
else:
|
||||
TargetAdd('libmayapview'+VNUM+'.mll', input=COMMON_EGG2X_LIBS)
|
||||
TargetAdd('libmayapview'+VNUM+'.mll', opts=['ADVAPI', VER])
|
||||
TargetAdd('libmayapview'+VNUM+'.mll', opts=['ADVAPI']+VER_OPTS)
|
||||
|
||||
TargetAdd('maya2egg'+VNUM+'_mayaToEgg.obj', opts=OPTS, input='mayaToEgg.cxx')
|
||||
TargetAdd('maya2egg'+VNUM+'_bin.exe', input='maya2egg'+VNUM+'_mayaToEgg.obj')
|
||||
@ -5934,13 +5944,7 @@ for VER in MAYAVERSIONS:
|
||||
TargetAdd('maya2egg'+VNUM+'_bin.exe', input=COMMON_EGG2X_LIBS_PYSTUB)
|
||||
else:
|
||||
TargetAdd('maya2egg'+VNUM+'_bin.exe', input=COMMON_EGG2X_LIBS)
|
||||
|
||||
if GetTarget() == "darwin" and int(VNUM) >= 2012:
|
||||
TargetAdd('maya2egg'+VNUM+'_bin.exe', opts=['ADVAPI', 'NOARCH:PPC', 'NOARCH:I386', VER])
|
||||
elif GetTarget() == "darwin" and int(VNUM) >= 2009:
|
||||
TargetAdd('maya2egg'+VNUM+'_bin.exe', opts=['ADVAPI', 'NOARCH:PPC', VER])
|
||||
else:
|
||||
TargetAdd('maya2egg'+VNUM+'_bin.exe', opts=['ADVAPI', VER])
|
||||
TargetAdd('maya2egg'+VNUM+'_bin.exe', opts=['ADVAPI']+VER_OPTS)
|
||||
|
||||
TargetAdd('egg2maya'+VNUM+'_eggToMaya.obj', opts=OPTS, input='eggToMaya.cxx')
|
||||
TargetAdd('egg2maya'+VNUM+'_bin.exe', input='egg2maya'+VNUM+'_eggToMaya.obj')
|
||||
@ -5950,13 +5954,7 @@ for VER in MAYAVERSIONS:
|
||||
TargetAdd('egg2maya'+VNUM+'_bin.exe', input=COMMON_EGG2X_LIBS_PYSTUB)
|
||||
else:
|
||||
TargetAdd('egg2maya'+VNUM+'_bin.exe', input=COMMON_EGG2X_LIBS)
|
||||
|
||||
if GetTarget() == 'darwin' and int(VNUM) >= 2012:
|
||||
TargetAdd('egg2maya'+VNUM+'_bin.exe', opts=['ADVAPI', 'NOARCH:PPC', 'NOARCH:I386', VER])
|
||||
elif GetTarget() == 'darwin' and int(VNUM) >= 2009:
|
||||
TargetAdd('egg2maya'+VNUM+'_bin.exe', opts=['ADVAPI', 'NOARCH:PPC', VER])
|
||||
else:
|
||||
TargetAdd('egg2maya'+VNUM+'_bin.exe', opts=['ADVAPI', VER])
|
||||
TargetAdd('egg2maya'+VNUM+'_bin.exe', opts=['ADVAPI']+VER_OPTS)
|
||||
|
||||
TargetAdd('mayacopy'+VNUM+'_mayaCopy.obj', opts=OPTS, input='mayaCopy.cxx')
|
||||
TargetAdd('mayacopy'+VNUM+'_bin.exe', input='mayacopy'+VNUM+'_mayaCopy.obj')
|
||||
@ -5966,17 +5964,11 @@ for VER in MAYAVERSIONS:
|
||||
TargetAdd('mayacopy'+VNUM+'_bin.exe', input=COMMON_EGG2X_LIBS_PYSTUB)
|
||||
else:
|
||||
TargetAdd('mayacopy'+VNUM+'_bin.exe', input=COMMON_EGG2X_LIBS)
|
||||
|
||||
if GetTarget() == 'darwin' and int(VNUM) >= 2012:
|
||||
TargetAdd('mayacopy'+VNUM+'_bin.exe', opts=['ADVAPI', 'NOARCH:PPC', 'NOARCH:I386', VER])
|
||||
elif GetTarget() == 'darwin' and int(VNUM) >= 2009:
|
||||
TargetAdd('mayacopy'+VNUM+'_bin.exe', opts=['ADVAPI', 'NOARCH:PPC', VER])
|
||||
else:
|
||||
TargetAdd('mayacopy'+VNUM+'_bin.exe', opts=['ADVAPI', VER])
|
||||
TargetAdd('mayacopy'+VNUM+'_bin.exe', opts=['ADVAPI']+VER_OPTS)
|
||||
|
||||
TargetAdd('mayasavepview'+VNUM+'_mayaSavePview.obj', opts=OPTS, input='mayaSavePview.cxx')
|
||||
TargetAdd('libmayasavepview'+VNUM+'.mll', input='mayasavepview'+VNUM+'_mayaSavePview.obj')
|
||||
TargetAdd('libmayasavepview'+VNUM+'.mll', opts=['ADVAPI', VER])
|
||||
TargetAdd('libmayasavepview'+VNUM+'.mll', opts=['ADVAPI']+VER_OPTS)
|
||||
|
||||
TargetAdd('mayapath'+VNUM+'.obj', opts=OPTS, input='mayapath.cxx')
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user