don't use new glDrawPixel routines in Xserver
[mesa.git] / Make-config
index 963e4e618797710a2add7a5580f7983c05879ebd..5f20adbc9fd12e5fe9c006332633e4ceeacb516c 100644 (file)
@@ -24,6 +24,7 @@ VERSION=$(MESA_MAJOR).$(MESA_MINOR)
 # CXX            the C++ compiler (usuall c++ or g++ or CC)
 # CFLAGS         options for C compiler (like -O)
 # CXXFLAGS       options for the C++ compiler (like -O)
+# GLUT_CFLAGS    extra flags for compiling GLUT
 # GL_LIB_DEPS    list of libraries which the GL library depends on
 # GLU_LIB_DEPS   list of libraries which the GLU library depends on
 # GLUT_LIB_DEPS  list of libraries which the GLUT library depends on
@@ -32,6 +33,7 @@ VERSION=$(MESA_MAJOR).$(MESA_MINOR)
 # ASM_SOURCES    optional list of assembly language files to assemble
 # MAKELIB        the script or command to make a library file
 #                XXX MAKELIB is obsolete; edit bin/mklib to support new systems
+# MKLIB_OPTIONS  extra options to pass to the mklib script (like -arch)
 
 
 aix:
@@ -83,9 +85,11 @@ cygnus:
        "LD = ld" \
        "CFLAGS = -I. -DWIN32 -D__WIN32__ -D_WINDOWS \
                -O2 -funroll-loops \
-               -fexpensive-optimizations -fomit-frame-pointer -ffast-math \
-               -malign-loops=2 -malign-functions=2" \
-       "CXXFLAGS = $(CFLAGS)" \
+               -fexpensive-optimizations -fomit-frame-pointer -ffast-math" \
+       "CXXFLAGS = -I. -DWIN32 -D__WIN32__ -D_WINDOWS \
+               -O2 -funroll-loops \
+               -fexpensive-optimizations -fomit-frame-pointer -ffast-math" \
+       "GLUT_CFLAGS = -fexceptions" \
        "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "WLIBS = $(TOP)/lib/wing32.a -lkernel32 -luser32 -lgdi32"
 
@@ -102,8 +106,7 @@ cygnus-linux:
        "WING_DIR= /dos/wing" \
        "CFLAGS = -I. -DWIN32 -D__WIN32__ -D_WINDOWS \
                -O2 -funroll-loops \
-               -fexpensive-optimizations -fomit-frame-pointer -ffast-math \
-               -malign-loops=2 -malign-functions=2" \
+               -fexpensive-optimizations -fomit-frame-pointer -ffast-math" \
        "MAKELIB = $(TOP)/bin/mklib.cygnus-linux" \
        "WLIBS = $(TOP)/lib/wing32.a -lkernel32 -luser32 -lgdi32"
 
@@ -119,7 +122,9 @@ darwin:
        "CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math \
                 -funroll-loops -fexpensive-optimizations -no-cpp-precomp \
                 -dynamic -Ddarwin" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math \
+                -funroll-loops -fexpensive-optimizations -no-cpp-precomp \
+                -dynamic -Ddarwin" \
        "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL \
@@ -135,7 +140,8 @@ freebsd:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -O2 -fPIC -pedantic" \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 freebsd-386:
@@ -148,11 +154,25 @@ freebsd-386:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100 -DUSE_X86_ASM -DFREEBSD" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -O3 -ffast-math -fPIC -pedantic -DFREEBSD" \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" \
-       "ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
-               x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
-               x86/x86_cliptest.S"
+       "ASM_SOURCES = $(X86_SOURCES)"
+
+gcc-sl:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.so" \
+       "GLU_LIB = libGLU.so" \
+       "GLUT_LIB = libglut.so" \
+       "GLW_LIB = libGLw.so" \
+       "OSMESA_LIB = libOSMesa.so" \
+       "CC = gcc" \
+       "CPLUSPLUS = g++" \
+       "CFLAGS = -fPIC -O3" \
+       "CXXFLAGS = -fPIC -O3" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "MAKELIB = $(TOP)/bin/mklib.gcc-sl" \
+       "APP_LIB_DEPS = -lX11 -lm"
 
 #special hidden target, to make a shared lib for ONLY Mesa "core"
 gcc-mesa-sl:
