Browse Source

clarify for users

David Rose 23 years ago
parent
commit
0ecc54b1a4
2 changed files with 44 additions and 52 deletions
  1. 3 5
      dtool/Config.pp
  2. 41 47
      dtool/LocalSetup.pp

+ 3 - 5
dtool/Config.pp

@@ -422,11 +422,9 @@
 
 // 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.
+// flex, not some other versions of yacc and lex.  However, you only
+// need to have these programs if you need to make changes to the
+// bison or flex sources (see the next point, below).
 #defer BISON bison
 #defer FLEX flex 
 

+ 41 - 47
dtool/LocalSetup.pp

@@ -9,41 +9,13 @@
 // configure.
 //
 
-#if $[ne $[BUILD_TYPE],autoconf]
-
 #output dtool_config.h notouch
 #format straight
 /* dtool_config.h.  Generated automatically by $[PPREMAKE] $[PPREMAKE_VERSION] from $[SOURCEFILE]. */
 
-/* Define if your processor stores words with the most significant
-   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-$[cdefine WORDS_BIGENDIAN]
-
-/* Define if the C++ compiler uses namespaces.  */
-$[cdefine HAVE_NAMESPACE]
-
-/* Define if the C++ iostream library supports ios::binary.  */
-$[cdefine HAVE_IOS_BINARY]
-
-/* Define if we can trust the compiler not to insert extra bytes in
-   structs between base structs and derived structs. */
-$[cdefine SIMPLE_STRUCT_POINTERS]
-
-/* Define if we have Dinkumware STL installed.  */
-$[cdefine HAVE_DINKUM]
-
 /* Define if we have Python installed.  */
 $[cdefine HAVE_PYTHON]
 
-/* Define if we want to track callbacks from within the show code.  */
-$[cdefine TRACK_IN_INTERPRETER]
-
-/* Define if we want to enable track-memory-usage.  */
-$[cdefine DO_MEMORY_USAGE]
-
-/* Define if we want to compile in support for pipelining.  */
-$[cdefine DO_PIPELINING]
-
 /* Define if we have RAD game tools, Miles Sound System installed.  */
 $[cdefine HAVE_RAD_MSS]
 
@@ -78,22 +50,11 @@ $[cdefine HAVE_NURBSPP]
 $[cdefine HAVE_VRPN]
 
 /* Define if we have zlib installed.  */
-/* $[ZLIB_LPATH] */
 $[cdefine HAVE_ZLIB]
 
-/* Define if we have sox libst installed.  */
-$[cdefine HAVE_SOXST]
-
 /* Define if we have OpenGL installed and want to build for GL.  */
 $[cdefine HAVE_GL]
 
-/* Define if we have Chromium OpenGL installed and want to build for GL.  */
-/* $[CHROMIUM_LPATH] */
-$[cdefine HAVE_CHROMIUM]
-
-/* Define if we have Chromium installed and want to run it in Windows.  */
-$[cdefine HAVE_WCR]
-
 /* Define if we want to build with SGI OpenGL extensions.  */
 $[cdefine HAVE_SGIGL]
 
@@ -109,9 +70,18 @@ $[cdefine HAVE_GLUT]
 /* Define if we have DirectX installed and want to build for DX.  */
 $[cdefine HAVE_DX]
 
+/* Define if we have Chromium OpenGL installed and want to build for GL.  */
+$[cdefine HAVE_CHROMIUM]
+
+/* Define if we have Chromium installed and want to run it in Windows.  */
+$[cdefine HAVE_WCR]
+
 /* Define if we want to build the Renderman interface.  */
 $[cdefine HAVE_RIB]
 
+/* Define if we have sox libst installed.  */
+$[cdefine HAVE_SOXST]
+
 /* Define if we want to use mikmod for audio.  */
 $[cdefine HAVE_MIKMOD]
 
@@ -121,29 +91,55 @@ $[cdefine HAVE_IPC]
 /* Define if we want to compile the net code.  */
 $[cdefine HAVE_NET]
 
+/* Define if we want to compile the audio code.  */
+$[cdefine HAVE_AUDIO]
+
+/* Define if we have bison and flex available. */
+$[cdefine HAVE_BISON]
+
 /* Define if we want to use PStats.  */
 $[cdefine DO_PSTATS]
 
+/* Define if we want to track callbacks from within the show code.  */
+$[cdefine TRACK_IN_INTERPRETER]
+
+/* Define if we want to enable track-memory-usage.  */
+$[cdefine DO_MEMORY_USAGE]
+
+/* Define if we want to compile in support for pipelining.  */
+$[cdefine DO_PIPELINING]
+
 /* Define if we want to keep Notify debug messages around, or undefine 
    to compile them out.  */
 $[cdefine NOTIFY_DEBUG]
 
-/* Define if we want to compile the audio code.  */
-$[cdefine HAVE_AUDIO]
-
 /* Define if we want to export template classes from the DLL.  Only
    makes sense to MSVC++. */
 $[cdefine EXPORT_TEMPLATES]
 
-/* Define if we have bison and flex available. */
-$[cdefine HAVE_BISON]
-
 /* Define if we are linking PANDAGL in with PANDA. */
 $[cdefine LINK_IN_GL]
 
 /* Define if we are linking PANDAPHYSICS in with PANDA. */
 $[cdefine LINK_IN_PHYSICS]
 
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+$[cdefine WORDS_BIGENDIAN]
+
+/* Define if the C++ compiler uses namespaces.  */
+$[cdefine HAVE_NAMESPACE]
+
+/* Define if the C++ iostream library supports ios::binary.  */
+$[cdefine HAVE_IOS_BINARY]
+
+/* Define if we can trust the compiler not to insert extra bytes in
+   structs between base structs and derived structs. */
+$[cdefine SIMPLE_STRUCT_POINTERS]
+
+/* Define if we have Dinkumware STL installed.  */
+$[cdefine HAVE_DINKUM]
+
 /* Define if we have a gettimeofday() function. */
 $[cdefine HAVE_GETTIMEOFDAY]
 
@@ -256,5 +252,3 @@ $[cdefine MODERN_STYLE_ALLOCATOR]
 $[cdefine NO_STYLE_ALLOCATOR]
 
 #end dtool_config.h
-
-#endif   // BUILD_TYPE