Browse Source

change some default settings; remove some unused variables

David Rose 17 years ago
parent
commit
7ec03c1c3e
3 changed files with 17 additions and 49 deletions
  1. 12 26
      dtool/Config.pp
  2. 5 16
      dtool/LocalSetup.pp
  3. 0 7
      dtool/Package.pp

+ 12 - 26
dtool/Config.pp

@@ -609,27 +609,22 @@
 // Similar to MIN_GL_VERSION, above.
 #define MIN_MESA_VERSION 1 1
 
-// Do you want to build tinydisplay, a cheesy software renderer built
-// into Panda, based on TinyGL?  On some platforms, this presently
-// requires SDL for window management.
-#define HAVE_TINYDISPLAY
-
-// The SDL library is at the moment required only for support of
-// tinydisplay.  It may not even be required for that, as we are in
-// the process of porting tinydisplay to direct OS-native window
-// creation.
+// Do you want to build tinydisplay, a light and fast software
+// renderer built into Panda, based on TinyGL?  This isn't as
+// full-featured as Mesa, but it is many times faster, and in fact
+// competes favorably with hardware-accelerated integrated graphics
+// cards for raw speed (though the hardware-accelerated output looks
+// better).
+#define HAVE_TINYDISPLAY 1
+
+// The SDL library is useful only for tinydisplay, and is not even
+// required for that, as tinydisplay is also supported natively on
+// each supported platform.
 #define SDL_IPATH
 #define SDL_LPATH
 #define SDL_LIBS
 #defer HAVE_SDL $[libtest $[SDL_LPATH],$[SDL_LIBS]]
 
-// Is the Chromium remote-rendering library installed, and where?
-// This should include libcr_opengl32.
-#defer CHROMIUM_IPATH
-#defer CHROMIUM_LPATH
-#defer CHROMIUM_LIBS
-#defer HAVE_CHROMIUM $[libtest $[CHROMIUM_LPATH],$[CHROMIUM_LIBS]]
-
 // How about GLX?
 #define GLX_IPATH
 #define GLX_LPATH
@@ -649,9 +644,6 @@
 // Should we try to build the WGL interface?
 #defer HAVE_WGL $[and $[HAVE_GL],$[WINDOWS_PLATFORM]]
 
-// Should we try to build the SGI-specific glxdisplay?
-#define HAVE_SGIGL $[eq $[PLATFORM],Irix]
-
 // Is DirectX8 available, and should we try to build with it?
 #define DX8_IPATH
 #define DX8_LPATH
@@ -712,12 +704,6 @@
 // This will compile in a homespun cooperative threading
 // implementation that runs strictly on one CPU, adding very little
 // overhead over plain single-threaded code.
-
-// Since SIMPLE_THREADS requires special support from the C runtime
-// library, it may not be available on all platforms and
-// architectures.  (However, it is known to be available on the big
-// three: Linux, Win32, and OSX, with their most common
-// architectures.)
 #define SIMPLE_THREADS
 
 // If you are using SIMPLE_THREADS, you might further wish to disable
@@ -754,7 +740,7 @@
 // "thread" when I/O is delayed, instead of blocking the entire
 // process.  Normally, there's no reason to turn this off, unless you
 // suspect a bug in Panda.
-#define USE_PANDAFILESTREAM
+#define USE_PANDAFILESTREAM 1
 
 // Do you want to build the PStats interface, for graphical run-time
 // performance statistics?  This requires NET to be available.  By

+ 5 - 16
dtool/LocalSetup.pp

@@ -41,11 +41,6 @@
 #else
 #print - Did not find fftw
 #endif
-#if $[HAVE_BDB]
-#print + Berkeley DB
-#else
-#print - Did not find Berkeley DB
-#endif
 #if $[HAVE_CG]
 #print + Nvidia Cg High Level Shading Language
 #else
@@ -121,11 +116,11 @@
 #else
 #print - Not building Tinydisplay
 #endif
-#if $[HAVE_SDL]
-#print + SDL
-#else
-#print - Did not find SDL
-#endif
+//#if $[HAVE_SDL]
+//#print + SDL
+//#else
+//#print - Did not find SDL
+//#endif
 #if $[HAVE_MESA]
 #print + Mesa
 #else
@@ -281,9 +276,6 @@ $[cdefine MESA_MGL]
 # define MIN_MESA_VERSION_MINOR $[word 2,$[MIN_MESA_VERSION]]
 #endif
 
-/* Define if we want to build with SGI OpenGL extensions.  */
-$[cdefine HAVE_SGIGL]
-
 /* Define if we have GLX installed and want to build for GLX.  */
 $[cdefine HAVE_GLX]
 
@@ -302,9 +294,6 @@ $[cdefine HAVE_TINYDISPLAY]
 /* Define if we have the SDL library. */
 $[cdefine HAVE_SDL]
 
-/* Define if we have Chromium installed and want to use it.  */
-$[cdefine HAVE_CHROMIUM]
-
 /* Define if we want to compile the threading code.  */
 $[cdefine HAVE_THREADS]
 

+ 0 - 7
dtool/Package.pp

@@ -203,19 +203,12 @@
 #set MESA_MGL $[MESA_MGL]
 #set HAVE_MESA $[HAVE_MESA]
 
-#set CHROMIUM_IPATH $[unixfilename $[CHROMIUM_IPATH]]
-#set CHROMIUM_LPATH $[unixfilename $[CHROMIUM_LPATH]]
-#set CHROMIUM_LIBS $[CHROMIUM_LIBS]
-#set HAVE_CHROMIUM $[HAVE_CHROMIUM]
-
 #set GLX_IPATH $[unixfilename $[GLX_IPATH]]
 #set GLX_LPATH $[unixfilename $[GLX_LPATH]]
 #set HAVE_GLX $[HAVE_GLX]
 
 #set HAVE_WGL $[HAVE_WGL]
 
-#set HAVE_SGIGL $[HAVE_SGIGL]
-
 #set DX8_IPATH $[unixfilename $[DX8_IPATH]]
 #set DX8_LPATH $[unixfilename $[DX8_LPATH]]
 #set DX8_LIBS $[DX8_LIBS]