disabled locked arrays in glDrawRangeElements()
[mesa.git] / Make-config
index b03e7235de34d9c2ffb2320d651416b95e552e97..808fd57c1702a21c66afa627c01c75b5e342f45b 100644 (file)
@@ -1,12 +1,13 @@
-# $Id: Make-config,v 1.1 1999/08/19 00:55:39 jtg Exp $
+# $Id: Make-config,v 1.18 2000/01/17 19:00:52 brianp Exp $
 
-MAJOR=3
-MINOR=1
-VERSION=$(MAJOR).$(MINOR)
+MESA_MAJOR=3
+MESA_MINOR=3
+MESA_TINY=0
+VERSION=$(MESA_MAJOR).$(MESA_MINOR)
 
 # Mesa 3-D graphics library
 # 
-# Copyright (C) 1999  Brian Paul   All Rights Reserved.
+# Copyright (C) 1999-2000  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"),
@@ -28,8 +29,8 @@ VERSION=$(MAJOR).$(MINOR)
 
 # The following variables are passed to each Makefile:
 #
-# GL_LIB      the name of the Mesa "GL" library file (usually libMesaGL.a)
-# GLU_LIB     the name of the Mesa "GLU" library file (usually libMesaGLU.a)
+# GL_LIB      the name of the Mesa "GL" library file (usually libGL.a)
+# GLU_LIB     the name of the Mesa "GLU" library file (usually libGLU.a)
 # GLUT_LIB    the name of the GLUT library file (usually libglut.a)
 # CC          the C compiler (usually cc or gcc)
 # CFLAGS      flags to C compiler (usually -O)
@@ -45,7 +46,7 @@ VERSION=$(MAJOR).$(MINOR)
 # To enable profiling add -DPROFILE to the CFLAGS line.  Be sure to set the
 # MESA_PROFILE environment variable to enable printing of the profile report.
 #
-# If your system supports the X Shared Memory extension add -DSHM to the
+# If your system supports the X Shared Memory extension add -DUSE_XSHM to the
 # CFLAGS line and add -lXext to the XLIBS line.
 #
 # Some compilers complain about const parameters.  Adding -DNO_CONST to the
@@ -66,7 +67,7 @@ aix:
        "CC = cc" \
        "CFLAGS = -O -DAIXV3" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
 
 aix-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -77,7 +78,7 @@ aix-sl:
        "CC = cc" \
        "CFLAGS = -O -DAIXV3" \
        "MAKELIB = ../bin/mklib.aix" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
 
 # Make-config additions for the Amiga 3000 UX
 # Carlyn Voss Iuzzolino   5/8/95: 
@@ -95,7 +96,7 @@ amix:
        "CC = cc" \
        "CFLAGS =" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -lX11 -lsocket -lnsl "
+       "XLIBS = -lX11 -lsocket -lnsl -lm"
 
 beos-r4:
        $(MAKE) -f Makefile.BeOS-R4 targets \
@@ -117,7 +118,7 @@ bsdos:
        "CC = gcc" \
        "CFLAGS = -I/usr/X11/include -O2" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/X11/lib -lX11 -lipc"
+       "XLIBS = -L/usr/X11/lib -lX11 -lipc -lm"
 
 bsdos4:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -128,7 +129,7 @@ bsdos4:
        "CC = gcc" \
        "CFLAGS = -I/usr/X11/include -O2 -fPIC" \
        "MAKELIB = ../bin/mklib.bsdos4" \
-       "XLIBS = -L/usr/X11/lib -lX11 -lipc"
+       "XLIBS = -L/usr/X11/lib -lX11 -lipc -lm"
 
 cygnus:
        $(MAKE) -f Makefile.cygnus $(MFLAGS) -f Makefile.X11 targets \
@@ -173,7 +174,7 @@ dgux:
        "CC = gcc" \
        "CFLAGS = -O" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -lX11"
+       "XLIBS = -lX11 -lm"
 
 freebsd:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -182,9 +183,9 @@ freebsd:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100" \
+       "CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \
        "MAKELIB = ../bin/mklib.freebsd" \
-       "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11"
+       "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 freebsd-386:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -193,10 +194,10 @@ freebsd-386:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100 -DUSE_X86_ASM -DFREEBSD" \
+       "CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100 -DUSE_X86_ASM -DFREEBSD" \
        "MAKELIB = ../bin/mklib.freebsd" \
-       "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S"
+       "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" \
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S"
 
 gcc:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -207,7 +208,7 @@ gcc:
        "CC = gcc" \
        "CFLAGS = -pedantic -O2" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -lX11"
+       "XLIBS = -lX11 -lm"
 
 hpux9:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -216,9 +217,9 @@ hpux9:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = cc" \
-       "CFLAGS = +O3 -Aa -D_HPUX_SOURCE -I/usr/include/X11R5 -DSHM" \
+       "CFLAGS = +O3 -Aa -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11"
+       "XLIBS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
 
 hpux9-gcc:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -227,9 +228,9 @@ hpux9-gcc:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DSHM" \
+       "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11"
+       "XLIBS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
 
 hpux9-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -238,9 +239,9 @@ hpux9-sl:
        "GLUT_LIB = libglut.sl" \
        "GLW_LIB = libGLw.sl" \
        "CC = cc" \