@@ -160,6 +180,7 @@ gcc-mesa-sl:
        "MESA_LIB = libMesa.so" \
        "CC = gcc" \
        "CFLAGS = -fPIC -O3" \
+       "GLUT_CFLAGS = -fexceptions" \
        "MAKELIB = $(TOP)/bin/mklib.gcc-sl" \
 
 hpux9:
@@ -184,7 +205,8 @@ hpux9-gcc:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
 
@@ -209,7 +231,8 @@ hpux9-gcc-sl:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
 
 # The hpux10 configs should work for hpux11 as well.
@@ -223,7 +246,7 @@ hpux10:
        "CC = cc" \
        "CXX = aCC" \
        "CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
-       "CXXFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+       "CXXFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE" \
        "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -L/usr/lib -lCsup"
 
@@ -237,7 +260,7 @@ hpux10-sl:
        "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 -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
+       "CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE" \
        "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 hpux10-gcc:
@@ -250,7 +273,8 @@ hpux10-gcc:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include  -DUSE_XSHM" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
@@ -264,7 +288,8 @@ hpux10-gcc-sl:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 
@@ -343,7 +368,8 @@ irix6-gcc-n32-sl:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -mabi=n32 -mips3 -O3 -DUSE_XSHM" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -mabi=n32 -mips3 -O3" \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -rpath $(TOP)/lib32 -lX11 -lXmu -lXi -lm"
 
 # For IRIX 6-64: -woff:
@@ -392,7 +418,8 @@ linux:
        "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 = $(CFLAGS)" \
+       "CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
@@ -409,21 +436,14 @@ linux-x86:
        "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" \
        "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
        "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \
        "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
-       "ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
-               x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
-               x86/x86_cliptest.S \
-               x86/mmx_blend.S \
-               x86/3dnow_xform1.S x86/3dnow_xform2.S \
-               x86/3dnow_xform3.S x86/3dnow_xform4.S \
-               x86/3dnow_normal.S \
-               x86/sse_xform1.S x86/sse_xform2.S \
-               x86/sse_xform3.S x86/sse_xform4.S \
-               x86/sse_normal.S"
+       "ASM_SOURCES = $(X86_SOURCES)"
 
 linux-x86-sse:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -435,20 +455,13 @@ linux-x86-sse:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -mcpu=pentium4 -mfpmath=sse -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 = -mcpu=pentium4 -mfpmath=sse -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
        "APP_LIB_DEPS = -lm" \
-       "ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
-               x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
-               x86/x86_cliptest.S \
-               x86/mmx_blend.S \
-               x86/3dnow_xform1.S x86/3dnow_xform2.S \
-               x86/3dnow_xform3.S x86/3dnow_xform4.S \
-               x86/3dnow_normal.S \
-               x86/sse_xform1.S x86/sse_xform2.S \
-               x86/sse_xform3.S x86/sse_xform4.S \
-               x86/sse_normal.S"
+       "ASM_SOURCES = $(X86_SOURCES)"
 
 linux-icc:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -464,16 +477,7 @@ linux-icc:
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
        "APP_LIB_DEPS = -lm" \
-       "ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
-               x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
-               x86/x86_cliptest.S \
-               x86/mmx_blend.S \
-               x86/3dnow_xform1.S x86/3dnow_xform2.S \
-               x86/3dnow_xform3.S x86/3dnow_xform4.S \
-               x86/3dnow_normal.S \
-               x86/sse_xform1.S x86/sse_xform2.S \
-               x86/sse_xform3.S x86/sse_xform4.S \
-               x86/sse_normal.S"
+       "ASM_SOURCES = $(X86_SOURCES)"
 
 # Contributed by Uwe_Maurer@t-online.de
 linux-ggi:
@@ -486,7 +490,8 @@ linux-ggi:
        "CC = gcc"  \
        "CXX = g++" \
        "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DGGI -DCDECL=" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DCDECL=" \
+       "GLUT_CFLAGS = -fexceptions" \
        "GL_LIB_DEPS = -L/usr/X11R6/lib -ggi -lX11 -lXext -lm -lm -lpthread" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
