mesa/mesa.patch.demos@e5f1af644b30 (annotated)
mesa/mesa.patch.demos
Tue, 28 Aug 2012 18:29:00 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 28 Aug 2012 18:29:00 +0200
- changeset 532
- e5f1af644b30
- permissions
- -rw-r--r--
Massively update modules from Drupal 6.x to 7.x, and add diverse OpenID modules.
Unfortunately many modules available to Drupal 6.x installations have not been
since maintained or ported to 7.x causing this package to diminish in both size
and utility.
| michael@34 | 1 | Index: progs/demos/Makefile |
| michael@34 | 2 | diff -Nau progs/demos/Makefile.orig progs/demos/Makefile |
| michael@34 | 3 | --- progs/demos/Makefile.orig 2008-08-25 16:46:41.000000000 +0200 |
| michael@34 | 4 | +++ progs/demos/Makefile 2008-11-26 21:42:37.000000000 +0100 |
| michael@34 | 5 | @@ -5,17 +5,17 @@ |
| michael@34 | 6 | |
| michael@34 | 7 | INCDIR = $(TOP)/include |
| michael@34 | 8 | |
| michael@34 | 9 | -OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) |
| michael@34 | 10 | +OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(GLUT_LIB_DEPS) |
| michael@34 | 11 | |
| michael@34 | 12 | -OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) |
| michael@34 | 13 | +OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(GLUT_LIB_DEPS) |
| michael@34 | 14 | |
| michael@34 | 15 | -OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) |
| michael@34 | 16 | +OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(GLUT_LIB_DEPS) |
| michael@34 | 17 | |
| michael@34 | 18 | LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \ |
| michael@34 | 19 | $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) |
| michael@34 | 20 | |
| michael@34 | 21 | LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ |
| michael@34 | 22 | - $(APP_LIB_DEPS) |
| michael@34 | 23 | + $(GLUT_LIB_DEPS) |
| michael@34 | 24 | |
| michael@34 | 25 | PROGS = \ |
| michael@34 | 26 | arbfplight \ |
| michael@34 | 27 | @@ -125,14 +125,14 @@ |
| michael@34 | 28 | |
| michael@34 | 29 | |
| michael@34 | 30 | reflect: reflect.o showbuffer.o readtex.o |
| michael@34 | 31 | - $(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@ |
| michael@34 | 32 | + $(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(OSMESA_LIBS) -o $@ |
| michael@34 | 33 | |
| michael@34 | 34 | reflect.o: reflect.c showbuffer.h |
| michael@34 | 35 | $(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c |
| michael@34 | 36 | |
| michael@34 | 37 | |
| michael@34 | 38 | shadowtex: shadowtex.o showbuffer.o |
| michael@34 | 39 | - $(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@ |
| michael@34 | 40 | + $(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(OSMESA_LIBS) -o $@ |
| michael@34 | 41 | |
| michael@34 | 42 | shadowtex.o: shadowtex.c showbuffer.h |
| michael@34 | 43 | $(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c |
| michael@34 | 44 | Index: progs/samples/Makefile |
| michael@34 | 45 | diff -Nau progs/samples/Makefile.orig progs/samples/Makefile |
| michael@34 | 46 | --- progs/samples/Makefile.orig 2008-08-25 16:46:42.000000000 +0200 |
| michael@34 | 47 | +++ progs/samples/Makefile 2008-11-26 21:46:18.000000000 +0100 |
| michael@34 | 48 | @@ -7,7 +7,7 @@ |
| michael@34 | 49 | |
| michael@34 | 50 | LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) |
| michael@34 | 51 | |
| michael@34 | 52 | -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) |
| michael@34 | 53 | +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(GLUT_LIB_DEPS) |
| michael@34 | 54 | |
| michael@34 | 55 | PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \ |
| michael@34 | 56 | font line logo nurb olympic overlay point prim quad select \ |
| michael@34 | 57 | @@ -28,6 +28,9 @@ |
| michael@34 | 58 | default: $(PROGS) |
| michael@34 | 59 | |
| michael@34 | 60 | |
| michael@34 | 61 | +nurb: nurb.c |
| michael@34 | 62 | + $(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@ |
| michael@34 | 63 | + |
| michael@34 | 64 | sphere: sphere.o readtex.o |
| michael@34 | 65 | $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) sphere.o readtex.o $(LIBS) -o $@ |
| michael@34 | 66 | |
| michael@34 | 67 | Index: progs/xdemos/Makefile |
| michael@34 | 68 | diff -Nau progs/xdemos/Makefile.orig progs/xdemos/Makefile |
| michael@34 | 69 | --- progs/xdemos/Makefile.orig 2008-08-25 16:46:42.000000000 +0200 |
| michael@34 | 70 | +++ progs/xdemos/Makefile 2008-11-26 21:48:28.000000000 +0100 |
| michael@34 | 71 | @@ -8,7 +8,7 @@ |
| michael@34 | 72 | |
| michael@34 | 73 | LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) |
| michael@34 | 74 | |
| michael@34 | 75 | -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) |
| michael@34 | 76 | +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GLUT_LIB_DEPS) |
| michael@34 | 77 | |
| michael@34 | 78 | PROGS = \ |
| michael@34 | 79 | corender \ |