-       "CFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DSHM" \
+       "CFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.hpux" \
-       "XLIBS = -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11"
+       "XLIBS = -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm"
 
 hpux9-gcc-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -249,9 +250,9 @@ hpux9-gcc-sl:
        "GLUT_LIB = libglut.sl" \
        "GLW_LIB = libGLw.sl" \
        "CC = gcc" \
-       "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DSHM" \
+       "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.hpux" \
-       "XLIBS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11"
+       "XLIBS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm"
 
 hpux10:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -260,9 +261,9 @@ hpux10:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = cc" \
-       "CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DSHM" \
+       "CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11"
+       "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 hpux10-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -271,9 +272,9 @@ hpux10-sl:
        "GLUT_LIB = libglut" \
        "GLW_LIB = libGLw.a" \
        "CC = cc" \
-       "CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DSHM" \
+       "CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.hpux" \
-       "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11"
+       "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 hpux10-gcc:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -282,9 +283,9 @@ hpux10-gcc:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include  -DSHM" \
+       "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include  -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11"
+       "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 hpux10-gcc-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -293,9 +294,9 @@ hpux10-gcc-sl:
        "GLUT_LIB = libglut.sl" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DSHM" \
+       "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.hpux" \
-       "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11"
+       "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 
 # For IRIX 4: don't use -fullwarn because it causes too much garbage
@@ -306,9 +307,9 @@ irix4:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = cc" \
-       "CFLAGS = -O2 -ansi -prototypes -DSHM" \
+       "CFLAGS = -O2 -ansi -prototypes -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.ar-rcv" \
-       "XLIBS = -lXext -lXmu -lXi -lX11"
+       "XLIBS = -lXext -lXmu -lXi -lX11 -lm"
 
 # On IRIX 5.3 -sopt causes a problem in drawpixels.c so we don't use it
 irix5:
@@ -318,9 +319,9 @@ irix5:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = cc" \
-       "CFLAGS = -O2 -ansi -fullwarn -DSHM -DNO_CONST" \
+       "CFLAGS = -O2 -ansi -fullwarn -DUSE_XSHM -DNO_CONST" \
        "MAKELIB = ../bin/mklib.ar-rcv" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
 
 # On IRIX 5.2+gcc
 irix5-gcc:
@@ -330,9 +331,9 @@ irix5-gcc:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -O2 -pedantic -DSHM" \
+       "CFLAGS = -O2 -pedantic -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.ar-rcv" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
 
 # IRIX 5 using Dynamic Shared Objects (DSO)
 irix5-dso:
@@ -342,9 +343,9 @@ irix5-dso:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = cc" \
-       "CFLAGS = -O2 -ansi -fullwarn -DSHM -DNO_CONST" \
+       "CFLAGS = -O2 -ansi -fullwarn -DUSE_XSHM -DNO_CONST" \
        "MAKELIB = ../bin/mklib.irix5" \
-       "XLIBS = -rpath ../lib -lX11 -lXmu -lXi"
+       "XLIBS = -rpath ../lib -lX11 -lXmu -lXi -lm"
 
 irix6-o32:
        pmake $(MFLAGS) -f Makefile.X11 targets \
@@ -353,9 +354,9 @@ irix6-o32:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = cc" \
-       "CFLAGS = -32 -mips2 -O2 -ansi -DSHM -DNO_CONST" \
+       "CFLAGS = -32 -mips2 -O2 -ansi -DUSE_XSHM -DNO_CONST" \
        "MAKELIB = ../bin/mklib.ar-rcv" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-o32-dso:
        pmake $(MFLAGS) -f Makefile.X11 targets \
@@ -364,9 +365,9 @@ irix6-o32-dso:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = cc" \
-       "CFLAGS = -32 -mips2 -O2 -ansi -DSHM -DNO_CONST" \
+       "CFLAGS = -32 -mips2 -O2 -ansi -DUSE_XSHM -DNO_CONST" \
        "MAKELIB = ../bin/mklib.irix6-32" \
-       "XLIBS = -rpath ../lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -rpath ../lib -lX11 -lXext -lXmu -lXi -lm"
 
 # For IRIX 6: -woff:
 #   1209 - controlling expression is constant
@@ -380,7 +381,7 @@ irix6-n32:
        "CC = cc" \
        "CFLAGS = -n32 -mips3 -O3 -ansi -woff 1209,1521" \
        "MAKELIB = ../bin/mklib.ar-rcv" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-n32-dso:
        pmake $(MFLAGS) -f Makefile.X11 targets \
@@ -390,9 +391,9 @@ irix6-n32-dso:
        "GLW_LIB = libGLw.a" \
        "LIBDIR = ../lib32" \
        "CC = cc" \
-       "CFLAGS = -n32 -mips3 -O3 -ansi -DSHM -woff 1185,1521" \
+       "CFLAGS = -n32 -mips3 -O3 -ansi -DUSE_XSHM -woff 1185,1521" \
        "MAKELIB = ../bin/mklib.irix6-n32" \