@@ -503,14 +508,13 @@ linux-x86-ggi:
        "CC = gcc"  \
        "CXX = g++" \
        "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -DGGI -DCDECL=" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DCDECL=" \
+       "GLUT_CFLAGS = -fexceptions" \
        "GL_LIB_DEPS = -L/usr/X11R6/lib -ggi -lX11 -lXext -lm -lm -lpthread" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
        "APP_LIB_DEPS = -lm" \
-       "ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
-               x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
-               x86/x86_cliptest.S"
+       "ASM_SOURCES = $(X86_SOURCES)"
 
 linux-glide:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -522,11 +526,12 @@ linux-glide:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
-       "CXXFLAGS = $(CFLAGS)" \
-       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L/usr/local/glide/lib -lglide2x" \
+       "CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L/usr/local/glide/lib -lglide3x" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
-       "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -lglut -lGLU -lGL"
+       "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide3x -lglut -lGLU -lGL"
 
 linux-x86-glide:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -537,23 +542,15 @@ linux-x86-glide:
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
        "CXX = g++" \
-       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
-       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \
+       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DUSE_XSHM -DFX -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
+       "CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide3x -lm -lpthread" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
        "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \
        "APP_LIB_DEPS = -lglut -lGLU -lGL -lm" \
-       "ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
-               x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
-               x86/x86_cliptest.S  \
-               x86/mmx_blend.S \
-               x86/3dnow_xform1.S x86/3dnow_xform2.S \
-               x86/3dnow_xform3.S x86/3dnow_xform4.S \
-               x86/3dnow_normal.S  \
-               FX/x86/fx_3dnow_fastpath.S \
-               x86/sse_xform1.S x86/sse_xform2.S \
-               x86/sse_xform3.S x86/sse_xform4.S \
-               x86/sse_normal.S "
+       "ASM_SOURCES = $(X86_SOURCES)"
 
 linux-alpha:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -565,7 +562,8 @@ linux-alpha:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "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" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
@@ -582,7 +580,8 @@ linux-alpha-static:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -L/usr/X11R6/lib -D_XOPEN_SOURCE -DUSE_XSHM" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lm"
 
@@ -596,7 +595,8 @@ linux-ppc:
        "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 = $(CFLAGS)" \
+       "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" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
@@ -613,7 +613,8 @@ linux-ppc-static:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -O3 -mcpu=603 -ansi -pedantic -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm"
 
@@ -627,7 +628,8 @@ linux-sparc:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "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" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
@@ -644,7 +646,8 @@ linux-sparc5:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -mv8 -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -mv8 -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" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
@@ -662,7 +665,8 @@ linux-sparc-ultra:
        "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 = $(CFLAGS)" \
+       "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" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
@@ -675,9 +679,22 @@ linux-osmesa16:
        "OSMESA16_LIB = libOSMesa16.so" \
        "CC = gcc" \
        "CXX = g++" \
-       "CFLAGS = -O3 -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "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" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "GL_LIB_DEPS = -lm -lpthread" \
+       "APP_LIB_DEPS = -lOSMesa16 -lGL"
+
+linux-osmesa16-static:
+       $(MAKE) $(MFLAGS) -f Makefile.OSMesa16 targets \
+       "OSMESA16_LIB = libOSMesa16.a" \
+       "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" \
+       "GLUT_CFLAGS = -fexceptions" \
        "GL_LIB_DEPS = -lm -lpthread" \
+       "MAKELIB_FLAGS = -static" \
        "APP_LIB_DEPS = -lOSMesa16 -lGL"
 
 # 32-bit/channel Mesa using OSMesa driver
@@ -686,15 +703,33 @@ linux-osmesa32:
        "OSMESA16_LIB = libOSMesa32.so" \
        "CC = gcc" \
        "CXX = g++" \
-       "CFLAGS = -O3 -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CFLAGS = -O3 -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \
+       "CXXFLAGS = -O3 -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
        "GL_LIB_DEPS = -lm -lpthread" \
        "APP_LIB_DEPS = -lOSMesa32 -lGL"
 
