diff options
| -rw-r--r-- | Make-config | 68 | ||||
| -rw-r--r-- | Makefile.X11 | 7 |
2 files changed, 37 insertions, 38 deletions
diff --git a/Make-config b/Make-config index cd8535041c3..5f0a2ee5fa3 100644 --- a/Make-config +++ b/Make-config @@ -1,4 +1,4 @@ -# $Id: Make-config,v 1.25.4.2 2000/10/22 23:10:48 gareth Exp $ +# $Id: Make-config,v 1.25.4.3 2000/10/23 19:38:26 brianp Exp $ MESA_MAJOR=3 MESA_MINOR=4 @@ -531,6 +531,35 @@ linux-x86-static: X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \ X86/katmai_norm_raw.S X86/katmai_vertex.S" +# Contributed by Uwe_Maurer@t-online.de +linux-ggi: + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ + "GL_LIB = libGL.so" \ + "GLU_LIB = libGLU.so" \ + "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 -DUSE_XSHM -DGGI -DCDECL=" \ + "MAKELIB = ../bin/mklib.ggi" \ + "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm" + +# Contributed by Emmanuel marty core@ggi-project.org +linux-386-ggi: + $(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 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -DGGI -DCDECL=" \ + "MAKELIB = ../bin/mklib.ggi" \ + "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm" \ + "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ + X86/x86_xform_raw2.S X86/x86_xform_raw3.S \ + X86/x86_xform_raw4.S X86/x86_xform_masked2.S \ + X86/x86_xform_masked3.S X86/x86_xform_masked4.S \ + X86/x86_cliptest.S X86/x86_vertex.S" + linux-glide: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ @@ -564,14 +593,14 @@ linux-386-glide: X86/x86_xform_masked3.S X86/x86_xform_masked4.S \ X86/x86_cliptest.S X86/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 -DUSE_XSHM -DFX -DFX_V2 -DUSE_X86_ASM -DPTHREAD -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 -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \ "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" \ @@ -583,14 +612,14 @@ linux-386-opt-V2-glide: X86/x86_xform_masked3.S X86/x86_xform_masked4.S \ X86/x86_cliptest.S X86/x86_vertex.S" -linux-386-opt-glide: +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 -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 -DPTHREADS -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 -DPTHREAD -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include"\ "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" \ @@ -633,35 +662,6 @@ linux-x86-glide: X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \ X86/katmai_norm_raw.S X86/katmai_vertex.S" -# Contributed by Uwe_Maurer@t-online.de -linux-ggi: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.so" \ - "GLU_LIB = libGLU.so" \ - "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 -DUSE_XSHM -DGGI -DCDECL=" \ - "MAKELIB = ../bin/mklib.ggi" \ - "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm" - -# Contributed by Emmanuel marty core@ggi-project.org -linux-386-ggi: - $(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 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -DGGI -DCDECL=" \ - "MAKELIB = ../bin/mklib.ggi" \ - "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm" \ - "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ - X86/x86_xform_raw2.S X86/x86_xform_raw3.S \ - X86/x86_xform_raw4.S X86/x86_xform_masked2.S \ - X86/x86_xform_masked3.S X86/x86_xform_masked4.S \ - X86/x86_cliptest.S X86/x86_vertex.S" - linux-alpha: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ diff --git a/Makefile.X11 b/Makefile.X11 index 22a3f252f19..05ecba0b6fc 100644 --- a/Makefile.X11 +++ b/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.32.2.3 2000/10/22 23:10:48 gareth Exp $ +# $Id: Makefile.X11,v 1.32.2.4 2000/10/23 19:38:26 brianp Exp $ # Mesa 3-D graphics library # Version: 3.4 @@ -68,15 +68,14 @@ default: @echo " make linux for Linux systems, make shared .so libs" @echo " make linux-static for Linux systems, make static .a libs" - @echo " make linux-386 for Linux on Intel, make shared .so libs" - @echo " make linux-386-static for Linux on Intel, make static .a libs" + @echo " make linux-x86 for Linux on Intel, make shared .so libs" + @echo " make linux-x86-static for Linux on Intel, make static .a libs" @echo " make linux-ggi for Linux systems with libggi" @echo " make linux-386-ggi for Linux systems with libggi w/ Intel assembly" @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 for Linux w/ all x86 asm" @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" |