-       "XLIBS = -rpath ../lib32 -lX11 -lXmu -lXi -lfpe"
+       "XLIBS = -rpath ../lib32 -lX11 -lXmu -lXi -lfpe -lm"
 
 irix6-gcc-n32-sl:
        make $(MFLAGS) -f Makefile.X11 targets \
@@ -402,9 +403,9 @@ irix6-gcc-n32-sl:
        "GLW_LIB = libGLw.so" \
        "LIBDIR = ../lib32" \
        "CC = gcc" \
-       "CFLAGS = -mabi=n32 -mips3 -O3 -DSHM" \
+       "CFLAGS = -mabi=n32 -mips3 -O3 -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.irix6-n32" \
-       "XLIBS = -rpath ../lib32 -lX11 -lXmu -lXi"
+       "XLIBS = -rpath ../lib32 -lX11 -lXmu -lXi -lm"
 
 # For IRIX 6-64: -woff:
 #   1068 - integer conversion resulted in a change of sign
@@ -422,9 +423,9 @@ irix6-64:
        "GLW_LIB = libGLw.a" \
        "LIBDIR = ../lib64" \
        "CC = cc" \
-       "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DSHM" \
+       "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.ar-rcv" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-64-dso:
        pmake $(MFLAGS) -f Makefile.X11 targets \
@@ -434,75 +435,66 @@ irix6-64-dso:
        "GLW_LIB = libGLw.so" \
        "LIBDIR = ../lib64" \
        "CC = cc" \
-       "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DSHM" \
+       "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.irix6-64" \
-       "XLIBS = -rpath ../lib64 -lX11 -lXmu -lXi"
-
-# May want to try these CFLAGS for better performance under Linux and GCC:
-# -fPIC -O2 -ansi -pedantic -mieee-fp -DSHM -funroll-loops
-# -fexpensive-optimizations -fomit-frame-pointer -ffast-math
-# and  -malign-loops=2 -malign-jumps=2 -malign-functions=2 for Pentium
+       "XLIBS = -rpath ../lib64 -lX11 -lXmu -lXi -lm"
 
 linux:
-       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
-       "GL_LIB = libGL.a" \
-       "GLU_LIB = libGLU.a" \
-       "GLUT_LIB = libglut.a" \
-       "GLW_LIB = libGLw.a" \
-       "CC = gcc" \
-       "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -I/usr/X11R6/include" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE"
-
-# One Linux user reports having to use these XLIBS:
-#    -lMrm -lXmu -lXi -lXt -lXext -lXmu -lXi -lSM -lICE -lX11
-
-linux-elf:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -I/usr/X11R6/include" \
+       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -I/usr/X11R6/include" \
        "MAKELIB = ../bin/mklib.linux" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm"
 
-linux-glide:
+linux-static:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "CC = gcc" \
+       "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -I/usr/X11R6/include" \
+       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm"
+
+linux-386:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
+       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -I/usr/X11R6/include" \
        "MAKELIB = ../bin/mklib.linux" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
 
-# Linux on Intel X86: assembly language optimizations
-linux-386:
+linux-386-static:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DUSE_X86_ASM -I/usr/X11R6/include" \
+       "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -I/usr/X11R6/include" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
        "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S"
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
 
-linux-386-elf:
+linux-glide:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DUSE_X86_ASM -I/usr/X11R6/include" \
+       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
        "MAKELIB = ../bin/mklib.linux" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm"
 
 linux-386-glide:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -511,84 +503,120 @@ linux-386-glide:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
+       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_XSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
        "MAKELIB = ../bin/mklib.linux" \
        "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S"
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
 
-linux-386-glide-mits:
+linux-386-opt-V2-glide:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DFX -D_REENTRANT -DMITS -DUSE_X86_ASM -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
+       "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DFX_V2 -DUSE_X86_ASM -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include"\
        "MAKELIB = ../bin/mklib.linux" \
        "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm -lpthread" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S"
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
 
-linux-386-opt-V2-glide:
+linux-386-opt-glide:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DFX -DFX_V2 -DUSE_X86_ASM -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include"\
+       "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DUSE_X86_ASM -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
        "MAKELIB = ../bin/mklib.linux" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm -lpthread" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm" \
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
 
-linux-386-opt-glide:
+linux-3dnow:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
-       "CC = gcc" \
-       "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DFX -DUSE_X86_ASM -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \
+       "CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
+       "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -I/usr/X11R6/include" \
+       "MAKELIB = ../bin/mklib.linux" \
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S \
+       X86/mmx_blend.S \
+       X86/3dnow_xform_raw1.S X86/3dnow_xform_raw2.S \
+       X86/3dnow_xform_raw3.S X86/3dnow_xform_raw4.S \
+       X86/3dnow_xform_masked1.S X86/3dnow_xform_masked2.S \
+       X86/3dnow_xform_masked3.S X86/3dnow_xform_masked4.S \
+       X86/3dnow_norm_raw.S X86/vertex.S X86/vertex_3dnow.S" 
+
+linux-3dnow-glide:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.so" \
+       "GLU_LIB = libGLU.so" \
+       "GLUT_LIB = libglut.so" \
+       "GLW_LIB = libGLw.so" \
+       "CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
+       "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_XSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
        "MAKELIB = ../bin/mklib.linux" \
        "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S"
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S \
+       X86/mmx_blend.S \
+       X86/3dnow_xform_raw1.S X86/3dnow_xform_raw2.S \
+       X86/3dnow_xform_raw3.S X86/3dnow_xform_raw4.S \
+       X86/3dnow_xform_masked1.S X86/3dnow_xform_masked2.S \
+       X86/3dnow_xform_masked3.S X86/3dnow_xform_masked4.S \
+       X86/3dnow_norm_raw.S X86/vertex.S X86/vertex_3dnow.S \
+       FX/X86/fx_3dnow_fastpath.S"
 
