diff options
| -rw-r--r-- | Make-config | 18 | ||||
| -rw-r--r-- | Makefile.X11 | 5 |
2 files changed, 19 insertions, 4 deletions
diff --git a/Make-config b/Make-config index 82c348980a..522405c0d7 100644 --- a/Make-config +++ b/Make-config @@ -1,4 +1,4 @@ -# $Id: Make-config,v 1.27 2000/09/15 15:55:24 brianp Exp $ +# $Id: Make-config,v 1.28 2000/09/15 19:44:43 brianp Exp $ MESA_MAJOR=3 MESA_MINOR=5 @@ -456,6 +456,20 @@ linux: "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ "APP_LIB_DEPS = -lm" +linux-trace: + $(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 -DPTHREADS -DGL_MESA_TRACE -I/usr/X11R6/include" \ + "MAKELIB = ../bin/mklib.linux" \ + "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -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" + linux-static: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ @@ -1292,7 +1306,7 @@ linux-elf-debug: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -g -ansi -pedantic -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DSVGA -I/usr/include/glide -DFX" \ + "CFLAGS = -g -ansi -pedantic -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DSVGA -I/usr/include/glide -DFX -DGL_MESA_TRACE" \ "MAKELIB = ../bin/mklib.linux" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lvga -L/usr/local/glide/lib -lglide2x" \ "GLU_LIB_DEPS = -L../lib -lGL -lm" \ diff --git a/Makefile.X11 b/Makefile.X11 index 7614c39426..c2da7c9647 100644 --- a/Makefile.X11 +++ b/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.34 2000/08/02 20:14:23 brianp Exp $ +# $Id: Makefile.X11,v 1.35 2000/09/15 19:44:39 brianp Exp $ # Mesa 3-D graphics library # Version: 3.5 @@ -67,6 +67,7 @@ default: @echo " make irix6-64-dso for SGI systems with IRIX 6.x, make 64-bit DSOs" @echo " make linux for Linux systems, make shared .so libs" + @echo " make linux-trace for Linux systems, make shared trace .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" @@ -140,7 +141,7 @@ 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-static-debug linux-elf-debug linux-prof linux-glide-debug \ -linux linux-static \ +linux linux-trace linux-static \ linux-386 linux-386-static \ linux-glide linux-386-glide linux-386-opt-glide \ linux-386-opt-V2-glide \ |