Merge head into branch

fixup gamma_render.c
2003-11-24 12:01:39 +00:00 · 2003-11-21 16:41:14 +00:00 · 2003-11-21 15:49:24 +00:00 · 2003-11-21 13:40:19 +00:00 · 2003-11-12 14:26:20 +00:00 · 2003-11-11 15:28:34 +00:00
1389 changed files with 77808 additions and 269566 deletions
--- a/1096
+++ b/1096
--- a/383
+++ b/383
@@ -1,383 +0,0 @@
 # Top-level Mesa makefile
 TOP = .
 SUBDIRS = src progs
 default: $(TOP)/configs/current
 	@for dir in $(SUBDIRS) ; do \
 		(cd $$dir ; $(MAKE)) || exit 1 ; \
 	done
 doxygen:
 	(cd doxygen ; make) ; \
 clean:
 	@for dir in $(SUBDIRS) ; do \
 		(cd $$dir ; $(MAKE) clean) ; \
 	done
 realclean:
 	touch $(TOP)/configs/current
 	$(MAKE) clean
 	-rm -rf lib*
 	-rm -f $(TOP)/configs/current
 	-rm -f `find . -name \*.o`
 	-rm -f `find . -name \*.a`
 	-rm -f `find . -name \*.so`
 install:
 	@echo "Installing"
 	$(TOP)/bin/installmesa 
 # If there's no current configuration file
 $(TOP)/configs/current:
 	@echo
 	@echo
 	@echo "Please choose a configuration from the following list:"
 	@ls -1 $(TOP)/configs | grep -v "current\|default\|CVS"
 	@echo
 	@echo "Then type 'make <config>' (ex: 'make linux-x86')"
 	@echo "(ignore the following error message)"
 	@exit 1
 # Rules to set/install a specific build configuration
 aix \
 aix-64 \
 aix-gcc \
 aix-static \
 beos \
 darwin \
 darwin-static \
 freebsd \
 freebsd-dri \
 freebsd-dri-x86 \
 hpux10 \
 hpux10-gcc \
 hpux10-static \
 hpux11-32 \
 hpux11-32-static \
 hpux11-32-static-nothreads \
 hpux11-64 \
 hpux11-64-static \
 hpux9 \
 hpux9-gcc \
 irix6-64 \
 irix6-64-static \
 irix6-n32 \
 irix6-n32-static \
 irix6-o32 \
 irix6-o32-static \
 linux \
 linux-alpha \
 linux-alpha-static \
 linux-debug \
 linux-dri \
 linux-dri-x86 \
 linux-dri-x86-64 \
 linux-dri-ppc \
 linux-glide \
 linux-icc \
 linux-icc-static \
 linux-osmesa16 \
 linux-osmesa16-static \
 linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
 linux-solo \
 linux-solo-x86 \
 linux-solo-ia64 \
 linux-sparc \
 linux-sparc5 \
 linux-static \
 linux-ultrasparc \
 linux-tcc \
 linux-x86 \
 linux-x86-debug \
 linux-x86-64 \
 linux-x86-64-static \
 linux-x86-glide \
 linux-x86-static \
 netbsd \
 openbsd \
 osf1 \
 solaris-x86 \
 solaris-x86-gcc \
 sunos4 \
 sunos4-gcc \
 sunos4-static \
 sunos5 \
 sunos5-gcc \
 sunos5-smp \
 ultrix-gcc:
 	(cd configs && rm -f current && ln -s $@ current)
 	$(MAKE) default
 # Rules for making release tarballs
 DIRECTORY = Mesa-6.2
 LIB_NAME = MesaLib-6.2
 DEMO_NAME = MesaDemos-6.2
 LIB_FILES =	\
 	$(DIRECTORY)/Makefile*						\
 	$(DIRECTORY)/descrip.mms					\
 	$(DIRECTORY)/mms-config.					\
 	$(DIRECTORY)/Mesa.dsw						\
 	$(DIRECTORY)/bin/mklib						\
 	$(DIRECTORY)/bin/installmesa					\
 	$(DIRECTORY)/configs/[a-z]*					\
 	$(DIRECTORY)/docs/*.html					\
 	$(DIRECTORY)/docs/COPYING					\
 	$(DIRECTORY)/docs/INSTALL.GNU					\
 	$(DIRECTORY)/docs/README.*					\
 	$(DIRECTORY)/docs/RELNOTES*					\
 	$(DIRECTORY)/docs/VERSIONS					\
 	$(DIRECTORY)/docs/*.spec					\
 	$(DIRECTORY)/include/GL/internal/glcore.h			\
 	$(DIRECTORY)/include/GL/dmesa.h					\
 	$(DIRECTORY)/include/GL/amesa.h					\
 	$(DIRECTORY)/include/GL/fxmesa.h				\
 	$(DIRECTORY)/include/GL/ggimesa.h				\
 	$(DIRECTORY)/include/GL/gl.h					\
 	$(DIRECTORY)/include/GL/glext.h					\
 	$(DIRECTORY)/include/GL/gl_mangle.h				\
 	$(DIRECTORY)/include/GL/glu.h					\
 	$(DIRECTORY)/include/GL/glu_mangle.h				\
 	$(DIRECTORY)/include/GL/glx.h					\
 	$(DIRECTORY)/include/GL/glxext.h				\
 	$(DIRECTORY)/include/GL/glx_mangle.h				\
 	$(DIRECTORY)/include/GL/mesa_wgl.h				\
 	$(DIRECTORY)/include/GL/mglmesa.h				\
 	$(DIRECTORY)/include/GL/osmesa.h				\
 	$(DIRECTORY)/include/GL/svgamesa.h				\
 	$(DIRECTORY)/include/GL/ugl*.h					\
 	$(DIRECTORY)/include/GL/vms_x_fix.h				\
 	$(DIRECTORY)/include/GL/wmesa.h					\
 	$(DIRECTORY)/include/GL/xmesa.h					\
 	$(DIRECTORY)/include/GL/xmesa_x.h				\
 	$(DIRECTORY)/include/GL/xmesa_xf86.h				\
 	$(DIRECTORY)/src/Makefile					\
 	$(DIRECTORY)/src/descrip.mms					\
 	$(DIRECTORY)/src/mesa/Makefile*					\
 	$(DIRECTORY)/src/mesa/sources					\
 	$(DIRECTORY)/src/mesa/descrip.mms				\
 	$(DIRECTORY)/src/mesa/depend					\
 	$(DIRECTORY)/src/mesa/main/*.[chS]				\
 	$(DIRECTORY)/src/mesa/main/main.dsp				\
 	$(DIRECTORY)/src/mesa/main/descrip.mms				\
 	$(DIRECTORY)/src/mesa/glapi/*.[chS]				\
 	$(DIRECTORY)/src/mesa/glapi/glapi.dsp				\
 	$(DIRECTORY)/src/mesa/glapi/descrip.mms				\
 	$(DIRECTORY)/src/mesa/array_cache/*.[ch]			\
 	$(DIRECTORY)/src/mesa/array_cache/array_cache.dsp		\
 	$(DIRECTORY)/src/mesa/array_cache/descrip.mms			\
 	$(DIRECTORY)/src/mesa/math/*.[ch]				\
 	$(DIRECTORY)/src/mesa/math/math.dsp				\
 	$(DIRECTORY)/src/mesa/math/descrip.mms				\
 	$(DIRECTORY)/src/mesa/shader/*.[ch]				\
 	$(DIRECTORY)/src/mesa/shader/shader.dsp				\
 	$(DIRECTORY)/src/mesa/shader/descrip.mms			\
 	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\
 	$(DIRECTORY)/src/mesa/swrast/swrast.dsp				\
 	$(DIRECTORY)/src/mesa/swrast/descrip.mms			\
 	$(DIRECTORY)/src/mesa/swrast_setup/*.[ch]			\
 	$(DIRECTORY)/src/mesa/swrast_setup/swrast_setup.dsp		\
 	$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms			\
 	$(DIRECTORY)/src/mesa/tnl/*.[chS]				\
 	$(DIRECTORY)/src/mesa/tnl/tnl.dsp				\
 	$(DIRECTORY)/src/mesa/tnl/descrip.mms				\
 	$(DIRECTORY)/src/mesa/tnl_dd/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm			\
 	$(DIRECTORY)/src/mesa/drivers/beos/*.cpp			\
 	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\
 	$(DIRECTORY)/src/mesa/drivers/dos/*.[chS]			\
 	$(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\
 	$(DIRECTORY)/src/mesa/drivers/glide/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/glide/*.def			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in		\
 	$(DIRECTORY)/src/mesa/drivers/ggi/default/*.c			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/default/genkgi.conf.in	\
 	$(DIRECTORY)/src/mesa/drivers/ggi/display/*.c			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in		\
 	$(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def			\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.dsp			\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/svga/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.def			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.dsp			\
 	$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms			\
 	$(DIRECTORY)/src/mesa/drivers/x11/*.[ch]			\
 	$(DIRECTORY)/src/mesa/sparc/*.[chS]				\
 	$(DIRECTORY)/src/mesa/x86/Makefile				\
 	$(DIRECTORY)/src/mesa/x86/*.[ch]				\
 	$(DIRECTORY)/src/mesa/x86/*.S					\
 	$(DIRECTORY)/src/glu/Makefile					\
 	$(DIRECTORY)/src/glu/descrip.mms				\
 	$(DIRECTORY)/src/glu/sgi/Makefile				\
 	$(DIRECTORY)/src/glu/sgi/Makefile.win				\
 	$(DIRECTORY)/src/glu/sgi/Makefile.DJ				\
 	$(DIRECTORY)/src/glu/sgi/cc*.txt				\
 	$(DIRECTORY)/src/glu/sgi/glu.def				\
 	$(DIRECTORY)/src/glu/sgi/glu.dsp				\
 	$(DIRECTORY)/src/glu/sgi/dummy.cc				\
 	$(DIRECTORY)/src/glu/sgi/descrip.mms				\
 	$(DIRECTORY)/src/glu/sgi/mesaglu.opt				\
 	$(DIRECTORY)/src/glu/sgi/include/gluos.h			\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h			\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc		\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h			\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc		\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h			\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc			\
 	$(DIRECTORY)/src/glu/sgi/libtess/README				\
 	$(DIRECTORY)/src/glu/sgi/libtess/alg-outline			\
 	$(DIRECTORY)/src/glu/sgi/libtess/*.[ch]				\
 	$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]				\
 	$(DIRECTORY)/src/glu/mesa/README[12]				\
 	$(DIRECTORY)/src/glu/mesa/Makefile*				\
 	$(DIRECTORY)/src/glu/mesa/descrip.mms				\
 	$(DIRECTORY)/src/glu/mesa/mms_depend				\
 	$(DIRECTORY)/src/glu/mesa/*.def					\
 	$(DIRECTORY)/src/glu/mesa/depend				\
 	$(DIRECTORY)/src/glu/mesa/*.[ch]				\
 	$(DIRECTORY)/src/glw/*.[ch]					\
 	$(DIRECTORY)/src/glw/Makefile*					\
 	$(DIRECTORY)/src/glw/README					\
 	$(DIRECTORY)/src/glw/depend					\
 	$(DIRECTORY)/progs/Makefile					\
 	$(DIRECTORY)/progs/util/README					\
 	$(DIRECTORY)/progs/util/*.[ch]					\
 	$(DIRECTORY)/progs/util/sampleMakefile				\
 	$(DIRECTORY)/vms/analyze_map.com				\
 	$(DIRECTORY)/vms/xlib.opt					\
 	$(DIRECTORY)/vms/xlib_share.opt
 DEMO_FILES =	\
 	$(DIRECTORY)/include/GL/glut.h			\
 	$(DIRECTORY)/include/GL/glutf90.h		\
 	$(DIRECTORY)/src/glut/glx/Makefile*		\
 	$(DIRECTORY)/src/glut/glx/depend		\
 	$(DIRECTORY)/src/glut/glx/*def			\
 	$(DIRECTORY)/src/glut/glx/descrip.mms		\
 	$(DIRECTORY)/src/glut/glx/mms_depend		\
 	$(DIRECTORY)/src/glut/glx/glut.dsp		\
 	$(DIRECTORY)/src/glut/glx/*.[ch]		\
 	$(DIRECTORY)/src/glut/beos/*.[ch]		\
 	$(DIRECTORY)/src/glut/beos/*.cpp		\
 	$(DIRECTORY)/src/glut/beos/Makefile		\
 	$(DIRECTORY)/src/glut/dos/*.[ch]		\
 	$(DIRECTORY)/src/glut/dos/Makefile.DJ		\
 	$(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]		\
 	$(DIRECTORY)/src/glut/ggi/*.[ch]		\
 	$(DIRECTORY)/src/glut/ggi/Makefile		\
 	$(DIRECTORY)/progs/beos/*.cpp			\
 	$(DIRECTORY)/progs/beos/Makefile		\
 	$(DIRECTORY)/progs/images/*.rgb			\
 	$(DIRECTORY)/progs/images/*.rgba		\
 	$(DIRECTORY)/progs/demos/Makefile*		\
 	$(DIRECTORY)/progs/demos/descrip.mms		\
 	$(DIRECTORY)/progs/demos/*.[ch]			\
 	$(DIRECTORY)/progs/demos/*.cxx			\
 	$(DIRECTORY)/progs/demos/*.dat			\
 	$(DIRECTORY)/progs/demos/README			\
 	$(DIRECTORY)/progs/demos/Windows/*.dsp		\
 	$(DIRECTORY)/progs/demos/Windows/*.dsw		\
 	$(DIRECTORY)/progs/xdemos/Makefile*		\
 	$(DIRECTORY)/progs/xdemos/descrip.mms		\
 	$(DIRECTORY)/progs/xdemos/*.[chf]		\
 	$(DIRECTORY)/progs/redbook/Makefile*		\
 	$(DIRECTORY)/progs/redbook/README		\
 	$(DIRECTORY)/progs/redbook/*.[ch]		\
 	$(DIRECTORY)/progs/samples/Makefile*		\
 	$(DIRECTORY)/progs/samples/README		\
 	$(DIRECTORY)/progs/samples/*.c			\
 	$(DIRECTORY)/progs/windml/Makefile.ugl		\
 	$(DIRECTORY)/progs/windml/*.c			\
 	$(DIRECTORY)/progs/windml/*.bmp			\
 	$(DIRECTORY)/progs/ggi/*.c
 DRI_FILES = \
 	$(DIRECTORY)/src/glx/Makefile					\
 	$(DIRECTORY)/src/glx/mini/*.[ch]				\
 	$(DIRECTORY)/src/glx/mini/example.miniglx.conf			\
 	$(DIRECTORY)/src/glx/mini/NOTES					\
 	$(DIRECTORY)/src/mesa/drivers/dri/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/dri/Makefile.template		\
 	$(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/dri/dri_client/imports/*.h	\
 	$(DIRECTORY)/src/mesa/drivers/dri/*/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/dri/*/depend			\
 	$(DIRECTORY)/src/mesa/drivers/dri/*/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile			\
 	$(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch]
 # Everything for new a Mesa release:
 tarballs: lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5
 lib_gz:
 	rm -f configs/current ; \
 	cd .. ; \
 	tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
 	gzip $(LIB_NAME).tar ; \
 	mv $(LIB_NAME).tar.gz $(DIRECTORY)
 demo_gz:
 	cd .. ; \
 	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
 	gzip $(DEMO_NAME).tar ; \
 	mv $(DEMO_NAME).tar.gz $(DIRECTORY)
 lib_bz2:
 	rm -f configs/current ; \
 	cd .. ; \
 	tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
 	bzip2 $(LIB_NAME).tar ; \
 	mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
 demo_bz2:
 	cd .. ; \
 	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
 	bzip2 $(DEMO_NAME).tar ; \
 	mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
 lib_zip:
 	rm -f configs/current ; \
 	-rm $(LIB_NAME).zip ; \
 	cd .. ; \
 	zip -r $(LIB_NAME).zip $(LIB_FILES) ; \
 	mv $(LIB_NAME).zip $(DIRECTORY)
 demo_zip:
 	-rm $(DEMO_NAME).zip ; \
 	cd .. ; \
 	zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
 	mv $(DEMO_NAME).zip $(DIRECTORY)
 md5:
 	@-md5sum $(LIB_NAME).tar.gz
 	@-md5sum $(LIB_NAME).tar.bz2
 	@-md5sum $(LIB_NAME).zip
 	@-md5sum $(DEMO_NAME).tar.gz
 	@-md5sum $(DEMO_NAME).tar.bz2
 	@-md5sum $(DEMO_NAME).zip
--- a/Makefile.DJ
+++ b/Makefile.DJ
@@ -20,9 +20,9 @@
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# DOS/DJGPP makefile v1.6 for Mesa
+# DOS/DJGPP makefile v1.4 for Mesa
 #
-#  Copyright (C) 2002 - Daniel Borca
+#  Copyright (C) 2002 - Borca Daniel
 #  Email : dborca@users.sourceforge.net
 #  Web   : http://www.geocities.com/dborca
@@ -43,7 +43,18 @@
 #			As a consequence, you'll need the DJGPP Glide3
 #			library to build any application.
 #			default = no
-#	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
+#	MATROX=1	build for Matrox Millennium I (MGA2064W) cards.
 #			This is experimental and not intensively tested.
 #			default = no
 #	HAVE_X86=1	optimize for i386.
 #			default = no
 #	HAVE_MMX=1	allow MMX specializations, provided your assembler
 #			supports MMX instruction set. However, the true CPU
 #			capabilities are checked at run-time to avoid crashes.
 #			default = no
 #	HAVE_SSE=1	(see HAVE_MMX)
 #			default = no
 #	HAVE_3DNOW=1	(see HAVE_MMX)
 #			default = no
 #
 #    Targets:
@@ -64,7 +75,7 @@ CPU ?= pentium
 GLU ?= mesa
 CFLAGS = -Wall -W -pedantic