+# standalone Mesa -- embedded
+# change -g to -O3 for non-debug
+linux-solo:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "SOLO = true" \
+       "LIBMESA = mesa.a" \
+       "GLU_LIB = libGLU.so" \
+       "GLUT_LIB = libglut.so" \
+       "CC = gcc" \
+       "CXX = g++" \
+       "CFLAGS = -g -std=c99 -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "CXXFLAGS = -g -std=c99 -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "GL_LIB_DEPS = -lm -lpthread -lexpat" \
+       "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm  -Wl,-rpath,$(TOP)/lib" \
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm  -Wl,-rpath,$(TOP)/lib" \
+       "APP_LIB_DEPS = -L$(TOP)/lib -lglut -lGLU -lGL -lm  -lpthread -Wl,-rpath,$(TOP)/lib" 
+
 # May want to add these CFLAGS for better performance under LynxOS and GCC:
 # -fPIC -O2 -ansi -pedantic -mieee-fp -DUSE_XSHM -funroll-loops
 # -fexpensive-optimizations -fomit-frame-pointer -ffast-math
-# and  -malign-loops=2 -malign-functions=2 for Pentium
 lynxos:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
@@ -705,7 +740,8 @@ lynxos:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -O2 -ansi -pedantic -funroll-loops -ffast-math -DUSE_XSHM" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -O2 -ansi -pedantic -funroll-loops -ffast-math" \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/X11/lib -lXext -lXi -lXmu -lX11 -lbsd -lm"
 
 mklinux:
@@ -718,7 +754,8 @@ mklinux:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -pedantic -O2" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -pedantic -O2" \
+       "GLUT_CFLAGS = -fexceptions" \
        "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm"
 
@@ -732,7 +769,8 @@ netbsd:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100"  \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -O2 -fPIC"  \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 openbsd:
@@ -768,7 +806,8 @@ openstep-win32:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -DOPENSTEP -O4" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -DOPENSTEP -O4" \
+       "GLUT_CFLAGS = -fexceptions" \
        "MAKELIB = $(TOP)/bin/mklib.openstep"
 
 osf1:
@@ -807,7 +846,6 @@ solaris-x86:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
        "CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM" \
-       "MAKELIB = $(TOP)/bin/mklib.solaris" \
        "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 solaris-x86-gcc:
@@ -820,8 +858,8 @@ solaris-x86-gcc:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DUSE_XSHM" \
-       "CXXFLAGS = $(CFLAGS)" \
-       "MAKELIB = $(TOP)/bin/mklib.solaris" \
+       "CXXFLAGS = -O3 -m486 -fPIC" \
+       "GLUT_CFLAGS = -fexceptions" \
        "APP_LIB_DEPS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 sunos4:
@@ -858,7 +896,8 @@ sunos4-gcc:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -O3 -DUSE_XSHM -DSUNOS4 -I/usr/openwin/include" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -O3 -DSUNOS4 -I/usr/openwin/include" \
+       "GLUT_CFLAGS = -fexceptions" \
        "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
@@ -871,8 +910,9 @@ sunos4-gcc-sl:
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
        "CXX = g++" \
-       "CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "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" \
        "MAKELIB = $(TOP)/bin/mklib.sunos4" \
        "APP_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
@@ -885,8 +925,9 @@ sunos4-gcc-x11r6-sl:
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
        "CXX = g++" \
-       "CFLAGS = -fPIC -O3 -I/usr/X11R6.3/include -DUSE_XSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CFLAGS = -fPIC -O3 -I/usr/X11R6.3/include -DUSE_XSHM -DSUNOS4" \
+       "CXXFLAGS = -fPIC -O3 -I/usr/X11R6.3/include -DSUNOS4" \
+       "GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG" \
        "MAKELIB = $(TOP)/bin/mklib.sunos4" \
        "APP_LIB_DEPS = -L/usr/X11R6.3/lib/X11 -lX11 -lXext -lXmu -lXi -lm"
 
