summaryrefslogtreecommitdiffstats
path: root/progs/demos
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-11-01 16:02:52 +0000
committerBrian Paul <[email protected]>2000-11-01 16:02:52 +0000
commit861eb8eb16b1e6e527e09a2c31d460d955f771db (patch)
tree417fbf1f384f9ee2136ce6612352d7fdc0899c61 /progs/demos
parent563d26b247395c1eaf0780a2b7536c52ceea9cc1 (diff)
update for separate libOSMesa.so lib
Diffstat (limited to 'progs/demos')
-rw-r--r--progs/demos/Makefile.X1111
1 files changed, 9 insertions, 2 deletions
diff --git a/progs/demos/Makefile.X11 b/progs/demos/Makefile.X11
index 0afb622327f..395d102f4a1 100644
--- a/progs/demos/Makefile.X11
+++ b/progs/demos/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.14 2000/06/27 16:54:18 brianp Exp $
+# $Id: Makefile.X11,v 1.15 2000/11/01 16:02:52 brianp Exp $
# Mesa 3-D graphics library
-# Version: 3.3
+# Version: 3.5
# Copyright (C) 1995-2000 Brian Paul
# Makefile for GLUT-based demo programs for Unix/X11
@@ -14,6 +14,8 @@ LIBDIR = ../lib
GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
+OSMESA_LIBS = -L$(LIBDIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
+
LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
PROGS = bounce \
@@ -62,9 +64,14 @@ PROGS = bounce \
.SUFFIXES:
.SUFFIXES: .c
+
+# make executable from .c file:
.c: $(LIB_DEP)
$(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
+# special case: need the -lOSMesa library:
+osdemo: osdemo.c
+ $(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
##### TARGETS #####