-CFLAGS += -O2 -ffast-math -mtune=$(CPU)
+CFLAGS += -O2 -ffast-math -mcpu=$(CPU)
 export CFLAGS
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -0,0 +1,622 @@
 # $Id: Makefile.X11,v 1.89.2.1 2003/11/24 12:01:39 keithw Exp $
 # Mesa 3-D graphics library
 # Version:  5.1
 # 
 # Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
 # and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
 # 
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 # 
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 # BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # Top-level makefile for Mesa
 # To add a new configuration for your system add it to the list below
 # then update the Make-config file.
 SHELL = /bin/sh
 default:
 	@echo "Type one of the following:"
 	@echo "  make aix                   for IBM RS/6000 with AIX"
 	@echo "  make aix-sl                for IBM RS/6000, make shared libs"
 	@echo "  make beos-r4               for BeOS R4"
 	@echo "  make cygnus                for Win95/NT using Cygnus-Win32"
 	@echo "  make cygnus-linux          for Win95/NT using Cygnus-Win32 under Linux"
 	@echo "  make darwin                for Darwin - Mac OS X"
 	@echo "  make freebsd               for FreeBSD systems with GCC"
 	@echo "  make freebsd-386           for FreeBSD systems with GCC, w/ Intel assembly"
 	@echo "  make gcc-sl                for a generic system with GCC for shared libs"
 	@echo "  make hpux9                 for HP systems with HPUX 9.x"
 	@echo "  make hpux9-sl              for HP systems with HPUX 9.x, make shared libs"
 	@echo "  make hpux9-gcc             for HP systems with HPUX 9.x using GCC"
 	@echo "  make hpux9-gcc-sl          for HP systems with HPUX 9.x, GCC, make shared libs"
 	@echo "  make hpux10                for HP systems with HPUX 10.x and 11.x"
 	@echo "  make hpux10-sl             for HP systems with HPUX 10.x and 11.x, shared libs"
 	@echo "  make hpux10-gcc            for HP systems with HPUX 10.x w/ GCC"
 	@echo "  make hpux10-gcc-sl         for HP systems with HPUX 10.x w/ GCC, shared libs"
 	@echo "  make irix6-o32             for SGI systems with IRIX 6.x, make o32-bit libs"
 	@echo "  make irix6-o32-dso         for SGI systems with IRIX 6.x, make o32-bit DSOs"
 	@echo "  make irix6-n32             for SGI systems with IRIX 6.x, make n32-bit libs"
 	@echo "  make irix6-n32-dso         for SGI systems with IRIX 6.x, make n32-bit DSOs"
 	@echo "  make irix6-gcc-n32-sl      for SGI systems with IRIX 6.x, GCC, make n32 DSOs"
 	@echo "  make irix6-64              for SGI systems with IRIX 6.x, make 64-bit libs"
 	@echo "  make irix6-64-dso          for SGI systems with IRIX 6.x, make 64-bit DSOs"
 	@echo "  make linux                 for Linux"
 	@echo "  make linux-x86             for Linux with x86 optimizations"
 	@echo "  make linux-ggi             for Linux with libggi driver"
 	@echo "  make linux-x86-ggi         for Linux with libggi driver and x86 optimizations"
 	@echo "  make linux-glide           for Linux with 3Dfx Glide driver"
 	@echo "  make linux-x86-glide       for Linux with 3Dfx Glide driver and x86 opts"
 	@echo "  make linux-alpha           for Linux with Alpha optimizations"
 	@echo "  make linux-alpha-static    for Linux with Alpha opts, make static libs"
 	@echo "  make linux-ppc             for Linux with PowerPC opts"
 	@echo "  make linux-ppc-static      for Linux with PowerPC opts, make static libs"
 	@echo "  make linux-sparc           for Linux with Sparc optimzations"
 	@echo "  make linux-sparc5          for Linux with Sparc5 optimizations"
 	@echo "  make linux-sparc-ultra     for Linux with UltraSparc optimizations"
 	@echo "  make linux-osmesa16        for 16-bit/channel OSMesa"
 	@echo "  make linux-osmesa16-static for 16-bit/channel OSMesa, make static libs"
 	@echo "  make linux-osmesa32        for 32-bit/channel OSMesa"
 	@echo "  make linux-solo            for Linux standalone with dri drivers"
 	@echo "  make linux-icc             for Linux with the Intel C/C++ compiler"
 	@echo "  make lynxos                for LynxOS systems with GCC"
 	@echo "  make mklinux               for Linux on Power Macintosh"
 	@echo "  make netbsd                for NetBSD 1.0 systems with GCC"
 	@echo "  make openbsd               for OpenBSD systems"
 	@echo "  make openstep              for OpenStep/MacOSX Server systems"
 	@echo "  make osf1                  for DEC Alpha systems with OSF/1"
 	@echo "  make qnx                   for QNX V4 systems with Watcom compiler"
 	@echo "  make solaris-x86           for PCs with Solaris"
 	@echo "  make solaris-x86-gcc       for PCs with Solaris using GCC"
 	@echo "  make sunos4                for Suns with SunOS 4.x"
 	@echo "  make sunos4-sl             for Suns with SunOS 4.x, make shared libs"
 	@echo "  make sunos4-gcc            for Suns with SunOS 4.x and GCC"
 	@echo "  make sunos4-gcc-sl         for Suns with SunOS 4.x, GCC, make shared libs"
 	@echo "  make sunos5                for Suns with SunOS 5.x"
 	@echo "  make sunos5-smp            for Suns with SunOS 5.x, SMP optimization"
 	@echo "  make sunos5-gcc            for Suns with SunOS 5.x and GCC"
 	@echo "  make ultrix-gcc            for DEC systems with Ultrix and GCC"
 	@echo "  make unixware              for PCs running UnixWare"
 	@echo "  make unixware-shared       for PCs running UnixWare, shared libs"
 	@echo "  make clean                 remove .o files"
 	@echo "  make realclean             remove .o, library and executable files"
 # XXX we may have to split up this group of targets into those that
 # have a C++ compiler and those that don't for the SI-GLU library.
 aix aix-sl darwin freebsd freebsd-386 gcc-sl \
 hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
 hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
 linux linux-debug \
 linux-x86 linux-x86-sse linux-icc linux-x86-static linux-x86-debug \
 linux-glide linux-x86-glide linux-glide-debug \
 linux-alpha-static linux-alpha \
 linux-ppc-static linux-ppc \
 linux-sparc linux-sparc5 linux-sparc-ultra \
 mklinux netbsd osf1 openbsd qnx \
 solaris-x86 solaris-x86-gcc \
 sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
 sunos5 sunos5-smp sunos5-gcc \
 ultrix-gcc unixware:
 	-mkdir lib
 	if [ -d src/mesa     ] ; then touch src/mesa/depend     ; fi
 	if [ -d src/glu/sgi  ] ; then touch src/glu/sgi/depend  ; fi
 	if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi
 	if [ -d src/glw      ] ; then touch src/glw/depend      ; fi
 	if [ -d src/mesa      ] ; then cd src/mesa      ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glu/sgi   ] ; then cd src/glu/sgi   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glut/glx  ] ; then cd src/glut/glx  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/demos   ] ; then cd progs/demos   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/xdemos  ] ; then cd progs/xdemos  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glw       ] ; then cd src/glw       ; $(MAKE) -f Makefile.X11 $@ ; fi
 gcc-mesa-sl:
 	if [ -d src ] ; then cd src  ; $(MAKE) -f Makefile.X11 $@ ; fi
 irix6-o32 irix6-o32-dso irix6-n32 irix6-n32-dso irix6-gcc-n32-sl:
 	-mkdir lib32
 	if [ -d src/mesa      ] ; then touch src/mesa/depend      ; fi
 	if [ -d src/glu/sgi   ] ; then touch src/glu/sgi/depend   ; fi
 	if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi
 	if [ -d src/glw ] ; then touch src/glw/depend ; fi
 	if [ -d src/mesa      ] ; then cd src/mesa      ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glu/sgi   ] ; then cd src/glu/sgi   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/demos    ] ; then cd progs/demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/xdemos   ] ; then cd progs/xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/samples  ] ; then cd progs/samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/redbook     ] ; then cd progs/redbook     ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glw ] ; then cd src/glw; $(MAKE) -f Makefile.X11 $@ ; fi
 irix6-64 irix6-64-dso:
 	-mkdir lib64
 	if [ -d src/mesa     ] ; then touch src/mesa/depend     ; fi
 	if [ -d src/glu/sgi  ] ; then touch src/glu/sgi/depend  ; fi
 	if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi
 	if [ -d src/glw      ] ; then touch src/glw/depend      ; fi
 	if [ -d src/mesa      ] ; then cd src/mesa      ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glu/sgi   ] ; then cd src/glu/sgi   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glut/glx  ] ; then cd src/glut/glx  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/demos   ] ; then cd progs/demos   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/xdemos  ] ; then cd progs/xdemos  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glw ] ; then cd src/glw; $(MAKE) -f Makefile.X11 $@ ; fi
 beos-r4:
 	-mkdir lib
 	-rm src/mesa/depend
 	touch src/mesa/depend
 	-rm src/glu/sgi/depend
 	touch src/glu/sgi/depend
 	if [ -d src/mesa      ] ; then cd src/mesa      ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
 	if [ -d src/glu/sgi   ] ; then cd src/glu/sgi   ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
 	if [ -d src/glut/beos ] ; then cd src/glut/beos ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
 	if [ -d src/glut/beos ] ; then cp src/glut/beos/obj*/libglut.so lib  ; fi
 	if [ -d progs/beos    ] ; then cd progs/beos    ; $(MAKE)                        ; fi
 	if [ -d progs/demos   ] ; then cd progs/demos   ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
 	if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
 	if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
 cygnus cygnus-linux:
 	-mkdir lib
 	touch src/depend
 	touch src-glu/depend
 	if [ -d src/mesa     ] ; then cd src/mesa     ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glu/sgi  ] ; then cd src/glu/sgi  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/demos  ] ; then cd progs/demos  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/xdemos ] ; then cd progs/xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glw      ] ; then cd src/glw      ; $(MAKE) -f Makefile.X11 $@ ; fi
 openstep:
 	-mkdir lib
 	cd src/mesa    ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
 	cd src/glu/sgi ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
 linux-ggi linux-x86-ggi:
 	-mkdir lib
 	touch src/depend
 	touch src/glu/sgi/depend
 	if [ -d src/glut/glx    ] ; then touch src/glut/glx/depend ; fi
 	if [ -d src/glw         ] ; then touch src/glw/depend ; fi
 	if [ -d src/mesa        ] ; then cd src            ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glu/sgi     ] ; then cd src/glu/sgi    ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glut/glx    ] ; then cd src/glut/glx   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d ggi/demos       ] ; then cd ggi/demos      ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/demos     ] ; then cd progs/demos    ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/xdemos    ] ; then cd progs/xdemos   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/samples   ] ; then cd progs/samples  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/redbook   ] ; then cd progs/redbook  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glw ] ; then cd src/glw; $(MAKE) -f Makefile.X11 $@ ; fi
 # if you change GGI_DEST please change it in ggimesa.conf, too.
 DESTDIR=/usr/local
 GGI_DEST=lib/ggi/mesa
 linux-ggi-install linux-x86-ggi-install:
 	install -d $(DESTDIR)/$(GGI_DEST)/default $(DESTDIR)/$(GGI_DEST)/display $(DESTDIR)/etc/ggi
 	install -m 0755 src/GGI/default/*.so $(DESTDIR)/$(GGI_DEST)/default
 	install -m 0755 src/GGI/display/*.so $(DESTDIR)/$(GGI_DEST)/display
 	install -m 0644 src/GGI/ggimesa.conf $(DESTDIR)/etc/ggi
 #	if [ -z "`grep ggimesa $(DESTDIR)/etc/ggi/libggi.conf`" ]; then \
 #	echo ".include $(DESTDIR)/etc/ggi/ggimesa.conf" >> $(DESTDIR)/etc/ggi/libggi.conf ; \
 #	fi
 linux-osmesa16 linux-osmesa16-static linux-osmesa32:
 	-mkdir lib
 	if [ -d src/mesa ] ; then touch src/mesa/depend ; fi
 	if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.OSMesa16 $@ ; fi
 linux-solo:
 	-mkdir lib
 	if [ -d src/mesa     ] ; then touch src/mesa/depend     ; fi
 	if [ -d src/glx/mini ] ; then touch src/glx/mini/depend  ; fi
 	if [ -d src/glu/mini ] ; then touch src/glu/mini/depend  ; fi
 	if [ -d src/glut/mini ] ; then touch src/glut/mini/depend  ; fi
 	if [ -d src/mesa/drivers/dri/r200 ] ; then touch src/mesa/drivers/dri/r200/depend ; fi
 	if [ -d src/mesa/drivers/dri/r128 ] ; then touch src/mesa/drivers/dri/r128/depend ; fi
 	if [ -d src/mesa/drivers/dri/radeon ] ; then touch src/mesa/drivers/dri/radeon/depend ; fi
 	if [ -d src/mesa/drivers/dri/mga ] ; then touch src/mesa/drivers/dri/mga/depend ; fi
 	if [ -d src/mesa/drivers/dri/i810 ] ; then touch src/mesa/drivers/dri/i810/depend ; fi
 	if [ -d src/mesa/drivers/dri/i830 ] ; then touch src/mesa/drivers/dri/i830/depend ; fi
 	if [ -d src/mesa/drivers/dri/sis ] ; then touch src/mesa/drivers/dri/sis/depend ; fi
 	if [ -d src/mesa/drivers/dri/gamma ] ; then touch src/mesa/drivers/dri/gamma/depend ; fi
 	if [ -d src/mesa/drivers/dri/fb ] ; then touch src/mesa/drivers/dri/fb/depend ; fi
 	if [ -d src/glut/mini ] ; then touch src/glut/mini/depend ; fi
 	if [ -d progs/miniglx ] ; then touch progs/miniglx/depend ; fi
 	if [ -d progs/tests ] ; then touch progs/tests/depend ; fi
 	if [ -d src/mesa      ] ; then cd src/mesa      ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/mesa/drivers/dri/r200 ] ; then cd src/mesa/drivers/dri/r200     ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/mesa/drivers/dri/r128 ] ; then cd src/mesa/drivers/dri/r128     ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/mesa/drivers/dri/radeon ] ; then cd src/mesa/drivers/dri/radeon ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/mesa/drivers/dri/mga ] ; then cd src/mesa/drivers/dri/mga       ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/mesa/drivers/dri/i810 ] ; then cd src/mesa/drivers/dri/i810       ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/mesa/drivers/dri/i830 ] ; then cd src/mesa/drivers/dri/i830       ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/mesa/drivers/dri/sis ] ; then cd src/mesa/drivers/dri/sis       ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/mesa/drivers/dri/gamma ] ; then cd src/mesa/drivers/dri/gamma       ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/mesa/drivers/dri/fb ] ; then cd src/mesa/drivers/dri/fb         ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glx/mini  ] ; then cd src/glx/mini  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glu/mini  ] ; then cd src/glu/mini  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d src/glut/mini ] ; then cd src/glut/mini ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/miniglx ] ; then cd progs/miniglx ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/tests   ] ; then cd progs/tests   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/demos   ] ; then cd progs/demos   ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/xdemos  ] ; then cd progs/xdemos  ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi
 	if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi
 # Remove .o files, emacs backup files, etc.
 clean:
 	if ! [ -f src/mesa/depend      ] ; then touch src/mesa/depend      ; fi
 	if ! [ -f src/mesa/drivers/dri/r200/depend ];   then touch src/mesa/drivers/dri/r200/depend;   fi
 	if ! [ -f src/mesa/drivers/dri/r128/depend ];   then touch src/mesa/drivers/dri/r128/depend;   fi
 	if ! [ -f src/mesa/drivers/dri/radeon/depend ]; then touch src/mesa/drivers/dri/radeon/depend; fi
 	if ! [ -f src/mesa/drivers/dri/mga/depend ];    then touch src/mesa/drivers/dri/mga/depend;    fi
 	if ! [ -f src/mesa/drivers/dri/fb/depend ];     then touch src/mesa/drivers/dri/fb/depend;     fi
 	if ! [ -f src/glu/mesa/depend  ] ; then touch src/glu/mesa/depend  ; fi
 	if ! [ -f src/glu/sgi/depend   ] ; then touch src/glu/sgi/depend   ; fi
 	if ! [ -f src/glu/mini/depend  ] ; then touch src/glu/mini/depend  ; fi
 	if ! [ -f src/glut/glx/depend  ] ; then touch src/glut/glx/depend  ; fi
 	if ! [ -f src/glut/mini/depend ] ; then touch src/glut/mini/depend ; fi
 	if ! [ -f src/glx/mini/depend  ] ; then touch src/glx/mini/depend  ; fi
 	if ! [ -f progs/tests/depend   ] ; then touch progs/tests/depend   ; fi
 	if ! [ -f progs/miniglx/depend ] ; then touch progs/miniglx/depend ; fi
 	-rm -f include/GL/*~
 	cd src/mesa          && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/mesa/drivers/dri/r200   && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/mesa/drivers/dri/r128   && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/mesa/drivers/dri/radeon && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/mesa/drivers/dri/mga    && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/mesa/drivers/dri/fb     && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/glu/mesa      && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/glu/sgi       && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/glu/mini      && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/glut/glx      && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/glut/mini     && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/glw           && $(MAKE) -f Makefile.X11 $@ || true
 	cd src/glx/mini      && $(MAKE) -f Makefile.X11 $@ || true
 	cd progs/demos       && $(MAKE) -f Makefile.X11 $@ || true
 	cd progs/redbook     && $(MAKE) -f Makefile.X11 $@ || true
 	cd progs/xdemos      && $(MAKE) -f Makefile.X11 $@ || true
 	cd progs/samples     && $(MAKE) -f Makefile.X11 $@ || true
 	cd progs/tests       && $(MAKE) -f Makefile.X11 $@ || true
 	cd progs/miniglx     && $(MAKE) -f Makefile.X11 $@ || true
 	if [ -f src/mesa/depend      ] ; then rm src/mesa/depend      ; fi
 	if [ -f src/mesa/drivers/dri/r200/depend ];   then rm -f src/mesa/drivers/dri/r200/depend;   fi
 	if [ -f src/mesa/drivers/dri/r128/depend ];   then rm -f src/mesa/drivers/dri/r128/depend;   fi
 	if [ -f src/mesa/drivers/dri/radeon/depend ]; then rm -f src/mesa/drivers/dri/radeon/depend; fi
 	if [ -f src/mesa/drivers/dri/mga/depend ];    then rm -f src/mesa/drivers/dri/mga/depend;    fi
 	if [ -f src/mesa/drivers/dri/fb/depend ];     then rm -f src/mesa/drivers/dri/fb/depend;     fi
 	if [ -f src/glu/mesa/depend  ] ; then rm -f src/glu/mesa/depend  ; fi
 	if [ -f src/glu/sgi/depend   ] ; then rm -f src/glu/sgi/depend   ; fi
 	if [ -f src/glu/mini/depend  ] ; then rm -f src/glu/mini/depend  ; fi
 	if [ -f src/glut/glx/depend  ] ; then rm -f src/glut/glx/depend  ; fi
 	if [ -f src/glut/mini/depend ] ; then rm -f src/glut/mini/depend ; fi
 	if [ -f src/glx/mini/depend  ] ; then rm -f src/glx/mini/depend  ; fi
 	if [ -f progs/tests/depend   ] ; then rm -f progs/tests/depend   ; fi
 	if [ -f progs/miniglx/depend ] ; then rm -f progs/miniglx/depend ; fi
 # Remove everything that can be remade
 realclean: clean
 	-rm -fr lib lib32 lib64
 	cd progs/demos       && $(MAKE) -f Makefile.X11 realclean || true
 	cd progs/xdemos      && $(MAKE) -f Makefile.X11 realclean || true
 	cd progs/redbook     && $(MAKE) -f Makefile.X11 realclean || true
 	cd progs/samples     && $(MAKE) -f Makefile.X11 realclean || true
 # Remove everything not in CVS
 cvsclean: realclean
 	-rm -f acinclude.m4 aclocal.m4
 	-rm -f conf.h conf.h.in config.guess config.log config.status
 	-rm -f config.sub configure
 	-rm -f install-sh libtool ltmain.sh Makefile.in
 	-rm -f missing mkinstalldirs stamp-h stamp-h.in
 DIRECTORY = Mesa-5.1
 LIB_NAME = MesaLib-5.1
 DEMO_NAME = MesaDemos-5.1
 GLU_NAME = MesaGLU-5.1
 GLUT_NAME = GLUT-3.7
 LIB_FILES =	\
 	$(DIRECTORY)/Makefile*						\
 	$(DIRECTORY)/Make-config					\
 	$(DIRECTORY)/descrip.mms					\
 	$(DIRECTORY)/mms-config.					\
 	$(DIRECTORY)/Mesa.dsw						\
 	$(DIRECTORY)/bin/mklib*						\
 	$(DIRECTORY)/docs/*.html					\
 	$(DIRECTORY)/docs/COPYING					\
 	$(DIRECTORY)/docs/INSTALL.GNU					\
 	$(DIRECTORY)/docs/README.*					\
 	$(DIRECTORY)/docs/RELNOTES*					\
 	$(DIRECTORY)/docs/VERSIONS					\
 	$(DIRECTORY)/docs/*.spec					\
 	$(DIRECTORY)/include/GL/internal/glcore.h			\
 	$(DIRECTORY)/include/GL/dmesa.h					\
 	$(DIRECTORY)/include/GL/amesa.h					\
 	$(DIRECTORY)/include/GL/fxmesa.h				\
 	$(DIRECTORY)/include/GL/ggimesa.h				\
 	$(DIRECTORY)/include/GL/gl.h					\
 	$(DIRECTORY)/include/GL/glext.h					\
 	$(DIRECTORY)/include/GL/gl_mangle.h				\
 	$(DIRECTORY)/include/GL/glu.h					\
 	$(DIRECTORY)/include/GL/glu_mangle.h				\
 	$(DIRECTORY)/include/GL/glx.h					\
 	$(DIRECTORY)/include/GL/glxext.h				\
 	$(DIRECTORY)/include/GL/glx_mangle.h				\
 	$(DIRECTORY)/include/GL/mesa_wgl.h				\
 	$(DIRECTORY)/include/GL/mglmesa.h				\
 	$(DIRECTORY)/include/GL/osmesa.h				\
 	$(DIRECTORY)/include/GL/svgamesa.h				\
 	$(DIRECTORY)/include/GL/ugl*.h					\
 	$(DIRECTORY)/include/GL/vms_x_fix.h				\
 	$(DIRECTORY)/include/GL/wmesa.h					\
 	$(DIRECTORY)/include/GL/xmesa.h					\
 	$(DIRECTORY)/include/GL/xmesa_x.h				\
 	$(DIRECTORY)/include/GL/xmesa_xf86.h				\
 	$(DIRECTORY)/src/mesa/Makefile*					\
 	$(DIRECTORY)/src/mesa/descrip.mms				\
 	$(DIRECTORY)/src/mesa/depend					\
 	$(DIRECTORY)/src/mesa/main/*.[chS]				\
 	$(DIRECTORY)/src/mesa/main/main.dsp				\
 	$(DIRECTORY)/src/mesa/glapi/*.[chS]				\
 	$(DIRECTORY)/src/mesa/glapi/glapi.dsp				\
 	$(DIRECTORY)/src/mesa/array_cache/*.[ch]			\
 	$(DIRECTORY)/src/mesa/array_cache/array_cache.dsp		\
 	$(DIRECTORY)/src/mesa/math/*.[ch]				\
 	$(DIRECTORY)/src/mesa/math/math.dsp				\
 	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\
 	$(DIRECTORY)/src/mesa/swrast/swrast.dsp				\
 	$(DIRECTORY)/src/mesa/swrast_setup/*.[ch]			\
 	$(DIRECTORY)/src/mesa/swrast_setup/swrast_setup.dsp		\
 	$(DIRECTORY)/src/mesa/tnl/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl/tnl.dsp				\
 	$(DIRECTORY)/src/mesa/tnl_dd/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch]				\
 	$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm			\
 	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/dos/*.[chS]			\
 	$(DIRECTORY)/src/mesa/drivers/dos/mga/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/beos/*.cpp			\
 	$(DIRECTORY)/src/mesa/drivers/glide/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/glide/*.def			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in		\
 	$(DIRECTORY)/src/mesa/drivers/ggi/default/*.c			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/default/genkgi.conf.in	\
 	$(DIRECTORY)/src/mesa/drivers/ggi/display/*.c			\
 	$(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in		\
 	$(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def			\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.dsp			\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/svga/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.def			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.dsp			\
 	$(DIRECTORY)/src/mesa/drivers/x11/*.[ch]			\
 	$(DIRECTORY)/src/mesa/sparc/*.[chS]				\
 	$(DIRECTORY)/src/mesa/x86/*.[ch]				\
 	$(DIRECTORY)/src/mesa/x86/*.S					\
 	$(DIRECTORY)/src/glu/sgi/Makefile.X11				\
 	$(DIRECTORY)/src/glu/sgi/Makefile.win				\
 	$(DIRECTORY)/src/glu/sgi/Makefile.DJ				\
 	$(DIRECTORY)/src/glu/sgi/cc*.txt				\
 	$(DIRECTORY)/src/glu/sgi/glu.def				\
 	$(DIRECTORY)/src/glu/sgi/glu.dsp				\
 	$(DIRECTORY)/src/glu/sgi/dummy.cc				\
 	$(DIRECTORY)/src/glu/sgi/descrip.mms				\
 	$(DIRECTORY)/src/glu/sgi/mesaglu.opt				\
 	$(DIRECTORY)/src/glu/sgi/include/gluos.h			\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h			\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc		\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h			\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc		\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h			\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc			\
 	$(DIRECTORY)/src/glu/sgi/libtess/README				\
 	$(DIRECTORY)/src/glu/sgi/libtess/alg-outline			\
 	$(DIRECTORY)/src/glu/sgi/libtess/*.[ch]				\
 	$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]				\
 	$(DIRECTORY)/src/glu/mesa/README[12]				\
 	$(DIRECTORY)/src/glu/mesa/Makefile*				\
 	$(DIRECTORY)/src/glu/mesa/descrip.mms				\
 	$(DIRECTORY)/src/glu/mesa/mms_depend				\
 	$(DIRECTORY)/src/glu/mesa/*.def					\
 	$(DIRECTORY)/src/glu/mesa/depend				\
 	$(DIRECTORY)/src/glu/mesa/*.[ch]				\
 	$(DIRECTORY)/src/glw/*.[ch]					\
 	$(DIRECTORY)/src/glw/Makefile*					\
 	$(DIRECTORY)/src/glw/README					\
 	$(DIRECTORY)/progs/util/README					\
 	$(DIRECTORY)/progs/util/*.[ch]					\
 	$(DIRECTORY)/progs/util/sampleMakefile				\
 	$(DIRECTORY)/vms/analyze_map.com				\
 	$(DIRECTORY)/vms/xlib.opt					\
 	$(DIRECTORY)/vms/xlib_share.opt
 DEMO_FILES =	\
 	$(DIRECTORY)/include/GL/glut.h			\
 	$(DIRECTORY)/include/GL/glutf90.h		\
 	$(DIRECTORY)/src/glut/glx/Makefile*		\
 	$(DIRECTORY)/src/glut/glx/depend		\
 	$(DIRECTORY)/src/glut/glx/*def			\
 	$(DIRECTORY)/src/glut/glx/descrip.mms		\
 	$(DIRECTORY)/src/glut/glx/mms_depend		\
 	$(DIRECTORY)/src/glut/glx/glut.dsp		\
 	$(DIRECTORY)/src/glut/glx/*.[ch]		\
 	$(DIRECTORY)/src/glut/dos/*.[ch]		\
 	$(DIRECTORY)/src/glut/dos/Makefile.DJ		\
 	$(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]		\
 	$(DIRECTORY)/progs/images/*			\
 	$(DIRECTORY)/progs/demos/Makefile*		\
 	$(DIRECTORY)/progs/demos/descrip.mms		\
 	$(DIRECTORY)/progs/demos/*.[ch]			\
 	$(DIRECTORY)/progs/demos/*.cxx			\
 	$(DIRECTORY)/progs/demos/*.dat			\
 	$(DIRECTORY)/progs/demos/README			\
 	$(DIRECTORY)/progs/demos/Windows/*		\
 	$(DIRECTORY)/progs/xdemos/Makefile*		\
 	$(DIRECTORY)/progs/xdemos/descrip.mms		\
 	$(DIRECTORY)/progs/xdemos/*.[chf]		\
 	$(DIRECTORY)/progs/redbook/Makefile*		\
 	$(DIRECTORY)/progs/redbook/README		\
 	$(DIRECTORY)/progs/redbook/*.[ch]		\
 	$(DIRECTORY)/progs/samples/Makefile*		\
 	$(DIRECTORY)/progs/samples/README		\
 	$(DIRECTORY)/progs/samples/*.c			\
 	$(DIRECTORY)/progs/windml/Makefile.ugl		\
 	$(DIRECTORY)/progs/windml/*.c			\
 	$(DIRECTORY)/progs/windml/*.bmp			\
 	$(DIRECTORY)/progs/ggi/*.c
 SI_GLU_FILES = \
 	$(DIRECTORY)/Makefile*					\
 	$(DIRECTORY)/Make-config				\
 	$(DIRECTORY)/bin/mklib*					\
 	$(DIRECTORY)/include/GL/glu.h				\
 	$(DIRECTORY)/src/glu/sgi/Makefile.X11			\
 	$(DIRECTORY)/src/glu/sgi/include/gluos.h		\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h		\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc	\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h		\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc	\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbstess/*.h		\
 	$(DIRECTORY)/src/glu/sgi/libnurbs/nurbstess/*.cc	\
 	$(DIRECTORY)/src/glu/sgi/libtess/README			\
 	$(DIRECTORY)/src/glu/sgi/libtess/alg-outline		\
 	$(DIRECTORY)/src/glu/sgi/libtess/*.[ch]			\
 	$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]
 GLU_FILES = \
 	$(DIRECTORY)/Makefile*			\
 	$(DIRECTORY)/Make-config		\
 	$(DIRECTORY)/bin/mklib*			\
 	$(DIRECTORY)/include/GL/gl.h		\
 	$(DIRECTORY)/include/GL/gl_mangle.h	\
 	$(DIRECTORY)/include/GL/glext.h		\
 	$(DIRECTORY)/include/GL/glu.h		\
 	$(DIRECTORY)/include/GL/glu_mangle.h	\
 	$(DIRECTORY)/src/glu/mesa/README[12]	\
 	$(DIRECTORY)/src/glu/mesa/Makefile*	\
 	$(DIRECTORY)/src/glu/mesa/descrip.mms	\
 	$(DIRECTORY)/src/glu/mesa/mms_depend	\
 	$(DIRECTORY)/src/glu/mesa/*.def		\
 	$(DIRECTORY)/src/glu/mesa/depend	\
 	$(DIRECTORY)/src/glu/mesa/*.[ch]
 GLUT_FILES = \
 	$(DIRECTORY)/Makefile*			\
 	$(DIRECTORY)/Make-config		\
 	$(DIRECTORY)/bin/mklib*			\
 	$(DIRECTORY)/include/GL/gl.h		\
 	$(DIRECTORY)/include/GL/gl_mangle.h	\
 	$(DIRECTORY)/include/GL/glext.h		\
 	$(DIRECTORY)/include/GL/glu.h		\
 	$(DIRECTORY)/include/GL/glu_mangle.h	\
 	$(DIRECTORY)/include/GL/glut.h		\
 	$(DIRECTORY)/include/GL/glutf90.h	\
 	$(DIRECTORY)/src/glut/glx/Makefile*	\
 	$(DIRECTORY)/src/glut/glx/depend	\
 	$(DIRECTORY)/src/glut/glx/*def		\
 	$(DIRECTORY)/src/glut/glx/descrip.mms	\
 	$(DIRECTORY)/src/glut/glx/mms_depend	\
 	$(DIRECTORY)/src/glut/glx/*.[ch]
 lib_gz:
 	cp Makefile.X11 Makefile ; \
 	cd .. ; \
 	tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
 	gzip $(LIB_NAME).tar ; \
 	mv $(LIB_NAME).tar.gz $(DIRECTORY)
 demo_gz:
 	cd .. ; \
 	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
 	gzip $(DEMO_NAME).tar ; \
 	mv $(DEMO_NAME).tar.gz $(DIRECTORY)
 lib_bz2:
 	cp Makefile.X11 Makefile ; \
 	cd .. ; \
 	tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
 	bzip2 $(LIB_NAME).tar ; \
 	mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
 demo_bz2:
 	cd .. ; \
 	tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
 	bzip2 $(DEMO_NAME).tar ; \
 	mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
 lib_zip:
 	-rm $(LIB_NAME).zip ; \
 	cp Makefile.X11 Makefile ; \
 	cd .. ; \
 	zip -r $(LIB_NAME).zip $(LIB_FILES) ; \
 	mv $(LIB_NAME).zip $(DIRECTORY)
 demo_zip:
 	-rm $(DEMO_NAME).zip ; \
 	cd .. ; \
 	zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
 	mv $(DEMO_NAME).zip $(DIRECTORY)
 md5:
 	@-md5sum $(LIB_NAME).tar.gz
 	@-md5sum $(LIB_NAME).tar.bz2
 	@-md5sum $(LIB_NAME).zip
 	@-md5sum $(DEMO_NAME).tar.gz
 	@-md5sum $(DEMO_NAME).tar.bz2
 	@-md5sum $(DEMO_NAME).zip
 # Everything for new Mesa release:
 tarballs: lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5
 # not used
 glu_gz:
 	cp Makefile.X11 Makefile ; \
 	cd .. ; \
 	tar -cvf $(GLU_NAME).tar $(GLU_FILES) ; \
 	gzip $(GLU_NAME).tar ; \
 	mv $(GLU_NAME).tar.gz $(DIRECTORY)
 glut_gz:
 	cp Makefile.X11 Makefile ; \
 	cd .. ; \
 	tar -cvf $(GLUT_NAME).tar $(GLUT_FILES) ; \
 	gzip $(GLUT_NAME).tar ; \
 	mv $(GLUT_NAME).tar.gz $(DIRECTORY)
--- a/Makefile.mgw
+++ b/Makefile.mgw
@@ -20,9 +20,9 @@
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# MinGW makefile v1.2 for Mesa
+# MinGW makefile v1.0 for Mesa
 #
-#  Copyright (C) 2002 - Daniel Borca
+#  Copyright (C) 2002 - Borca Daniel
 #  Email : dborca@users.sourceforge.net
 #  Web   : http://www.geocities.com/dborca
@@ -40,10 +40,15 @@
 #			As a consequence, you'll need the Win32 Glide3
 #			library to build any application.
 #			default = no
-#	ICD=1		build the installable client driver interface
+#	HAVE_X86=1	optimize for i386.
 #			(windows opengl driver interface)
 #			default = no
-#	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
+#	HAVE_MMX=1	allow MMX specializations, provided your assembler
 #			supports MMX instruction set. However, the true CPU
 #			capabilities are checked at run-time to avoid crashes.
 #			default = no
 #	HAVE_SSE=1	(see HAVE_MMX)
 #			default = no
 #	HAVE_3DNOW=1	(see HAVE_MMX)
 #			default = no
 #
 #    Targets:
@@ -59,14 +64,8 @@
 CPU ?= pentium
-ifeq ($(ICD),1)
+CFLAGS = -Wall -W -pedantic
-  # when -std=c99 mingw will not define WIN32
+CFLAGS += -O2 -ffast-math -mcpu=$(CPU)
  CFLAGS = -Wall -W -Werror
 else
  # I love c89
  CFLAGS = -Wall -W -pedantic
 endif
 CFLAGS += -O2 -ffast-math -mtune=$(CPU)
 export CFLAGS
--- a/Makefile.wfx
+++ b/Makefile.wfx
@@ -0,0 +1,87 @@
 # Mesa 3-D graphics library
 # Version:  5.1
 #
 # Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
 # and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 # BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # Win32/FX makefile for Mesa
 #
 #  Copyright (c) 2003 - Hiroshi Morii
 #  Email : koolsmoky@users.sourceforge.net
 #  URL   : http://www.3dfxzone.it/koolsmoky
 # Debug build                : nmake -f Makefile.wfx debug
 # Optimized build            : nmake -f Makefile.wfx
 # Remove objects             : nmake -f Makefile.wfx clean
 # Remove files in bin, lib   : nmake -f Makefile.wfx clobber
 # Remove all generated files : nmake -f Makefile.wfx realclean
 # Build the libs
 SUBDIRS	  = src\mesa.dir
 DBGBUILD  = $(SUBDIRS:.dir=.debug)
 CLEAN	  = $(SUBDIRS:.dir=.clean)
 CLOBBER	  = $(SUBDIRS:.dir=.clobber)
 REALCLEAN = $(SUBDIRS:.dir=.realclean)
 LIBDIR    = lib
 # default rule
 default	  : $(LIBDIR) $(SUBDIRS)
 # debug build rules
 debug     : $(LIBDIR) $(DBGBUILD)
 # cleanup rules
 clean	  : $(CLEAN)
 clobber	  : $(CLOBBER)
 realclean : $(REALCLEAN)
 # inference rules
 $(LIBDIR):
 	@echo.
 	@mkdir $(LIBDIR)
 $(SUBDIRS):
 	@echo.
 	@cd $*
 	@nmake -f Makefile.wfx
 	@cd ..
 $(DBGBUILD):
 	@echo.
 	@cd $*
 	@nmake -f Makefile.wfx DEBUG=1
 	@cd ..
 $(CLEAN):
 	@echo.
 	@cd $*
 	@nmake -f Makefile.wfx clean
 	@cd ..
 $(CLOBBER):
 	@echo.
 	@cd $*
 	@nmake -f Makefile.wfx clobber
 	@cd ..
 $(REALCLEAN):
 	@echo.
 	@cd $*
 	@nmake -f Makefile.wfx realclean
 	@cd ..
--- a/Mesa.dsw
+++ b/Mesa.dsw
@@ -44,9 +44,6 @@ Package=<4>
    Begin Project Dependency
    Project_Dep_Name glapi
    End Project Dependency
    Begin Project Dependency
    Project_Dep_Name shader
    End Project Dependency
 }}}
 ###############################################################################
@@ -78,6 +75,21 @@ Package=<4>
 ###############################################################################
 Project: "glut"=".\src\glut\glx\glut.dsp" - Package Owner=<4>
 Package=<5>
 {{{
 }}}
 Package=<4>
 {{{
    Begin Project Dependency
    Project_Dep_Name glu
    End Project Dependency
 }}}
 ###############################################################################
 Project: "main"=".\SRC\MESA\main\main.dsp" - Package Owner=<4>
 Package=<5>
@@ -117,18 +129,6 @@ Package=<4>
 ###############################################################################
 Project: "shader"=".\SRC\MESA\shader\shader.dsp" - Package Owner=<4>
 Package=<5>
 {{{
 }}}
 Package=<4>
 {{{
 }}}
 ###############################################################################
 Project: "swrast"=".\SRC\MESA\swrast\swrast.dsp" - Package Owner=<4>
 Package=<5>
--- a/bin/installmesa
+++ b/bin/installmesa
@@ -1,57 +0,0 @@
 #!/bin/sh
 #
 # Simple shell script for installing Mesa's header and library files.
 # If the copy commands below don't work on a particular system (i.e. the
 # -f or -d flags), we may need to branch on `uname` to do the right thing.
 #
 TOP=.
 INCLUDE_DIR="/usr/local/include"
 LIB_DIR="/usr/local/lib"
 echo
 echo "***** Mesa installation - You may need root privileges to do this *****"
 echo
 echo "Default directory for header files is:" ${INCLUDE_DIR}
 echo "Enter new directory or press <Enter> to accept this default."
 read INPUT
 if [ x${INPUT} != "x" ] ; then
 	INCLUDE_DIR=${INPUT}
 fi
 echo
 echo "Default directory for library files is:" ${LIB_DIR}
 echo "Enter new directory or press <Enter> to accept this default."
 read INPUT
 if [ x${INPUT} != "x" ] ; then
 	LIB_DIR=${INPUT}
 fi
 echo
 echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL
 echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR}
 echo "Press <Enter> to continue, or <ctrl>-C to abort."
 read INPUT
 # flags:
 #  -f = force
 #  -d = preserve symlinks
 set -v
 mkdir ${INCLUDE_DIR}
 mkdir ${INCLUDE_DIR}/GL
 mkdir ${LIB_DIR}
 cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL
 cp -fd ${TOP}/lib*/lib* ${LIB_DIR}
 echo "Done."