-linux-3dnow:
+linux-katmai:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
-       "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -I/usr/X11R6/include" \
+       "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -I/usr/X11R6/include" \
        "MAKELIB = ../bin/mklib.linux" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S \
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S \
        X86/mmx_blend.S \
        X86/3dnow_xform_raw1.S X86/3dnow_xform_raw2.S \
        X86/3dnow_xform_raw3.S X86/3dnow_xform_raw4.S \
        X86/3dnow_xform_masked1.S X86/3dnow_xform_masked2.S \
        X86/3dnow_xform_masked3.S X86/3dnow_xform_masked4.S \
-       X86/3dnow_norm_raw.S"
+       X86/3dnow_norm_raw.S X86/vertex.S X86/vertex_3dnow.S \
+       X86/katmai_norm_raw.S \
+       X86/katmai_xform_raw1.S X86/katmai_xform_masked1.S \
+       X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
+       X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
+       X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
+       X86/vertex_katmai.S"
 
-linux-3dnow-glide:
+linux-katmai-glide:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
-       "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 -DSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
+       "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_KATMAI_ASM -DUSE_XSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \
        "MAKELIB = ../bin/mklib.linux" \
        "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S \
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S \
        X86/mmx_blend.S \
        X86/3dnow_xform_raw1.S X86/3dnow_xform_raw2.S \
        X86/3dnow_xform_raw3.S X86/3dnow_xform_raw4.S \
        X86/3dnow_xform_masked1.S X86/3dnow_xform_masked2.S \
        X86/3dnow_xform_masked3.S X86/3dnow_xform_masked4.S \
-       X86/3dnow_norm_raw.S \
-       FX/X86/fx_3dnow_fastpath.S"
-
+       X86/3dnow_norm_raw.S X86/vertex.S X86/vertex_3dnow.S \
+       FX/X86/fx_3dnow_fastpath.S \
+       X86/katmai_norm_raw.S \
+       X86/katmai_xform_raw1.S X86/katmai_xform_masked1.S \
+       X86/katmai_xform_raw2.S X86/katmai_xform_masked2.S \
+       X86/katmai_xform_raw3.S X86/katmai_xform_masked3.S \
+       X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \
+       X86/vertex_katmai.S" 
 
 # Contributed by Uwe_Maurer@t-online.de
 linux-ggi:
@@ -598,9 +626,9 @@ linux-ggi:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc"  \
-       "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM -DGGI -DCDECL=" \
+       "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DGGI -DCDECL=" \
        "MAKELIB = ../bin/mklib.ggi" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lggi"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lggi -lm"
 
 # Contributed by Emmanuel marty core@ggi-project.org
 linux-386-ggi:
@@ -610,10 +638,10 @@ linux-386-ggi:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc"  \
-       "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM -DUSE_X86_ASM -DGGI -DCDECL=" \
+       "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -DGGI -DCDECL=" \
        "MAKELIB = ../bin/mklib.ggi" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lggi" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lggi -lm" \
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
 
 # Linux on Alpha (based on email from John Ferguson ferguson@viz.tamu.edu)
 linux-alpha:
@@ -623,9 +651,9 @@ linux-alpha:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -O2 -mieee -pedantic -L/usr/X11R6/lib -D_XOPEN_SOURCE -DSHM" \
+       "CFLAGS = -O2 -mieee -pedantic -L/usr/X11R6/lib -D_XOPEN_SOURCE -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/X11R6/lib -lX11"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lm"
 
 linux-alpha-elf:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -634,9 +662,9 @@ linux-alpha-elf:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DSHM" \
+       "CFLAGS = -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.linux" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi -lm"
 
 # Not tested, but should be okay on any RedHat-based linux for PowerPC machines
 # If your linux supports shared libraries, you might want to build with the 
@@ -650,45 +678,46 @@ linux-ppc:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM" \
+       "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm"
 
 # -O5 and -fexpensive-optimizations causes a compiler crash for Linux PPC R4
 linux-ppc-so:
-       $(MAKE) targets \
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM" \
+       "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" \
        "MAKELIB = ../bin/mklib.linux" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm"
 
-# Contributed by John Stone
+# Contributed by John Gotts
 linux-386-pthread:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
-       "GL_LIB = libGL.a" \
-       "GLU_LIB = libGLU.a" \
-       "GLUT_LIB = libglut.a" \
+       "GL_LIB = libGL.so" \
+       "GLU_LIB = libGLU.so" \
+       "GLUT_LIB = libglut.so" \
        "CC = gcc" \
