From b2dad16e42c1822f410ebdc6e1b94b131475d8be Mon Sep 17 00:00:00 2001 From: Bei Yang Date: Wed, 18 Nov 2009 17:24:32 +0000 Subject: [PATCH] Added Maya 2010 support Added some BIGOBJ flags as well as NOD:LIBCMT to MFC ignore flags --- makepanda/makepanda.py | 6 +++--- makepanda/makepandacore.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index bca762a1dd..cdfcf6d199 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -785,8 +785,8 @@ def CompileLink(dll, obj, opts): if (platform.architecture()[0] == "64bit"): cmd += " /MACHINE:X64" if ("MFC" not in opts): - cmd += " /NOD:MFC90.LIB" - cmd += " /NOD:MFC80.LIB /NOD:LIBCI.LIB /DEBUG" + cmd += " /NOD:MFC90.LIB /NOD:MFC80.LIB /NOD:LIBCMT" + cmd += " /NOD:LIBCI.LIB /DEBUG" cmd += " /nod:libc /nod:libcmtd /nod:atlthunk /nod:atls" if (GetOrigExt(dll) != ".exe"): cmd += " /DLL" optlevel = GetOptimizeOption(opts) @@ -2396,7 +2396,7 @@ if (not RUNTIME): # if (not RUNTIME): - OPTS=['DIR:panda/src/grutil', 'BUILDING:PANDA', 'FFMPEG'] + OPTS=['DIR:panda/src/grutil', 'BUILDING:PANDA', 'FFMPEG', 'BIGOBJ'] TargetAdd('grutil_multitexReducer.obj', opts=OPTS, input='multitexReducer.cxx') TargetAdd('grutil_composite1.obj', opts=OPTS, input='grutil_composite1.cxx') TargetAdd('grutil_composite2.obj', opts=OPTS, input='grutil_composite2.cxx') diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 7369ca1123..05d02c0b96 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -37,6 +37,7 @@ MAYAVERSIONINFO=[("MAYA6", "6.0"), ("MAYA85", "8.5"), ("MAYA2008","2008"), ("MAYA2009","2009"), + ("MAYA2010","2010"), ] MAXVERSIONINFO = [("MAX6", "SOFTWARE\\Autodesk\\3DSMAX\\6.0", "installdir", "maxsdk\\cssdk\\include"),