diff options
| -rw-r--r-- | Make-config | 105 | ||||
| -rw-r--r-- | Makefile.X11 | 22 |
2 files changed, 47 insertions, 80 deletions
diff --git a/Make-config b/Make-config index d8c646c78a0..1480c300db7 100644 --- a/Make-config +++ b/Make-config @@ -1,4 +1,4 @@ -# $Id: Make-config,v 1.14 1999/12/08 11:52:29 wertmann Exp $ +# $Id: Make-config,v 1.15 2000/01/05 06:33:17 brianp Exp $ MESA_MAJOR=3 MESA_MINOR=3 @@ -439,27 +439,8 @@ irix6-64-dso: "MAKELIB = ../bin/mklib.irix6-64" \ "XLIBS = -rpath ../lib64 -lX11 -lXmu -lXi -lm" -# May want to try these CFLAGS for better performance under Linux and GCC: -# -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 - 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 -DUSE_XSHM -I/usr/X11R6/include" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ - "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" - -# 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" \ @@ -469,19 +450,30 @@ linux-elf: "MAKELIB = ../bin/mklib.linux" \ "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 -DUSE_XSHM -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/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" \ @@ -493,17 +485,16 @@ linux-386: "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.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 -DUSE_XSHM -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 X86/vertex.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 \ @@ -517,18 +508,6 @@ linux-386-glide: "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/vertex.S" -linux-386-glide-mits: - $(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 -DUSE_XSHM -DFX -D_REENTRANT -DMITS -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 X86/vertex.S" - linux-386-opt-V2-glide: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ @@ -639,19 +618,6 @@ linux-katmai-glide: X86/katmai_xform_raw4.S X86/katmai_xform_masked4.S \ X86/vertex_katmai.S" -# Contributed by C. Alex. North-Keys ([email protected]) -linux-386-pthread-shared-glide: - $(MAKE) $(MFLAGS) 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/usr/X11R6/include -DUSE_XSHM -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 -lm" \ - "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S \ - X86/mmx_blend.S X86/vertex.S" - # Contributed by [email protected] linux-ggi: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -718,7 +684,7 @@ linux-ppc: # -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" \ @@ -728,29 +694,30 @@ linux-ppc-so: "MAKELIB = ../bin/mklib.linux" \ "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 -DUSE_XSHM -DUSE_X86_ASM -D_REENTRANT -DTHREADS -DPTHREADS" \ - "MAKELIB = ../bin/mklib.ar-ruv" \ + "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/vertex.S" -# Contributed by John Gotts -linux-386-pthread-shared: +# Contributed by C. Alex. North-Keys ([email protected]) +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 -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/vertex.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/mmx_blend.S X86/vertex.S" linux-sparc: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -972,7 +939,7 @@ sco5: "GLW_LIB = libGLw.a" \ "CC = gcc" \ "CFLAGS = -pedantic -O2 -mieee-fp" \ - "MAKELIB = ../mklib.ar-ruv" \ + "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -lXm -lXt -lX11 -lXmu -lXext -lsocket -lx -lm" solaris-x86: @@ -1294,7 +1261,7 @@ DEBUG: "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" \ diff --git a/Makefile.X11 b/Makefile.X11 index a8584e5cb26..9932505f4f6 100644 --- a/Makefile.X11 +++ b/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.14 1999/11/24 21:17:32 brianp Exp $ +# $Id: Makefile.X11,v 1.15 2000/01/05 06:33:17 brianp Exp $ # Mesa 3-D graphics library # Version: 3.3 @@ -66,10 +66,10 @@ default: @echo " make irix6-64 for SGI systems with IRIX 6.x, make 64-bit libs" @echo " make irix6-64-dso for SGI systems with IRIX 6.x, make 64-bit DSOs" - @echo " make linux for Linux systems, make static .a libs" - @echo " make linux-elf for Linux systems, make ELF shared libs" - @echo " make linux-386 for Linux w/ Intel assembly" - @echo " make linux-386-elf for Linux w/ Intel assembly, make ELF shared libs" + @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-ggi for Linux systems with libggi" @echo " make linux-386-ggi for Linux systems with libggi w/ Intel assembly" @echo " make linux-alpha for Linux on Alpha systems" @@ -84,9 +84,8 @@ default: @echo " make linux-3dnow-glide for Linux on AMD w/ 3DNow! for Glide" @echo " make linux-katmai for Linux on PentiumIII w/ SSE" @echo " make linux-katmai-glide for Linux on PentiumIII w/ SSE 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-386-pthread for Linux on Intel, thread safety" + @echo " make linux-386-pthread-glide for Linux on Intel, thread safety, Glide" @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" @@ -142,15 +141,16 @@ aix aix-sl amix bsdos bsdos4 dgux freebsd freebsd-386 gcc \ hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \ hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \ irix4 irix5 irix5-gcc irix5-dso irix6-o32 irix6-o32-dso \ -linux linux-debug linux-prof linux-elf linux-elf-debug linux-glide-debug \ +linux-static-debug linux-elf-debug linux-prof linux-glide-debug \ +linux linux-static \ +linux-386 linux-386-static \ linux-glide linux-386-glide linux-386-opt-glide \ linux-386-opt-V2-glide \ -linux-386 linux-386-elf \ linux-3dnow linux-3dnow-glide \ linux-katmai linux-katmai-glide \ linux-alpha linux-alpha-elf \ linux-ppc linux-ppc-so \ -linux-386-pthread linux-386-pthread-shared linux-386-pthread-shared-glide \ +linux-386-pthread linux-386-pthread-glide \ linux-sparc \ linux-sparc5-elf \ linux-sparc-ultra \ |