-       "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R\6/include -DSHM -DUSE_X86_ASM -D_REENTRANT -DTHREADS -DPTHREADS" \
-       "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lpthread" \
-       "ASM_SOURCES = asm_386.S"
+       "CFLAGS = -O3 -fPIC -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/us\r/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -D_REENTRANT -DTHREADS -DPTHREADS" \
+       "MAKELIB = ../bin/mklib.linux" \
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lpthread -lm" \
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
 
-# Contributed by John Gotts
-linux-386-pthread-shared:
+# Contributed by C. Alex. North-Keys (erlkonig@talisman.org)
+linux-386-pthread-glide:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
        "CC = gcc" \
-       "CFLAGS = -O3 -fPIC -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/us\r/X11R6/include -DSHM -DUSE_X86_ASM -D_REENTRANT -DTHREADS -DPTHREADS" \
-       "MAKELIB = ../bin/mklib.linux" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lpthread" \
-       "ASM_SOURCES = asm_386.S"
+       "CFLAGS = -O3 -fPIC -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -D_REENTRANT -DTHREADS -DPTHREADS -DFX -I/usr/include/glide -I/usr/local/glide/include" \
+       "MAKELIB = ../bin/mklib.glide" \
+       "XLIBS = -L/usr/X11/lib -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lpthread -lm" \
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S \
+       X86/mmx_blend.S X86/vertex.S"
 
 linux-sparc:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -697,9 +726,9 @@ linux-sparc:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -pedantic -funroll-loops -O3 -DSHM" \
+       "CFLAGS = -pedantic -funroll-loops -O3 -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXt -lSM -lICE -lXmu -lXi"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXt -lSM -lICE -lXmu -lXi -lm"
 
 # Replace -mv8 with -mcypress, -msupersparc or -msparclite as appropriate.
 linux-sparc5-elf:
@@ -709,9 +738,9 @@ linux-sparc5-elf:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -mv8 -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM" \
+       "CFLAGS = -mv8 -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.linux" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm"
 
 # 32-bit Sparc ELF userland, on UltraSparc
 linux-sparc-ultra:
@@ -721,12 +750,12 @@ linux-sparc-ultra:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM" \
+       "CFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.linux" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm"
 
 # May want to add these CFLAGS for better performance under LynxOS and GCC:
-# -fPIC -O2 -ansi -pedantic -mieee-fp -DSHM -funroll-loops
+# -fPIC -O2 -ansi -pedantic -mieee-fp -DUSE_XSHM -funroll-loops
 # -fexpensive-optimizations -fomit-frame-pointer -ffast-math
 # and  -malign-loops=2 -malign-jumps=2 -malign-functions=2 for Pentium
 
@@ -737,9 +766,9 @@ lynxos:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -O2 -ansi -pedantic -funroll-loops -ffast-math -DSHM" \
+       "CFLAGS = -O2 -ansi -pedantic -funroll-loops -ffast-math -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/X11/lib -lXext -lXi -lXmu -lX11 -lbsd"
+       "XLIBS = -L/usr/X11/lib -lXext -lXi -lXmu -lX11 -lbsd -lm"
 
 machten-2.2:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -750,7 +779,7 @@ machten-2.2:
        "CC = gcc" \
        "CFLAGS = -DTENON -D__MACHTEN__ -fstrength-reduce -m68881 -O2" \
        "MAKELIB = ../bin/mklib.ar-rcv" \
-       "XLIBS = -L/usr/lib/X11 -lX11"
+       "XLIBS = -L/usr/lib/X11 -lX11 -lm"
 
 machten-4.0:
        $(MAKE) targets \
@@ -761,7 +790,7 @@ machten-4.0:
        "CC = gcc" \
        "CFLAGS = -DTENON -D__MACHTEN__ -fstrength-reduce -O2" \
        "MAKELIB = ../bin/mklib.ar-rcv" \
-       "XLIBS = -L/usr/X11R5/lib -lX11"
+       "XLIBS = -L/usr/X11R5/lib -lX11 -lm"
 
 mklinux:
        $(MAKE) targets \
@@ -772,7 +801,7 @@ mklinux:
        "CC = gcc" \
        "CFLAGS = -pedantic -O2" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -lmoto -L/usr/X11/lib -lXmu -lX11"
+       "XLIBS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm"
 
 netbsd:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -781,9 +810,9 @@ netbsd:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -O2 -fPIC -DSHM -I/usr/X11R6/include -DHZ=100"  \
+       "CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100"  \
        "MAKELIB = ../bin/mklib.netbsd" \
-       "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11"
+       "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
 
 next:  
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -801,9 +830,9 @@ openbsd:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = cc" \
-       "CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DSHM -DHZ=100" \
+       "CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \
        "MAKELIB = ../bin/mklib.openbsd" \
-       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi -lm"
 
 openstep:      
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -832,8 +861,8 @@ os2-x11:
        "CC = gcc" \
        "CFLAGS = -Zmt -O3 -m486 -funroll-loops -Wall -Wno-unused -ansi -pedantic -ffast-math -DUSE_X86_ASM -D_SVID_SOURCE -D_BSD_SOURCE -I$(X11ROOT)/XFree86/include" \
        "MAKELIB = ..\\bin\\mklib-emx.cmd " \