--- a/bin/mklib
+++ b/bin/mklib
@@ -1,15 +1,14 @@
 #!/bin/sh
 # Make a shared library.
-# Basically do a switch/case depending on the OS and make a shared (or static)
+# Basically do a switch/case depending on the OS and make a shared
-# library conforming to that OS.
+# lib conforming to that OS.
 # Usage:
 #   mklib [options] objects ...
 # Options:
-#   -o LIBRARY    specifies the name of resulting library
+#   -o LIBRARY    specifies the name of resulting library ("GL" for example)
 #                 ("-o GL" for example, might result in "libGL.so" being made)
 #   -major N      specifies major version number (default is 1)
 #   -minor N      specifies minor version number (default is 0)
 #   -patch N      specifies patch version number (default is 0)
@@ -17,15 +16,12 @@
 #   -LDIR         search in DIR for library dependencies
 #   -cplusplus    link with C++ runtime
 #   -static       make a static library (default is dynamic/shared)
-#   -install DIR  move resulting library file(s) to DIR
+#   -install DIR  move resulting library files to DIR
 #   -arch ARCH    override using `uname` to determine architecture
 #   -archopt OPT  specify an extra achitecture-specific option OPT
 #   -noprefix     don't prefix library name with "lib" or any suffix
 #   -exports FILE only export the symbols listed in FILE
 #
 # The library name should just be "GL" or "GLU", etc.  The 'lib' prefix
-# will be added here if needed, as well as the ".so" or ".a" suffix,
+# will be added here if needed, as well as the ".so" or ".a" suffix, etc.
 # etc (unless the -noprefix option is used).
 #
 # objects should be:  foo.o bar.o etc.o
 #
@@ -41,15 +37,13 @@
 LIBNAME=""
 MAJOR=1
 MINOR=0
-PATCH=""
+PATCH=0
 DEPS=""
 CPLUSPLUS=0
 STATIC=0
 INSTALLDIR="."
 ARCH="auto"
 ARCHOPT=""
 NOPREFIX=0
 EXPORTS=""
 #
@@ -69,8 +63,6 @@ do
 	'-install')   shift 1; INSTALLDIR=$1;;
 	'-arch')      shift 1; ARCH=$1;;
 	'-archopt')   shift 1; ARCHOPT=$1;;
 	'-noprefix')  NOPREFIX=1;;
 	'-exports')   shift 1; EXPORTS=$1;;
 	-*)           echo "mklib: Unknown option: " $1 ; exit 1;;
 	*) break
    esac
@@ -107,7 +99,6 @@ if [  ]  ; then
    echo MINOR is $MINOR
    echo PATCH is $PATCH
    echo DEPS are $DEPS
    echo "EXPORTS in" $EXPORTS
    echo "-----------------"
 fi
@@ -117,74 +108,27 @@ fi
 #
 case $ARCH in
-    'Linux' | 'OpenBSD')
+    'Linux')
-	# we assume gcc
+	LIBNAME="lib${LIBNAME}"     # prefix with "lib"
-	# Set default compilers if env vars not set
+        if [ $STATIC = 1 ] ; then
-	if [ "x$CXX" = "x" ] ; then
+            echo "mklib: Making Linux static library: " ${LIBNAME}.a
 	    CXX=g++
 	fi
 	if [ "x$CC" = "x" ] ; then
 	    CC=gcc
 	fi
 	if [ $NOPREFIX = 1 ] ; then
 	    # No "lib" or ".so" part
 	    echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}
 	    #OPTS="-shared -Wl,-soname,${LIBNAME}"  # soname???
 	    OPTS="-shared"
            if [ $CPLUSPLUS = 1 ] ; then
                LINK=$CXX
            else
                LINK=$CC
            fi
            rm -f ${LIBNAME}
            # make lib
            ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
            # finish up
            FINAL_LIBS="${LIBNAME}"
        elif [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}"     # prefix with "lib"
            echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a
            LINK="ar"
-            OPTS="-ru"
+            OPTS="-ruv"
            # make lib
            ${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
 	    ranlib ${LIBNAME}.a
            # finish up
-            FINAL_LIBS=${LIBNAME}.a
+            FINAL_LIBS="${LIBNAME}.a"
        else
-	    LIBNAME="lib${LIBNAME}"     # prefix with "lib"
+            OPTS="-Xlinker -Bsymbolic -shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
-	    if [ $ARCH = 'Linux' ] ; then
+            VERSION="${MAJOR}.${MINOR}.${PATCH}"
 		OPTS="-Xlinker -Bsymbolic -shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
 	    else
 		OPTS="-shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
 	    fi
 	    if [ $EXPORTS ] ; then
 		#OPTS="${OPTS} -Xlinker --retain-symbols-file ${EXPORTS}"
 		# Make the 'exptmp' file for --version-script option
 		echo "VERSION_${MAJOR}.${MINOR} {" > exptmp
 		echo "global:" >> exptmp
 		sed 's/$/;/' ${EXPORTS} >> exptmp
 		echo "local:" >> exptmp
 		echo "*;" >> exptmp
 		echo "};" >> exptmp
 		OPTS="${OPTS} -Xlinker --version-script=exptmp"
 		# exptmp is removed below
 	    fi
 	    if [ x${PATCH} = "x" ] ; then
 		VERSION="${MAJOR}.${MINOR}"
 	    else
 		VERSION="${MAJOR}.${MINOR}.${PATCH}"
 	    fi
-            echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}.so.${VERSION}
+            echo "mklib: Making Linux shared library: " ${LIBNAME}.so.${VERSION}
            if [ $CPLUSPLUS = 1 ] ; then
-                LINK=$CXX
+                LINK="g++"
            else
-                LINK=$CC
+                LINK="gcc"
            fi
            # rm any old libs
@@ -199,205 +143,119 @@ case $ARCH in
            ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
            # finish up
            FINAL_LIBS="${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so"
 #	    rm -f exptmp
        fi
 	;;
    'SunOS')
-        if [ $STATIC = 1 ] ; then
+	LIBNAME="lib${LIBNAME}.so"
-	    LIBNAME="lib${LIBNAME}.a"
+	echo "mklib: Making SunOS shared library: " ${LIBNAME}
-	    echo "mklib: Making SunOS static library: " ${LIBNAME}
+	OPTS="-G"
-	    rm -f ${LIBNAME}
+	if [ $CPLUSPLUS = 1 ] ; then
-	    ar -ruv ${LIBNAME} ${OBJECTS}
+	    # link for C++
-	    FINAL_LIBS=${LIBNAME}
+	    if [ "x${CXX}" = "xg++" ] ; then
-	else
+		LINK="g++"
-	    LIBNAME="lib${LIBNAME}.so"
+	    elif [ "x${CXX}" = "xCC" ] ; then
-	    echo "mklib: Making SunOS shared library: " ${LIBNAME}
+		LINK="CC"
-	    # XXX OPTS for gcc should be -shared, but that doesn't work.
+	    elif [ `which c++` ] ; then
-	    # Using -G does work though.
+		LINK="c++"
-	    if [ $CPLUSPLUS = 1 ] ; then
+	    elif [ `type g++` ] ; then
-		# determine linker and options for C++ code
+		LINK="g++"
 		if [ "x${CXX}" = "xg++" ] ; then
 		    # use g++
 		    LINK="g++"
 		    OPTS="-G"
 		elif [ "x${CXX}" = "xCC" ] ; then
 		    # use Sun CC
 		    LINK="CC"
 		    OPTS="-G"
 		elif [ "x${CXX}" = "xc++" ] ; then
 		    # use Sun c++
 		    LINK="c++"
 		    OPTS="-G"
 		elif [ `which c++` ] ; then
 		    # use Sun c++
 		    LINK="c++"
 		    OPTS="-G"
 		elif [ `type g++` ] ; then
 		    # use g++
 		    LINK="g++"
 		    OPTS="-G"
 		else
 		    echo "mklib: warning: can't find C++ comiler, trying CC."
 		    LINK="CC"
 		    OPTS="-G"
 		fi
 	    elif [ "x${CC}" = "xgcc" ] ; then
 		# use gcc for linking
 		LINK="gcc"
 		OPTS="-G"
 	    else
-		# use native Sun linker
+		echo "mklib: warning: can't find C++ comiler, trying CC."
-		LINK="ld"
+		LINK="CC"
 		OPTS="-G"
 	    fi
-	    echo "mklib: linker is" ${LINK} ${OPTS}
+	elif [ "x${CC}" = "xgcc" ] ; then
-	    rm -f ${LIBNAME}.${MAJOR} ${LIBNAME}
+	    # use gcc for linking
-	    ${LINK} ${OPTS} -o ${LIBNAME}.${MAJOR} ${OBJECTS} ${DEPS}
+	    LINK="gcc"
-	    ln -s ${LIBNAME}.${MAJOR} ${LIBNAME}
+	else
-	    FINAL_LIBS="${LIBNAME}.${MAJOR} ${LIBNAME}"
+	    # use native Sun linker
 	    LINK="ld"
 	fi
 	echo "mklib: linker is " ${LINK}
 	rm -f ${LIBNAME}
 	${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
 	FINAL_LIBS=${LIBNAME}
 	;;
    'FreeBSD')
-	if [ $NOPREFIX = 1 ] ; then
+	SHLIB="lib${LIBNAME}.so.${MAJOR}.${MINOR}"
-	    # No "lib" or ".so" part
+	STLIB="lib${LIBNAME}.a"
-	    echo "mklib: Making FreeBSD shared library: " ${LIBNAME}
+	echo "mklib: Making FreeBSD shared library: " ${SHLIB}
-	    rm -f ${LIBNAME}
+	rm -f ${SHLIB} ${STLIB}
-	    ld -Bshareable -o ${LIBNAME} ${OBJECTS}
+	ar cq ${STLIB} ${OBJECTS}
-	    FINAL_LIBS=${LIBNAME}
+	ranlib ${STLIB}
-        elif [ $STATIC = 1 ] ; then
+	ld -Bshareable -o ${SHLIB} ${OBJECTS}
-	    STLIB="lib${LIBNAME}.a"
+	# XXX make lib${LIBNAME}.so.${MAJOR} symlink?
-	    echo "mklib: Making FreeBSD static library: " ${STLIB}
+	FINAL_LIBS="${SHLIB} ${STLIB}"
-	    rm -f ${STLIB}
+	;;
-	    ar cq ${STLIB} ${OBJECTS}
+
-	    ranlib ${STLIB}
+    'OpenBSD')
-	    FINAL_LIBS=${STLIB}
+	LIBNAME="lib${LIBNAME}"
-	else
+	VERSION="${MAJOR}.${MINOR}"
-	    SHLIB="lib${LIBNAME}.so.${MAJOR}.${MINOR}"
+	echo "Building OpenBSD PIC library: " ${LIBNAME}
-	    echo "mklib: Making FreeBSD shared library: " ${SHLIB}
+	rm -f ${LIBNAME}_pic.a ${LIBNAME}.so.${VERSION}
-	    rm -f ${SHLIB}
+	ar cq ${LIBNAME}_pic.a ${OBJECTS}
-	    ld -Bshareable -o ${SHLIB} ${OBJECTS}
+	ranlib ${LIBNAME}_pic.a
-	    # XXX make lib${LIBNAME}.so.${MAJOR} symlink?
+	ld -x -Bshareable -Bforcearchive -o ${LIBNAME}.so.${VERSION} ${LIBNAME}_pic.a
-	    FINAL_LIBS=${SHLIB}
+	ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so
-	fi
+	FINAL_LIBS="${LIBNAME}_pic.a ${LIBNAME}.so.${VERSION} ${LIBNAME}.so"
 	;;
    'NetBSD')