@@ -899,12 +940,32 @@ sunos5:
        "OSMESA_LIB = libOSMesa.so" \
        "CC = cc" \
        "CXX = c++" \
-       "CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+       "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" \
        "GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm" \
+       "GLUT_CFLAGS = -DSOLARIS_2_4_BUG" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \
        "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \
-       "APP_LIB_DEPS = -lX11 -lglut -lGLU -lGL -lm"
+       "APP_LIB_DEPS = -lCrun -lX11 -lglut -lGLU -lGL -lm"
+
+sunos5-smp:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.so" \
+       "GLU_LIB = libGLU.so" \
+       "GLUT_LIB = libglut.so" \
+       "GLW_LIB = libGLw.so" \
+       "OSMESA_LIB = libOSMesa.so" \
+       "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$(TOP)/lib -lGL -lm" \
+       "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \
+       "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \
+       "APP_LIB_DEPS = -lX11 -lglut -lGLU -lGL -lm -lCrun"
 
 sunos5-gcc:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -915,8 +976,9 @@ sunos5-gcc:
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
        "CXX = g++" \
-       "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
-       "CXXFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
+       "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM" \
+       "CXXFLAGS = -O3 -I/usr/openwin/include" \
+       "GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG" \
        "GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \
@@ -933,7 +995,8 @@ ultrix-gcc:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -pedantic -O2" \
-       "CXXFLAGS = $(CFLAGS)" \
+       "CXXFLAGS = -pedantic -O2" \
+       "GLUT_CFLAGS = -fexceptions" \
        "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -lXmu -lX11 -lXi -lm"
 
@@ -946,6 +1009,7 @@ unixware:
        "OSMESA_LIB = libOSMesa.a" \
        "CC = cc" \
        "CFLAGS = -O -I/usr/X/include -DUSE_XSHM" \
+       "CXXFLAGS = -O" \
        "MAKELIB = $(TOP)/bin/mklib.ar-ruv" \
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm"
 
@@ -958,7 +1022,7 @@ unixware-shared:
        "OSMESA_LIB = libOSMesa" \
        "CC = cc" \
        "CFLAGS = -O -I/usr/X/include -KPIC,inline -DUSE_XSHM" \
-       "MAKELIB = $(TOP)/bin/mklib.solaris" \
+       "CXXFLAGS = -O -KPIC,inline" \
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm"
 
 # for debugging on IRIX 5.x systems
@@ -990,7 +1054,8 @@ linux-debug:
        "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 = $(CFLAGS)" \
+       "CXXFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -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" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
@@ -1006,21 +1071,14 @@ linux-x86-debug:
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
        "CXX = g++" \
-       "CFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -malign-loops=2 -malign-functions=2 -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 -DDEBUG -DMESA_DEBUG" \
+       "CFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -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 -DDEBUG -DMESA_DEBUG" \
+       "CXXFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG" \
+       "GLUT_CFLAGS = -fexceptions" \
        "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
        "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
        "APP_LIB_DEPS = -lm" \
-       "ASM_SOURCES = x86/common_x86_asm.S x86/glapi_x86.S \
-               x86/x86_xform2.S x86/x86_xform3.S x86/x86_xform4.S \
-               x86/x86_cliptest.S \
-               x86/mmx_blend.S \
-               x86/3dnow_xform1.S x86/3dnow_xform2.S \
-               x86/3dnow_xform3.S x86/3dnow_xform4.S \
-               x86/3dnow_normal.S \
-               x86/sse_xform1.S x86/sse_xform2.S \
-               x86/sse_xform3.S x86/sse_xform4.S \
-               x86/sse_normal.S"
+       "ASM_SOURCES = $(X86_SOURCES)"
 
 linux-glide-debug:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1032,6 +1090,7 @@ linux-glide-debug:
        "CC = gcc" \
        "CXX = g++" \
        "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DFX -DDEBUG -I/usr/local/glide/include -I/usr/include/glide" \
-       "CXXFLAGS = $(CFLAGS)" \
-       "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lvga -lm -lpthread"
+       "CXXFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG" \
+       "GLUT_CFLAGS = -fexceptions" \
+       "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide3x -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lvga -lm -lpthread"