-       "XLIBS = -Zmt -Zcrtdll -Zexe -L$(X11ROOT)/XFree86/lib -lXt -lX11" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S"
+       "XLIBS = -Zmt -Zcrtdll -Zexe -L$(X11ROOT)/XFree86/lib -lXt -lX11 -lm" \
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
 
 osf1:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -842,9 +871,9 @@ osf1:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = cc" \
-       "CFLAGS = -O2 -std1 -ieee_with_no_inexact -DSHM -DNO_CONST" \
+       "CFLAGS = -O2 -std1 -ieee_with_no_inexact -DUSE_XSHM -DNO_CONST" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
 
 osf1-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -853,9 +882,9 @@ osf1-sl:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = cc" \
-       "CFLAGS = -O2 -std1 -ieee_with_no_inexact -DSHM -DNO_CONST" \
+       "CFLAGS = -O2 -std1 -ieee_with_no_inexact -DUSE_XSHM -DNO_CONST" \
        "MAKELIB = ../bin/mklib.osf1" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
 
 pgi-cygnus:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -866,7 +895,7 @@ pgi-cygnus:
        "CC = pgcc" \
        "CFLAGS = -fast -cyglibs -Munix -I. -DWIN32 -D__WIN32__ -D_WINDOWS " \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -lX11"
+       "XLIBS = -lX11 -lm"
 
 pgi-mingw32:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -877,7 +906,7 @@ pgi-mingw32:
        "CC = pgcc" \
        "CFLAGS = -fast -msvcrt -Munix -I. -DWIN32 -D__WIN32__ -D_WINDOWS " \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -lX11"
+       "XLIBS = -lX11 -lm"
 
 # QNX V4 & Watcom Compiler
 qnx:
@@ -889,7 +918,7 @@ qnx:
        "CC = cc" \
        "CFLAGS = -O" \
        "MAKELIB = ../bin/mklib.qnx" \
-       "XLIBS = -L/usr/X11/lib -lX11"
+       "XLIBS = -L/usr/X11/lib -lX11 -lm"
 
 sco:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -900,29 +929,40 @@ sco:
        "CC = gcc" \
        "CFLAGS = -pedantic -O2 -mieee-fp" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/X11/lib -lX11"
+       "XLIBS = -L/usr/X11/lib -lX11 -lm"
+
+sco5:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.a" \
+       "GLU_LIB = libGLU.a" \
+       "GLUT_LIB = libglut.a" \
+       "GLW_LIB = libGLw.a" \
+       "CC = gcc" \
+       "CFLAGS = -pedantic -O2 -mieee-fp" \
+       "MAKELIB = ../bin/mklib.ar-ruv" \
+       "XLIBS = -lXm -lXt -lX11 -lXmu -lXext -lsocket -lx -lm"
 
 solaris-x86:
-       $(MAKE) targets \
+       $(MAKE) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = cc" \
-       "CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DSHM" \
+       "CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.solaris" \
-       "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 solaris-x86-gcc:
-       $(MAKE) targets \
+       $(MAKE) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DSHM" \
+       "CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.solaris" \
-       "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 sunos4:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -931,9 +971,9 @@ sunos4:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = acc" \
-       "CFLAGS = -O -DSHM -DSUNOS4" \
+       "CFLAGS = -O -DUSE_XSHM -DSUNOS4" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
 
 sunos4-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -942,9 +982,9 @@ sunos4-sl:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = acc" \
-       "CFLAGS = -Kpic -O -I/usr/include/X11R5 -DSHM -DSUNOS4" \
+       "CFLAGS = -Kpic -O -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4" \
        "MAKELIB = ld -assert pure-text -o" \
-       "XLIBS = -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi -lm"
 
 sunos4-gcc:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -953,9 +993,9 @@ sunos4-gcc:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -O3 -DSHM -DSUNOS4 -I/usr/openwin/include" \
+       "CFLAGS = -O3 -DUSE_XSHM -DSUNOS4 -I/usr/openwin/include" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 sunos4-gcc-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -964,9 +1004,9 @@ sunos4-gcc-sl:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \
+       "CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \
        "MAKELIB = ../bin/mklib.sunos4" \
-       "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 sunos4-gcc-x11r6-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -975,9 +1015,9 @@ sunos4-gcc-x11r6-sl:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -fPIC -O3 -I/usr/X11R6.3/include -DSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \
+       "CFLAGS = -fPIC -O3 -I/usr/X11R6.3/include -DUSE_XSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \
        "MAKELIB = ../bin/mklib.sunos4" \
-       "XLIBS = -L/usr/X11R6.3/lib/X11 -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/X11R6.3/lib/X11 -lX11 -lXext -lXmu -lXi -lm"
 
 sunos5:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -986,9 +1026,9 @@ sunos5:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = cc" \
-       "CFLAGS = -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DSHM -DSOLARIS_2_4_BUG" \
+       "CFLAGS = -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 sunos5-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -997,9 +1037,9 @@ sunos5-sl:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = cc" \
-       "CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DSHM -DSOLARIS_2_4_BUG" \
+       "CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
        "MAKELIB = ../bin/mklib.sunos5" \