-        if [ $STATIC = 1 ] ; then
+	LIBNAME="lib${LIBNAME}"
-	    LIBNAME="lib${LIBNAME}_pic.a"
+	echo "mklib: Making NetBSD PIC shared library: " ${LIBNAME}
-	    echo "mklib: Making NetBSD PIC static library: " ${LIBNAME}
+	VERSION="${MAJOR}.${MINOR}"
-	    rm -f ${LIBNAME}
+	rm -f ${LIBNAME}_pic.a ${LIBNAME}.so.${VERSION}
-	    ar cq ${LIBNAME} ${OBJECTS}
+	ar cq ${LIBNAME}_pic.a ${OBJECTS}
-	    ranlib ${LIBNAME}
+	ranlib ${LIBNAME}_pic.a
-	    FINAL_LIBS=${LIBNAME}
+	ld -x -Bshareable -Bforcearchive -o ${LIBNAME}.so.${VERSION} ${LIBNAME}_pic.a
-	else
+	FINAL_LIBS="${LIBNAME}_pic.a ${LIBNAME}.so.${VERSION}"
 	    LIBNAME="lib${LIBNAME}.so.${MAJOR}.${MINOR}"
 	    echo "mklib: Making NetBSD PIC shared library: " ${LIBNAME}
 	    rm -f ${LIBNAME}
 	    ld -x -Bshareable -Bforcearchive -o ${LIBNAME} ${OBJECTS}
 	    FINAL_LIBS=${LIBNAME}
 	fi
 	;;
-    'IRIX' | 'IRIX64')
+    'IRIX')
-        if [ $STATIC = 1 ] ; then
+	LIBNAME="lib${LIBNAME}.so"  # prefix with "lib", suffix with ".so"
-	    LIBNAME="lib${LIBNAME}.a"
+	if [ $ARCHOPTS = "64" ] ; then
-	    rm -f ${LIBNAME}
+	    # 64-bit ABI
-	    ar rc ${LIBNAME} ${OBJECTS}
+	    OPTS="-64 -shared -all"
-	    FINAL_LIBS=${LIBNAME}
+	    echo "mklib: Making IRIX 64-bit shared library: " ${LIBNAME}
 	elif [ $ARCHOPTS = "o32" ] ; then
 	    # old 32-bit ABI
 	    OPTS="-32 -shared -all"
 	    echo "mklib: Making IRIX o32-bit shared library: " ${LIBNAME}
 	else
-	    LIBNAME="lib${LIBNAME}.so"  # prefix with "lib", suffix with ".so"
+	    # new 32-bit ABI
-	    if [ $ARCHOPT = "64" ] ; then
+	    OPTS="-n32 -shared -all"
-		# 64-bit ABI
+	    echo "mklib: Making IRIX n32-bit shared library: " ${LIBNAME}
 		OPTS="-64 -shared -all"
 		echo "mklib: Making IRIX 64-bit shared library: " ${LIBNAME}
 	    elif [ $ARCHOPT = "o32" ] ; then
 		# old 32-bit ABI
 		OPTS="-32 -shared -all"
 		echo "mklib: Making IRIX o32-bit shared library: " ${LIBNAME}
 	    else
 		# new 32-bit ABI
 		OPTS="-n32 -shared -all"
 		echo "mklib: Making IRIX n32-bit shared library: " ${LIBNAME}
 	    fi
 	    if [ $CPLUSPLUS = 1 ] ; then
 		LINK="CC"
 	    else
 		LINK="ld"
 	    fi
 	    ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
 	    FINAL_LIBS=${LIBNAME}
 	fi
 	ld ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
 	FINAL_LIBS="${LIBNAME}"
 	;;
    'IRIX64')
 	LIBNAME="lib${LIBNAME}.so"  # prefix with "lib", suffix with ".so"
 	echo "mklib: Making IRIX64 library: " ${LIBNAME}
 	# 64-bit ABI
 	OPTS="-64 -shared -all"
 	ld ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
 	FINAL_LIBS="${LIBNAME}"
 	;;
    'linux-cygwin')
 	LIBNAME="lib${LIBNAME}.a"
 	echo "mklib: Making linux-cygwin library: " ${LIBNAME}
 	rm -f ${LIBNAME}
 	gnuwin32ar ruv ${LIBNAME} ${OBJECTS}
 	FINAL_LIBS=${LIBNAME}
 	;;
-    'HP-UX')
+    'HPUX')
-        if [ $STATIC = 1 ] ; then
+	RUNLIB="lib${LIBNAME}.${MAJOR}"
-	    LIBNAME="lib${LIBNAME}.a"
+	DEVLIB="lib${LIBNAME}.sl"
-	    echo "mklib: Making HP-UX static library: " ${LIBNAME}
+	echo "mklib: Making HPUX library: " ${RUNLIB} ${DEVLIB}
-	    rm -f ${LIBNAME}
+	ld -b -o ${RUNLIB} +b ${RUNLIB} ${OBJECTS} ${DEPS}
-	    ar -ruv ${LIBNAME} ${OBJECTS}
+	ln -s ${RUNLIB} ${DEVLIB}
-	    FINAL_LIBS=${LIBNAME}
+	FINAL_LIBS="{RUNLIB} ${DEVLIB}"
 	else
 	    RUNLIB="lib${LIBNAME}.${MAJOR}"
 	    DEVLIB="lib${LIBNAME}.sl"
 	    echo "mklib: Making HP-UX shared library: " ${RUNLIB} ${DEVLIB}
 	    ld -b -o ${RUNLIB} +b ${RUNLIB} ${OBJECTS} ${DEPS}
 	    ln -s ${RUNLIB} ${DEVLIB}
 	    FINAL_LIBS="${RUNLIB} ${DEVLIB}"
 	fi
 	;;
    'AIX' | 'AIX64')
 	if [ $ARCH = "AIX64" ] ; then
 	    X64="-X64"
 	fi
        if [ $STATIC = 1 ] ; then
            LIBNAME="lib${LIBNAME}.a"
            echo "mklib: Making AIX static library: " ${LIBNAME}
            ar -ruv ${X64} ${LIBNAME} ${OBJECTS}
            FINAL_LIBS=${LIBNAME}
        else
 	    EXPFILE="lib${LIBNAME}.exp"
 	    OFILE=shr.o  #Want to be consistent with the IBM libGL.a
 	    LIBNAME="lib${LIBNAME}.a"  # shared objects are still stored in the .a libraries
 	    if [ $ARCH = "AIX64" ] ; then
 		OPTS="-bE:${EXPFILE} -bM:SRE -bnoentry -q64"
 	    else
 		OPTS="-bE:${EXPFILE} -bM:SRE -bnoentry"
 	    fi
 	    rm -f ${EXPFILE} ${OFILE}
 	    NM="/bin/nm -eC ${X64}"
 	    echo "#! /usr/lib/${LIBNAME}" > ${EXPFILE}
 	    ${NM} ${OBJECTS} | awk '{
 	    if ((($2 == "T") || ($2 == "D") || ($2 == "B")) \
 	    && ( substr($1,1,1) != ".")) {
 		    if (substr ($1, 1, 7) != "__sinit" &&
 			    substr ($1, 1, 7) != "__sterm") {
 			    if (substr ($1, 1, 5) == "__tf1")
 				print (substr ($1, 7))
 			    else if (substr ($1, 1, 5) == "__tf9")
 				print (substr ($1, 15))
 			    else
 				print $1
 			}
 		}
 	    }' | sort -u >> ${EXPFILE}
 	    cc ${OPTS} -o ${OFILE} ${OBJECTS} ${DEPS}
 	    ar ${X64} -r ${LIBNAME} ${OFILE}
            FINAL_LIBS="${LIBNAME}"
        fi
        ;;
    'OpenSTEP')
 	LIBNAME="lib${LIBNAME}.a"
 	echo "mklib: Making OpenSTEP static library: " ${LIBNAME}
@@ -406,70 +264,45 @@ case $ARCH in
 	;;
    'OSF1')
-        if [ $STATIC = 1 ] ; then
+	VERSION="${MAJOR}.${MINOR}"
-	    LIBNAME="lib${LIBNAME}.a"
+	LIBNAME="lib${LIBNAME}.so"
-	    echo "mklib: Making OSF/1 static library: " ${LIBNAME}
+	ARNAME="lib${LIBNAME}.a"
-	    rm -f ${LIBNAME}
+	echo "mklib: Making OSF/1 library: " ${LIBNAME}
-	    ar -ruv ${LIBNAME} ${OBJECTS}
+	rm -f ${LIBNAME}.${VERSION}
-	    FINAL_LIBS=${LIBNAME}
+	ld -o ${LIBNAME}.${VERSION} -shared -no_archive -set_version ${VERSION} -soname ${LIBNAME}.${VERSION} -expect_unresolved \* -all ${OBJECTS} ${DEPS}
-	else
+	ln -sf ${LIBNAME}.${VERSION} ${LIBNAME}
-	    VERSION="${MAJOR}.${MINOR}"
+
-	    LIBNAME="lib${LIBNAME}.so"
+	# also make static lib
-	    echo "mklib: Making OSF/1 shared library: " ${LIBNAME}
+	rm -f ${ARNAME}
-	    if [ $CPLUSPLUS = 1 ] ; then
+	ar clqz ${ARNAME} ${OBJECTS}
-		LINK=$CXX
+	FINAL_LIBS="${ARNAME} ${LIBNAME} ${LIBNAME}.${VERSION}"
 	    else
 		LINK=$CC
 	    fi
 	    rm -f ${LIBNAME}.${VERSION}
 	    ${LINK} -o ${LIBNAME}.${VERSION} -shared -set_version ${VERSION} -soname ${LIBNAME}.${VERSION} -expect_unresolved \* -all ${OBJECTS} ${DEPS}
 	    ln -sf ${LIBNAME}.${VERSION} ${LIBNAME}
 	    FINAL_LIBS="${LIBNAME} ${LIBNAME}.${VERSION}"
 	fi
 	;;
    'Darwin')
-        if [ $STATIC = 1 ] ; then
+	VERSION="${MAJOR}.${MINOR}.${TINY}"
-            LIBNAME="lib${LIBNAME}.a"
+	LIBNAME="lib${LIBNAME}.dylib"
-            echo "mklib: Making Darwin static library: " ${LIBNAME}
+	ARNAME="lib${LIBNAME}.dylib.a"
-            LINK="ar"
+	echo "mklib: Making Darwin libraries: " ${LIBNAME} ${ARNAME}
-            OPTS="-ruv"
+	FLAGS="-dynamiclib -multiply_defined suppress"
-            ${LINK} ${OPTS} ${LIBNAME} ${OBJECTS}
+	cc ${FLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
-            FINAL_LIBS=${LIBNAME}
+	# also make regular .a files,
-        else
+	# provided by Danek Duvall (duvall@dhduvall.student.princeton.edu)
-            LIBNAME="${LIBNAME}.dylib"
+	ar ruv ${ARNAME} ${OBJECTS}
-            echo "mklib: Making Darwin shared library: " ${LIBNAME}
+	ranlib ${ARNAME}
-            FLAGS="-dynamiclib -multiply_defined suppress"
+	FINAL_LIBS="${ARNAME} ${LIBNAME}"
-	    if [ $CPLUSPLUS = 1 ] ; then
+	;;
 		LINK="g++"
 	    else
 		LINK="cc"
 	    fi
            ${LINK} ${FLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
            FINAL_LIBS=${LIBNAME}
        fi
        ;;
    'LynxOS')
 	LIBNAME="lib${LIBNAME}.a"
-	echo "mklib: Making LynxOS static library: " ${LIBNAME}
+	echo "mklib: Making LynxOS library: " ${LIBNAME}
 	rm -f ${LIBNAME}
 	ar ru ${LIBNAME} ${OBJECTS}
 	FINAL_LIBS=${LIBNAME}
 	;;
    'BeOS')
-        if [ $STATIC = 1 ] ; then
+	LIBNAME="lib${LIBNAME}.so"
-            LIBNAME="lib${LIBNAME}.a"
+	echo "mklib: Making BeOS shared library: " ${LIBNAME}
-            echo "mklib: Making BeOS static library: " ${LIBNAME}
+	gcc -nostart -Xlinker -soname=${LIBNAME} -L/Be/develop/lib/x86 ${OBJECTS} -lbe -o ${LIBNAME}
            ar -cru "${LIBNAME}" ${OBJECTS}
        else
 	    LIBNAME="lib${LIBNAME}.so"
 	    echo "mklib: Making BeOS shared library: " ${LIBNAME}
 	    gcc -nostart -Xlinker "-soname=${LIBNAME}" -L/Be/develop/lib/x86 -lbe ${DEPS} ${OBJECTS} -o "${LIBNAME}"
 	    mimeset -f "${LIBNAME}"
 	    setversion "${LIBNAME}" -app ${MAJOR} ${MINOR} ${PATCH} -short "Powered by Mesa3D!" -long "Powered by Mesa3D!"
 	fi
 	FINAL_LIBS=${LIBNAME}
 	;;
@@ -487,135 +320,24 @@ case $ARCH in
 	FINAL_LIBS="${LIBNAME}"
 	;;
    'icc')
 	# Intel C compiler
 	LIBNAME="lib${LIBNAME}"     # prefix with "lib"
        if [ $STATIC = 1 ] ; then
            echo "mklib: Making Intel ICC static library: " ${LIBNAME}.a
            LINK="ar"
            OPTS="-ruv"
            # make lib
            ${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
            # finish up
            FINAL_LIBS="${LIBNAME}.a"
        else
            OPTS="-shared"
            VERSION="${MAJOR}.${MINOR}.${PATCH}"
            echo "mklib: Making Intel ICC shared library: " ${LIBNAME}.so.${VERSION}
            if [ $CPLUSPLUS = 1 ] ; then
                LINK="icc"
            else
                LINK="icc"
            fi
            # rm any old libs
            rm -f ${LIBNAME}.so.${VERSION}
            rm -f ${LIBNAME}.so.${MAJOR}
            rm -f ${LIBNAME}.so
            # make lib
            ${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
            # make usual symlinks
            ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
            ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
            # finish up
            FINAL_LIBS="${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so"
        fi
 	;;
    'aix-gcc')
 	# AIX with gcc
        if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    echo "mklib: Making AIX GCC static library: " ${LIBNAME}
 	    rm -f ${LIBNAME}
 	    ar ru ${LIBNAME} ${OBJECTS}
 	    FINAL_LIBS=${LIBNAME}
 	else
 	    LIBNAME="lib${LIBNAME}.so"  # prefix with "lib", suffix with ".so"
 	    echo "mklib: Making AIX GCC shared library: " ${LIBNAME}
 	    # remove old lib
 	    rm -f ${LIBNAME}
 	    # make the lib
 	    gcc -shared -Wl,-G ${OBJECTS} ${DEPS} -o ${LIBNAME}
 	    # NOTE: the application linking with this library must specify
 	    # the -Wl,-brtl flags to gcc
 	    FINAL_LIBS=${LIBNAME}
 	fi
 	;;
    'ultrix')
 	# XXX untested
        if [ $STATIC = 0 ] ; then
 	    echo "mklib: Warning shared libs not supported on Ultrix"
 	fi
 	LIBNAME="lib${LIBNAME}.a"
 	echo "mklib: Making static library for Ultrix: " ${LIBNAME}
 	rm -f ${LIBNAME}
 	ar ru ${LIBNAME} ${OBJECTS}
 	FINAL_LIBS="${LIBNAME}"
 	;;
     CYGWIN*)
 	# GCC-based environment
 	CYGNAME="cyg${LIBNAME}"     # prefix with "cyg"
 	LIBNAME="lib${LIBNAME}"     # prefix with "lib"
        if [ $STATIC = 1 ] ; then
            echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a
            LINK="ar"
            OPTS="-ru"
            # make lib
            ${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
 	    ranlib ${LIBNAME}.a
            # finish up
            FINAL_LIBS=${LIBNAME}.a
        else
 	    OPTS="-shared -Wl,-export-all -Wl,--out-implib=${LIBNAME}-${MAJOR}.dll.a"
            echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}-${MAJOR}.dll
            if [ $CPLUSPLUS = 1 ] ; then
                LINK="g++"
            else
                LINK="gcc"
            fi
            # rm any old libs
            rm -f ${LIBNAME}-${MAJOR}.dll
            rm -f ${LIBNAME}.dll.a
            rm -f ${LIBNAME}.a
            # make lib
            ${LINK} ${OPTS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS}
            # make usual symlinks
            ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a
            # finish up
            FINAL_LIBS="${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a"
 	    # special case for installing in bin
            FINAL_BINS="${CYGNAME}-${MAJOR}.dll"
        fi
 	;;
    'example')
 	# If you're adding support for a new architecture, you can
 	# start with this:
-        if [ $STATIC = 1 ] ; then
+	LIBNAME="lib${LIBNAME}.so"  # prefix with "lib"
-	    LIBNAME="lib${LIBNAME}.a"
+	echo "mklib: Making library for example arch: " ${LIBNAME}
-	    echo "mklib: Making static library for example arch: " ${LIBNAME}
+	ld -o ${LIBNAME} ${OBJECTS} ${DEPS}
-	    rm -f ${LIBNAME}
+	FINAL_LIBS="${LIBNAME}"
 	    ar rv ${LIBNAME} ${OBJECTS}
 	    FINAL_LIBS="${LIBNAME}"
 	else
 	    LIBNAME="lib${LIBNAME}.so"  # prefix with "lib"
 	    echo "mklib: Making shared library for example arch: " ${LIBNAME}
 	    ld -o ${LIBNAME} ${OBJECTS} ${DEPS}
 	    FINAL_LIBS="${LIBNAME}"
 	fi
 	;;
    *)
-	echo "mklib: ERROR: Don't know how to make a static/shared library for" ${ARCH}
+	echo "mklib: WARNING: making library for unknown platform!"
-	echo "mklib: Please add necessary commands to mklib script."
+	echo "mklib: WARNING: this may not work!"
 	echo "mklib: WARNING: please update the bin/mklib script!"
 	# XXX this is a total hack for Mesa - remove someday
 	# fall-back to an old mklib.* script
 	LIBNAME="lib${LIBNAME}.a"
 	${TOP}/${MAKELIB} "lib${LIBNAME}.a" ${MAJOR} ${MINOR} ${PATCH} ${OBJECTS}
 	FINAL_LIBS="${LIBNAME}"
 	;;
 esac
--- a/bin/mklib.aix
+++ b/bin/mklib.aix
@@ -0,0 +1,153 @@
 #!/bin/ksh
 # Make an AIX shared library (tricky!!!)
 # Based on a script from Athanasios G. Gaitatzes (gaitat@vnet.ibm.com)
 # Improved by Greg Thompson <gregt@visix.com> -gt
 #--identification------------------------------------------------------
 # $Id: mklib.aix,v 1.2 1999/09/15 15:10:20 brianp Exp $
 # $Log: mklib.aix,v $
 # Revision 1.2  1999/09/15 15:10:20  brianp
 # added third, tiny version number to arguments
 #
 # Revision 1.1  1999/08/19 13:52:56  brianp
 # initial check-in (post-crash)
 #
 #--common--------------------------------------------------------------
 LIBRARY=$1
 shift 1
 MAJOR=$1
 shift 1
 MINOR=$1
 shift 1
 TINY=$1
 shift 1
 OBJECTS=$*
 #--platform------------------------------------------------------------
 # BASENAME = LIBRARY without .a suffix
 BASENAME=`echo ${LIBRARY} | sed "s/\.a//g"`
 # Name of exports file
 EXPFILE=${BASENAME}.exp
 # Name of temporary shared lib file
 OFILE=shr.o
 ####OFILE=${BASENAME}.o
 # Remove any old files from previous make
 rm -f ${LIBRARY} ${EXPFILE} ${OFILE}
 # Pick a way to use nm -gt
 NM=${NM-/bin/nm -eC}
 # Determine which version of AIX this is
 AIXVERSION=`uname -v`
 # Pick a way to tell the linker there's no entrypoint -gt
 case ${AIXVERSION}
 {
 	3*)
 		ENTRY='-e _nostart'
 		;;
 	4*)
 		ENTRY=-bnoentry
 		;;
 	*)
 		echo "Error in mklib.aix!"
 		exit 1
 		;;
 }
 # Other libraries which we may be dependent on.  Since we make the libraries
 # in the order libGL.a, libaGLU.a, libglut.a just depends on its predecessor.
 # modified to make otherlibs in the form of -lfoo -gt
 OTHERLIBS=`ls ../lib/*.a | sed "s/..\/lib\/lib/-l/g" | sed "s/\.a//g"`
 ##echo OTHERLIBS are ${OTHERLIBS}
 # Make exports (.exp) file header
 echo "#! ${LIBRARY}" > ${EXPFILE}
 # Append list of exported symbols to exports file -gt
 case ${AIXVERSION}
 {
    3*)
 	${NM} ${OBJECTS} | awk -F'|' '{
 	    if ($3 != "extern" || substr($7,1,1) == " ") continue
 	    sub ("  *", "", $1); sub ("  *", "", $7)
 	    if ( (($7 == ".text") || ($7 == ".data") || ($7 == ".bss"))  \
 		    && ( substr($1,1,1) != ".")) {
 		if (substr ($1, 1, 7) != "__sinit" &&
 			substr ($1, 1, 7) != "__sterm") {
 		    if (substr ($1, 1, 5) == "__tf1")
 			print (substr ($1, 7))
 		    else if (substr ($1, 1, 5) == "__tf9")
 			print (substr ($1, 15))
 		    else
 			print $1
 		}
 	    }
 	}' | sort -u >> ${EXPFILE}
 	;;
    4*)
 	${NM} ${OBJECTS} | awk '{
 	    if ((($2 == "T") || ($2 == "D") || ($2 == "B")) \
 		    && ( substr($1,1,1) != ".")) {
 		if (substr ($1, 1, 7) != "__sinit" &&
 			substr ($1, 1, 7) != "__sterm") {
 		    if (substr ($1, 1, 5) == "__tf1")
 			print (substr ($1, 7))
 		    else if (substr ($1, 1, 5) == "__tf9")
 			print (substr ($1, 15))
 		    else
 			print $1
 		}
 	    }
 	}' | sort -u >> ${EXPFILE}
 	;;
 }
 # This next line is a hack to allow full compatibility with IBM's OpenGL
 # libraries.  IBM mistakenly exports glLoadIdentity from the libGLU.a
 # library.  We have to do the same thing.  Problem reported by Yemi Adesanya
 # (adesanya@afsmail.cern.ch) and Patrick Brown (pbrown@austin.ibm.com)
 if [ "${BASENAME}" = libGLU ] ; then
    echo "glLoadIdentity" >> ${EXPFILE}
 fi
 # Make the shared lib file
 cc -o ${OFILE} ${OBJECTS} -L../lib ${OTHERLIBS} -lX11 -lXext -lXmu -lXi -lm -lc -bE:${EXPFILE} -bM:SRE ${ENTRY}
 # Make the .a file
 ar ruv ${LIBRARY} ${OFILE}
 # Put exports file in Mesa lib directory
 mv ${EXPFILE} ../lib
 # Remove OFILE
 rm -f ${OFILE}
 #NOTES
 # AIX 4.x /usr/bin/nm -B patch from ssclift@mach.me.queensu.ca (Simon Clift)
 # Robustified symbol extraction for AIX 3 and 4
 #   Greg Thompson <gregt@visix.com>
