TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Made tinydisplay optional and reordered and labeled the list of optional modules.

Browse Source
This commit is contained in:
gogg 2010-04-20 10:36:44 +00:00
parent 8697b40ccf
commit 230dbd65aa
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
makepanda/makepanda.py
View File

@ -51,13 +51,20 @@ OSXTARGET=None
if "MACOSX_DEPLOYMENT_TARGET" in os.environ: if "MACOSX_DEPLOYMENT_TARGET" in os.environ:
OSXTARGET=os.environ["MACOSX_DEPLOYMENT_TARGET"] OSXTARGET=os.environ["MACOSX_DEPLOYMENT_TARGET"]
PkgListSet(MAYAVERSIONS + MAXVERSIONS + DXVERSIONS + [ PkgListSet(["PYTHON", # Language bindings
"PYTHON","ZLIB","PNG","JPEG","TIFF","VRPN","TINYXML", "OPENGL"] + DXVERSIONS + ["TINYDISPLAY", "NVIDIACG", # 3D graphics
"FMODEX","OPENAL","NVIDIACG","OPENSSL","FREETYPE","WX", "OPENAL", "FMODEX", "FFMPEG", # Multimedia
"FFTW","ARTOOLKIT","SQUISH","ODE","DIRECTCAM","NPAPI", "ODE", "PHYSX", # Physics
"OPENCV","FFMPEG","SWSCALE","FCOLLADA","GTK2","OPENGL", "ZLIB", "PNG", "JPEG", "TIFF", "SQUISH", "FREETYPE", # 2D Formats support
"OSMESA","X11","XF86DGA","XRANDR","PHYSX", ] + MAYAVERSIONS + MAXVERSIONS + [ "FCOLLADA", # 3D Formats support
"PANDATOOL","CONTRIB","AWESOMIUM" "VRPN", "OPENSSL", # Transport
"FFTW", "SWSCALE", # Algorithm helpers
"ARTOOLKIT", "OPENCV", "DIRECTCAM", # Augmented Reality
"NPAPI", "AWESOMIUM", # Browser embedding
"GTK2", "WX", # Toolkit support
"OSMESA", "X11", "XF86DGA", "XRANDR", # Unix platform support
"PANDATOOL", "TINYXML", # Toolchain
"CONTRIB" # Experimental
]) ])
CheckPandaSourceTree() CheckPandaSourceTree()
@ -3294,7 +3301,7 @@ if (not RTDIST and not RUNTIME):
# DIRECTORY: panda/src/tinydisplay/ # DIRECTORY: panda/src/tinydisplay/
# #
if (not RUNTIME and (sys.platform == "win32" or sys.platform == "darwin" or PkgSkip("X11")==0)): if (not RUNTIME and (sys.platform == "win32" or sys.platform == "darwin" or PkgSkip("X11")==0) and PkgSkip("TINYDISPLAY")==0):
OPTS=['DIR:panda/src/tinydisplay', 'BUILDING:TINYDISPLAY'] OPTS=['DIR:panda/src/tinydisplay', 'BUILDING:TINYDISPLAY']
TargetAdd('tinydisplay_composite1.obj', opts=OPTS, input='tinydisplay_composite1.cxx') TargetAdd('tinydisplay_composite1.obj', opts=OPTS, input='tinydisplay_composite1.cxx')
TargetAdd('tinydisplay_composite2.obj', opts=OPTS, input='tinydisplay_composite2.cxx') TargetAdd('tinydisplay_composite2.obj', opts=OPTS, input='tinydisplay_composite2.cxx')