removed linux-386-opt-V2-glide config since FX_V2 symbol has no significance anymore

diff --git a/Make-config b/Make-config
index ff2b13a45ff8867282ab2437316d3ef4173b41e5..e69c2d94df11eeb3ecd4db4ec0eca6d00dcd9c95 100644 (file)
--- a/Make-config
+++ b/Make-config
@@ -1,4 +1,4 @@
-# $Id: Make-config,v 1.43 2001/04/26 22:27:09 brianp Exp $
+# $Id: Make-config,v 1.44 2001/05/10 03:00:58 brianp Exp $
 
 MESA_MAJOR=3
 MESA_MINOR=5
@@ -645,7 +645,7 @@ linux-glide:
        "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L/usr/local/glide/lib -lglide2x" \
        "GLU_LIB_DEPS = -L../lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
-       "APP_LIB_DEPS = -lglut -lGLU -lGL"
+       "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -lglut -lGLU -lGL"
 
 linux-386-glide:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
@@ -662,7 +662,7 @@ linux-386-glide:
        "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \
        "GLU_LIB_DEPS = -L../lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
-       "APP_LIB_DEPS = -lm" \
+       "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -lglut -lGLU -lGL"
        "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/x86_vertex.S"
@@ -687,26 +687,6 @@ linux-386-opt-glide:
                X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \
                X86/x86_cliptest.S X86/x86_vertex.S"
 
-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" \
-       "OSMESA_LIB = libOSMesa.so" \
-       "CC = gcc" \
-       "CPLUSPLUS = g++" \
-       "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 -DPTHREAD -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include"\
-       "CCFLAGS = $(CFLAGS)" \
-       "MAKELIB = ../bin/mklib.linux" \
-       "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \
-       "GLU_LIB_DEPS = -L../lib -lGL -lm" \
-       "GLUT_LIB_DEPS = -L../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/x86_vertex.S"
-
 linux-x86-glide:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
@@ -1466,7 +1446,7 @@ linux-debug:
        "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L/usr/local/glide/lib -lglide2x -lvga" \
        "GLU_LIB_DEPS = -L../lib -lGL -lm" \
        "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \
-       "APP_LIB_DEPS = -lglut -lGLU -lGL"
+       "APP_LIB_DEPS = -lglut -lGLU -lGL -L/usr/local/glide/lib -lglide2x"
 
 linux-static-debug:
        $(MAKE) $(MFLAGS) -f Makefile.X11 targets \

diff --git a/Makefile.X11 b/Makefile.X11
index cc7ff0cbfafa0777440f7212016b06f638b141f4..5d688ed642180ceb19b15bccd2ec4664e04fdd64 100644 (file)
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.43 2001/04/26 22:27:09 brianp Exp $
+# $Id: Makefile.X11,v 1.44 2001/05/10 03:00:58 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.5
@@ -76,7 +76,6 @@ default:
        @echo "  make linux-glide          for Linux w/ 3Dfx Glide driver"
        @echo "  make linux-386-glide      for Linux w/ 3Dfx Glide driver, Intel assembly"
        @echo "  make linux-386-opt-glide  for Linux with 3Dfx Voodoo1 for GLQuake"
-       @echo "  make linux-386-opt-V2-glide  for Linux with 3Dfx Voodoo2 for GLQuake"
        @echo "  make linux-x86-glide      for Linux w/ all x86 asm for Glide"
        @echo "  make linux-alpha          for Linux on Alpha systems"
        @echo "  make linux-alpha-static   for Linux on Alpha systems, static libs"
@@ -144,7 +143,7 @@ irix4 irix5 irix5-gcc irix5-dso irix6-o32 irix6-o32-dso \
 linux linux-static linux-debug linux-static-debug linux-prof \
 linux-x86 linux-x86-static linux-x86-debug \
 linux-glide linux-386-glide linux-386-opt-glide \
-linux-386-opt-V2-glide linux-x86-glide linux-glide-debug linux-glide-prof \
+linux-x86-glide linux-glide-debug linux-glide-prof \
 linux-alpha-static linux-alpha \
 linux-ppc-static linux-ppc \
 linux-sparc \