--- a/bin/mklib.ar-ruv
+++ b/bin/mklib.ar-ruv
@@ -0,0 +1,38 @@
 #!/bin/sh
 # Make a standard Unix .a library file with 'ar ruv'
 #--identification------------------------------------------------------
 # $Id: mklib.ar-ruv,v 1.2 1999/09/15 15:10:20 brianp Exp $
 # $Log: mklib.ar-ruv,v $
 # Revision 1.2  1999/09/15 15:10:20  brianp
 # added third, tiny version number to arguments
 #
 # Revision 1.1  1999/08/19 13:52:57  brianp
 # initial check-in (post-crash)
 #
 #--common--------------------------------------------------------------
 LIBRARY=$1
 shift 1
 MAJOR=$1
 shift 1
 MINOR=$1
 shift 1
 TINY=$1
 shift 1
 OBJECTS=$*
 #--platform-------------------------------------------------------------
 #ar ruv $LIBRARY $OBJECTS
 ar ru $LIBRARY $OBJECTS
--- a/configs/aix
+++ b/configs/aix
@@ -1,28 +0,0 @@
 # Configuration for AIX, dynamic libs
 include $(TOP)/configs/default
 CONFIG_NAME = aix
 # Compiler and flags
 CC = cc
 CXX = xlC
 CFLAGS = -O -DAIXV3
 CXXFLAGS = -O -DAIXV3
 MKLIB_OPTIONS =
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS = -lX11 -lXext -lm
 GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
 GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
 GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXt -lX11
 OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
 APP_LIB_DEPS = -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC
--- a/configs/aix-64
+++ b/configs/aix-64
@@ -1,28 +0,0 @@
 # Configuration for AIX 64-bit, dynamic libs
 include $(TOP)/configs/default
 CONFIG_NAME = aix-64
 # Compiler and flags
 CC = xlc
 CXX = xlC
 CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3
 CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3
 MKLIB_OPTIONS = -arch AIX64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS = -lX11 -lXext -lm
 GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
 GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
 GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXt -lX11
 OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
 APP_LIB_DEPS = -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC
--- a/configs/aix-gcc
+++ b/configs/aix-gcc
@@ -1,19 +0,0 @@
 # Configuration for AIX with gcc
 include $(TOP)/configs/default
 CONFIG_NAME = aix-gcc
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O2 -DAIXV3
 CXXFLAGS = -O2 -DAIXV3
 MKLIB_OPTIONS = -arch aix-gcc
 GL_LIB_DEPS = -lX11 -lXext -lm
 GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu
 APP_LIB_DEPS = -L$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXmu -lXi
--- a/configs/aix-static
+++ b/configs/aix-static
@@ -1,23 +0,0 @@
 # Configuration for AIX, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = aix-static
 # Compiler and flags
 CC = cc
 CXX = xlC
 CFLAGS = -O -DAIXV3
 CXXFLAGS = -O -DAIXV3
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -lXext -lXmu -lXi -lm
--- a/configs/beos
+++ b/configs/beos
@@ -1,99 +0,0 @@
 # Configuration for BeOS
 # Written by Philippe Houdoin
 include $(TOP)/configs/default
 CONFIG_NAME = beos
 DEFINES = 	\
 	-DBEOS_THREADS 
 MACHINE=$(shell uname -m)
 ifeq ($(MACHINE), BePC)
 	CPU = x86
 else
 	CPU = ppc
 endif
 ifeq ($(CPU), x86)
 	# BeOS x86 settings
 	DEFINES += \
 		-DGNU_ASSEMBLER \
 		-DUSE_X86_ASM \
 		-DUSE_MMX_ASM \
 		-DUSE_3DNOW_ASM \
 		-DUSE_SSE_ASM
 	ASM_SOURCES = $(X86_SOURCES) $(X86_API)
 	CC = gcc
 	CXX = g++
 	LD = gcc
 	CFLAGS = \
 		-Wall -Wno-multichar -Wno-ctor-dtor-privacy \
 		$(DEFINES)
 	CXXFLAGS = $(CFLAGS)
 	LDFLAGS += -Xlinker
 	ifdef DEBUG
 		CFLAGS   += -g -O0
 		LDFLAGS += -g
 		DEFINES += -DDEBUG
 	else
 		CFLAGS   += -O3
 	endif
 	GLUT_CFLAGS = -fexceptions
 else
 	# BeOS PPC settings
 	CC = mwcc
 	CXX = $(CC)
 	LD = mwldppc
 	CFLAGS = \
 		-w on -requireprotos \
 		$(DEFINES)
 	CXXFLAGS = $(CFLAGS)
 	LDFLAGS += \
 		-export pragma \
 		-init _init_routine_ \
 		-term _term_routine_ \
 		-lroot \
 		/boot/develop/lib/ppc/glue-noinit.a \
 		/boot/develop/lib/ppc/init_term_dyn.o \
 		/boot/develop/lib/ppc/start_dyn.o 
 	ifdef DEBUG
 		CFLAGS   += -g -O0
 		CXXFLAGS += -g -O0
 		LDFLAGS += -g
 	else
 		CFLAGS   += -O7
 		CXXFLAGS += -O7
 	endif
 	GLUT_CFLAGS = -fexceptions
 endif
 # Directories
 SRC_DIRS = mesa glu glut/beos
 GLU_DIRS = sgi
 DRIVER_DIRS = beos
 PROGRAM_DIRS = beos samples redbook demos tests
 # Library/program dependencies
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS =  
 GLUT_LIB_DEPS = -lgame -L$(LIB_DIR) -l$(GL_LIB)
 APP_LIB_DEPS = -lbe -L$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB)
--- a/configs/darwin
+++ b/configs/darwin
@@ -1,25 +0,0 @@
 # Configuration for Darwin / MacOS X, making dynamic libs
 include $(TOP)/configs/default
 CONFIG_NAME = darwin
 # Compiler and flags
 CC = cc
 CXX = cc
 CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
 CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
 # Library names (actual file names)
 GL_LIB_NAME = libGL.dylib
 GLU_LIB_NAME = libGLU.dylib
 GLUT_LIB_NAME = libglut.dylib
 GLW_LIB_NAME = libGLw.dylib
 OSMESA_LIB_NAME = libOSMesa.dylib
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = $(TOP)/lib/GL.dylib
 GLU_LIB_DEPS = $(TOP)/lib/GL.dylib
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
 APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
--- a/configs/darwin-static
+++ b/configs/darwin-static
@@ -1,24 +0,0 @@
 # Configuration for Darwin / MacOS X, making static libs
 include $(TOP)/configs/darwin
 CONFIG_NAME = darwin-static
 # Compiler and flags
 CFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
 CXXFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
 APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
--- a/configs/default
+++ b/configs/default
@@ -1,68 +0,0 @@
 # Default/template configuration
 # This is included by other config files which may override some
 # of these variables.
 CONFIG_NAME = default
 # Version info
 MESA_MAJOR=6
 MESA_MINOR=3
 MESA_TINY=0
 # external projects
 DRM_SOURCE_PATH=$(TOP)/../drm
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -O
 CXXFLAGS = -O
 GLU_CFLAGS = 
 # Misc tools and flags
 MKLIB_OPTIONS = 
 MKDEP = makedepend
 MKDEP_OPTIONS = -fdepend
 MAKE = make
 # Library names (base name)
 GL_LIB = GL
 GLU_LIB = GLU
 GLUT_LIB = glut
 GLW_LIB = GLw
 OSMESA_LIB = OSMesa
 # Library names (actual file names)
 GL_LIB_NAME = libGL.so
 GLU_LIB_NAME = libGLU.so
 GLUT_LIB_NAME = libglut.so
 GLW_LIB_NAME = libGLw.so
 OSMESA_LIB_NAME = libOSMesa.so
 # Optional assembly language optimization files for libGL
 ASM_SOURCES = 
 # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
 # order to build the Motif widget too)
 GLW_SOURCES = GLwDrawA.c
 # Directories
 LIB_DIR = $(TOP)/lib
 INSTALL_PREFIX = /usr/local
 SRC_DIRS = mesa glu glut/glx glw
 GLU_DIRS = sgi
 DRIVER_DIRS = x11 osmesa
 PROGRAM_DIRS = demos redbook samples xdemos
 # Library/program dependencies
 GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
--- a/configs/freebsd
+++ b/configs/freebsd
@@ -1,17 +0,0 @@
 # Configuration for FreeBSD
 include $(TOP)/configs/default
 CONFIG_NAME = FreeBSD
 # Compiler and flags
 CC = gcc
 CXX = g++
 MAKE = gmake
 CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100
 CXXFLAGS = -O2 -fPIC -pedantic
 GLUT_CFLAGS = -fexceptions
 APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -1,41 +0,0 @@
 # -*-makefile-*-
 # Configuration for freebsd-dri: FreeBSD DRI hardware drivers
 include $(TOP)/configs/freebsd
 CONFIG_NAME = freebsd-dri
 # Compiler and flags
 CC = gcc
 CXX = g++
 WARN_FLAGS = -Wall
 OPT_FLAGS = -O
 X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
 DEFINES = -DDRI_NEW_INTERFACE_ONLY 
 CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -I/usr/local/include $(X11_INCLUDES)
 CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
 ASM_SOURCES = 
 # Library/program dependencies
 DRI_LIB_DEPS = -lm -lpthread -lexpat
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -pthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
 # Directories
 SRC_DIRS = mesa glu glut/glx glw glx/x11
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri
 DRM_SOURCE_PATH=$(TOP)/../drm
 # ffb and gamma are missing because they have not been converted to use the new
 # interface.
 DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx \
 	   unichrome savage sis
--- a/configs/freebsd-dri-x86
+++ b/configs/freebsd-dri-x86
@@ -1,12 +0,0 @@
 # -*-makefile-*-
 # Configuration for freebsd-dri: FreeBSD DRI hardware drivers
 include $(TOP)/configs/freebsd-dri
 CONFIG_NAME = freebsd-dri-x86
 # Unnecessary on x86, generally.
 PIC_FLAGS = 
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 ASM_SOURCES = $(X86_SOURCES)
--- a/configs/hpux10
+++ b/configs/hpux10
@@ -1,14 +0,0 @@
 # Configuration for HPUX v10, shared libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux10
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
 CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE
 APP_LIB_DEPS = -$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/hpux10-gcc
+++ b/configs/hpux10-gcc
@@ -1,16 +0,0 @@
 # Configuration for HPUX v10, with gcc
 include $(TOP)/configs/default
 CONFIG_NAME = hpux10-gcc
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include  -DUSE_XSHM
 CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE
 GLUT_CFLAGS = -fexceptions
 APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/hpux10-static
+++ b/configs/hpux10-static
@@ -1,30 +0,0 @@
 # Configuration for HPUX v10, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux10-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
 CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies (static libs don't have dependencies)
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -lstdc++
--- a/configs/hpux11-32
+++ b/configs/hpux11-32
@@ -1,26 +0,0 @@
 # Configuration for HPUX v11
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-32
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = +z -Aa +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
 MKLIB_OPTIONS =
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
 APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/hpux11-32-static
+++ b/configs/hpux11-32-static
@@ -1,26 +0,0 @@
 # Configuration for HPUX v11, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-32-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
 APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/hpux11-32-static-nothreads
+++ b/configs/hpux11-32-static-nothreads
@@ -1,26 +0,0 @@
 # Configuration for HPUX v11, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-32-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
 CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
 APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/hpux11-64
+++ b/configs/hpux11-64
@@ -1,27 +0,0 @@
 # Configuration for HPUX v11, 64-bit
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-64
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +z -Ae +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = +z -Aa +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
 MKLIB_OPTIONS =
 LIBDIR = $(TOP)/lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
 APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/hpux11-64-static
+++ b/configs/hpux11-64-static
@@ -1,27 +0,0 @@
 # Configuration for HPUX v11, 64-bit, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux11-64-static
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 CXXFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
 MKLIB_OPTIONS = -static
 LIBDIR = $(TOP)/lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies
 APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/hpux9
+++ b/configs/hpux9
@@ -1,16 +0,0 @@
 # Configuration for HPUX v9, shared libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux9
 # Compiler and flags
 CC = cc
 # XXX fix this
 CXX = c++
 CFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM
 CXXFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5
 APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm
--- a/configs/hpux9-gcc
+++ b/configs/hpux9-gcc
@@ -1,14 +0,0 @@
 # Configuration for HPUX v10, shared libs
 include $(TOP)/configs/default
 CONFIG_NAME = hpux9-gcc
 # Compiler and flags
 CC = cc
 CXX = aCC
 CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
 CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE
 APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/irix6-64
+++ b/configs/irix6-64
@@ -1,18 +0,0 @@
 # Configuration for IRIX 6.x, make n64 DSOs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-64
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM
 CXXFLAGS = -64 -O3 -ansi -woff 1174
 MKLIB_OPTIONS = -archopt 64
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = $(TOP)/lib64
 APP_LIB_DEPS = -L$(LIB_DIR) -64 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm
--- a/configs/irix6-64-static
+++ b/configs/irix6-64-static
@@ -1,25 +0,0 @@
 # Configuration for IRIX 6.x, make n64 static libs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-64-static
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM
 CXXFLAGS = -64 -O3 -ansi -woff 1174
 MKLIB_OPTIONS = -archopt 64 -static
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = $(TOP)/lib64
 APP_LIB_DEPS = -L$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/irix6-n32
+++ b/configs/irix6-n32
@@ -1,18 +0,0 @@
 # Configuration for IRIX 6.x, make n32 DSOs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-n32
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM
 CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552
 MKLIB_OPTIONS = -archopt n32
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = $(TOP)/lib32
 APP_LIB_DEPS = -L$(LIB_DIR) -n32 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lfpe -lm
--- a/configs/irix6-n32-static
+++ b/configs/irix6-n32-static
@@ -1,25 +0,0 @@
 # Configuration for IRIX 6.x, make n32 static libs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-n32-static
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -n32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
 CXXFLAGS = -n32 -mips2 -O2 -ansi -woff 3262,3666
 MKLIB_OPTIONS = -archopt n32 -static
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = $(TOP)/lib32
 APP_LIB_DEPS = -L$(LIB_DIR) -n32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/irix6-o32
+++ b/configs/irix6-o32
@@ -1,19 +0,0 @@
 # Configuration for IRIX 6.x, make o32 DSOs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-o32
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
 CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
 MKLIB_OPTIONS = -archopt o32
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = $(TOP)/lib32
 APP_LIB_DEPS = -L$(LIB_DIR) -32 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
--- a/configs/irix6-o32-static
+++ b/configs/irix6-o32-static
@@ -1,25 +0,0 @@
 # Configuration for IRIX 6.x, make o32 static libs
 include $(TOP)/configs/default
 CONFIG_NAME = irix6-o32-static
 # Compiler and flags
 CC = cc
 CXX = CC
 CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
 CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
 MKLIB_OPTIONS = -archopt o32 -static
 GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
 LIB_DIR = $(TOP)/lib32
 APP_LIB_DEPS = -L$(LIB_DIR) -32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/linux
+++ b/configs/linux
@@ -1,20 +0,0 @@
 # Configuration for generic Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 # Library/program dependencies
 # Need to have -L/usr/X11R6/lib in these:
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
--- a/configs/linux-alpha
+++ b/configs/linux-alpha
@@ -1,18 +0,0 @@
 # Configuration for Linux on Alpha
 include $(TOP)/configs/default
 CONFIG_NAME = linux-alpha
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM
 CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE
 GLUT_CFLAGS = -fexceptions
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
--- a/configs/linux-alpha-static
+++ b/configs/linux-alpha-static
@@ -1,27 +0,0 @@
 # Configuration for Linux on Alpha, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = linux-alpha-static
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE -DUSE_XSHM
 CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -L/usr/X11R6/lib -lX11 -lm
--- a/configs/linux-debug
+++ b/configs/linux-debug
@@ -1,20 +0,0 @@
 # Configuration for debugging on Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux-debug
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG
 CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
 GLUT_CFLAGS = -fexceptions
 # Need to have -L/usr/X11R6/lib in these:
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -1,53 +0,0 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/default
 CONFIG_NAME = linux-dri
 # Compiler and flags
 CC = gcc
 CXX = g++
 MKDEP = /usr/X11R6/bin/makedepend
 #MKDEP = gcc -M
 #MKDEP_OPTIONS = -MF depend
 WARN_FLAGS = -Wall
 OPT_FLAGS = -O -g
 PIC_FLAGS = -fPIC
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
 	-DDRI_NEW_INTERFACE_ONLY -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 
 X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
 CFLAGS =  $(WARN_FLAGS) $(OPT_FLAGS) $(ASM_FLAGS) -std=c99 $(PIC_FLAGS) -ffast-math  \
 	$(DEFINES)
 CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) \
 	$(DEFINES)
 ASM_SOURCES = 
 # Library/program dependencies
 DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 # Directories
 SRC_DIRS = mesa glu glut/glx glw glx/x11
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri
 # ffb and gamma are missing because they have not been converted to use the new
 # interface.
 DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon s3v \
 	savage sis tdfx trident unichrome
--- a/configs/linux-dri-ppc
+++ b/configs/linux-dri-ppc
@@ -1,17 +0,0 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/linux-dri
 CONFIG_NAME = linux-dri-ppc
 OPT_FLAGS = -Os -mcpu=603
 PIC_FLAGS = -fPIC
 ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
 ASM_SOURCES = $(PPC_SOURCES)
 # Build only the drivers for cards that exist on PowerPC.  At some point MGA
 # will be added, but not yet.
 DRI_DIRS = dri_client mach64 r128 r200 radeon tdfx
--- a/configs/linux-dri-x86
+++ b/configs/linux-dri-x86
@@ -1,12 +0,0 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/linux-dri
 CONFIG_NAME = linux-dri-x86
 # Unnecessary on x86, generally.
 PIC_FLAGS = 
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 ASM_SOURCES = $(X86_SOURCES)
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -1,40 +0,0 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 include $(TOP)/configs/default
 CONFIG_NAME = linux-dri-x86-64
 # Compiler and flags
 CC = gcc
 CXX = g++
 DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE  -D__AMD64__ 
 CFLAGS = -m64 -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math $(DEFINES)
 CXXFLAGS = -m64 -Wall -g -ansi -pedantic -fPIC $(DEFINES)
 X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
 #ASM_SOURCES = $(X86_SOURCES)
 LIB_DIR = $(TOP)/lib64
 # Library/program dependencies
 DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
 GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib64 -lXt -lX11
 # Directories
 SRC_DIRS = mesa glu glut/glx glw glx/x11
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri
 # ffb, gamma, and sis are missing because they have
 # not be converted to use the new interface.  Do i810 & i830 really
 # need to be included here?
 #
 DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome savage
--- a/configs/linux-glide
+++ b/configs/linux-glide
@@ -1,20 +0,0 @@
 # Configuration for generic Linux with 3Dfx Glide driver
 include $(TOP)/configs/default
 CONFIG_NAME = linux-glide
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
--- a/configs/linux-icc
+++ b/configs/linux-icc
@@ -1,21 +0,0 @@
 # Configuration for Linux with Intel C compiler
 include $(TOP)/configs/default
 CONFIG_NAME = linux-icc
 # Compiler and flags
 CC = icc
 CXX = g++
 CFLAGS = -O3 -tpp6 -axK -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -O3
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -arch icc
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)
--- a/configs/linux-icc-static
+++ b/configs/linux-icc-static
@@ -1,29 +0,0 @@
 # Configuration for Linux with Intel C compiler, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = linux-icc-static
 # Compiler and flags
 CC = icc
 CXX = g++
 CFLAGS = -O3 -tpp6 -axK -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -O3
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static -arch icc
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 MKLIB_OPTIONS = -arch icc
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)
--- a/configs/linux-osmesa16
+++ b/configs/linux-osmesa16
@@ -1,27 +0,0 @@
 # Configuration for 16 bits/channel OSMesa library on Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux-osmesa16
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 # Library names
 OSMESA_LIB = OSMesa16
 OSMESA_LIB_NAME = libOSMesa16.so
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = 
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
 APP_LIB_DEPS = -lOSMesa16
--- a/configs/linux-osmesa16-static
+++ b/configs/linux-osmesa16-static
@@ -1,28 +0,0 @@
 # Configuration for 16 bits/channel OSMesa library on Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux-osmesa16-static
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
 CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 MKLIB_OPTIONS = -static
 # Library names
 OSMESA_LIB = OSMesa16
 OSMESA_LIB_NAME = libOSMesa16.a
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = 
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
 APP_LIB_DEPS = -lOSMesa16
--- a/configs/linux-osmesa32
+++ b/configs/linux-osmesa32
@@ -1,27 +0,0 @@
 # Configuration for 32 bits/channel OSMesa library on Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux-osmesa32
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
 CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 # Library names
 OSMESA_LIB = OSMesa32
 OSMESA_LIB_NAME = libOSMesa32.so
 # Directories
 SRC_DIRS = mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = 
 # Dependencies
 OSMESA_LIB_DEPS = -lm -lpthread
 APP_LIB_DEPS = -lOSMesa32
--- a/configs/linux-ppc
+++ b/configs/linux-ppc
@@ -1,18 +0,0 @@
 # Configuration for Linux on PPC
 include $(TOP)/configs/default
 CONFIG_NAME = linux-ppc
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
 CXXFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
--- a/configs/linux-ppc-static
+++ b/configs/linux-ppc-static
@@ -1,26 +0,0 @@
 # Configuration for Linux on PPC, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = linux-ppc-static
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
 CXXFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm
--- a/configs/linux-solo
+++ b/configs/linux-solo
@@ -1,33 +0,0 @@
 # Configuration for linux-solo: Linux DRI hardware drivers for fbdev
 include $(TOP)/configs/default
 CONFIG_NAME = linux-solo
 # Compiler and flags
 CC = gcc
 CXX = g++
 DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE
 CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math
 CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC
 ASM_SOURCES = $(X86_SOURCES)
 # Library/program dependencies
 DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
 GL_LIB_DEPS = -lm -lpthread -ldl
 GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
 # Directories
 SRC_DIRS = mesa glx/mini glu glut/mini
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx
 #DRI_DIRS = fb ffb gamma sis savage
 DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome
--- a/configs/linux-solo-ia64
+++ b/configs/linux-solo-ia64
@@ -1,29 +0,0 @@
 # Configuration for linux-solo-ia64: Linux DRI hardware drivers for fbdev
 include $(TOP)/configs/default
 CONFIG_NAME = linux-solo-ia64
 # Compiler and flags
 CC = gcc
 CXX = g++
 DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE
 CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math
 CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC
 # Library/program dependencies
 DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
 GL_LIB_DEPS = -lm -lpthread -ldl
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
 # Directories
 SRC_DIRS = mesa glx/mini glu glut/mini
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx
 DRI_DIRS = fb mach64 mga r128 r200 radeon sis tdfx unichrome
--- a/configs/linux-solo-x86
+++ b/configs/linux-solo-x86
@@ -1,32 +0,0 @@
 # Configuration for linux-solo: Linux DRI hardware drivers for fbdev
 include $(TOP)/configs/default
 CONFIG_NAME = linux-solo-x86
 # Compiler and flags
 CC = gcc
 CXX = g++
 DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS
 CFLAGS = $(DEFINES) -Wmissing-prototypes -O3 -g -std=c99 -Wundef -fPIC -ffast-math
 CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC
 ASM_SOURCES = $(X86_SOURCES)
 # Library/program dependencies
 DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
 GL_LIB_DEPS = -lm -lpthread -ldl
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
 # Directories
 SRC_DIRS = mesa glx/mini glu glut/mini
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx
 #DRI_DIRS = fb ffb gamma sis savage
 DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome
--- a/configs/linux-sparc
+++ b/configs/linux-sparc
@@ -1,16 +0,0 @@
 # Configuration for Linux on Sparc
 include $(TOP)/configs/default
 CONFIG_NAME = linux-sparc
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
 CXXFLAGS = -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
