From 0ecc54b1a4e815737bdac2f2495e6b5aa333c2db Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 24 May 2002 22:58:45 +0000 Subject: [PATCH] clarify for users --- dtool/Config.pp | 8 ++--- dtool/LocalSetup.pp | 88 +++++++++++++++++++++------------------------ 2 files changed, 44 insertions(+), 52 deletions(-) diff --git a/dtool/Config.pp b/dtool/Config.pp index e32f46757c..2f35433dc0 100644 --- a/dtool/Config.pp +++ b/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 diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp index 29d6cc832b..1a050655e6 100644 --- a/dtool/LocalSetup.pp +++ b/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