*** empty log message ***

dtool/Config.pp

@@ -54,15 +54,15 @@
 // allowable choices, at present, are:
 //
 //  autoconf  - Generate configure.in and a series of Makefile.am files,
-//              suitable for using with autoconf/automake.  Not quite
+//              suitable for using with autoconf/automake.  Do not use
-//              there yet.
+//              this mode yet; it's not finished.
 //  stopgap   - Generate original Frang-style Makefile/Makefile.install/etc.
 //              files, to ease transition to the new system.
 //  unix      - Generate makefiles suitable for most Unix platforms,
 //              without using autoconf.
 //  msvc      - Generate makefiles suitable for building on Windows platforms
 //              (e.g. Windows NT, Windows 2000) using the Microsoft Visual C++
-//              command-line compiler.
+//              command-line compiler and Microsoft nmake.
 //
 #define BUILD_TYPE stopgap
 
@@ -244,6 +244,36 @@
 #defer HAVE_MAYA $[isdir $[MAYA_LOCATION]]
 
 
+///////////////////////////////////////////////////////////////////////
+// The following variables are meaningful when BUILD_TYPE is "unix" or
+// "msvc".  They define a few environmental things.
+//////////////////////////////////////////////////////////////////////
+
+// How to invoke bison and flex.  Panda takes advantage of some
+// bison/flex features, and therefore specifically requires bison and
+// flex, not some other versions of yacc and lex.  You can build Panda
+// without having bison or flex, but only if you obtained Panda from a
+// tarball or zip archive that included the source files generated by
+// bison and flex, and only if you do not modify any bison or flex
+// sources.
+#defer BISON bison
+#defer FLEX flex 
+
+// How to invoke sed.  Only a few make rules use this.  You can
+// probably do without it without too much trouble.
+#defer SED sed
+
+// What directory name (within each source directory) should the .o
+// (or .obj) files be written to, for both shared and static sources?
+// In general, it is safe to define these to be the same.  However,
+// don't define these to be '.', or you will be very sad the next time
+// you run 'make clean'.
+#defer ODIR Opt$[OPTIMIZE]-$[PLATFORM]
+#defer ODIR_SHARED $[ODIR]
+#defer ODIR_STATIC $[ODIR]
+
+
+
 ///////////////////////////////////////////////////////////////////////
 // The following variables are only meaningful when BUILD_TYPE is
 // "unix".  These define the commands to invoke the compiler, linker,
@@ -254,15 +284,6 @@
 #defer CC gcc
 #defer CXX g++
 
-// How to invoke bison and flex.  Panda takes advantage of some
-// bison/flex features, and therefore specifically requires bison and
-// flex, not some other versions of yacc and lex.
-#defer BISON bison
-#defer FLEX flex 
-
-// How to invoke sed.  A few make rules use this.
-#defer SED sed
-
 // How to compile a C or C++ file into a .o file.  $[target] is the
 // name of the .o file, $[source] is the name of the source file,
 // $[ipath] is a space-separated list of directories to search for
@@ -301,15 +322,6 @@
 // special support for this.
 #defer CFLAGS_SHARED -fPIC
 
-// What directory name (within each source directory) should the .o
-// files be written to, for both shared and static sources?  In
-// general, it is safe to define these to be the same.  However, don't
-// define these to be '.', or you will be very sad the next time you
-// run 'make clean'.
-#defer ODIR Opt$[OPTIMIZE]-$[PLATFORM]
-#defer ODIR_SHARED $[ODIR]
-#defer ODIR_STATIC $[ODIR]
-
 // How to generate a C or C++ executable from a collection of .o
 // files.  $[target] is the name of the binary to generate, and
 // $[sources] is the list of .o files.  $[libs] is a space-separated