--- a/configs/linux-sparc5
+++ b/configs/linux-sparc5
@@ -1,17 +0,0 @@
 # Configuration for Linux on Sparc5
 include $(TOP)/configs/default
 CONFIG_NAME = linux-sparc5
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
 CXXFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
--- a/configs/linux-static
+++ b/configs/linux-static
@@ -1,30 +0,0 @@
 # Configuration for generic Linux, making static libs
 include $(TOP)/configs/default
 CONFIG_NAME = linux-static
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies (static libs don't have dependencies)
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++
--- a/configs/linux-tcc
+++ b/configs/linux-tcc
@@ -1,22 +0,0 @@
 # Configuration for debugging on Linux
 include $(TOP)/configs/default
 CONFIG_NAME = linux-tcc
 # Compiler and flags
 CC = gcc
 CXX = g++
 TCC_DIR=/home/progs/tcc-0.9.20
 CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DUSE_TCC -I$(TCC_DIR)
 CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
 GLUT_CFLAGS = -fexceptions
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L$(TCC_DIR) -ltcc -ldl
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
--- a/configs/linux-ultrasparc
+++ b/configs/linux-ultrasparc
@@ -1,17 +0,0 @@
 # Configuration for Linux on UltraSparc
 include $(TOP)/configs/default
 CONFIG_NAME = linux-ultrasparc
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
 CXXFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR)-l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
--- a/configs/linux-x86
+++ b/configs/linux-x86
@@ -1,24 +0,0 @@
 # Configuration for Linux with x86 optimizations
 include $(TOP)/configs/default
 CONFIG_NAME = linux-x86
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
--- a/configs/linux-x86-64
+++ b/configs/linux-x86-64
@@ -1,28 +0,0 @@
 # Configuration for Linux for 64-bit X86 (Opteron)
 include $(TOP)/configs/default
 CONFIG_NAME = linux-x86-64
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -D__AMD64__ -I/usr/X11R6/include
 CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
 GLUT_CFLAGS = -fexceptions
 #ASM_SOURCES = $(X86_SOURCES)
 LIB_DIR = $(TOP)/lib64
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib64 -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
--- a/configs/linux-x86-64-static
+++ b/configs/linux-x86-64-static
@@ -1,40 +0,0 @@
 # Configuration for Linux for 64-bit X86 (Opteron), static libs
 include $(TOP)/configs/default
 CONFIG_NAME = linux-x86-64-static
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -D__AMD64__ -I/usr/X11R6/include
 CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 #ASM_SOURCES = $(X86_SOURCES)
 LIB_DIR = $(TOP)/lib64
 # Library/program dependencies (static libs don't have dependencies)
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++
--- a/configs/linux-x86-debug
+++ b/configs/linux-x86-debug
@@ -1,10 +0,0 @@
 # Configuration for Linux with x86 code, but no gcc optimizations and 
 # debugging enabled.
 include $(TOP)/configs/linux-x86
 CONFIG_NAME = linux-x86-debug
 CFLAGS = -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
--- a/configs/linux-x86-glide
+++ b/configs/linux-x86-glide
@@ -1,24 +0,0 @@
 # Configuration for Linux with 3Dfx Glide driver and x86 optimizations
 include $(TOP)/configs/default
 CONFIG_NAME = linux-x86-glide
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
 CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
--- a/configs/linux-x86-static
+++ b/configs/linux-x86-static
@@ -1,37 +0,0 @@
 # Configuration for Linux with x86 optimizations, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = linux-x86-static
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
 CXXFLAGS = -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)
 # Library/program dependencies (static libs don't have dependencies)
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++
--- a/configs/netbsd
+++ b/configs/netbsd
@@ -1,14 +0,0 @@
 # Configuration for NetBSD
 include $(TOP)/configs/default
 CONFIG_NAME = netbsd
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100
 CXXFLAGS = -O2 -fPIC
 GLUT_CFLAGS = -fexceptions
 APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
--- a/configs/openbsd
+++ b/configs/openbsd
@@ -1,18 +0,0 @@
 # Configuration for OpenBSD
 include $(TOP)/configs/default
 CONFIG_NAME = openbsd
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100
 CXXFLAGS = -O2 -fPIC -I/usr/X11R6/include -DHZ=100
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm
 OSMESA_LIB_DEPS = -lm
 GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
--- a/configs/osf1
+++ b/configs/osf1
@@ -1,16 +0,0 @@
 # Configuration for OSF/1
 include $(TOP)/configs/default
 CONFIG_NAME = osf1
 # Compiler and flags
 CC = cc
 CXX = cxx
 CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM
 CXXFLAGS = -O2 -std ansi -ieee
 GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
 GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
--- a/configs/solaris-x86
+++ b/configs/solaris-x86
@@ -1,18 +0,0 @@
 # Configuration for Solaris on x86
 include $(TOP)/configs/default
 CONFIG_NAME = solaris-x86
 # Compiler and flags
 CC = cc
 CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM
 MKLIB_OPTIONS = -static
 APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/solaris-x86-gcc
+++ b/configs/solaris-x86-gcc
@@ -1,24 +0,0 @@
 # Configuration for Solaris on x86 with gcc, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = solaris-x86-gcc
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DUSE_XSHM
 CXXFLAGS = -O3 -m486 -fPIC
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static
 GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread
 GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm
 APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
--- a/configs/sunos4
+++ b/configs/sunos4
@@ -1,12 +0,0 @@
 # Configuration for SunOS 4, shared libs
 include $(TOP)/configs/default
 CONFIG_NAME = sunos4
 # Compiler and flags
 CC = acc
 CFLAGS = -Kpic -O -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4
 APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi -lm
--- a/configs/sunos4-gcc
+++ b/configs/sunos4-gcc
@@ -1,15 +0,0 @@
 # Configuration for SunOS 4, with gcc, shared libs
 include $(TOP)/configs/default
 CONFIG_NAME = sunos4-gcc
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4
 CXXFLAGS = -fPIC -O3 -I/usr/openwin/include -DSUNOS4
 GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG
 APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
--- a/configs/sunos4-static
+++ b/configs/sunos4-static
@@ -1,25 +0,0 @@
 # Configuration for SunOS 4, static libs
 include $(TOP)/configs/default
 CONFIG_NAME = sunos4-static
 # Compiler and flags
 CC = acc
 CFLAGS = -O -DUSE_XSHM -DSUNOS4
 MKLIB_OPTIONS = -static
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 # Library/program dependencies (static libs don't have dependencies)
 GL_LIB_DEPS = 
 OSMESA_LIB_DEPS = 
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm
--- a/configs/sunos5
+++ b/configs/sunos5
@@ -1,18 +0,0 @@
 # Configuration for SunOS 5
 include $(TOP)/configs/default
 CONFIG_NAME = sunos5
 # Compiler and flags
 CC = cc
 CXX = c++
 CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM
 CXXFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include
 GLUT_CFLAGS = -DSOLARIS_2_4_BUG
 GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm
 GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -lCrun -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
--- a/configs/sunos5-gcc
+++ b/configs/sunos5-gcc
@@ -1,21 +0,0 @@
 # Configuration for SunOS 5, with gcc
 include $(TOP)/configs/default
 CONFIG_NAME = sunos5-gcc
 ASM_SOURCES = $(SPARC_SOURCES) $(SPARC_API)
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT -DUSE_XSHM -DUSE_SPARC_ASM
 CXXFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT -DUSE_SPARC_ASM
 GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG
 GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
 GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
--- a/configs/sunos5-smp
+++ b/configs/sunos5-smp
@@ -1,19 +0,0 @@
 # Configuration for SunOS 5, SMP systems
 include $(TOP)/configs/default
 CONFIG_NAME = sunos5-smp
 # Compiler and flags
 CC = cc
 CXX = c++
 CFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG
 CXXFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include
 GLUT_CFLAGS = -DSOLARIS_2_4_BUG
 GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
 GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
 APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lCrun
--- a/configs/ultrix-gcc
+++ b/configs/ultrix-gcc
@@ -1,21 +0,0 @@
 # Configuration for Ultrix, with gcc
 include $(TOP)/configs/default
 CONFIG_NAME = ultrix-gcc
 # Compiler and flags
 CC = gcc
 CXX = g++
 CFLAGS = -pedantic -O2
 CXXFLAGS = -pedantic -O2
 GLUT_CFLAGS = -fexceptions
 MKLIB_OPTIONS = -static
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
 GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXmu -lX11 -lXi -lm
--- a/descrip.mms
+++ b/descrip.mms
@@ -17,4 +17,5 @@ all :
 	$(MMS)$(MMSQUALIFIERS)
 	set default [-.xdemos]
 	$(MMS)$(MMSQUALIFIERS)
-	if f$search("[-]test.DIR") .nes. "" then pipe set default [-.test] ; $(MMS)$(MMSQUALIFIERS)
+	set default [-.tests]
 	$(MMS)$(MMSQUALIFIERS)
--- a/docs/MESA_agp_offset.spec
+++ b/docs/MESA_agp_offset.spec
@@ -8,7 +8,7 @@ Name Strings
 Contact
-    Brian Paul, Tungsten Graphics, Inc. (brian.paul 'at' tungstengraphics.com)
+    Brian Paul, Tungsten Graphics, Inc. (brian 'at' tungstengraphics.com)
    Keith Whitwell, Tungsten Graphics, Inc.  (keith 'at' tungstengraphics.com)
 Status
@@ -48,7 +48,7 @@ Issues
 New Procedures and Functions
-    unsigned int glXGetAGPOffsetMESA( const void *pointer )
+    GLuint glXGetAGPOffsetMESA( const GLvoid *pointer )
 New Tokens
@@ -92,4 +92,3 @@ Revision History
    20 September 2002 - Initial draft
    2 October 2002 - finished GLX chapter 3 additions
    27 July 2004 - use unsigned int instead of GLuint, void instead of GLvoid
--- a/docs/MESA_copy_sub_buffer.spec
+++ b/docs/MESA_copy_sub_buffer.spec
@@ -8,7 +8,7 @@ Name Strings
 Contact
-    Brian Paul (brian.paul 'at' tungstengraphics.com)
+    Brian Paul (brian 'at' mesa3d.org)
 Status
--- a/docs/MESA_pack_invert.spec
+++ b/docs/MESA_pack_invert.spec
@@ -8,7 +8,7 @@ Name Strings
 Contact
-    Brian Paul, Tungsten Graphics, Inc. (brian.paul 'at' tungstengraphics.com)
+    Brian Paul, Tungsten Graphics, Inc. (brian 'at' tungstengraphics.com)
    Keith Whitwell, Tungsten Graphics, Inc.  (keith 'at' tungstengraphics.com)
 Status
--- a/docs/MESA_pixmap_colormap.spec
+++ b/docs/MESA_pixmap_colormap.spec
@@ -8,7 +8,7 @@ Name Strings
 Contact
-    Brian Paul (brian.paul 'at' tungstengraphics.com)
+    Brian Paul (brian 'at' mesa3d.org)
 Status
--- a/docs/MESA_program_debug.spec
+++ b/docs/MESA_program_debug.spec
@@ -8,7 +8,7 @@ Name Strings
 Contact
-    Brian Paul (brian.paul 'at' tungstengraphics.com)
+    Brian Paul (brian @ tungstengraphics.com)
 Status
@@ -18,7 +18,7 @@ Version
    Last Modified Date: July 20, 2003
    Author Revision: 1.0
-    $Date: 2004/03/25 01:42:41 $ $Revision: 1.4 $
+    $Date: 2003/09/23 14:46:11 $ $Revision: 1.3 $
 Number
--- a/docs/MESA_release_buffers.spec
+++ b/docs/MESA_release_buffers.spec
@@ -8,7 +8,7 @@ Name Strings
 Contact
-    Brian Paul (brian.paul 'at' tungstengraphics.com)
+    Brian Paul (brian 'at' mesa3d.org)
 Status
--- a/docs/MESA_resize_buffers.spec
+++ b/docs/MESA_resize_buffers.spec
@@ -8,7 +8,7 @@ Name Strings
 Contact
-    Brian Paul (brian.paul 'at' tungstengraphics.com)
+    Brian Paul, brianp 'at' mesa3d.org
 Status
@@ -16,7 +16,7 @@ Status
 Version
-    $Id: MESA_resize_buffers.spec,v 1.3 2004/03/25 01:42:42 brianp Exp $
+    $Id: MESA_resize_buffers.spec,v 1.2 2000/04/04 23:29:32 brianp Exp $
 Number
--- a/docs/MESA_set_3dfx_mode.spec
+++ b/docs/MESA_set_3dfx_mode.spec
@@ -8,7 +8,7 @@ Name Strings
 Contact
-    Brian Paul (brian.paul 'at' tungstengraphics.com)
+    Brian Paul (brian 'at' mesa3d.org)
 Status
--- a/docs/MESA_trace.spec
+++ b/docs/MESA_trace.spec
@@ -4,7 +4,7 @@ Name
 Name Strings
-     GL_MESA_trace
+     GL_MESA_TRACE
 Contact
@@ -17,7 +17,7 @@ Status
 Version
-    $Id: MESA_trace.spec,v 1.4 2004/03/25 01:42:42 brianp Exp $
+    $Id: MESA_trace.spec,v 1.3 2003/09/19 14:58:21 brianp Exp $
 Number
--- a/docs/MESA_window_pos.spec
+++ b/docs/MESA_window_pos.spec
@@ -8,7 +8,7 @@ Name Strings
 Contact
-    Brian Paul, brian.paul 'at' tungstengraphics.com
+    Brian Paul, brianp 'at' mesa3d.org
 Status
@@ -16,7 +16,7 @@ Status
 Version
-    $Id: MESA_window_pos.spec,v 1.4 2004/03/25 01:42:42 brianp Exp $
+    $Id: MESA_window_pos.spec,v 1.3 2000/04/04 23:29:32 brianp Exp $
 Number
--- a/docs/MESA_ycbcr_texture.spec
+++ b/docs/MESA_ycbcr_texture.spec
@@ -8,7 +8,7 @@ Name Strings
 Contact
-    Brian Paul, Tungsten Graphics, Inc. (brian.paul 'at' tungstengraphics.com)
+    Brian Paul, Tungsten Graphics, Inc. (brian 'at' tungstengraphics.com)
    Keith Whitwell, Tungsten Graphics, Inc.  (keith 'at' tungstengraphics.com)
 Status
@@ -75,14 +75,14 @@ Additions to Chapter 2 of the OpenGL 1.4 Specification (OpenGL Operation)
 Additions to Chapter 3 of the OpenGL 1.4 Specification (Rasterization)
-    In section 3.6.4, Rasterization of Pixel Rectangles, on page 101,
+    In section 3.6.4, Rasterization of Pixel Rectangles, on page 102,
    add the following to Table 3.8 (Packed pixel formats):
    type Parameter                GL Data   Number of        Matching
     Token Name                    Type     Components     Pixel Formats
    --------------                -------   ----------     -------------
-    UNSIGNED_SHORT_8_8_MESA       ushort         2         YCBCR_MESA
+    UNSIGNED_SHORT_8_8_MESA       ushort         3         YCBCR_422_MESA
-    UNSIGNED_SHORT_8_8_REV_MESA   ushort         2         YCBCR_MESA
+    UNSIGNED_SHORT_8_8_REV_MESA   ushort         3         YCBCR_422_MESA
    In section 3.6.4, Rasterization of Pixel Rectangles, on page 102,
@@ -103,13 +103,13 @@ Additions to Chapter 3 of the OpenGL 1.4 Specification (Rasterization)
    +-------------------------------+-------------------------------+
-    In section 3.6.4, Rasterization of Pixel Rectangles, on page 104,
+    In section 3.6.4, Rasterization of Pixel Rectangles, on page 102,
    add the following to Table 3.12 (Packed pixel fiedl assignments):
                       First       Second     Third      Fourth
    Format             Element     Element    Element    Element
    ------             -------     -------    -------    -------
-    YCBCR_MESA         luminance   chroma
+    YCBCR_422_MESA     luminance   chroma
    In section 3.8.1, Texture Image Specification, on page 125, add
@@ -201,4 +201,3 @@ Revision History
     3 September 2003 - further clarify when YCbCr->RGB conversion takes place
    19 September 2003 - a few more updates prior to submitting to extension
                        registry.
     3 April 2004 - fix assorted inaccuracies
--- a/docs/README.3DFX
+++ b/docs/README.3DFX
@@ -3,220 +3,62 @@
-Requirements:
+Mesa-5.1 release notes:
-------------
+-----------------------
-A Voodoo-based videocard/accelerator
+1) Glide2 support has been ceased; in order to keep Voodoo Graphics
-DOS (with DJGPP), Windows9x/2k (with MinGW), Linux
+   and Voodoo Rush compatibility, please visit the Glide SourceForge
-Glide3x library for your OS
+   and help us to fix Glide3 for those cards.
 2) The current release is a WIP; among other things, the Linux build works
   only to some extent. Any help will be appreciated.
 3) Glide3 can be found at http://sourceforge.net/projects/glide/
-http://sourceforge.net/projects/glide/
+
 Known supported HW/OS:
 ----------------------
 Voodoo^2, Voodoo Banshee, Voodoo3, Voodoo4, Voodoo5
 DOS (DJGPP), Windows9x/2k (MinGW/MSVC), Linux
 How to compile:
 ---------------
-DJGPP:
+DJGPP/MinGW/MSVC:
   Place the Glide3 SDK in the top Mesa directory:
