Fixed --no-bison and --no-flex, added maya 7

This commit is contained in:
Josh Yelon 2006-01-24 07:27:04 +00:00
parent b629960ae4
commit c92b9d8241

View File

@ -36,7 +36,7 @@ VERSION=0
VERBOSE=1 VERBOSE=1
COMPRESSOR="zlib" COMPRESSOR="zlib"
PACKAGES=["PYTHON","ZLIB","PNG","JPEG","TIFF","VRPN","FMOD","NVIDIACG","HELIX","NSPR", PACKAGES=["PYTHON","ZLIB","PNG","JPEG","TIFF","VRPN","FMOD","NVIDIACG","HELIX","NSPR",
"OPENSSL","FREETYPE","FFTW","MILES","MAYA5","MAYA6","MAYA65","MAX5","MAX6","MAX7", "OPENSSL","FREETYPE","FFTW","MILES","MAYA6","MAYA65","MAYA7","MAX6","MAX7","MAX8",
"BISON","FLEX","OPENCV","PANDATOOL","PANDAAPP"] "BISON","FLEX","OPENCV","PANDATOOL","PANDAAPP"]
OMIT=PACKAGES[:] OMIT=PACKAGES[:]
WARNINGS=[] WARNINGS=[]
@ -50,9 +50,10 @@ SLAVEFILE=0
DEPENDENCYQUEUE=[] DEPENDENCYQUEUE=[]
FILEDATECACHE = {} FILEDATECACHE = {}
CXXINCLUDECACHE = {} CXXINCLUDECACHE = {}
ALLIN=[]
SLAVEBUILD=0 SLAVEBUILD=0
THREADCOUNT=0 THREADCOUNT=0
MAYAVERSIONS=["6","65","7"]
MAXVERSIONS=["6","7","8"]
########################################################################################## ##########################################################################################
# #
@ -238,12 +239,13 @@ def packageInfo():
See panda3d/doc/INSTALL-PP for more detailed information. See panda3d/doc/INSTALL-PP for more detailed information.
3D modeling an painting packages: 3D modeling an painting packages:
MAX5 3D Studio Max version 5
MAX6 3D Studio Max version 6 MAX6 3D Studio Max version 6
MAX7 3D Studio Max version 7 MAX7 3D Studio Max version 7
MAX8 3D Studio Max version 8
MAYA5 Maya version 5
MAYA6 Maya version 6 MAYA6 Maya version 6
MAYA65 Maya version 6.5
MAYA7 Maya version 7
Audio playback: Audio playback:
FMOD f mod FMOD f mod
@ -433,15 +435,15 @@ os.chdir(PANDASOURCE)
if (os.path.isdir("sdks")): if (os.path.isdir("sdks")):
DIRECTXSDK="sdks/directx" DIRECTXSDK="sdks/directx"
MAXSDKCS["MAX5"] = "sdks/maxsdk5"
MAXSDKCS["MAX6"] = "sdks/maxsdk6" MAXSDKCS["MAX6"] = "sdks/maxsdk6"
MAXSDKCS["MAX7"] = "sdks/maxsdk7" MAXSDKCS["MAX7"] = "sdks/maxsdk7"
MAXSDK["MAX5"] = "sdks/maxsdk5" MAXSDKCS["MAX8"] = "sdks/maxsdk8"
MAXSDK["MAX6"] = "sdks/maxsdk6" MAXSDK["MAX6"] = "sdks/maxsdk6"
MAXSDK["MAX7"] = "sdks/maxsdk7" MAXSDK["MAX7"] = "sdks/maxsdk7"
MAYASDK["MAYA5"] = "sdks/maya5" MAXSDK["MAX8"] = "sdks/maxsdk8"
MAYASDK["MAYA6"] = "sdks/maya6" MAYASDK["MAYA6"] = "sdks/maya6"
MAYASDK["MAYA65"] = "sdks/maya65" MAYASDK["MAYA65"] = "sdks/maya65"
MAYASDK["MAYA7"] = "sdks/maya7"
######################################################################## ########################################################################
## ##
@ -468,16 +470,16 @@ if sys.platform == "win32" and DIRECTXSDK is None:
######################################################################## ########################################################################
## ##
## Locate the Maya 5.0 and Maya 6.0 SDK ## Locate the Maya SDK
## ##
######################################################################## ########################################################################
MAYAVERSIONS=[("MAYA5", "SOFTWARE\\Alias|Wavefront\\Maya\\5.0\\Setup\\InstallPath"), MAYAVERSIONINFO=[("MAYA6", "SOFTWARE\\Alias|Wavefront\\Maya\\6.0\\Setup\\InstallPath"),
("MAYA6", "SOFTWARE\\Alias|Wavefront\\Maya\\6.0\\Setup\\InstallPath"), ("MAYA65", "SOFTWARE\\Alias|Wavefront\\Maya\\6.5\\Setup\\InstallPath"),
("MAYA65", "SOFTWARE\\Alias|Wavefront\\Maya\\6.5\\Setup\\InstallPath") ("MAYA7", "SOFTWARE\\Alias|Wavefront\\Maya\\7.0\\Setup\\InstallPath")
] ]
for (ver,key) in MAYAVERSIONS: for (ver,key) in MAYAVERSIONINFO:
if (OMIT.count(ver)==0) and (MAYASDK.has_key(ver)==0): if (OMIT.count(ver)==0) and (MAYASDK.has_key(ver)==0):
if (sys.platform == "win32"): if (sys.platform == "win32"):
MAYASDK[ver]=GetRegistryKey(key, "MAYA_INSTALL_LOCATION") MAYASDK[ver]=GetRegistryKey(key, "MAYA_INSTALL_LOCATION")
@ -498,11 +500,12 @@ for (ver,key) in MAYAVERSIONS:
## ##
######################################################################## ########################################################################
MAXVERSIONS = [("MAX5", "SOFTWARE\\Autodesk\\3DSMAX\\5.0\\MAX-1:409", "uninstallpath", "Cstudio\\Sdk"), MAXVERSIONINFO = [("MAX6", "SOFTWARE\\Autodesk\\3DSMAX\\6.0", "installdir", "maxsdk\\cssdk\\include"),
("MAX6", "SOFTWARE\\Autodesk\\3DSMAX\\6.0", "installdir", "maxsdk\\cssdk\\include"), ("MAX7", "SOFTWARE\\Autodesk\\3DSMAX\\7.0", "Installdir", "maxsdk\\include\\CS"),
("MAX7", "SOFTWARE\\Autodesk\\3DSMAX\\7.0", "Installdir", "maxsdk\\include\\CS")] ("MAX8", "SOFTWARE\\Autodesk\\3DSMAX\\8.0", "Installdir", "maxsdk\\include\\CS"),
]
for version,key1,key2,subdir in MAXVERSIONS: for version,key1,key2,subdir in MAXVERSIONINFO:
if (OMIT.count(version)==0) and (MAXSDK.has_key(version)==0): if (OMIT.count(version)==0) and (MAXSDK.has_key(version)==0):
if (sys.platform == "win32"): if (sys.platform == "win32"):
top = GetRegistryKey(key1,key2) top = GetRegistryKey(key1,key2)
@ -626,11 +629,6 @@ if (OMIT.count("MILES")==0):
WARNINGS.append("I have automatically added this command-line option: --no-miles") WARNINGS.append("I have automatically added this command-line option: --no-miles")
OMIT.append("MILES") OMIT.append("MILES")
if (OMIT.count("MAYA5")==0):
WARNINGS.append("MAYA5 support is currently broken.")
WARNINGS.append("I have automatically added this command-line option: --no-maya5")
OMIT.append("MAYA5")
########################################################################################## ##########################################################################################
# #
# Verify that LD_LIBRARY_PATH contains the built/lib directory. # Verify that LD_LIBRARY_PATH contains the built/lib directory.
@ -967,13 +965,14 @@ def CompileCxxMSVC7(wobj,fullsrc,ipath,opts):
cmd = "cl /Fo" + wobj + " /nologo /c" cmd = "cl /Fo" + wobj + " /nologo /c"
if (OMIT.count("PYTHON")==0): cmd = cmd + " /Ibuilt/python/include" if (OMIT.count("PYTHON")==0): cmd = cmd + " /Ibuilt/python/include"
if (opts.count("DXSDK")): cmd = cmd + ' /I"' + DIRECTXSDK + '/include"' if (opts.count("DXSDK")): cmd = cmd + ' /I"' + DIRECTXSDK + '/include"'
for ver in ["MAYA5","MAYA6","MAYA65"]: for ver in MAYAVERSIONS:
if (opts.count(ver)): cmd = cmd + ' /I"' + MAYASDK[ver] + '/include"' if (PkgSelected(opts,"MAYA"+ver)):
for max in ["MAX5","MAX6","MAX7"]: cmd = cmd + ' /I"' + MAYASDK["MAYA"+ver] + '/include"'
if (PkgSelected(opts,max)): for ver in MAXVERSIONS:
cmd = cmd + ' /I"' + MAXSDK[max] + '/include" /I"' + MAXSDKCS[max] + '" /D' + max if (PkgSelected(opts,"MAX"+ver)):
cmd = cmd + ' /I"' + MAXSDK["MAX"+ver] + '/include" /I"' + MAXSDKCS["MAX"+ver] + '" /DMAX' + ver
for pkg in PACKAGES: for pkg in PACKAGES:
if (pkg[:4] != "MAYA") and PkgSelected(opts,pkg): if (pkg[:4] != "MAYA") and (pkg[:3]!="MAX") and PkgSelected(opts,pkg):
cmd = cmd + " /Ithirdparty/win-libs-vc7/" + pkg.lower() + "/include" cmd = cmd + " /Ithirdparty/win-libs-vc7/" + pkg.lower() + "/include"
for x in ipath: cmd = cmd + " /I" + x for x in ipath: cmd = cmd + " /I" + x
if (opts.count('NOFLOATWARN')): cmd = cmd + ' /wd4244 /wd4305' if (opts.count('NOFLOATWARN')): cmd = cmd + ' /wd4244 /wd4305'
@ -1059,17 +1058,16 @@ def EnqueueBison(ipath=0,opts=0,pre=0,obj=0,dsth=0,src=0):
if (SLAVEBUILD!=0) and (SLAVEBUILD!=wobj): return if (SLAVEBUILD!=0) and (SLAVEBUILD!=wobj): return
ipath = ["built/tmp"] + ipath + ["built/include"] ipath = ["built/tmp"] + ipath + ["built/include"]
fullsrc = CxxFindSource(src, ipath) fullsrc = CxxFindSource(src, ipath)
if (fullsrc == 0): exit("Cannot find source file "+src)
if (OMIT.count("BISON")): if (OMIT.count("BISON")):
dir = os.path.dirname(fullsrc) dir = os.path.dirname(fullsrc)
CopyFile("built/tmp/"+dstc, dir+"/"+dstc+".prebuilt") CopyFile("built/tmp/"+obj[:-4]+".cxx", dir+"/"+src[:-4]+".cxx.prebuilt")
CopyFile("built/tmp/"+dsth, dir+"/"+dsth+".prebuilt") CopyFile("built/include/"+src[:-4]+".h", dir+"/"+src[:-4]+".h.prebuilt")
EnqueueCxx(ipath=ipath,opts=opts,obj=obj,src=dstc) EnqueueCxx(ipath=ipath,opts=opts,obj=obj,src=obj[:-4]+".cxx")
return() else:
dstc=obj[:-4]+".cxx" dstc = "built/tmp/"+obj[:-4]+".cxx"
if (fullsrc == 0): exit("Cannot find source file "+src) dsth = "built/include/"+src[:-4]+".h"
dstc="built/tmp/"+dstc DependencyQueue(fn, [pre,dsth,dstc,wobj,ipath,opts,fullsrc], [wobj, dsth], [fullsrc], [])
dsth="built/include/"+dsth
DependencyQueue(fn, [pre,dsth,dstc,wobj,ipath,opts,fullsrc], [wobj, dsth], [fullsrc], [])
######################################################################## ########################################################################
## ##
@ -1092,22 +1090,21 @@ def EnqueueFlex(ipath=0,opts=0,pre=0,obj=0,src=0,dashi=0):
exit("syntax error in EnqueueFlex directive") exit("syntax error in EnqueueFlex directive")
if (COMPILER=="MSVC7"): if (COMPILER=="MSVC7"):
wobj="built/tmp/"+obj[:-4]+".obj" wobj="built/tmp/"+obj[:-4]+".obj"
dst="built/tmp/"+obj[:-4]+".cxx"
fn=CompileFlexMSVC7 fn=CompileFlexMSVC7
if (COMPILER=="LINUXA"): if (COMPILER=="LINUXA"):
wobj="built/tmp/"+obj[:-4]+".o" wobj="built/tmp/"+obj[:-4]+".o"
dst="built/tmp/"+obj[:-4]+".cxx"
fn=CompileFlexLINUXA fn=CompileFlexLINUXA
if (SLAVEBUILD!=0) and (SLAVEBUILD!=wobj): return if (SLAVEBUILD!=0) and (SLAVEBUILD!=wobj): return
ipath = ["built/tmp"] + ipath + ["built/include"] ipath = ["built/tmp"] + ipath + ["built/include"]
fullsrc = CxxFindSource(src, ipath) fullsrc = CxxFindSource(src, ipath)
if (fullsrc == 0): exit("Cannot find source file "+src)
if (OMIT.count("FLEX")): if (OMIT.count("FLEX")):
dir = os.path.dirname(fullsrc) dir = os.path.dirname(fullsrc)
CopyFile("built/tmp/"+dst, dir+"/"+dst+".prebuilt") CopyFile("built/tmp/"+obj[:-4]+".cxx", dir+"/"+src[:-4]+".cxx.prebuilt")
EnqueueCxx(ipath=IPATH, opts=OPTS, obj=obj, src=dst) EnqueueCxx(ipath=IPATH, opts=OPTS, obj=obj, src=obj[:-4]+".cxx")
return() else:
if (fullsrc == 0): exit("Cannot find source file "+src) dst = "built/tmp/"+obj[:-4]+".cxx"
DependencyQueue(fn, [pre,dst,fullsrc,wobj,ipath,opts,dashi], [wobj], [fullsrc], []) DependencyQueue(fn, [pre,dst,fullsrc,wobj,ipath,opts,dashi], [wobj], [fullsrc], [])
######################################################################## ########################################################################
## ##
@ -1140,8 +1137,9 @@ def CompileIgateMSVC7(ipath,opts,outd,outc,wobj,src,module,library,files):
if (opts.count("WITHINPANDA")): cmd = cmd + " -DWITHIN_PANDA" if (opts.count("WITHINPANDA")): cmd = cmd + " -DWITHIN_PANDA"
cmd = cmd + ' -module ' + module + ' -library ' + library cmd = cmd + ' -module ' + module + ' -library ' + library
if ((COMPILER=="MSVC7") and opts.count("DXSDK")): cmd = cmd + ' -I"' + DIRECTXSDK + '/include"' if ((COMPILER=="MSVC7") and opts.count("DXSDK")): cmd = cmd + ' -I"' + DIRECTXSDK + '/include"'
for ver in ["MAYA5","MAYA6","MAYA65"]: for ver in MAYAVERSIONS:
if ((COMPILER=="MSVC7") and opts.count(ver)): cmd = cmd + ' -I"' + MAYASDK[ver] + '/include"' if ((COMPILER=="MSVC7") and PkgSelected(opts,"MAYA"+ver)):
cmd = cmd + ' -I"' + MAYASDK["MAYA"+ver] + '/include"'
for x in files: cmd = cmd + ' ' + x for x in files: cmd = cmd + ' ' + x
oscmd(cmd) oscmd(cmd)
CompileCxxMSVC7(wobj,outc,ipath,opts) CompileCxxMSVC7(wobj,outc,ipath,opts)
@ -1170,8 +1168,9 @@ def CompileIgateLINUXA(ipath,opts,outd,outc,wobj,src,module,library,files):
if (opts.count("WITHINPANDA")): cmd = cmd + " -DWITHIN_PANDA" if (opts.count("WITHINPANDA")): cmd = cmd + " -DWITHIN_PANDA"
cmd = cmd + ' -module ' + module + ' -library ' + library cmd = cmd + ' -module ' + module + ' -library ' + library
if (opts.count("DXSDK")): cmd = cmd + ' -I"' + DIRECTXSDK + '/include"' if (opts.count("DXSDK")): cmd = cmd + ' -I"' + DIRECTXSDK + '/include"'
for ver in ["MAYA5","MAYA6","MAYA65"]: for ver in MAYAVERSIONS:
if (opts.count(ver)): cmd = cmd + ' -I"' + MAYASDK[ver] + '/include"' if (PkgSelected(opts, "MAYA"+ver)):
cmd = cmd + ' -I"' + MAYASDK["MAYA"+ver] + '/include"'
for x in files: cmd = cmd + ' ' + x for x in files: cmd = cmd + ' ' + x
oscmd(cmd) oscmd(cmd)
CompileCxxLINUXA(wobj,outc,ipath,opts) CompileCxxLINUXA(wobj,outc,ipath,opts)
@ -1180,7 +1179,7 @@ def EnqueueIgate(ipath=0, opts=0, outd=0, obj=0, src=0, module=0, library=0, als
if ((ipath==0)|(opts==0)|(outd==0)|(obj==0)|(src==0)|(module==0)|(library==0)|(also==0)|(skip==0)): if ((ipath==0)|(opts==0)|(outd==0)|(obj==0)|(src==0)|(module==0)|(library==0)|(also==0)|(skip==0)):
exit("syntax error in EnqueueIgate directive") exit("syntax error in EnqueueIgate directive")
if (COMPILER=="MSVC7"): if (COMPILER=="MSVC7"):
altdep = "built/bin/interrogate.exe" altdep = "built/bin/interrogate.exe"
wobj = "built/tmp/"+obj wobj = "built/tmp/"+obj
fn = CompileIgateMSVC7 fn = CompileIgateMSVC7
if (COMPILER=="LINUXA"): if (COMPILER=="LINUXA"):
@ -1188,7 +1187,6 @@ def EnqueueIgate(ipath=0, opts=0, outd=0, obj=0, src=0, module=0, library=0, als
wobj = "built/tmp/"+obj[:-4]+".o" wobj = "built/tmp/"+obj[:-4]+".o"
fn = CompileIgateLINUXA fn = CompileIgateLINUXA
if (SLAVEBUILD!=0) and (SLAVEBUILD!=wobj): return if (SLAVEBUILD!=0) and (SLAVEBUILD!=wobj): return
ALLIN.append(outd)
outd = 'built/pandac/input/'+outd outd = 'built/pandac/input/'+outd
dirlisting = os.listdir(src) dirlisting = os.listdir(src)
files = fnmatch.filter(dirlisting,"*.h") files = fnmatch.filter(dirlisting,"*.h")
@ -1234,11 +1232,11 @@ def EnqueueImod(ipath=0, opts=0, obj=0, module=0, library=0, files=0):
if ((ipath==0)|(opts==0)|(obj==0)|(module==0)|(library==0)|(files==0)): if ((ipath==0)|(opts==0)|(obj==0)|(module==0)|(library==0)|(files==0)):
exit("syntax error in EnqueueImod directive") exit("syntax error in EnqueueImod directive")
if (COMPILER=="MSVC7"): if (COMPILER=="MSVC7"):
altdep = "built/bin/interrogate_module.exe" altdep = "built/bin/interrogate_module.exe"
wobj = "built/tmp/"+obj[:-4]+".obj" wobj = "built/tmp/"+obj[:-4]+".obj"
fn = CompileImodMSVC7 fn = CompileImodMSVC7
if (COMPILER=="LINUXA"): if (COMPILER=="LINUXA"):
altdep = "built/bin/interrogate_module" altdep = "built/bin/interrogate_module"
wobj = "built/tmp/"+obj[:-4]+".o" wobj = "built/tmp/"+obj[:-4]+".o"
fn = CompileImodLINUXA fn = CompileImodLINUXA
if (SLAVEBUILD!=0) and (SLAVEBUILD!=wobj): return if (SLAVEBUILD!=0) and (SLAVEBUILD!=wobj): return
@ -1357,21 +1355,21 @@ def CompileLinkMSVC7(wdll, wlib, wobj, opts, dll, ldef):
if (PkgSelected(opts,"FFTW")): if (PkgSelected(opts,"FFTW")):
cmd = cmd + ' thirdparty/win-libs-vc7/fftw/lib/rfftw.lib' cmd = cmd + ' thirdparty/win-libs-vc7/fftw/lib/rfftw.lib'
cmd = cmd + ' thirdparty/win-libs-vc7/fftw/lib/fftw.lib' cmd = cmd + ' thirdparty/win-libs-vc7/fftw/lib/fftw.lib'
for maya in ["MAYA5","MAYA6","MAYA65"]: for ver in MAYAVERSIONS:
if (PkgSelected(opts,maya)): if (PkgSelected(opts,"MAYA"+ver)):
cmd = cmd + ' "' + MAYASDK[maya] + '/lib/Foundation.lib"' cmd = cmd + ' "' + MAYASDK["MAYA"+ver] + '/lib/Foundation.lib"'
cmd = cmd + ' "' + MAYASDK[maya] + '/lib/OpenMaya.lib"' cmd = cmd + ' "' + MAYASDK["MAYA"+ver] + '/lib/OpenMaya.lib"'
cmd = cmd + ' "' + MAYASDK[maya] + '/lib/OpenMayaAnim.lib"' cmd = cmd + ' "' + MAYASDK["MAYA"+ver] + '/lib/OpenMayaAnim.lib"'
cmd = cmd + ' "' + MAYASDK[maya] + '/lib/OpenMayaUI.lib"' cmd = cmd + ' "' + MAYASDK["MAYA"+ver] + '/lib/OpenMayaUI.lib"'
for max in ["MAX5","MAX6","MAX7"]: for ver in MAXVERSIONS:
if PkgSelected(opts,max): if (PkgSelected(opts,"MAX"+ver)):
cmd = cmd + ' "' + MAXSDK[max] + '/lib/core.lib"' cmd = cmd + ' "' + MAXSDK["MAX"+ver] + '/lib/core.lib"'
cmd = cmd + ' "' + MAXSDK[max] + '/lib/edmodel.lib"' cmd = cmd + ' "' + MAXSDK["MAX"+ver] + '/lib/edmodel.lib"'
cmd = cmd + ' "' + MAXSDK[max] + '/lib/gfx.lib"' cmd = cmd + ' "' + MAXSDK["MAX"+ver] + '/lib/gfx.lib"'
cmd = cmd + ' "' + MAXSDK[max] + '/lib/geom.lib"' cmd = cmd + ' "' + MAXSDK["MAX"+ver] + '/lib/geom.lib"'
cmd = cmd + ' "' + MAXSDK[max] + '/lib/mesh.lib"' cmd = cmd + ' "' + MAXSDK["MAX"+ver] + '/lib/mesh.lib"'
cmd = cmd + ' "' + MAXSDK[max] + '/lib/maxutil.lib"' cmd = cmd + ' "' + MAXSDK["MAX"+ver] + '/lib/maxutil.lib"'
cmd = cmd + ' "' + MAXSDK[max] + '/lib/paramblk2.lib"' cmd = cmd + ' "' + MAXSDK["MAX"+ver] + '/lib/paramblk2.lib"'
if (PkgSelected(opts,"OPENCV")): if (PkgSelected(opts,"OPENCV")):
cmd = cmd + " /LIBPATH:thirdparty/win-libs-vc7/opencv/lib" cmd = cmd + " /LIBPATH:thirdparty/win-libs-vc7/opencv/lib"
cmd = cmd + " cv.lib cxcore.lib cvaux.lib trs.lib highgui.lib" cmd = cmd + " cv.lib cxcore.lib cvaux.lib trs.lib highgui.lib"
@ -3834,7 +3832,7 @@ if (OMIT.count("PANDATOOL")==0):
# DIRECTORY: pandatool/src/maya/ # DIRECTORY: pandatool/src/maya/
# #
for VER in ["5","6","65"]: for VER in MAYAVERSIONS:
if (OMIT.count("MAYA"+VER)==0) and (OMIT.count("PANDATOOL")==0): if (OMIT.count("MAYA"+VER)==0) and (OMIT.count("PANDATOOL")==0):
IPATH=['pandatool/src/maya'] IPATH=['pandatool/src/maya']
OPTS=['MAYA'+VER, 'NSPR'] OPTS=['MAYA'+VER, 'NSPR']
@ -3846,7 +3844,7 @@ for VER in ["5","6","65"]:
# DIRECTORY: pandatool/src/mayaegg/ # DIRECTORY: pandatool/src/mayaegg/
# #
for VER in ["5","6","65"]: for VER in MAYAVERSIONS:
if (OMIT.count("MAYA"+VER)==0) and (OMIT.count("PANDATOOL")==0): if (OMIT.count("MAYA"+VER)==0) and (OMIT.count("PANDATOOL")==0):
IPATH=['pandatool/src/mayaegg', 'pandatool/src/maya'] IPATH=['pandatool/src/mayaegg', 'pandatool/src/maya']
OPTS=['MAYA'+VER, 'NSPR'] OPTS=['MAYA'+VER, 'NSPR']
@ -3859,7 +3857,7 @@ for VER in ["5","6","65"]:
# DIRECTORY: pandatool/src/maxegg/ # DIRECTORY: pandatool/src/maxegg/
# #
for VER in ["6", "7"]: for VER in MAXVERSIONS:
if (OMIT.count("MAX"+VER)==0) and (OMIT.count("PANDATOOL")==0): if (OMIT.count("MAX"+VER)==0) and (OMIT.count("PANDATOOL")==0):
IPATH=['pandatool/src/maxegg'] IPATH=['pandatool/src/maxegg']
OPTS=['MAX'+VER, 'NSPR', "WINCOMCTL", "WINCOMDLG", "WINUSER", "MSFORSCOPE"] OPTS=['MAX'+VER, 'NSPR', "WINCOMCTL", "WINCOMDLG", "WINUSER", "MSFORSCOPE"]
@ -3886,7 +3884,7 @@ for VER in ["6", "7"]:
# DIRECTORY: pandatool/src/maxprogs/ # DIRECTORY: pandatool/src/maxprogs/
# #
for VER in ["6", "7"]: for VER in MAXVERSIONS:
if (OMIT.count("MAX"+VER)==0) and (OMIT.count("PANDATOOL")==0): if (OMIT.count("MAX"+VER)==0) and (OMIT.count("PANDATOOL")==0):
IPATH=['pandatool/src/maxprogs'] IPATH=['pandatool/src/maxprogs']
OPTS=['MAX'+VER, 'NSPR', "WINCOMCTL", "WINCOMDLG", "WINUSER", "MSFORSCOPE"] OPTS=['MAX'+VER, 'NSPR', "WINCOMCTL", "WINCOMDLG", "WINUSER", "MSFORSCOPE"]
@ -4013,7 +4011,7 @@ if (OMIT.count("PANDATOOL")==0):
# DIRECTORY: pandatool/src/mayaprogs/ # DIRECTORY: pandatool/src/mayaprogs/
# #
for VER in ["5","6","65"]: for VER in MAYAVERSIONS:
if (OMIT.count('MAYA'+VER)==0) and (OMIT.count("PANDATOOL")==0): if (OMIT.count('MAYA'+VER)==0) and (OMIT.count("PANDATOOL")==0):
IPATH=['pandatool/src/mayaprogs', 'pandatool/src/maya', 'pandatool/src/mayaegg', IPATH=['pandatool/src/mayaprogs', 'pandatool/src/maya', 'pandatool/src/mayaegg',
'pandatool/src/cvscopy'] 'pandatool/src/cvscopy']
@ -4385,7 +4383,7 @@ if (OMIT.count("PANDAAPP")==0):
OPTS=['NSPR'] OPTS=['NSPR']
CopyAllHeaders('pandaapp/src/stitchbase') CopyAllHeaders('pandaapp/src/stitchbase')
EnqueueBison(ipath=IPATH, opts=OPTS, pre='stitchyy', src='stitchParser.yxx', dsth='stitchParser.h', obj='stitchbase_stitchParser.obj') EnqueueBison(ipath=IPATH, opts=OPTS, pre='stitchyy', src='stitchParser.yxx', dsth='stitchParser.h', obj='stitchbase_stitchParser.obj')
EnqueueFlex(ipath=IPATH, opts=OPTS, pre='stitchyy', src='stitchLexer.lxx', obj='stitchbase_stitchLexer.cxx', dashi=1) EnqueueFlex(ipath=IPATH, opts=OPTS, pre='stitchyy', src='stitchLexer.lxx', obj='stitchbase_stitchLexer.obj', dashi=1)
EnqueueCxx(ipath=IPATH, opts=OPTS, src='stitchbase_composite1.cxx', obj='stitchbase_composite1.obj') EnqueueCxx(ipath=IPATH, opts=OPTS, src='stitchbase_composite1.cxx', obj='stitchbase_composite1.obj')
EnqueueCxx(ipath=IPATH, opts=OPTS, src='stitchbase_composite2.cxx', obj='stitchbase_composite2.obj') EnqueueCxx(ipath=IPATH, opts=OPTS, src='stitchbase_composite2.cxx', obj='stitchbase_composite2.obj')
EnqueueLib(lib='libstitchbase.lib', obj=[ EnqueueLib(lib='libstitchbase.lib', obj=[
@ -4607,8 +4605,9 @@ RunDependencyQueue(DEPENDENCYQUEUE)
########################################################################################## ##########################################################################################
if (OMIT.count("PYTHON")==0): if (OMIT.count("PYTHON")==0):
if (older(['built/pandac/PandaModules.py'],xpaths("built/pandac/input/",ALLIN,""))): allin = os.listdir("built/pandac/input")
if (GENMAN): oscmd("built/bin/genpycode -m") if (older(['built/pandac/PandaModules.py'],xpaths("built/pandac/input/",allin,""))):
if (GENMAN): oscmd("built/bin/genpycode -d")
else : oscmd("built/bin/genpycode") else : oscmd("built/bin/genpycode")
updatefiledate('built/pandac/PandaModules.py') updatefiledate('built/pandac/PandaModules.py')