From 4ecd027408ee81a6771bc41746cadba3bc55b7b9 Mon Sep 17 00:00:00 2001
From: Josh Yelon <jyelon@gmail.com>
Date: Wed, 11 Jul 2007 20:17:05 +0000
Subject: [PATCH] Minor fixes

---
 doc/makepanda/config.in    | 17 +++++++++++++----
 doc/makepanda/makepanda.py | 11 +++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/doc/makepanda/config.in b/doc/makepanda/config.in
index 9b3404d4e0..26727c1ecc 100755
--- a/doc/makepanda/config.in
+++ b/doc/makepanda/config.in
@@ -19,11 +19,20 @@ win-size 800 600
 
 fullscreen #f
 
-# If you don't object to running OpenGL in software leave the keyword
-# "software" in the following line, otherwise remove it to force
-# hardware only.
+# The framebuffer-hardware flag forces it to use an accelerated driver.
+# The framebuffer-software flag forces it to use a software renderer.
+# If you don't set either, it will use whatever's available.
 
-framebuffer-mode rgba double-buffer depth hardware
+framebuffer-hardware #t
+framebuffer-software #f
+
+# These set the minimum requirements for the framebuffer.
+
+depth-bits 16
+color-bits 16
+alpha-bits 0
+stencil-bits 0
+multisamples 0
 
 # These control the amount of output Panda gives for some various
 # categories.  The severity levels, in order, are "spam", "debug",
diff --git a/doc/makepanda/makepanda.py b/doc/makepanda/makepanda.py
index 7f126f0f17..61cb0e1179 100755
--- a/doc/makepanda/makepanda.py
+++ b/doc/makepanda/makepanda.py
@@ -145,13 +145,18 @@ def NeedsBuild(files,others):
 ##
 ## The following routine scans a CXX file and returns a list of
 ## the include-directives inside that file.  It's not recursive:
-## it just returns the includes that are immediately inside the file.
+## it just returns the includes that are textually inside the 
+## file.  If you need recursive dependencies, you need the higher-level
+## routine CxxCalcDependencies, defined elsewhere.
 ##
 ## Since scanning a CXX file is slow, we cache the result.  It records
 ## the date of the source file and the list of includes that it
 ## contains.  It assumes that if the file date hasn't changed, that
 ## the list of include-statements inside the file has not changed
-## either.
+## either.  Once again, this particular routine does not return
+## recursive dependencies --- it only returns an explicit list of
+## include statements that are textually inside the file.  That
+## is what the cache stores, as well.
 ##
 ########################################################################
 
@@ -2592,8 +2597,6 @@ EnqueueIgate(ipath=IPATH, opts=OPTS, outd='libpgui.in', obj='libpgui_igate.obj',
 
 IPATH=['panda/src/pnmimagetypes', 'panda/src/pnmimage']
 OPTS=['BUILDING_PANDA', 'PNG', 'ZLIB', 'JPEG', 'ZLIB',  'JPEG', 'TIFF']
-#EnqueueCxx(ipath=IPATH, opts=OPTS, src='pnmFileTypePNG.cxx', obj='pnmimagetypes_pnmFileTypePNG.obj')
-EnqueueCxx(ipath=IPATH, opts=OPTS, src='pnmFileTypeTIFF.cxx', obj='pnmimagetypes_pnmFileTypeTIFF.obj')
 EnqueueCxx(ipath=IPATH, opts=OPTS, src='pnmimagetypes_composite.cxx', obj='pnmimagetypes_composite.obj')
 
 #