-       "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 sunos5-ultra:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1008,9 +1048,9 @@ sunos5-ultra:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = cc" \
-       "CFLAGS = -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DSHM -DSOLARIS_2_4_BUG" \
+       "CFLAGS = -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 sunos5-ultra-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1019,9 +1059,9 @@ sunos5-ultra-sl:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = cc" \
-       "CFLAGS = -KPIC -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DSHM -DSOLARIS_2_4_BUG" \
+       "CFLAGS = -KPIC -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
        "MAKELIB = ../bin/mklib.sunos5" \
-       "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 sunos5-gcc:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1030,9 +1070,9 @@ sunos5-gcc:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG" \
+       "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 sunos5-gcc-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1041,9 +1081,9 @@ sunos5-gcc-sl:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -fPIC -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG" \
+       "CFLAGS = -fPIC -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
        "MAKELIB = ../bin/mklib.sunos5" \
-       "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 sunos5-x11r6-gcc-sl:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1052,9 +1092,9 @@ sunos5-x11r6-gcc-sl:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -fPIC -O3 -DSHM -DSOLARIS_2_4_BUG" \
+       "CFLAGS = -fPIC -O3 -DUSE_XSHM -DSOLARIS_2_4_BUG" \
        "MAKELIB = ../bin/mklib.sunos5" \
-       "XLIBS = -lSM -lICE -lX11 -lXext -lXmu -lXi -lnsl -lsocket"
+       "XLIBS = -lSM -lICE -lX11 -lXext -lXmu -lXi -lnsl -lsocket -lm"
 
 # Contributed by John Stone
 sunos5-pthread:
@@ -1063,9 +1103,9 @@ sunos5-pthread:
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
        "CC = cc" \
-       "CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DSHM -DSOLARIS_2_4\_BUG -DTHREADS -DPTHREADS" \
+       "CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4\_BUG -DTHREADS -DPTHREADS" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread"
+       "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm"
 
 # Contributed by John Stone
 sunos5-thread:
@@ -1074,9 +1114,9 @@ sunos5-thread:
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
        "CC = cc" \
-       "CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DSHM -DSOLARIS_2_4\_BUG -DTHREADS -DSOLARIS_THREADS" \
+       "CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4\_BUG -DTHREADS -DSOLARIS_THREADS" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread"
+       "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread -lm"
 
 # Contributed by John Stone
 sunos5-gcc-thread:
@@ -1085,9 +1125,9 @@ sunos5-gcc-thread:
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
        "CC = gcc" \
-       "CFLAGS = -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DTHREADS -DSOLARIS_THR\EADS" \
+       "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DTHREADS -DSOLARIS_THREADS" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread"
+       "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread -lm"
 
 # Contributed by John Stone
 sunos5-gcc-pthread:
@@ -1096,9 +1136,9 @@ sunos5-gcc-pthread:
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
        "CC = gcc" \
-       "CFLAGS = -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DTHREADS -DPTHREADS" \
+       "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DTHREADS -DPTHREADS" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread"
+       "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm"
 
 # from Ron Metoyer (metoyer@iexist.flw.lucent.com)
 sunSolaris-CC:
@@ -1108,9 +1148,9 @@ sunSolaris-CC:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = CC" \
-       "CFLAGS = -O -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG" \
+       "CFLAGS = -O -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm"
 
 #This config doesn't work, Ultrix C compiler isn't ANSI compliant
 ultrix:
@@ -1122,7 +1162,7 @@ ultrix:
        "CC = cc" \
        "CFLAGS = -O -Dconst=/**/" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -lXmu -lX11 -lXi"
+       "XLIBS = -lXmu -lX11 -lXi -lm"
 
 ultrix-gcc:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1133,7 +1173,7 @@ ultrix-gcc:
        "CC = gcc" \
        "CFLAGS = -pedantic -O2" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -lXmu -lX11 -lXi"
+       "XLIBS = -lXmu -lX11 -lXi -lm"
 
 # tested on Cray C90 running UNICOS 8.0.4
 unicos:
@@ -1145,7 +1185,7 @@ unicos:
        "CC = cc" \
        "CFLAGS =" \
        "MAKELIB = ../bin/mklib/ar-rcv" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lm"
 
 unixware:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1154,9 +1194,9 @@ unixware:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = cc" \
-       "CFLAGS = -O -I/usr/X/include -DSHM" \
+       "CFLAGS = -O -I/usr/X/include -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm"
 
 unixware-shared:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1165,9 +1205,9 @@ unixware-shared:
        "GLUT_LIB = libglut" \
        "GLW_LIB = libGLw" \
        "CC = cc" \
-       "CFLAGS = -O -I/usr/X/include -KPIC,inline -DSHM" \
+       "CFLAGS = -O -I/usr/X/include -KPIC,inline -DUSE_XSHM" \
        "MAKELIB = ../bin/mklib.solaris" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm"
 
 uwin:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1177,7 +1217,7 @@ uwin:
        "CC = gcc" \
        "CFLAGS = -pedantic -O2 -I/usr/X11/include " \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/X11/lib -lX11"
