diff options
| -rw-r--r-- | Make-config | 14 | ||||
| -rw-r--r-- | Makefile.X11 | 5 |
2 files changed, 16 insertions, 3 deletions
diff --git a/Make-config b/Make-config index b03e7235de..20b8773a9d 100644 --- a/Make-config +++ b/Make-config @@ -1,4 +1,4 @@ -# $Id: Make-config,v 1.1 1999/08/19 00:55:39 jtg Exp $ +# $Id: Make-config,v 1.2 1999/09/14 12:20:17 brianp Exp $ MAJOR=3 MINOR=1 @@ -590,6 +590,18 @@ linux-3dnow-glide: FX/X86/fx_3dnow_fastpath.S" +# Contributed by C. Alex. North-Keys (erlkonig@talisman.org) +linux-386-pthread-shared-glide: + $(MAKE) $(MFLAGS) targets \ + "GL_LIB = libMesaGL.so" \ + "GLU_LIB = libMesaGLU.so" \ + "GLUT_LIB = libglut.so" \ + "CC = gcc" \ + "CFLAGS = -O3 -fPIC -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM -DUSE_X86_ASM -D_REENTRANT -DTHREADS -DPTHREADS -DFX -I/usr/include/glide -I/usr/local/glide/include" \ + "MAKELIB = ../mklib.glide" \ + "XLIBS = -L/usr/X11/lib -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lpthread" \ + "ASM_SOURCES = asm_386.S" + # Contributed by Uwe_Maurer@t-online.de linux-ggi: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ diff --git a/Makefile.X11 b/Makefile.X11 index c70d2f72d8..47555064e4 100644 --- a/Makefile.X11 +++ b/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.2 1999/08/19 13:26:16 brianp Exp $ +# $Id: Makefile.X11,v 1.3 1999/09/14 12:20:17 brianp Exp $ # Mesa 3-D graphics library # Version: 3.1 @@ -84,6 +84,7 @@ default: @echo " make linux-3dnow-glide for Linux on AMD w/ 3DNow! for Glide" @echo " make linux-386-pthread for Linux w/ Intel assembly and linuxthreads" @echo " make linux-386-pthread-shared for Linux w/ Intel assembly and linuxthreads" + @echo " make linux-386-pthread-shared-glide for Linux w/ Intel assembly, linuxthreads, and 3Dfx Glide driver" @echo " make linux-sparc for Linux on Sparc systems" @echo " make linux-sparc5-elf for Sparc5 systems, make ELF shared libs" @echo " make linux-sparc-ultra for UltraSparc systems, make ELF shared libs" @@ -145,7 +146,7 @@ linux-386 linux-386-elf \ linux-3dnow linux-3dnow-glide \ linux-alpha linux-alpha-elf \ linux-ppc linux-ppc-so \ -linux-386-pthread linux-386-pthread-shared \ +linux-386-pthread linux-386-pthread-shared linux-386-pthread-shared-glide \ linux-sparc \ linux-sparc5-elf \ linux-sparc-ultra \ |