-	$(MESA)/glide3/include/
+	$(MESA)/glide3/include/*.h
 		3dfx.h, g3ext.h, glide.h, glidesys.h, glideutl.h, sst1vid.h
 	$(MESA)/glide3/lib/
-		libgld3x.a, libgld3i.a, glide3x.dxe
+   Required headers:
 	3dfx.h, g3ext.h, glide.h, glidesys.h, glideutl.h, sst1vid.h
   Required libraries:
 	OS specific
   Type:
-	make -f Makefile.DJ X86=1 FX=1
+	make -f Makefile.DJ HAVE_MMX=1 HAVE_3DNOW=1 FX=1
-   Look into the makefile for further information.
+	or
-
+	make -f Makefile.mgw HAVE_MMX=1 HAVE_3DNOW=1 FX=1
-MinGW:
+	or
-   Place the Glide3 SDK in the top Mesa directory:
+	nmake -f Makefile.wfx
-	$(MESA)/glide3/include/
+   Look into the corresponding makefiles for further information.
 		3dfx.h, g3ext.h, glide.h, glidesys.h, glideutl.h, sst1vid.h
 	$(MESA)/glide3/lib/
 		libglide3x.a, glide3x.dll
   Type:
 	make -f Makefile.mgw X86=1 FX=1
   Look into the makefile for further information.
 Linux:
   Place the Glide3 SDK in /usr/local/glide
 	/usr/local/glide/include/
 		3dfx.h, g3ext.h, glide.h, glidesys.h, glideutl.h, sst1vid.h
 	/usr/local/glide/lib/
 		libglide3x.a, libglide3x.so
   Type:
 	make linux-glide
 	or
 	make linux-x86-glide
 Compilation defines:
 --------------------
 FX_DEBUG
 	enable driver debug code
 FX_TRAP_GLIDE
 	enable Glide trace code
 FX_PACKEDCOLOR
 	use packed color in vertex structure
 FX_TC_NAPALM
 	map GL_COMPRESSED_RGB[A] to FXT1. Works with VSA100-based cards only.
 FX_COMPRESS_S3TC_AS_FXT1_HACK
 	map S3TC to FXT1
 FX_RESCALE_BIG_TEXURES_HACK
 	fake textures larger than HW can support
 	(see MESA_FX_MAXLOD environment variable)
 Environment variables:
 ----------------------
 The following environment variables affect MesaFX. Those that affect Glide
 only, are beyond the scope of this section. Entries that don't have a "Value"
 field, can have any value whatsoever
 	ex: set MESA_FX_IGNORE_CMBEXT=y
 "Note" (*) means that the environment variable affects Glide, too; also, if
 the var is not found in the environment, it is searched in windoze registry.
 "Note" (!) means that the environment variable is not working as expected;
 may have undefined effects, might have effects only at Glide level or might
 not have any effect whatsoever. Caveat emptor! Those are to be revised soon.
 It is recommended to leave the envvars alone, so that Mesa/Glide will run with
 default values. Use them only when you experience crashes or strange behavior.
 FX_GLIDE_NUM_TMU
 	OS: all
 	HW: dual-TMU cards (Voodoo2, Avenger, Napalm)
 	Desc: force single-TMU
 	Note: (*)
 	Value: "1"
 FX_GLIDE_SWAPPENDINGCOUNT
 	OS: all
 	HW: all
 	Desc: max # of buffers allowed to build up
 	Note: (*) (!)
 	Value: "0", "1", "2", "3", "4", "5" or "6"
 FX_GLIDE_SWAPINTERVAL
 	OS: all
 	HW: all
 	Desc: number of vertical retraces to wait before swapping
 	Note: (*) (!) works only at Glide-level?
 SSTH3_SLI_AA_CONFIGURATION
 	OS: all
 	HW: VSA100-based cards
 	Desc: SLI/AA setup
 	Note: (*) (!) works only at Glide-level?
 	Value:
 	    1, 2, 4 chip cards
 		"0" - SLI & AA disable
 		"1" - SLI disabled, 2 sample AA enabled
 	    2, 4 chip cards
 		"2" - 2-way SLI enabled, AA disabled
 		"3" - 2-way SLI enabled, 2 sample AA enabled
 		"4" - SLI disabled, 4 sample AA enabled
 	    4 chip cards
 		"5" - 4-way SLI enabled, AA disabled
 		"6" - 4-way SLI enabled, 2 sample AA enabled
 		"7" - 2-way SLI enabled, 4 sample AA enabled
 		"8" - SLI disabled, 8 sample AA enabled 
 SST_DUALHEAD
 	OS: win32
 	HW: ?
 	Desc: ?
 	Note: (!) disabled?
 MESA_FX_NO_SIGNALS
 	OS: linux
 	HW: all
 	Desc: avoid installing signals
 	Note: (!) untested!
 MESA_FX_INFO
 	OS: all
 	HW: all
 	Desc: verbose to stderr
 	Value: any; special value "r" to redirect stderr to MESA.LOG
 MESA_FX_NOSNAP
 	OS: all
 	HW: Voodoo1, Rush, Banshee
 	Desc: do not snap vertices inside Mesa
 	Note: to be used with Glide3x that snaps vertices internally
 MESA_FX_POINTCAST
 	OS: all
 	HW: dual-TMU cards (some Voodoo1, Voodoo2, Avenger, Napalm)
 	Desc: try to use pointcast palette
 	Note: may give adverse effects on UMA cards (Avenger, Napalm)
 MESA_FX_IGNORE_PALEXT
 	OS: all
 	HW: all
 	Desc: disable 6666 palette
 MESA_FX_IGNORE_PIXEXT
 	OS: all
 	HW: Napalm
 	Desc: force 565 16bpp mode (traditional Voodoo, no 32/15bpp)
 MESA_FX_IGNORE_TEXFMT
 	OS: all
 	HW: Napalm
 	Desc: disable 32bit textures
 MESA_FX_IGNORE_CMBEXT
 	OS: all
 	HW: Napalm
 	Desc: disable Napalm combiners (color/alpha/texture)
 	Note: this option allows dual-TMU cards perform single-pass
 	      trilinear, but some advanced (multi)texturing modes
 	      won't work (GL_EXT_texture_env_combine)
 MESA_FX_IGNORE_MIREXT
 	OS: all
 	HW: all
 	Desc: disable mirror extension
 MESA_FX_IGNORE_TEXUMA
 	OS: all
 	HW: all
 	Desc: disable UMA
 MESA_FX_IGNORE_TEXUS2
 	OS: all
 	HW: all
 	Desc: disable Texus2
 MESA_FX_MAXLOD
 	OS: all
 	HW: non VSA-100 cards
 	Desc: enable large texture support using SW rescaling
 	Value:
 	    "9"  - 512x512 textures
 	    "10" - 1024x1024 textures
 	    "11" - 2048x2048 textures
 MESA_FX_ALLOW_VP
 	OS: all
 	HW: all
 	Desc: allow vertex program extensions
 MESA_GLX_FX
 	OS: linux
 	HW: Voodoo1, Rush, Voodoo2
 	Desc: display mode
 	Note: (!) experimental
 	Value:
 	    "w" - windowed mode
 	    "f" - fullscreen mode
 	    "d" - disable glide driver
 	OS: win32
 	HW: Rush, Banshee, Avenger, Napalm
 	Desc: display mode
 	Note: (!) experimental
 	Value:
 	    "w" - windowed mode
 Contact:
 --------
-Daniel Borca <dborca 'at' users 'dot' sourceforge 'dot' net>
+Daniel Borca <dborca@users.sourceforge.net>
-Hiroshi Morii <koolsmoky 'at' users 'dot' sourceforge 'dot' net>
+Hiroshi Morii <koolsmoky@users.sourceforge.net>
-WARNING! The info below this line is outdated (yet some of it useful). WARNING!
+The info below this line is outdated. You have been warned...
-*******************************************************************************
+*************************************************************
--- a/docs/README.BEOS
+++ b/docs/README.BEOS
@@ -5,11 +5,10 @@
 * Introduction
-Brian Paul added in Mesa 3.1 a driver for BeOS R4.5 operating system.
+Mesa 4.1 features a driver for the BeOS.  The driver implements
-This driver implements a clone of the BGLView class.  This class,
+a clone of the BGLView class.  This class, derived from BView, allows
-derived from BView, allows OpenGL rendering into any BeOS window.  His
+OpenGL rendering into a BeOS window.
-driver was updated in Mesa 4.1 and again in version 6.1 by Philippe
+The 4.1 BeOS driver is an update of Brian Paul's BeOS driver released in Mesa 3.1.
 Houdoin, who's maintaining this driver since.
 Any application which uses the BGLView should be able to use Mesa
 instead of Be's OpenGL without changing any code.
@@ -19,70 +18,51 @@ SGI sample implementation, it's pretty slow.  You'll see that Mesa
 is considerably faster.
 * Source Code
-The source code for the driver is in src/mesa/drivers/beos/ directory.
+The source code for the driver is in Mesa-4.1/src/BeOS/ directory.
 It's not 100% finished at this time but many GLUT-based demos are
 working.  No optimizations have been made at this time.
 * Compiling
-Since Mesa 6.x, it can be build under BeOS with both the R5 builtin gcc version
+Requirements:
-or more recent gcc versions available for BeOS, like this gcc version 2.95.3 for BeOS 
+  - gcc version 2.95.3 for BeOS 
-you can find at http://www.bebits.com/app/2157.
+  You can find it here: http://www.bebits.com/app/2157
 Anyway, keep in mind that to take full advantage of Mesa x86 optimizations, you better
 want to use gcc 2.95.3 or sooner versions...
 To build Mesa-powered BeOS libGL.so version, open an Terminal window,
 move to Mesa root folder and type this command:
 $ make beos
 Note that the "beos" argument is only needed the first time to setup build config.
 Next times, typing "make" will be enough.
 Move to the Mesa-4.x src sub-directory and then type "make -f Makefile.BeOS-R5".
 When it finishes the Mesa based libGL.so library for
-BeOS will be in the lib/ directory, along libglut.so library.
+BeOS will be in the Mesa-4.x/src/obj.{x86|ppc}/ directory.
 Several demo/test programs should have been build too under progs/* folders.
 If it stop when building one of the progs/* programs, you may want to ignore it
 and force make to move on next target by adding the -k make option:
 $ cd progs
 $ make -k
 To install it as Be's default libGL.so replacement, put it in your 
-/boot/home/config/lib/ directory. All your GL/GLUT apps will use 
+/boot/home/config/lib/ directory. All your GL/GLUTapps will use 
 the Mesa based then. 
 By default, it build a non-debug version library.
 The x86 (MMX, SSE and 3DNOW) optimizations are also supported for x86 target.
-For PowerPC BeOS flavor, sorry, Mesa don't have ppc (Altivec) optimizations
+Sorry, Mesa don't have ppc (Altivec) optimizations yet.
 yet.
 To build a DEBUG version, type instead this :
 $ DEBUG=1 make
 * Example Programs
-Look under progs/beos/ for some BGLView-based programs.
+Look in the Mesa-4.x/BeOS/ directory for one or two BGLView demo
-You should find under progs/samples and progs/redbook directories GLUT-based programs too.
+programs.  They should have been compiled along with the Mesa
-They all should have been compiled along with the Mesa library.
+library.
 * GLUT
-A beta version of GLUT 3.7 port for BeOS, made by Jake Hamby, can be found at 
+A beta version of GLUT 3.7 port for BeOS can be found at 
 http://anobject.com/jehamby/Code/Glut-3.7-x86.zip.
 This is the version currently included in Mesa source code, and
 build in lib/libglut.so.
-A previous 3.5 version of this GLUT BeOS port used to be available at
+There's is a 2.5 version in src-glut.beos/, too.
-http://home.beoscentral.com/jehamby/Glut-3.5-x86.zip.
+The original distribution can be obtained from
 http://home.beoscentral.com/jehamby/Glut-3.5-x86.zip
-They're special versions of GLUT for the BeOS platform.  I don't
+They are special version of GLUT adapted for the BeOS.  I don't
 believe Mark Kilgard's normal GLUT distribution includes BeOS
 support.
@@ -98,40 +78,37 @@ that you're actually using Mesa (with glGetString) so you don't
 cause a fatal error when running with Be's OpenGL.
 * Work Left To Do
- BDirectWindow single buffering support is not implemented yet.
+BDirectWindow single buffering support is not implemented yet.
 - Color index mode is not implemented yet.
 - Reading pixels from the front buffer not implemented yet.
 - There is also a BGLScreen class in BeOS for full-screen OpenGL rendering.
  This should also be implemented for Mesa.
 - Multiple renderers add-ons support, first step toward hardware acceleration
  support.
-* Other contributors to this BeOS port
+Color index mode is not implemented yet.
-Jake Hamby                      jhamby <at> anobject <dot> com
+Reading pixels from the front buffer not implemented yet.
-Marcin Konicki                  ahwayakchih <at> neoni <dot> net
+
-Francois Revol                  revol <at> free <dot> fr
+There is also a BGLScreen class in BeOS for full-screen OpenGL
-Nathan Whitehorn                nathanw <at> uchicago <dot> edu
+rendering.  This should also be implemented for Mesa.
-* Older BeOS Driver
+
 * Old BeOS Driver
 Mesa 2.6 had an earlier BeOS driver.  It was based on Mesa's Off-screen
 rendering interface, not BGLView.  If you're interested in the older
 driver you should get Mesa 2.6.
 * BeOS and Glide
 Mesa 3.0 supported the 3Dfx/Glide library on Beos.  Download Mesa 3.0
 if interested.  Ideally, the 3Dfx/Glide support should be updated to
 work with the new Mesa 3.1 BGLView implementation.
-The Glide library hasn't been updated for BeOS R4 and newer, to my knowledge,
+The Glide library hasn't been updated for BeOS R4, to my knowledge, as
-as of February, 1999.
+of February, 1999.
 ----------------------------------------------------------------------
-$Id: README.BEOS,v 1.12 2004/10/13 00:35:55 phoudoin Exp $
+$Id: README.BEOS,v 1.7 2002/09/19 16:19:44 brianp Exp $
--- a/docs/README.CYGWIN
+++ b/docs/README.CYGWIN
@@ -1,256 +0,0 @@
                          Mesa Cygwin/X11 Information
 WARNING
 =======
 If you installed X11 (packages xorg-x11-devel and xorg-x11-bin-dlls ) with the 
 latest setup.exe from Cygwin the GL (Mesa) libraries and include are already 
 installed in /usr/X11R6. 
 The following will explain how to "replace" them.
 Installation
 ============
 How to compile Mesa on Cygwin/X11 systems:
 1. Shared libs:
    type 'make cygwin-sl'.
    When finished, the Mesa DLL will be in the Mesa-x.y/lib/ and 
    Mesa-x.y/bin directories.
 2. Static libs:
    type 'make cygwin-static'.
    When finished, the Mesa libraries will be in the Mesa-x.y/lib/ directory.
 Header and library files:
   After you've compiled Mesa and tried the demos I recommend the following
   procedure for "installing" Mesa.
   Copy the Mesa include/GL directory to /usr/X11R6/include:
 	cp -a include/GL /usr/X11R6/include
   Copy the Mesa library files to /usr/X11R6/lib:
 	cp -a lib/* /usr/X11R6ocal/lib
   Copy the Mesa bin files (used by the DLL stuff) to /usr/X11R6/bin:
 	cp -a lib/cyg* /usr/X11R6/bin
 Xt/Motif widgets:
   If you want to use Mesa or OpenGL in your Xt/Motif program you can build
   the widgets found in either the widgets-mesa or widgets-sgi directories.
   The former were written for Mesa and the later are the original SGI
   widgets.  Look in those directories for more information.
   For the Motif widgets you must have downloaded the lesstif package.
 Using the library
 =================
 Configuration options:
   The file src/mesa/main/config.h has many parameters which you can adjust
   such as maximum number of lights, clipping planes, maximum texture size,
   etc.  In particular, you may want to change DEPTH_BITS from 16 to 32
   if a 16-bit depth buffer isn't precise enough for your application.
 Shared libraries:
   If you compile shared libraries (Win32 DLLS) you may have to set an 
   environment variable to specify where the Mesa libraries are located.  
   Set the PATH variable to include /your-dir/Mesa-2.6/bin.   
   Otherwise, when you try to run a demo it may fail with a message saying 
   that one or more DLL couldn't be found.
 Xt/Motif Widgets:
   Two versions of the Xt/Motif OpenGL drawing area widgets are included:
      widgets-sgi/	SGI's stock widgets
      widgets-mesa/	Mesa-tuned widgets
   Look in those directories for details
 Togl:
   Togl is an OpenGL/Mesa widget for Tcl/Tk.
   See http://togl.sourceforge.net for more information.
 X Display Modes:
   Mesa supports RGB(A) rendering into almost any X visual type and depth.
   The glXChooseVisual function tries its best to pick an appropriate visual
   for the given attribute list.  However, if this doesn't suit your needs
   you can force Mesa to use any X visual you want (any supported by your
   X server that is) by setting the MESA_RGB_VISUAL and MESA_CI_VISUAL
   environment variables.  When an RGB visual is requested, glXChooseVisual
   will first look if the MESA_RGB_VISUAL variable is defined.  If so, it
   will try to use the specified visual.  Similarly, when a color index
   visual is requested, glXChooseVisual will look for the MESA_CI_VISUAL
   variable.
   The format of accepted values is:  <visual-class> <depth>
   Here are some examples:
   using the C-shell:
 	% setenv MESA_RGB_VISUAL "TrueColor 8"		// 8-bit TrueColor
 	% setenv MESA_CI_VISUAL "PseudoColor 12"	// 12-bit PseudoColor
 	% setenv MESA_RGB_VISUAL "PseudoColor 8"	// 8-bit PseudoColor
   using the KornShell:
 	$ export MESA_RGB_VISUAL="TrueColor 8"
 	$ export MESA_CI_VISUAL="PseudoColor 12"
 	$ export MESA_RGB_VISUAL="PseudoColor 8"
 Double buffering:
   Mesa can use either an X Pixmap or XImage as the backbuffer when in
   double buffer mode.  Using GLX, the default is to use an XImage.  The
   MESA_BACK_BUFFER environment variable can override this.  The valid
   values for MESA_BACK_BUFFER are:  Pixmap and XImage (only the first
   letter is checked, case doesn't matter).
   A pixmap is faster when drawing simple lines and polygons while an
   XImage is faster when Mesa has to do pixel-by-pixel rendering.  If you
   need depth buffering the XImage will almost surely be faster.  Exper-
   iment with the MESA_BACK_BUFFER variable to see which is faster for
   your application.  
 Colormaps:
   When using Mesa directly or with GLX, it's up to the application writer
   to create a window with an appropriate colormap.  The aux, tk, and GLUT
   toolkits try to minimize colormap "flashing" by sharing colormaps when
   possible.  Specifically, if the visual and depth of the window matches
   that of the root window, the root window's colormap will be shared by
   the Mesa window.  Otherwise, a new, private colormap will be allocated.
   When sharing the root colormap, Mesa may be unable to allocate the colors
   it needs, resulting in poor color quality.  This can happen when a
   large number of colorcells in the root colormap are already allocated.
   To prevent colormap sharing in aux, tk and GLUT, define the environment
   variable MESA_PRIVATE_CMAP.  The value isn't significant.
 Gamma correction:
   To compensate for the nonlinear relationship between pixel values
   and displayed intensities, there is a gamma correction feature in
   Mesa.  Some systems, such as Silicon Graphics, support gamma
   correction in hardware (man gamma) so you won't need to use Mesa's
   gamma facility.  Other systems, however, may need gamma adjustment
   to produce images which look correct.  If in the past you thought
   Mesa's images were too dim, read on.
   Gamma correction is controlled with the MESA_GAMMA environment
   variable.  Its value is of the form "Gr Gg Gb" or just "G" where
   Gr is the red gamma value, Gg is the green gamma value, Gb is the
   blue gamma value and G is one gamma value to use for all three
   channels.  Each value is a positive real number typically in the
   range 1.0 to 2.5.  The defaults are all 1.0, effectively disabling
   gamma correction.  Examples using csh:
 	% setenv MESA_GAMMA "2.3 2.2 2.4"	// separate R,G,B values
 	% setenv MESA_GAMMA "2.0"		// same gamma for R,G,B
   The demos/gamma.c program may help you to determine reasonable gamma
   value for your display.  With correct gamma values, the color intensities
   displayed in the top row (drawn by dithering) should nearly match those
   in the bottom row (drawn as grays).
   Alex De Bruyn reports that gamma values of 1.6, 1.6 and 1.9 work well
   on HP displays using the HP-ColorRecovery technology.
   Mesa implements gamma correction with a lookup table which translates
   a "linear" pixel value to a gamma-corrected pixel value.  There is a
   small performance penalty.  Gamma correction only works in RGB mode.
   Also be aware that pixel values read back from the frame buffer will
   not be "un-corrected" so glReadPixels may not return the same data
   drawn with glDrawPixels.
   For more information about gamma correction see:
   http://www.inforamp.net/~poynton/notes/colour_and_gamma/GammaFAQ.html
 Overlay Planes
   Overlay planes in the frame buffer are supported by Mesa but require
   hardware and X server support.  To determine if your X server has
   overlay support you can test for the SERVER_OVERLAY_VISUALS property:
 	xprop -root | grep SERVER_OVERLAY_VISUALS
 HPCR glClear(GL_COLOR_BUFFER_BIT) dithering
   If you set the MESA_HPCR_CLEAR environment variable then dithering
   will be used when clearing the color buffer.  This is only applicable
   to HP systems with the HPCR (Color Recovery) system.
 Extensions
 ==========
   There are three Mesa-specific GLX extensions at this time.
   GLX_MESA_pixmap_colormap 
      This extension adds the GLX function:
         GLXPixmap glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visual,
                                           Pixmap pixmap, Colormap cmap )
      It is an alternative to the standard glXCreateGLXPixmap() function.
      Since Mesa supports RGB rendering into any X visual, not just True-
      Color or DirectColor, Mesa needs colormap information to convert RGB
      values into pixel values.  An X window carries this information but a
      pixmap does not.  This function associates a colormap to a GLX pixmap.
      See the xdemos/glxpixmap.c file for an example of how to use this
      extension.
   GLX_MESA_release_buffers
      Mesa associates a set of ancillary (depth, accumulation, stencil and
      alpha) buffers with each X window it draws into.  These ancillary
      buffers are allocated for each X window the first time the X window
      is passed to glXMakeCurrent().  Mesa, however, can't detect when an
      X window has been destroyed in order to free the ancillary buffers.
      The best it can do is to check for recently destroyed windows whenever
      the client calls the glXCreateContext() or glXDestroyContext()
      functions.  This may not be sufficient in all situations though.
      The GLX_MESA_release_buffers extension allows a client to explicitly
      deallocate the ancillary buffers by calling glxReleaseBuffersMESA()
      just before an X window is destroyed.  For example:
         #ifdef GLX_MESA_release_buffers
            glXReleaseBuffersMESA( dpy, window );
         #endif
         XDestroyWindow( dpy, window );
      This extension is new in Mesa 2.0.
   GLX_MESA_copy_sub_buffer
      This extension adds the glXCopySubBufferMESA() function.  It works
      like glXSwapBuffers() but only copies a sub-region of the window
      instead of the whole window.
      This extension is new in Mesa version 2.6
 Summary of X-related environment variables:
   MESA_RGB_VISUAL - specifies the X visual and depth for RGB mode (X only)
   MESA_CI_VISUAL - specifies the X visual and depth for CI mode (X only)
   MESA_BACK_BUFFER - specifies how to implement the back color buffer (X only)
   MESA_PRIVATE_CMAP - force aux/tk libraries to use private colormaps (X only)
   MESA_GAMMA - gamma correction coefficients (X only)
 ----------------------------------------------------------------------
 README.CYGWIN - lassauge April 2004 - based on README.X11
--- a/docs/README.DJ
+++ b/docs/README.DJ
@@ -1,4 +1,4 @@
-			Mesa 6.3 DOS/DJGPP Port v1.7
+			Mesa 5.1 DOS/DJGPP Port v1.4
 			~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -6,7 +6,7 @@
 Description:
 ~~~~~~~~~~~~
-Well, guess what... this is the DOS port of Mesa 6.3, for DJGPP fans... Whoa!
+Well, guess what... this is the DOS port of Mesa 5.1, for DJGPP fans... Whoa!
 The driver has its origins in ddsample.c, written by Brian Paul and found by me
 in Mesa 3.4.2.
@@ -42,7 +42,18 @@ Available options:
 			As a consequence, you'll need the DJGPP Glide3
 			library to build any application.
 			default = no
-	X86=1		optimize for x86 (if possible, use MMX, SSE, 3DNow).
+	MATROX=1	build for Matrox Millennium I (MGA2064W) cards.
 			This is experimental and not intensively tested.
 			default = no
 	HAVE_X86=1	optimize for i386.
 			default = no
 	HAVE_MMX=1	allow MMX specializations, provided your assembler
 			supports MMX instruction set. However, the true CPU
 			capabilities are checked at run-time to avoid lockups.
 			default = no
 	HAVE_SSE=1	(see HAVE_MMX)
 			default = no
 	HAVE_3DNOW=1	(see HAVE_MMX)
 			default = no
     Targets:
@@ -57,9 +68,9 @@ Available options:
 Tested on:
 	CPU:		AMD Athlon XP 1800+
-	Mainboard:	GA-7VTXE w/ 512 MB DDRAM
+	Mainboard:	EP-8KTA3 w/ 128 MB SDRAM
-	Video card:	Voodoo5 6000 AGP w/ 128 MB SDRAM
+	Video card:	Voodoo5 5500 AGP w/ 64 MB SDRAM
-	DJGPP:		djdev 2.04 + gcc v3.4.3 + make v3.80
+	DJGPP:		djdev 2.04 + gcc v3.2.2 + make v3.80
 	OS:		DOS and Win98SE
@@ -91,61 +102,23 @@ FAQ:
 2. Using Mesa for DJGPP
   Q) Every test I tried crashes badly.
   A) If you have compiled with SSE and you're running under plain DOS, you
      have to disable SSE at run-time. See environment variables below.
   Q) DMesa is so SLOOOW! The Win32 OpenGL performs so much better...
-   A) Is that a question? If you have a 3dfx Voodoo (any model), you're
+   A) Is that a question? If you have a 3dfx Voodoo Banshee or higher card,
-      lucky (check http://sourceforge.net/projects/glide for the DJGPP port).
+      you're lucky (check http://sourceforge.net/projects/glide for the DJGPP
      port). If you have a Matrox Millennium I card, you just MIGHT be lucky...
      If you haven't, sorry; everything is done in software. Suggestions?
   Q) I tried to set refresh rate w/ DMesa, but without success.
-   A) Refresh rate control works only for VESA 3.0 and the 3dfx driver (in
+   A) Refresh rate control works only for VESA 3.0. If you were compiling for
-      which case FX_GLIDE_REFRESH will be overwritten if it is defined and
+      Glide, see Glide info. If not, sorry!
      is not 0).
   Q) I made a simple application and it does nothing. It exits right away. Not
      even a blank screen.
-   A) Pure software drivers (VESA/VGA/NUL) support only double-buffered modes.
+   A) The pure software drivers (VESA/VGA) support only double-buffered modes.
   A) Another weird "feature" is that buffer width must be multiple of 8 (I'm a
      lazy programmer and I found that the easiest way to keep buffer handling
      at peak performance ;-).
   Q) I'm getting a "bad font!" fatal error.
   A) By default, DOS GLUT compiles with GLUT_IMPORT_LIB, to cope with variable
      access inside dynamic modules (same mechanism used for Win32 _DLL). Since
      -DGLUT_IMPORT_LIB affects Mesa's `glut.h', your apps must be compiled the
      same way GLUT was compiled (either with or without defining it). If you
      want to use another `glut.h' when building your own demos, or just don't
      feel happy about this, make sure you remove the line with GLUT_IMPORT_LIB
      from `Mesa/src/glut/dos/Makefile.DJ' before (re)making GLUT. Beware, this
      means you will never EVER be able to safely use `glut.dxe'!
   Q) What is NUL driver good for, if I don't get any output at all?
   A) For debugging. The NUL driver is very much like OSMesa. Everything is
      done just the same as VESA/VGA drivers, only it doesn't touch your video
      hardware. You can query the actual buffer by issuing:
 	DMesaGetIntegerv(DMESA_GET_BUFFER_ADDR, &buffer);
      and dump it to a file.
   Q) How do I query for a list of available video modes to choose as a visual?
   A) This is an ugly hack, for which I'm sure I'll burn in hell.
      First, query for a list of modes:
 	n = DMesaGetIntegerv(DMESA_GET_VIDEO_MODES, NULL);
      If `n' is strictly positive, you allocate an array of pointers to a given
      struct (which is guaranteed to be extended only - not changed in future):
 	struct {
 		int xres, yres;
 		int bpp;
 	} **l = malloc(n * sizeof(void *));
      Now pass the newly allocated buffer to fill in:
 	DMesaGetIntegerv(DMESA_GET_VIDEO_MODES, (GLint *)l);
      And collect the info:
 	for (i = 0; i < n; i++) {
 	    printf("%dx%d:%d\n", l[i]->xres, l[i]->yres, l[i]->bpp);
 	}
   Q) The GLUT is incomplete.
   A) See below.
@@ -192,13 +165,8 @@ chosen in such a way that first window will fit. If you need high resolution
 with small windows, set initial position far to the right (or way down); then
 you can move them back to any position right before the main loop.
-
+The following environment variables can customize GLUT behaviour:
 Environment variables:
 ~~~~~~~~~~~~~~~~~~~~~~
 	DMESA_NULDRV		- (any value) force NUL driver
 	GLUT_FPS		- print frames/second statistics to stderr
 	MESA_NO_SSE		- (any value) safe option under pure DOS
 	DMESA_GLUT_REFRESH	- set vertical screen refresh rate (VESA3)
 	DMESA_GLUT_BPP		- set default bits per pixel (VGA needs 8)
 	DMESA_GLUT_ALPHA	- set default alpha bits (8)
@@ -241,7 +209,7 @@ v1.3 (mar-2003)
 	* revamped GLUT
 	* switched to DXE3
-v1.4 (dec-2003)
+v1.4 (nov-2003)
 	+ enabled GLUT fonts with DXE
 	+ truly added multi-window support in GLUT (for Adrian Woodward)
 	* accomodated makefiles with the new sourcetree
@@ -249,29 +217,11 @@ v1.4 (dec-2003)
 	* minor changes to PC_HW/timer interface
 	x hacked and slashed the 3dfx driver (w/ help from Hiroshi Morii)
 v1.5 (jan-2004)
 	+ added interface to query available "visuals" (GLFW - Marcus Geelnard)
 	+ added GLUT timer callback
 	- removed Matrox Millennium MGA2064W driver
 	x more changes to the 3dfx driver
 v1.6 (aug-2004)
 	+ implemented NUL driver
 	+ added DMesaGetProcAddress and glutGetProcAddress
 	* reorganized fxMesa wrapper to handle multiple contexts
 	! fixed a horrible bug in VGA initialization routine
 	! fixed partial clears
 v1.7 (???-2005)
 	+ enabled OpenGL 2.0 support
 	+ added support for sw texture compression
 	* minor rework
 Contact:
 ~~~~~~~~
-Name:   Daniel Borca
+Name:   Borca Daniel
 E-mail: dborca@users.sourceforge.net
 WWW:    http://www.geocities.com/dborca/
--- a/docs/README.MINGW32
+++ b/docs/README.MINGW32
@@ -1,81 +1,53 @@
-			     Mesa 6.1 for MinGW32
+August 30, 1998 -- Paul Garceau
-			     ~~~~~~~~~~~~~~~~~~~~
+Updated January 13, 2000 -- Paul Garceau (pgarceau@teleport.com)
-
+
-
+DISCLAIMER:  I make this port of the Mesa 3-D Graphics Library as a service
-
+to the general public.  I can, in no way support or make any guarantee that the
-Quick & dirty start:
+build will work for your system.
--------------------
+
-
+	The associated packages and batch files I have included as part of the GCC-2.95.2/Mingw32 extension are provided "As-is" with out any guarantee of support or functionality from this author.
-	mingw32-make -f Makefile.mgw [OPTIONS...]
+
-
+	Feel free to modify or change things as you see fit, just remember that
-   Look into the corresponding makefiles for further information.
+I can't support any modifications you might want to make to the files which I
-   Check README.3DFX to find out how to compile Mesa Glide3 driver
+have included OR the lgpl protected Mesa 3-D Graphics Library.
-   with MinGW32!
+
-
+	I recommend using GCC-2.95.2/Mingw32 which is available at Mumit Khans' ftp site:
-
+
-
+		(ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/)
-Contact:
+
--------
+	This build has been tested under WinNT4/SP6.  Win9x and WinNT5 remain untested by me.  I have not tested any of the demos included with Mesa3d.
-
+
-Daniel Borca <dborca@users.sourceforge.net>
+	I recommend using the GCC-2.95.2/Mingw32.
-
+
-
+	ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95.2
-
+
-WARNING! The info below this line is outdated (yet some of it useful). WARNING!
+	Much thanks to the combined efforts of Mumit Khan, Jan-Jaap Vanderhagen
-*******************************************************************************
+and Colin Peters for making it possible for the Mingw32 toolchain to exist.  Also, thanks go out to Stephane Rehel for the work that was completed on the Cygwin build.
-
+
-
+Installing GCC-2.95.2/Mingw32 Build:
-
+
-August 30, 1998 -- Paul Garceau
+	a) Open the file archive (either tar.gz or .zip extensions)
-Updated January 13, 2000 -- Paul Garceau (pgarceau@teleport.com)
+
-
+	b) Decide the directory you want to move the archived files to.
-DISCLAIMER:  I make this port of the Mesa 3-D Graphics Library as a service
+
-to the general public.  I can, in no way support or make any guarantee that the
+	d) Extract the files from the archive.
-build will work for your system.
+	
-
+	e) Edit the mingw32.bat file to accomodate your choice of directory structure.
-	The associated packages and batch files I have included as part of the GCC-2.95.2/Mingw32 extension are provided "As-is" with out any guarantee of support or functionality from this author.
+
-
+		%mesaroot%:	This is your root directory (Mesa-3.3)
-	Feel free to modify or change things as you see fit, just remember that
+		%mesasrc%:	This is the Mesa-3.3 src directory (Mesa-3.3\src)
-I can't support any modifications you might want to make to the files which I
+		%mesalib%:	This is where the build will put libGL.a and libGLU.a
-have included OR the lgpl protected Mesa 3-D Graphics Library.
+
-
+Running the Build:
-	I recommend using GCC-2.95.2/Mingw32 which is available at Mumit Khans' ftp site:
+
-
+	Open your Command Prompt or MS-DOS prompt.
-		(ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/)
+	Go to your Mesa-3.3 'root' directory
-
+	At the command line type: mingw32
-	This build has been tested under WinNT4/SP6.  Win9x and WinNT5 remain untested by me.  I have not tested any of the demos included with Mesa3d.
+
-
+	That's all there is to it.
-	I recommend using the GCC-2.95.2/Mingw32.
+
-
+	Enjoy!
-	ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95.2
+
-
+	Peace,
-	Much thanks to the combined efforts of Mumit Khan, Jan-Jaap Vanderhagen
+
 and Colin Peters for making it possible for the Mingw32 toolchain to exist.  Also, thanks go out to Stephane Rehel for the work that was completed on the Cygwin build.
 Installing GCC-2.95.2/Mingw32 Build:
 	a) Open the file archive (either tar.gz or .zip extensions)
 	b) Decide the directory you want to move the archived files to.
 	d) Extract the files from the archive.
 	e) Edit the mingw32.bat file to accomodate your choice of directory structure.
 		%mesaroot%:	This is your root directory (Mesa-3.3)
 		%mesasrc%:	This is the Mesa-3.3 src directory (Mesa-3.3\src)
 		%mesalib%:	This is where the build will put libGL.a and libGLU.a
 Running the Build:
 	Open your Command Prompt or MS-DOS prompt.
 	Go to your Mesa-3.3 'root' directory
 	At the command line type: mingw32
 	That's all there is to it.
 	Enjoy!
 	Peace,
 		Paul G. (pgarceau@teleport.com)
--- a/docs/README.WIN32
+++ b/docs/README.WIN32
@@ -1,6 +1,6 @@
 File: docs/README.WIN32
-Last updated: Oct 01, 2004 - Karl Schultz - kschultz@users.sourceforge.net
+Last updated: Sep 18, 2003 - Karl Schultz - kschultz@users.sourceforge.net
 Quick Start
@@ -14,36 +14,16 @@ The build system has been changed to use Microsoft Visual Studio project
 workspaces and projects.  Makefiles are no longer shipped or supported, but
 can be generated from the projects using Visual Studio.
 The workspace and project files were created with Visual Studio 6, so that
 they can be used with VS6 and so that they can also be imported into VS 7.
 Details and Notes
 - To build the Mesa libraries, open the Mesa.dsw workspace file
-  in the top directory.  You will need to build at least one
+  in the top directory.  You can build each project one-by-one,
-  driver.  Currently, only the gdi and osmesa drivers are available.
+  or build the glut project to build everything except osmesa,
-  Select one or the other as the active project and build it.
+  which needs to be built separately.  The build process will
-  If you want glu, select the glu project as active and build that as well.
+  create a lib directory in the top directory and will put the
-
+  following files there:
- Glut is no longer in the Mesa.dsw workspace.  It is now built in
+	OPENGL32.LIB, GLU32.LIB, GLUT32.LIB, OSMESA32.LIB
-  the demo workspace (see below).
+	OPENGL32.DLL, GLU32.DLL, GLUT32.DLL, OSMESA32.DLL
 - The build process will create a lib directory in the top directory 
  and will put the following files there as you build them:
 	OPENGL32.LIB, GLU32.LIB, OSMESA32.LIB
 	OPENGL32.DLL, GLU32.DLL, OSMESA32.DLL
 - Some users have reported problems building glu with VS7 after importing
  and converting the VS6 project files.  The problem is caused by a custom
  build step that was put in place to work around a problem with VS6 not
  recognizing .cc files as C++ source files.  It appears that VS7 can be
  configured to recognize .cc files as C++ files and so it compiles these
  glu files with the default settings, and does not use settings that are
  required to compile the files correctly.  The easiest way to solve the
  problem is to remove the .cc files from the glu project.  This does not
  delete the files, but removes them from the project so that VS does not
  try to compile them at all.  This allows the custom build step to compile 
  the files with the proper settings.
 - After building, you can copy the above DLL files to a place in your PATH
  such as $SystemRoot/SYSTEM32.  If you don't like putting things in a
@@ -71,6 +51,9 @@ Details and Notes
 - The si-glu sources are used to build the GLU libs.  This was done
  mainly to get the better tessellator code.
 - The osmesa driver builds and should work on Windows as well as
  any other platform.
 - The Windows driver (in src/Windows) builds and runs at least at
  a minimal level.  I modified this driver to work with the new
  Mesa 4.0 code and driver architecture, but I did not do a great
--- a/docs/README.X11
+++ b/docs/README.X11
@@ -85,8 +85,8 @@ Using the library
 =================
 Configuration options:
-   The file src/mesa/main/config.h has many parameters which you can adjust
+   The file src/config.h has many parameters which you can adjust such
-   such as maximum number of lights, clipping planes, maximum texture size,
+   as maximum number of lights, clipping planes, maximum texture size,
   etc.  In particular, you may want to change DEPTH_BITS from 16 to 32
   if a 16-bit depth buffer isn't precise enough for your application.
@@ -311,4 +311,4 @@ Summary of X-related environment variables:
 ----------------------------------------------------------------------
-$Id: README.X11,v 3.11 2003/12/17 15:14:31 brianp Exp $
+$Id: README.X11,v 3.10 2003/03/08 17:38:57 brianp Exp $
--- a/docs/RELNOTES-5.1
+++ b/docs/RELNOTES-5.1
@@ -1,7 +1,7 @@
                            Mesa 5.1 release notes
-                              December 17, 2003
+                              Month day, 2003
                                PLEASE READ!!!!
@@ -24,10 +24,6 @@ See the VERSIONS file for a list of bugs fixed in this release.
 New Features in Mesa 5.1
 ------------------------
 GL_ARB_vertex_program / GL_ARB_fragment_program
   Michal Krol and Karl Rasche implemented these extensions.  Thanks!
   Be aware that there may be some rough edges and lurking bugs.
 GL_ATI_texture_env_combine3 extension
   This adds a few new texture combine modes.
   Contributed by Ian Romanick.
@@ -75,24 +71,6 @@ GL_IBM_multimode_draw_arrays
 GL_SUN_multi_draw_arrays
   An alias for GL_EXT_multi_draw_arrays, standard in OpenGL 1.4.
 Faster glDrawPixels / glCopyPixels in X11 driver
   If your X screen is 32bpp, glDrawPixels to the front color buffer will
   be accelerated (via XPutImage()) if the image format is GL_BGRA and the
   type is GL_UNSIGNED_BYTE.  No raster operations, such as depth test,
   blend, fog, etc. can be enabled.
   If your X screen is 16bpp, glDrawPixels to the front color buffer will
   be accelerated (via XPutImage()) if the image format is GL_RGB and the
   type is GL_UNSIGNED_SHORT_5_6_5.  No raster operations, such as depth
   test, blend, fog, etc. can be enabled.
   glCopyPixels() calls for the front color buffer will be accelerated
   (via XCopyArea()) if no raster operations, such as depth test, blend,
   fog, pixel zoom, etc. are enabled.
   The speed-up over typical software rendering is a factor of 10 for
   glDrawPixels and 100 for glCopyPixels.
 With the addition of GL_ARB_occlusion_query, GL_ARB_vertex_buffer_object,
 GL_ARB_texture_non_power_of_two and GL_EXT_shadow_funcs, Mesa 5.1 supports
@@ -170,10 +148,6 @@ Old files:
 New files:
 	program.[ch]              - generic ARB/NV program code
 	arbprogram.[ch]           - ARB program API functions
 	arbfragparse.[ch]         - ARB fragment program parsing
 	arbvertparse.[ch]         - ARB vertex program parsing
 	arbparse.[ch]             - ARB vertex/fragment parsing
 	arbparse_syn.h            - vertex/fragment program syntax
 	nvprogram.[ch]            - NV program API functions
 	nvvertprog.h              - NV vertex program definitions
 	nvfragprog.h              - NV fragment program definitions
@@ -182,33 +156,13 @@ New files:
 	nvvertexec.[ch]           - NV vertex program execution
 	swrast/s_nvfragprog.[ch]  - NV fragment program execution
-The files related to per-vertex handling have changed.
+Removed files:
-Old files:
+	swrast/s_histogram.[ch] - moved into src/histogram.c
 	tnl/t_eval_api.c          - old per-vertex code
 	tnl/t_imm_alloc.c         - old per-vertex code
 	tnl/t_imm_api.c           - old per-vertex code
 	tnl/t_imm_debug.c         - old per-vertex code
 	tnl/t_imm_dlist.c         - old per-vertex code
 	tnl/t_imm_elt.c           - old per-vertex code
 	tnl/t_imm_eval.c          - old per-vertex code
 	tnl/t_imm_exec.c          - old per-vertex code
 	tnl/t_imm_fixup.c         - old per-vertex code
 	tnl/t_vtx_sse.c           - old per-vertex code
 	tnl/t_vtx_x86.c           - old per-vertex code
 New files:
 	tnl/t_save_api.c          - new per-vertex code
 	tnl/t_save_loopback.c     - new per-vertex code
 	tnl/t_save_playback.c     - new per-vertex code
 	tnl/t_vtx_eval.c          - old per-vertex code
-Other new files:
+Other New files:
 	bufferobj.[ch]		- GL_ARB_vertex_buffer_object functions
 	version.h		- defines the Mesa version info
 Other removed files:
 	swrast/s_histogram.[ch]   - moved into src/histogram.c
 Other Changes
 -------------
@@ -236,11 +190,6 @@ The ctx->_TriangleCaps field is deprecated.
   While testing _TriangleCaps bits was fast, it was kludgey, and setting
   the bits in the first place could be error prone.
 New vertex processing code.
   The code behind glBegin, glEnd, glVertex, glNormal, etc. has been
   totally rewritten.  It's a cleaner implementation now and should use
   less memory. (Keith)
 To Do
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Keith Whitwell	027fdb8bbd	Merge head into branch	2003-11-24 12:01:39 +00:00
Alan Hourihane	3a7c3b02a3	fixup gamma_render.c	2003-11-21 16:41:14 +00:00
Keith Whitwell	3ec97611d2	Merge head into branch	2003-11-21 15:49:24 +00:00
Keith Whitwell	f2f09abce4	linux-solo compiles as far as the gamma driver, which seems independently broken?	2003-11-21 13:40:19 +00:00
Keith Whitwell	93320957f2	compilation fixes, disable ubyte color code for now at least	2003-11-12 14:26:20 +00:00
Keith Whitwell	374a09c4f7	Turn off some debug	2003-11-11 15:28:34 +00:00
Keith Whitwell	1302fd3b25	Clean a little	2003-11-11 15:12:24 +00:00
Keith Whitwell	5198950cde	Don't adjust indicies if adjustment is zero	2003-11-11 15:11:59 +00:00
Keith Whitwell	88d66b7208	Fix import_color functions.	2003-11-11 15:07:58 +00:00
Keith Whitwell	701208d259	Add CallLists() to vtxfmt. Restore old NormalLength optimization for display lists. Add some heuristics to t_vtx_api.c to prevent bloated vertices and excessive flushing (hopefully).	2003-11-11 11:42:50 +00:00
Keith Whitwell	dfd3c9c40f	Add CallLists to vtxfmt definition. Fix some FLUSH() usage in save functions.	2003-11-11 11:40:16 +00:00
Keith Whitwell	cef9471ab2	Add missing GL_FRONT_AND_BACK case.	2003-10-16 17:56:46 +00:00
Keith Whitwell	8d8bb0679c	Fix assertion	2003-10-15 10:02:57 +00:00
Keith Whitwell	5affcd3cbb	Restore code to clean incoming position data of size <= 2.	2003-10-14 18:10:47 +00:00
Keith Whitwell	86ac3e3c2d	Deal with wrapped, weak primitives correctly.	2003-10-14 18:09:35 +00:00
Keith Whitwell	5c2d467e6d	Bind material data when required. Remove #if 0 blocks Need to verify VertexProgram behaviour.	2003-10-14 18:08:48 +00:00
Keith Whitwell	c00a1c4622	Implement FALLBACK() when receiving EvalCoord or CallList inside begin/end pair when compiling. Clean up compilation state invalidation a little.	2003-10-14 12:00:33 +00:00
Keith Whitwell	dad38213e7	Reset ctx->Driver.CurrentSavePrimitive to PRIM_UNKNOWN after compiling a glCallList() command.	2003-10-14 11:33:04 +00:00
Keith Whitwell	9cbad64314	Implement compiled DrawArrays and DrawElements. Use the PRIM_WEAK flag to make sure they are executed correctly on playback.	2003-10-14 11:24:28 +00:00
Keith Whitwell	f0bf8c0ed1	Initialize the arrayelt helper	2003-10-14 11:23:52 +00:00
Keith Whitwell	6b692dc06c	Make it clear that the driver (or tnl/ module) must supply the DrawArray/DrawElements code for the outside-begin-end compilation states.	2003-10-14 11:23:08 +00:00
Keith Whitwell	be3c25458b	Use correct check to terminate DrawArrays loop	2003-10-14 11:18:04 +00:00
Keith Whitwell	a384b0c5eb	Cope with being initialized multiple times.	2003-10-14 11:12:15 +00:00
Keith Whitwell	acfa4d46a4	Use _mesa_compile_error() rather than just _mesa_error().	2003-10-14 10:29:13 +00:00
Keith Whitwell	df3b1eb5bc	Cope with dangling attribute references from display lists Handle colormaterial updates correctly	2003-10-14 10:19:05 +00:00
Keith Whitwell	34a9e4adaf	use VERT_ATTRIB constants in definitions of _save_VertexAttrib*	2003-10-13 18:26:19 +00:00
Keith Whitwell	34f6df8b6d	Add code for GL_COMPILE_AND_EXECUTE	2003-10-13 18:24:38 +00:00
Keith Whitwell	5fc6940aca	Use ctx->Exec rather than _glapi_Dispatch so that this will work even in COMPILE_AND_EXECUTE modes.	2003-10-13 18:24:14 +00:00
Keith Whitwell	c9c27a6efd	Fix error in material recording. Add flush commands to new vertex functions for serializing with tnl module.	2003-10-13 18:04:02 +00:00
Keith Whitwell	79a49e30a1	Fix several more display list glitches. Get 'loopback' replay of display lists working.	2003-10-13 18:01:05 +00:00
Keith Whitwell	f1582dbe52	use VERT_ATTRIB constants in definitions of _tnl_VertexAttrib*	2003-10-13 18:00:00 +00:00
Keith Whitwell	4fc77f884c	Fix typo in VertexAttrib2fNV	2003-10-13 17:21:16 +00:00
Keith Whitwell	398f8d10a2	Correctly convert back colors to GLchan values when copying	2003-10-13 12:48:15 +00:00
Keith Whitwell	5b9ad341a0	Correct initialization of tnl->vtx.current for material attributes.	2003-10-13 12:31:58 +00:00
Keith Whitwell	fcd68a2b30	Add code to get materials working in lighting again.	2003-10-13 12:29:35 +00:00
Keith Whitwell	f1bbe8d0a5	Flush vertex data before playing back a vertex_list.	2003-10-13 12:27:58 +00:00
Keith Whitwell	3c0cfda46b	remove debug statements	2003-10-13 09:19:13 +00:00
Keith Whitwell	5d80efc35e	Fix a few minor displaylist bugs	2003-10-13 09:18:09 +00:00
Keith Whitwell	e01f56b3a8	Solve the gears glitches.	2003-10-10 21:54:34 +00:00
Keith Whitwell	30cd200068	Fix a typo with evalcoord1f	2003-10-10 21:40:53 +00:00
Keith Whitwell	e55c545d4a	Get edgeflag/unfilled polygons working. Don't allow more vertices in a vertex list than ctx->Const.MaxArrayLockSize.	2003-10-10 19:19:50 +00:00
Keith Whitwell	b101554d16	vertex_list display lists (replacing the old immediate struct) are working, though gears shows a couple of glitches still.	2003-10-10 18:35:57 +00:00
Keith Whitwell	1b8c209523	Fallback (opcode-based) display lists are working.	2003-10-10 13:05:40 +00:00
Keith Whitwell	d46adad5cd	Fix assertion in render stage. Add missing call to _mesa_update_state() before running pipeline Bind ctx->Current values when no user-supplied vertex data available.	2003-10-10 12:18:01 +00:00
Keith Whitwell	bfc37379cc	Added quite a bit of debug prints. Fixed a couple of smaller bugs. Isosurf and pointblast run & looks pretty close to correct!	2003-10-10 09:32:55 +00:00
Keith Whitwell	0c390fec04	Checkpoint -- The whole library compiles now...	2003-10-09 17:42:36 +00:00
Keith Whitwell	d5c9fd383b	Checkpoint -- module compiles. Some issues with strides outstanding.	2003-10-09 14:45:30 +00:00
Keith Whitwell	8ae69294ad	Checkpoint commit -- module compiles	2003-10-09 13:45:50 +00:00
Keith Whitwell	46330d3aa7	remove one more unused type	2003-10-09 10:16:05 +00:00
Keith Whitwell	c91f7ad52b	Remove no-longer-used vector types	2003-10-09 10:06:14 +00:00
Keith Whitwell	5b40d6924c	Actually include the dlist.c changes this time.	2003-10-08 17:31:58 +00:00
Keith Whitwell	27b4c2d675	new file	2003-10-08 17:05:07 +00:00
Keith Whitwell	051a8141d1	Checkpoint commit. - Changes flowing from rework in tnl/ module.	2003-10-08 16:52:17 +00:00
Keith Whitwell	9b6d6988c4	Checkpoint commit. Doesn't yet compile. - New vertex building code to replace 'struct immediate' stuff. - New display list compiler designed for hardware acceleration. - Emphasis of 'Attrib' pointers over traditional 'Color', 'Normal', etc.	2003-10-08 16:51:36 +00:00
Keith Whitwell	967fa00a7f	Modify vtxfmt code to always pass colors and indexes as floats. Modify vtxfmt code to include size 1,2,3 vertex attribute functions. Extend api_noop.c to include more functions for building an outside-begin-end dispatch table or vtxfmt. Add opcodes to dlist.c to compile vertex attributes, begin/end commands, etc. - The intention is for these to be used as a fallback for an optimizing display list compiler. Store Index internally as a float.	2003-10-08 16:49:42 +00:00