projects / packages / Mesa.git / blame
| Commit | Line | Data |
|---|---|---|
| 11062ced JB |
1 | --- Mesa-3.4.2/widgets-sgi/Makefile.X11.orig Thu Jun 15 20:46:09 2000 |
| 2 | +++ Mesa-3.4.2/widgets-sgi/Makefile.X11 Sun May 27 14:37:57 2001 | |
| 3 | @@ -16,9 +16,9 @@ | |
| 4 | INCDIRS = -I../include -I/usr/include/Motif1.2 -I/usr/X11R6/include | |
| 5 | LIBDIR = ../lib | |
| 6 | ||
| 7 | # Compile GLwMDrawA.c only if you have Motif headers! | |
| 8 | -#SOURCES = GLwDrawA.c GLwMDrawA.c | |
| 9 | -SOURCES = GLwDrawA.c | |
| 10 | +SOURCES = GLwDrawA.c GLwMDrawA.c | |
| 11 | +#SOURCES = GLwDrawA.c | |
| 12 | ||
| 13 | ||
| 14 | OBJECTS = $(SOURCES:.c=.o) | |
| 15 | @@ -40,14 +41,12 @@ | |
| 16 | clean: | |
| 17 | -rm *.o *~ | |
| 18 | ||
| 19 | -targets: $(LIBDIR)/$(GLW_LIB) message | |
| 20 | +targets: $(LIBDIR)/$(GLW_LIB) | |
| 21 | ||
| 22 | ||
| 23 | # Make the library | |
| 24 | $(LIBDIR)/$(GLW_LIB): $(OBJECTS) | |
| 25 | $(MAKELIB) $(GLW_LIB) $(MAJOR) $(MINOR) $(TINY) $(OBJECTS) | |
| 26 | - mv $(GLW_LIB)* $(LIBDIR) | |
| 27 | - -mv *.a $(LIBDIR) | |
| 28 | ||
| 29 | ||
| 30 | message: | |
| 31 | --- Mesa-3.4.2/Make-config.orig Mon May 14 21:11:32 2001 | |
| 32 | +++ Mesa-3.4.2/Make-config Sun May 27 14:31:38 2001 | |
| 33 | @@ -453,7 +453,7 @@ | |
| 34 | "GLUT_LIB = libglut.so" \ | |
| 35 | - "GLW_LIB = libGLw.so" \ | |
| 36 | + "GLW_LIB = libGLw.a" \ | |
| 37 | "CC = gcc" \ | |
| 38 | - "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \ | |
| 39 | + "CFLAGS = $(OPTFLAGS) -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \ | |
| 40 | "MAKELIB = ../bin/mklib.linux" \ | |
| 41 | "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ | |
| 42 | "GLU_LIB_DEPS = -L../lib -lGL -lm" \ |