1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/mesa/mesa.patch.demos Thu Jan 08 10:18:50 2009 +0100
1.3 @@ -0,0 +1,79 @@
1.4 +Index: progs/demos/Makefile
1.5 +diff -Nau progs/demos/Makefile.orig progs/demos/Makefile
1.6 +--- progs/demos/Makefile.orig 2008-08-25 16:46:41.000000000 +0200
1.7 ++++ progs/demos/Makefile 2008-11-26 21:42:37.000000000 +0100
1.8 +@@ -5,17 +5,17 @@
1.9 +
1.10 + INCDIR = $(TOP)/include
1.11 +
1.12 +-OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
1.13 ++OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(GLUT_LIB_DEPS)
1.14 +
1.15 +-OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
1.16 ++OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(GLUT_LIB_DEPS)
1.17 +
1.18 +-OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
1.19 ++OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(GLUT_LIB_DEPS)
1.20 +
1.21 + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
1.22 + $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
1.23 +
1.24 + LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
1.25 +- $(APP_LIB_DEPS)
1.26 ++ $(GLUT_LIB_DEPS)
1.27 +
1.28 + PROGS = \
1.29 + arbfplight \
1.30 +@@ -125,14 +125,14 @@
1.31 +
1.32 +
1.33 + reflect: reflect.o showbuffer.o readtex.o
1.34 +- $(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@
1.35 ++ $(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(OSMESA_LIBS) -o $@
1.36 +
1.37 + reflect.o: reflect.c showbuffer.h
1.38 + $(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
1.39 +
1.40 +
1.41 + shadowtex: shadowtex.o showbuffer.o
1.42 +- $(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@
1.43 ++ $(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(OSMESA_LIBS) -o $@
1.44 +
1.45 + shadowtex.o: shadowtex.c showbuffer.h
1.46 + $(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
1.47 +Index: progs/samples/Makefile
1.48 +diff -Nau progs/samples/Makefile.orig progs/samples/Makefile
1.49 +--- progs/samples/Makefile.orig 2008-08-25 16:46:42.000000000 +0200
1.50 ++++ progs/samples/Makefile 2008-11-26 21:46:18.000000000 +0100
1.51 +@@ -7,7 +7,7 @@
1.52 +
1.53 + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
1.54 +
1.55 +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
1.56 ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(GLUT_LIB_DEPS)
1.57 +
1.58 + PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
1.59 + font line logo nurb olympic overlay point prim quad select \
1.60 +@@ -28,6 +28,9 @@
1.61 + default: $(PROGS)
1.62 +
1.63 +
1.64 ++nurb: nurb.c
1.65 ++ $(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
1.66 ++
1.67 + sphere: sphere.o readtex.o
1.68 + $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) sphere.o readtex.o $(LIBS) -o $@
1.69 +
1.70 +Index: progs/xdemos/Makefile
1.71 +diff -Nau progs/xdemos/Makefile.orig progs/xdemos/Makefile
1.72 +--- progs/xdemos/Makefile.orig 2008-08-25 16:46:42.000000000 +0200
1.73 ++++ progs/xdemos/Makefile 2008-11-26 21:48:28.000000000 +0100
1.74 +@@ -8,7 +8,7 @@
1.75 +
1.76 + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
1.77 +
1.78 +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
1.79 ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GLUT_LIB_DEPS)
1.80 +
1.81 + PROGS = \
1.82 + corender \