+       "XLIBS = -L/usr/X11/lib -lX11 -lm"
 
 vistra:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1188,7 +1228,7 @@ vistra:
        "CC = gcc" \
        "CFLAGS = -pedantic -O2" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -lX11 -lsocket -lnsl -lgen"
+       "XLIBS = -lX11 -lsocket -lnsl -lgen -lm"
 
 
 # for debugging on IRIX 5.x systems
@@ -1205,9 +1245,9 @@ irix-debug:
        "GLW_LIB = libGLw.a" \
        "LIBDIR = ../lib32" \
        "CC = cc" \
-       "CFLAGS = -g -n32 -ansi -fullwarn -DSHM -DDEBUG -woff 1209,1210,1506,1521,3496" \
+       "CFLAGS = -g -n32 -ansi -fullwarn -DUSE_XSHM -DDEBUG -woff 1209,1210,1506,1521,3496" \
        "MAKELIB = ../bin/mklib.ar-rcv" \
-       "XLIBS = -rpath ../lib32 -lX11 -lXext -lXmu -lXi -lfpe -lXext -lXmu -lXi"
+       "XLIBS = -rpath ../lib32 -lX11 -lXext -lXmu -lXi -lfpe -lXext -lXmu -lXi -lm"
 
 DEBUG:
        pmake $(MFLAGS) -f Makefile.X11 targets \
@@ -1216,22 +1256,22 @@ DEBUG:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = cc" \
-       "CFLAGS = -g -ansi -prototypes -fullwarn -DSHM -DDEBUG" \
+       "CFLAGS = -g -ansi -prototypes -fullwarn -DUSE_XSHM -DDEBUG" \
        "MAKELIB = ../bin/mklib.ar-rcv" \
-       "XLIBS = -lX11 -lXext -lXmu -lXi -lfpe"
+       "XLIBS = -lX11 -lXext -lXmu -lXi -lfpe -lm"
 
 # for debugging on Linux systems
-linux-debug:
+linux-static-debug:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -g -ansi -pedantic -Wall -DSHM -DDEBUG -DSVGA -DFX -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM_not -I/usr/include/glide -I/usr/local/glide/include" \
+       "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -DUSE_XSHM -DDEBUG -DSVGA -DFX -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM_not -I/usr/include/glide -I/usr/local/glide/include" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/local/glide/lib -lglide2x -ltexus -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lvga" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S"
+       "XLIBS = -L/usr/local/glide/lib -lglide2x -ltexus -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lvga -lm" \
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S X86/vertex.S"
 
 linux-elf-debug:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -1240,10 +1280,20 @@ linux-elf-debug:
        "GLUT_LIB = libglut.so" \
        "GLW_LIB = libGLw.so" \
        "CC = gcc" \
-       "CFLAGS = -g -ansi -pedantic -Wall -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM -DFX -DDEBUG -I/usr/local/glide/include -I/usr/include/glide" \
+       "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DTHREADS -DPTHREADS -DDEBUG" \
+       "MAKELIB = ../bin/mklib.linux" \
+       "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lvga -lm -lpthread"
+
+linux-glide-debug:
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+       "GL_LIB = libGL.so" \
+       "GLU_LIB = libGLU.so" \
+       "GLUT_LIB = libglut.so" \
+       "GLW_LIB = libGLw.so" \
+       "CC = gcc" \
+       "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DTHREADS -DPTHREADS -DFX -DDEBUG -I/usr/local/glide/include -I/usr/include/glide" \
        "MAKELIB = ../bin/mklib.linux" \
-       "XLIBS = -L/usr/local/glide/lib -lglide2x -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lvga -L/usr/local/glide/lib -lglide2x -lm" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S"
+       "XLIBS = -L/usr/local/glide/lib -lglide2x -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lvga -lm -lpthread"
 
 # for profiling on Linux systems
 linux-prof:
@@ -1253,13 +1303,14 @@ linux-prof:
        "GLUT_LIB = libglut.a" \
        "GLW_LIB = libGLw.a" \
        "CC = gcc" \
-       "CFLAGS = -O2 -pg -ansi -pedantic -Wall -DSHM -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -I/usr/include/glide -I/usr/local/glide/include" \
+       "CFLAGS = -O2 -pg -ansi -pedantic -Wall -DUSE_XSHM -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -I/usr/include/glide -I/usr/local/glide/include" \
        "MAKELIB = ../bin/mklib.ar-ruv" \
-       "XLIBS = -L/usr/local/glide/lib -lglide2x -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE" \
-       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S \
+       "XLIBS = -L/usr/local/glide/lib -lglide2x -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \
+       "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/glapi_x86.S \
        X86/mmx_blend.S \
        X86/3dnow_xform_raw1.S X86/3dnow_xform_raw2.S \
        X86/3dnow_xform_raw3.S X86/3dnow_xform_raw4.S \
        X86/3dnow_xform_masked1.S X86/3dnow_xform_masked2.S \
        X86/3dnow_xform_masked3.S X86/3dnow_xform_masked4.S \
-       X86/3dnow_norm_raw.S"
+       X86/3dnow_norm_raw.S X86/vertex.S X86/vertex_3dnow.S \
+       FX/X86/fx_3dnow_fastpath.S"