summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
Diffstat (limited to 'configs')
-rw-r--r--configs/CVS/Entries77
-rw-r--r--configs/CVS/Repository1
-rw-r--r--configs/CVS/Root1
-rw-r--r--configs/CVS/Root.bak1
-rw-r--r--configs/CVS/Template0
-rw-r--r--configs/aix10
-rw-r--r--configs/aix-6417
-rw-r--r--configs/aix-64-static25
-rw-r--r--configs/aix-static8
-rw-r--r--configs/darwin6
-rw-r--r--configs/darwin-static4
-rw-r--r--configs/darwin-static-x86ppc26
-rw-r--r--configs/darwin-x86ppc33
-rw-r--r--configs/debian6
-rw-r--r--configs/debian-debug-i3867
-rw-r--r--configs/debian-dri14
-rw-r--r--configs/debian-dri-i3863
-rw-r--r--configs/debian-glide-i3867
-rw-r--r--configs/debian-i3867
-rw-r--r--configs/debian-static-i3867
-rw-r--r--configs/freebsd-dri6
-rw-r--r--configs/hpux11-328
-rw-r--r--configs/hpux11-32-static7
-rw-r--r--configs/hpux11-6410
-rw-r--r--configs/hpux11-64-static8
-rw-r--r--configs/hpux11-ia6430
-rw-r--r--configs/hpux11-ia64-static27
-rw-r--r--configs/irix6-647
-rw-r--r--configs/irix6-64-static9
-rw-r--r--configs/irix6-n327
-rw-r--r--configs/irix6-n32-static8
-rw-r--r--configs/irix6-o321
-rw-r--r--configs/irix6-o32-static4
-rw-r--r--configs/linux-dri6
-rw-r--r--configs/linux-dri-xcb4
-rw-r--r--configs/linux-ia64-icc21
-rw-r--r--configs/linux-ia64-icc-static27
-rw-r--r--configs/linux-icc-static13
-rw-r--r--configs/linux-x86-64-static2
-rw-r--r--configs/linux-x86-static2
-rw-r--r--configs/osf16
-rw-r--r--configs/osf1-static17
-rw-r--r--configs/solaris-x86-gcc15
-rw-r--r--configs/solaris-x86-gcc-static24
-rw-r--r--configs/sunos5-64-gcc11
-rw-r--r--configs/sunos5-v818
-rw-r--r--configs/sunos5-v8-static16
-rw-r--r--configs/sunos5-v923
-rw-r--r--configs/sunos5-v9-static18
49 files changed, 444 insertions, 171 deletions
diff --git a/configs/CVS/Entries b/configs/CVS/Entries
deleted file mode 100644
index 6f89911d65e..00000000000
--- a/configs/CVS/Entries
+++ /dev/null
@@ -1,77 +0,0 @@
-/hpux10/1.1/Fri Mar 26 15:16:35 2004//
-/hpux10-gcc/1.1/Fri Mar 26 15:16:35 2004//
-/hpux11-32-static/1.1/Fri Mar 26 15:16:35 2004//
-/hpux11-32-static-nothreads/1.1/Fri Mar 26 15:16:35 2004//
-/hpux11-64-static/1.1/Fri Mar 26 15:16:35 2004//
-/hpux9/1.1/Fri Mar 26 15:16:35 2004//
-/hpux9-gcc/1.1/Fri Mar 26 15:16:35 2004//
-/linux-osmesa16/1.1/Fri Mar 26 15:16:35 2004//
-/linux-osmesa16-static/1.1/Fri Mar 26 15:16:35 2004//
-/linux-osmesa32/1.1/Fri Mar 26 15:16:35 2004//
-/netbsd/1.1/Fri Mar 26 15:16:35 2004//
-/sunos4/1.1/Fri Mar 26 15:16:35 2004//
-/sunos4-gcc/1.1/Fri Mar 26 15:16:35 2004//
-/aix-static/1.1/Thu Jul 1 15:32:51 2004//
-/aix/1.3/Sat Oct 2 22:34:50 2004//
-/aix-64/1.2/Fri Oct 1 16:29:39 2004//
-/darwin-static/1.2/Sat Oct 2 22:34:50 2004//
-/hpux10-static/1.2/Sat Oct 2 22:34:50 2004//
-/hpux11-32/1.1/Fri Oct 1 20:18:42 2004//
-/hpux11-64/1.1/Fri Oct 1 20:18:42 2004//
-/irix6-64/1.3/Sat Oct 2 22:34:50 2004//
-/irix6-64-static/1.3/Sat Oct 2 22:34:50 2004//
-/irix6-n32/1.3/Sat Oct 2 22:34:50 2004//
-/irix6-n32-static/1.3/Sat Oct 2 22:34:50 2004//
-/irix6-o32/1.3/Sat Oct 2 22:34:50 2004//
-/irix6-o32-static/1.3/Sat Oct 2 22:34:50 2004//
-/linux-alpha/1.2/Sat Oct 2 22:34:50 2004//
-/linux-alpha-static/1.2/Sat Oct 2 22:34:50 2004//
-/linux-glide/1.3/Sat Oct 2 22:34:50 2004//
-/linux-sparc5/1.3/Sat Oct 2 22:34:50 2004//
-/linux-ultrasparc/1.2/Sat Oct 2 22:34:50 2004//
-/openbsd/1.2/Sat Oct 2 22:34:50 2004//
-/solaris-x86-gcc/1.2/Sat Oct 2 22:34:50 2004//
-/sunos4-static/1.2/Sat Oct 2 22:34:50 2004//
-/sunos5/1.2/Sat Oct 2 22:34:50 2004//
-/sunos5-smp/1.2/Sat Oct 2 22:34:50 2004//
-/ultrix-gcc/1.2/Sat Oct 2 22:34:50 2004//
-/osf1/1.3/Tue Nov 23 16:07:45 2004//
-/linux-fbdev/1.2/Sat May 7 16:30:50 2005//
-/solaris-x86/1.2/Mon Jun 20 18:26:35 2005//
-/linux-ppc/1.3/Fri Jul 15 22:18:52 2005//
-/linux-ppc-static/1.3/Fri Jul 15 22:18:52 2005//
-/linux-static/1.3/Fri Jul 15 22:18:52 2005//
-/linux-x86-32/1.4/Fri Jul 15 22:18:52 2005//
-/linux-x86-64-static/1.6/Fri Jul 15 22:18:52 2005//
-/linux-x86-static/1.5/Fri Jul 15 22:18:52 2005//
-/linux-solo-ia64/1.8/Thu Aug 11 14:15:58 2005//
-/linux-sparc/1.3/Thu Aug 11 14:15:58 2005//
-/linux-dri-ppc/1.3/Fri Aug 19 22:03:05 2005//
-/beos/1.6/Mon Sep 12 15:03:11 2005//
-/freebsd-dri-amd64/1.3/Mon Sep 12 15:03:11 2005//
-/freebsd-dri-x86/1.2/Mon Sep 12 15:03:11 2005//
-/linux-directfb/1.2/Mon Sep 12 15:03:11 2005//
-/linux-dri-x86/1.12/Mon Sep 12 15:03:11 2005//
-/linux-icc/1.4/Mon Sep 12 15:03:11 2005//
-/linux-icc-static/1.4/Mon Sep 12 15:03:11 2005//
-/linux-solo-x86/1.9/Mon Sep 12 15:03:11 2005//
-/linux-x86-64/1.10/Mon Sep 12 15:03:11 2005//
-/linux-x86-glide/1.5/Mon Sep 12 15:03:11 2005//
-/sunos5-gcc/1.5/Mon Sep 12 15:03:11 2005//
-/default/1.22/Mon Sep 19 20:07:49 2005//
-/linux/1.6/Fri Oct 28 14:28:10 2005//
-/linux-profile/1.2/Sat Nov 12 17:56:59 2005//
-/linux-x86-64-debug/1.4/Sat Nov 12 17:56:59 2005//
-/linux-x86-debug/1.4/Sat Nov 12 17:56:59 2005//
-/darwin/1.4/Tue Dec 6 15:42:31 2005//
-/linux-indirect/1.5/Wed Jan 25 15:09:44 2006//
-/linux-dri-x86-64/1.20/Tue Feb 7 00:40:29 2006//
-/linux-solo/1.23/Tue Feb 7 00:40:29 2006//
-/aix-gcc/1.3/Wed Feb 22 17:22:23 2006//
-/freebsd/1.5/Tue Mar 14 15:23:14 2006//
-/linux-debug/1.9/Thu Mar 30 14:16:30 2006//
-/freebsd-dri/1.17/Fri Mar 31 17:29:46 2006//
-/linux-dri/1.39/Fri Mar 31 17:29:46 2006//
-/linux-dri-xcb/1.2/Fri Mar 31 17:29:46 2006//
-/linux-x86/1.7/Fri Mar 31 23:13:45 2006//
-D
diff --git a/configs/CVS/Repository b/configs/CVS/Repository
deleted file mode 100644
index 467347235d9..00000000000
--- a/configs/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-Mesa/configs
diff --git a/configs/CVS/Root b/configs/CVS/Root
deleted file mode 100644
index 231303aae3e..00000000000
--- a/configs/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:ext:[email protected]:/cvs/mesa
diff --git a/configs/CVS/Root.bak b/configs/CVS/Root.bak
deleted file mode 100644
index eba07540827..00000000000
--- a/configs/CVS/Root.bak
+++ /dev/null
@@ -1 +0,0 @@
-:ext:[email protected]:/cvs/mesa
diff --git a/configs/CVS/Template b/configs/CVS/Template
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/configs/CVS/Template
+++ /dev/null
diff --git a/configs/aix b/configs/aix
index fe8e48cd654..a509732876d 100644
--- a/configs/aix
+++ b/configs/aix
@@ -8,8 +8,8 @@ CONFIG_NAME = aix
CC = cc
CXX = xlC
-CFLAGS = -O -DAIXV3
-CXXFLAGS = -O -DAIXV3
+CFLAGS = -O -DAIXV3 -DPTHREADS
+CXXFLAGS = -O -DAIXV3 -DPTHREADS
MKLIB_OPTIONS =
# Library names (actual file names)
@@ -19,10 +19,10 @@ GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
-GL_LIB_DEPS = -lX11 -lXext -lm
+GL_LIB_DEPS = -lX11 -lXext -lpthread -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
+GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXm -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
+APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC
diff --git a/configs/aix-64 b/configs/aix-64
index 0d98475293c..bd195947539 100644
--- a/configs/aix-64
+++ b/configs/aix-64
@@ -8,9 +8,9 @@ CONFIG_NAME = aix-64
CC = xlc
CXX = xlC
-CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3
-CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3
-MKLIB_OPTIONS = -arch AIX64
+CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS
+CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS
+LIB_DIR=$(TOP)/lib64
# Library names (actual file names)
GL_LIB_NAME = libGL.a
@@ -19,10 +19,9 @@ 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
+GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
+GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lC
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXm -lXt -lX11
+APP_LIB_DEPS = -L$(TOP)/lib64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lpthread -lC
diff --git a/configs/aix-64-static b/configs/aix-64-static
new file mode 100644
index 00000000000..d1bfe1e5b64
--- /dev/null
+++ b/configs/aix-64-static
@@ -0,0 +1,25 @@
+# Configuration for AIX, static libs
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = aix-64-static
+
+# Compiler and flags
+CC = cc
+CXX = xlC
+
+CFLAGS = -q64 -O -DAIXV3 -DPTHREADS
+CXXFLAGS = -q64 -O -DAIXV3 -DPTHREADS
+MKLIB_OPTIONS = -static
+LIB_DIR=$(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
+
+APP_LIB_DEPS = -q64 -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+ -lX11 -lXext -lXmu -lXi -lm -lpthread -lC
+
diff --git a/configs/aix-static b/configs/aix-static
index f6f086edb6a..323284201f2 100644
--- a/configs/aix-static
+++ b/configs/aix-static
@@ -8,8 +8,8 @@ CONFIG_NAME = aix-static
CC = cc
CXX = xlC
-CFLAGS = -O -DAIXV3
-CXXFLAGS = -O -DAIXV3
+CFLAGS = -O -DAIXV3 -DPTHREADS
+CXXFLAGS = -O -DAIXV3 -DPTHREADS
MKLIB_OPTIONS = -static
# Library names (actual file names)
@@ -19,5 +19,7 @@ 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
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+ -lX11 -lXext -lXmu -lXi -lm -lpthread -lC
+
diff --git a/configs/darwin b/configs/darwin
index 5abd16448be..0c8a6ec47a7 100644
--- a/configs/darwin
+++ b/configs/darwin
@@ -5,13 +5,11 @@ include $(TOP)/configs/default
CONFIG_NAME = darwin
# Compiler and flags
-CC = c++
-CXX = c++
+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
-MKLIB_OPTIONS = -cplusplus
-
# Library names (actual file names)
GL_LIB_NAME = libGL.dylib
GLU_LIB_NAME = libGLU.dylib
diff --git a/configs/darwin-static b/configs/darwin-static
index c7f9c5f06be..3eb6581fb02 100644
--- a/configs/darwin-static
+++ b/configs/darwin-static
@@ -16,9 +16,9 @@ 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
+GL_LIB_DEPS =
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
+APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm
diff --git a/configs/darwin-static-x86ppc b/configs/darwin-static-x86ppc
new file mode 100644
index 00000000000..844a1d2eade
--- /dev/null
+++ b/configs/darwin-static-x86ppc
@@ -0,0 +1,26 @@
+# Configuration for Darwin / MacOS X, making static libs
+
+include $(TOP)/configs/darwin
+
+CONFIG_NAME = darwin-static
+
+# Compiler and flags
+CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
+ -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
+CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
+ -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
+MKLIB_OPTIONS = -static -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+
+# 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 =
+OSMESA_LIB_DEPS =
+GLU_LIB_DEPS =
+GLUT_LIB_DEPS =
+GLW_LIB_DEPS =
+APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm
diff --git a/configs/darwin-x86ppc b/configs/darwin-x86ppc
new file mode 100644
index 00000000000..6006af23403
--- /dev/null
+++ b/configs/darwin-x86ppc
@@ -0,0 +1,33 @@
+# Configuration for Darwin / MacOS X, making dynamic libs
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = darwin
+
+# Compiler and flags
+CC = cc
+CXX = cc
+CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
+ -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
+CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
+ -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
+
+MKLIB_OPTIONS = -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+
+# 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 = -L$(LIB_DIR) -lGL
+GLU_LIB_DEPS = -L$(LIB_DIR) -lGL
+GLUT_LIB_DEPS = -L$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext
+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
+
+# omit glw lib for now:
+SRC_DIRS = mesa glu glut/glx
+
diff --git a/configs/debian b/configs/debian
index 79ca0a769c8..7f3023611dc 100644
--- a/configs/debian
+++ b/configs/debian
@@ -5,7 +5,7 @@ CONFIG_NAME = debian
CC = cc
CXX = c++
-DEBIAN_COMMON_CPPFLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
+DEBIAN_COMMON_CPPFLAGS = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DUSE_XSHM -DPTHREADS `pkg-config --cflags x11 xext`
DEBIAN_COMMON_CFLAGS = -ansi -pedantic -Wall -fPIC -std=c99
@@ -18,5 +18,5 @@ CXXFLAGS = $(DEBIAN_COMMON_CPPFLAGS) $(DEBIAN_COMMON_CXXFLAGS) $(DEBIAN_OPT_CFLA
GLW_SOURCES += GLwMDrawA.c
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11 -lXm
+GL_LIB_DEPS = `pkg-config --libs x11 xext` -lm -lpthread
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) `pkg-config --libs x11 xt` -lXm
diff --git a/configs/debian-debug-i386 b/configs/debian-debug-i386
new file mode 100644
index 00000000000..b9e0eebbd3f
--- /dev/null
+++ b/configs/debian-debug-i386
@@ -0,0 +1,7 @@
+include $(TOP)/configs/debian-debug
+
+CONFIG_NAME = debian-debug-i386
+
+DEBIAN_OPT_CFLAGS = -march=i686 -msse -mfpmath=sse -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+
+ASM_SOURCES = $(X86_SOURCES) $(X86_API)
diff --git a/configs/debian-dri b/configs/debian-dri
index 1356a53c6b6..e9f612cceea 100644
--- a/configs/debian-dri
+++ b/configs/debian-dri
@@ -2,11 +2,11 @@ include $(TOP)/configs/debian
CONFIG_NAME = debian-dri
-DEBIAN_COMMON_CPPFLAGS += -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DDEFAULT_DRIVER_DIR=\"/usr/lib/dri\"
+DEBIAN_COMMON_CPPFLAGS += -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DDEFAULT_DRIVER_DIR=\"$(DEBIAN_DRIVERS_DIR)\"
LIBDRM_LIB = `pkg-config --libs libdrm`
DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread -ldl $(LIBDRM_LIB)
+GL_LIB_DEPS = `pkg-config --libs x11 xext xxf86vm` -lm -lpthread -ldl $(LIBDRM_LIB)
USING_EGL=0
@@ -22,4 +22,12 @@ endif
DRIVER_DIRS = dri
WINDOW_SYSTEM=dri
-DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome ffb
+DRI_DIRS = mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
+
+ifeq ($(DEB_HOST_ARCH),i386)
+DRI_DIRS += i810 i915 sis ffb unichrome
+endif
+
+ifeq ($(DEB_HOST_ARCH),amd64)
+DRI_DIRS += i915
+endif
diff --git a/configs/debian-dri-i386 b/configs/debian-dri-i386
index 722770e98a5..1079660adda 100644
--- a/configs/debian-dri-i386
+++ b/configs/debian-dri-i386
@@ -1,5 +1,4 @@
+include $(TOP)/configs/debian_i386
include $(TOP)/configs/debian-dri
CONFIG_NAME = debian-dri-i386
-
-DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome
diff --git a/configs/debian-glide-i386 b/configs/debian-glide-i386
new file mode 100644
index 00000000000..dd0ab727a63
--- /dev/null
+++ b/configs/debian-glide-i386
@@ -0,0 +1,7 @@
+include $(TOP)/configs/debian-i386
+
+CONFIG_NAME = debian-glide-i386
+
+DEBIAN_COMMON_CPPFLAGS += -DFX -I/usr/include/glide3
+
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lglide3x -lm -lpthread
diff --git a/configs/debian-i386 b/configs/debian-i386
new file mode 100644
index 00000000000..a4a7e68fa78
--- /dev/null
+++ b/configs/debian-i386
@@ -0,0 +1,7 @@
+include $(TOP)/configs/debian
+
+CONFIG_NAME = debian-i386
+
+override DEBIAN_OPT_CFLAGS = -O3 -march=i686 -msse -mfpmath=387 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+
+ASM_SOURCES = $(X86_SOURCES) $(X86_API)
diff --git a/configs/debian-static-i386 b/configs/debian-static-i386
new file mode 100644
index 00000000000..4f1ae52f944
--- /dev/null
+++ b/configs/debian-static-i386
@@ -0,0 +1,7 @@
+include $(TOP)/configs/debian-static
+
+CONFIG_NAME = debian-static-i386
+
+DEBIAN_OPT_CFLAGS = -O3 -march=i686 -msse -mfpmath=sse -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+
+ASM_SOURCES = $(X86_SOURCES) $(X86_API)
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index d5bbed50ab7..9734aff5a75 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -15,8 +15,10 @@ EXPAT_INCLUDES = -I/usr/local/include
X11_INCLUDES = -I/usr/X11R6/include
DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC \
- -ffast-math $(ASM_FLAGS) $(X11_INCLUDES)
+
+CFLAGS = -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math \
+ $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
+
CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
ASM_SOURCES =
diff --git a/configs/hpux11-32 b/configs/hpux11-32
index 9ff407bd53e..59cc0918b27 100644
--- a/configs/hpux11-32
+++ b/configs/hpux11-32
@@ -10,7 +10,7 @@ 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
+CXXFLAGS = +z -Aa +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
MKLIB_OPTIONS =
@@ -23,4 +23,8 @@ 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
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB)
+GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXt -lXi -lX11 -lm -lpthread
+GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS)
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
diff --git a/configs/hpux11-32-static b/configs/hpux11-32-static
index 7507ab0b0b5..7dc7608e5f8 100644
--- a/configs/hpux11-32-static
+++ b/configs/hpux11-32-static
@@ -8,9 +8,9 @@ CONFIG_NAME = hpux11-32-static
CC = cc
CXX = aCC
-CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
+CFLAGS = +O3 +DA2.0 -Ae -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
+CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
MKLIB_OPTIONS = -static
@@ -23,4 +23,5 @@ 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
+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 -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl
+
diff --git a/configs/hpux11-64 b/configs/hpux11-64
index b0869cf81df..8b28f261c99 100644
--- a/configs/hpux11-64
+++ b/configs/hpux11-64
@@ -10,11 +10,11 @@ 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
+CXXFLAGS = +z -Aa +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
MKLIB_OPTIONS =
-LIBDIR = $(TOP)/lib64
+LIB_DIR = $(TOP)/lib64
# Library names (actual file names)
GL_LIB_NAME = libGL.a
@@ -24,4 +24,8 @@ 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
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB)
+GL_LIB_DEPS = -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread
+GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS)
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
diff --git a/configs/hpux11-64-static b/configs/hpux11-64-static
index 451dc4208e4..e2b23ce8ae4 100644
--- a/configs/hpux11-64-static
+++ b/configs/hpux11-64-static
@@ -8,13 +8,13 @@ CONFIG_NAME = hpux11-64-static
CC = cc
CXX = aCC
-CFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
+CFLAGS = +O3 +DA2.0W -Ae -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
+CXXFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
MKLIB_OPTIONS = -static
-LIBDIR = $(TOP)/lib64
+LIB_DIR = $(TOP)/lib64
# Library names (actual file names)
GL_LIB_NAME = libGL.a
@@ -24,4 +24,4 @@ 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
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl
diff --git a/configs/hpux11-ia64 b/configs/hpux11-ia64
new file mode 100644
index 00000000000..dc1291b8b5d
--- /dev/null
+++ b/configs/hpux11-ia64
@@ -0,0 +1,30 @@
+# Configuration for HPUX IA64 v11, 64-bit
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = hpux11-ia64
+
+# Compiler and flags
+CC = cc
+CXX = aCC
+
+CFLAGS = +z -Ae +DD64 +O3 +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
+
+CXXFLAGS = +z -Aa +DD64 +O3 +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
+
+MKLIB_OPTIONS =
+
+LIB_DIR = $(TOP)/lib64
+
+# 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
+
+# Library/program dependencies
+GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread
+GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS)
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
diff --git a/configs/hpux11-ia64-static b/configs/hpux11-ia64-static
new file mode 100644
index 00000000000..407aa9630ca
--- /dev/null
+++ b/configs/hpux11-ia64-static
@@ -0,0 +1,27 @@
+# Configuration for HPUX v11, 64-bit, static libs
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = hpux11-ia64-static
+
+# Compiler and flags
+CC = cc
+CXX = aCC
+
+CFLAGS = +O3 +DD64 -Aa -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
+
+CXXFLAGS = +O3 +DD64 -Aa -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
+
+MKLIB_OPTIONS = -static
+
+LIB_DIR = $(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$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lXt -lX11 -lpthread -lm -lCsup -lcl
diff --git a/configs/irix6-64 b/configs/irix6-64
index 6c33d33ba92..a794627ba96 100644
--- a/configs/irix6-64
+++ b/configs/irix6-64
@@ -7,12 +7,11 @@ 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
+CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS
+CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS
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
+APP_LIB_DEPS = -L$(LIB_DIR) -64 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lpthread -lm
diff --git a/configs/irix6-64-static b/configs/irix6-64-static
index d66af5be878..8e264412b88 100644
--- a/configs/irix6-64-static
+++ b/configs/irix6-64-static
@@ -7,15 +7,15 @@ 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
+CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS
+CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS
+MKLIB_OPTIONS = -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
+APP_LIB_DEPS = -L$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
@@ -23,3 +23,4 @@ GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
+
diff --git a/configs/irix6-n32 b/configs/irix6-n32
index 4bf2964014f..d42aa774846 100644
--- a/configs/irix6-n32
+++ b/configs/irix6-n32
@@ -7,12 +7,11 @@ 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
+CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM -DPTHREADS
+CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552 -DPTHREADS
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
+APP_LIB_DEPS = -L$(LIB_DIR) -n32 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lfpe -lpthread -lm
diff --git a/configs/irix6-n32-static b/configs/irix6-n32-static
index b60de380c62..74db4112160 100644
--- a/configs/irix6-n32-static
+++ b/configs/irix6-n32-static
@@ -7,15 +7,15 @@ 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
+CFLAGS = -n32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM -DPTHREADS
+CXXFLAGS = -n32 -mips2 -O2 -ansi -woff 3262,3666 -DPTHREADS
+MKLIB_OPTIONS = -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
+APP_LIB_DEPS = -L$(LIB_DIR) -n32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
diff --git a/configs/irix6-o32 b/configs/irix6-o32
index 56a19796031..f26c988a996 100644
--- a/configs/irix6-o32
+++ b/configs/irix6-o32
@@ -9,7 +9,6 @@ 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
diff --git a/configs/irix6-o32-static b/configs/irix6-o32-static
index ac3d6ee17a6..468f67489d6 100644
--- a/configs/irix6-o32-static
+++ b/configs/irix6-o32-static
@@ -9,13 +9,13 @@ 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
+MKLIB_OPTIONS = -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
+APP_LIB_DEPS = -L$(LIB_DIR) -32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
diff --git a/configs/linux-dri b/configs/linux-dri
index 585eeb61431..e56b7d6c592 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -13,7 +13,7 @@ CXX = g++
#MKDEP = gcc -M
#MKDEP_OPTIONS = -MF depend
-OPT_FLAGS = -g
+OPT_FLAGS = -O -g
PIC_FLAGS = -fPIC
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
@@ -26,8 +26,8 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
X11_INCLUDES = -I/usr/X11R6/include
-CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
- $(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math
+CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
+ $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index 2e5860abc59..17270601b25 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -24,7 +24,7 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DUSE_XCB
-X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb`
+X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I xcb-glx`
CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math
@@ -40,7 +40,7 @@ EXTRA_LIB_PATH=`pkg-config --libs-only-L x11`
LIBDRM_LIB = `pkg-config --libs libdrm`
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
- $(LIBDRM_LIB) `pkg-config --libs xcb`
+ $(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs xcb-glx`
# This is now 0 by default since it seems to confuse the hell out of people
diff --git a/configs/linux-ia64-icc b/configs/linux-ia64-icc
new file mode 100644
index 00000000000..4eeb1783406
--- /dev/null
+++ b/configs/linux-ia64-icc
@@ -0,0 +1,21 @@
+# Configuration for Linux with Intel C compiler
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-icc
+
+# Compiler and flags
+CC = icc
+CXX = icpc
+CFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
+CXXFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
+GLUT_CFLAGS = -fexceptions
+MKLIB_OPTIONS = -arch icc-istatic
+
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lpthread
+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 -lXmu -lXt -lXi
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB)
+
+
diff --git a/configs/linux-ia64-icc-static b/configs/linux-ia64-icc-static
new file mode 100644
index 00000000000..981ad5a53de
--- /dev/null
+++ b/configs/linux-ia64-icc-static
@@ -0,0 +1,27 @@
+# Configuration for Linux with Intel C compiler, static libs
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-icc-static
+
+# Compiler and flags
+CC = icc
+CXX = icpc
+CFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
+CXXFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
+GLUT_CFLAGS = -fexceptions
+MKLIB_OPTIONS = -static -arch icc-istatic
+
+# 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 =
+GLU_LIB_DEPS =
+GLUT_LIB_DEPS =
+GLW_LIB_DEPS =
+APP_LIB_DEPS = -i-static -cxxlib-icc -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lpthread -lm -lcxa -lunwind
+
diff --git a/configs/linux-icc-static b/configs/linux-icc-static
index ac847a92152..9404ae2280f 100644
--- a/configs/linux-icc-static
+++ b/configs/linux-icc-static
@@ -6,9 +6,9 @@ CONFIG_NAME = linux-icc-static
# Compiler and flags
CC = icc
-CXX = g++
+CXX = icpc
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
+CXXFLAGS = -O3 -tpp6 -axK -DPTHREADS
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -static -arch icc
@@ -19,12 +19,9 @@ 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
+GL_LIB_DEPS =
+GLUT_LIB_DEPS =
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -lpthread -lcxa -lunwind
ASM_SOURCES = $(X86_SOURCES)
ASM_API = $(X86_API)
-
-
diff --git a/configs/linux-x86-64-static b/configs/linux-x86-64-static
index 05f21d87a64..d88cf544799 100644
--- a/configs/linux-x86-64-static
+++ b/configs/linux-x86-64-static
@@ -19,3 +19,5 @@ 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) \
+ $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm
diff --git a/configs/linux-x86-static b/configs/linux-x86-static
index d4ccfca803e..c838a84012e 100644
--- a/configs/linux-x86-static
+++ b/configs/linux-x86-static
@@ -19,3 +19,5 @@ 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) \
+ $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm
diff --git a/configs/osf1 b/configs/osf1
index bc88c204221..2d8d72fb994 100644
--- a/configs/osf1
+++ b/configs/osf1
@@ -7,10 +7,10 @@ CONFIG_NAME = osf1
# Compiler and flags
CC = cc
CXX = cxx
-CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM
-CXXFLAGS = -O2 -std ansi -ieee
+CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM -DPTHREADS -D_REENTRANT
+CXXFLAGS = -O2 -std ansi -ieee -DPTHREADS -D_REENTRANT
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
+APP_LIB_DEPS = -L$(LIB_DIR) -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm
diff --git a/configs/osf1-static b/configs/osf1-static
new file mode 100644
index 00000000000..974718d400f
--- /dev/null
+++ b/configs/osf1-static
@@ -0,0 +1,17 @@
+# Configuration for OSF/1
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = osf1
+
+# Compiler and flags
+CC = cc
+CXX = cxx
+CFLAGS = -O2 -std1 -ieee_with_no_inexact -DUSE_XSHM -DPTHREADS -D_REENTRANT
+CXXFLAGS = -O2 -std ansi -ieee -DPTHREADS -D_REENTRANT
+MKLIB_OPTIONS = -static
+
+GL_LIB_DEPS =
+GLU_LIB_DEPS =
+GLUT_LIB_DEPS =
+APP_LIB_DEPS = -noso -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -so_archive -lX11 -lXext -lXmu -lXi -lpthread -lm -lcxx
diff --git a/configs/solaris-x86-gcc b/configs/solaris-x86-gcc
index 01f3d86d1df..1f02ab2f514 100644
--- a/configs/solaris-x86-gcc
+++ b/configs/solaris-x86-gcc
@@ -1,4 +1,4 @@
-# Configuration for Solaris on x86 with gcc, static libs
+# Configuration for Solaris on x86 with gcc, dynamic libs
include $(TOP)/configs/default
@@ -7,18 +7,11 @@ 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
+CFLAGS = -O3 -march=i486 -fPIC -I/usr/openwin/include -DUSE_XSHM
+CXXFLAGS = -O3 -march=i486 -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
+APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXi -lXmu
diff --git a/configs/solaris-x86-gcc-static b/configs/solaris-x86-gcc-static
new file mode 100644
index 00000000000..6959ea3e255
--- /dev/null
+++ b/configs/solaris-x86-gcc-static
@@ -0,0 +1,24 @@
+# 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 -march=i486 -fPIC -I/usr/openwin/include -DUSE_XSHM
+CXXFLAGS = -O3 -march=i486 -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 -lX11 -lXext -lXi -lXmu
+
+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
diff --git a/configs/sunos5-64-gcc b/configs/sunos5-64-gcc
new file mode 100644
index 00000000000..c03903f8c95
--- /dev/null
+++ b/configs/sunos5-64-gcc
@@ -0,0 +1,11 @@
+# Configuration for 64-bit SunOS 5, with gcc
+
+include $(TOP)/configs/sunos5-gcc
+
+CONFIG_NAME = sunos5-64-gcc
+
+# only set vars that differ from sunos5-gcc config
+
+OPT_FLAGS = -O3 -m64 -mcpu=ultrasparc -mv8plus -mvis -g -fomit-frame-pointer -pipe
+
+ARCH_FLAGS = -m64
diff --git a/configs/sunos5-v8 b/configs/sunos5-v8
new file mode 100644
index 00000000000..cae109b58d1
--- /dev/null
+++ b/configs/sunos5-v8
@@ -0,0 +1,18 @@
+# Configuration for SunOS 5
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = sunos5-v8
+
+# Compiler and flags
+CC = cc
+CXX = CC
+CFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS
+CXXFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS
+GLUT_CFLAGS = -DSOLARIS_2_4_BUG
+
+GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread
+GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun
+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
diff --git a/configs/sunos5-v8-static b/configs/sunos5-v8-static
new file mode 100644
index 00000000000..3b9fcee7d7f
--- /dev/null
+++ b/configs/sunos5-v8-static
@@ -0,0 +1,16 @@
+# Configuration for SunOS 5
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = sunos5-v8-static
+
+MKLIB_OPTIONS = -static
+
+# Compiler and flags
+CC = cc
+CXX = CC
+CFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS
+CXXFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS
+GLUT_CFLAGS = -DSOLARIS_2_4_BUG
+
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -lXext -lXmu -lXi -lpthread -lm -lCstd -lCrun
diff --git a/configs/sunos5-v9 b/configs/sunos5-v9
new file mode 100644
index 00000000000..11f263a45b5
--- /dev/null
+++ b/configs/sunos5-v9
@@ -0,0 +1,23 @@
+# Configuration for SunOS 5, SPARC V9
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = sunos5-v9
+
+MKLIB_OPTIONS = -cplusplus
+
+LIB_DIR = $(TOP)/lib64
+
+# Compiler and flags
+CC = cc
+CXX = CC
+CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS
+CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS
+GLUT_CFLAGS = -DSOLARIS_2_4_BUG
+
+GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread
+GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun
+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
+
diff --git a/configs/sunos5-v9-static b/configs/sunos5-v9-static
new file mode 100644
index 00000000000..8cf4b636612
--- /dev/null
+++ b/configs/sunos5-v9-static
@@ -0,0 +1,18 @@
+# Configuration for SunOS 5, SPARC V9, static libs
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = sunos5-v9-static
+
+MKLIB_OPTIONS = -static -cplusplus
+
+LIB_DIR = $(TOP)/lib64
+
+# Compiler and flags
+CC = cc
+CXX = CC
+CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS
+CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS
+GLUT_CFLAGS = -DSOLARIS_2_4_BUG
+
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11 -lXext -lXmu -lXi -lpthread -lm -lCstd -lCrun