* demos/Makefile.am (INCLUDES): Added -I$(top_srcdir)/util.

[mesa.git] / progs / demos / Makefile.X11

diff --git a/progs/demos/Makefile.X11 b/progs/demos/Makefile.X11
index 3a476248df7392c1eb0a49cde5d9427a17e41e19..41175a1c57494ce9ee5bed41a737d894e0f40c69 100644 (file)
--- a/progs/demos/Makefile.X11
+++ b/progs/demos/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.12 2000/05/30 01:19:49 brianp Exp $
+# $Id: Makefile.X11,v 1.16 2000/12/24 22:53:54 pesco 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,12 +14,49 @@ 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 clearspd cubemap drawpix gamma gears geartrain glinfo gloss \
-       glutfx isosurf lodbias morph3d multiarb occlude osdemo paltex \
-       pixeltex pointblast readpix reflect renormal spectex stex3d \
-       tessdemo texcyl texdown texobj trispd winpos
+PROGS = bounce \
+       clearspd \
+       cubemap \
+       drawpix \
+       fire \
+       gamma \
+       gears \
+       geartrain \
+       glinfo \
+       gloss \
+       gltestperf \
+       glutfx \
+       isosurf \
+       ipers \
+       lodbias \
+       morph3d \
+       multiarb \
+       occlude \
+       osdemo \
+       paltex \
+       pixeltex \
+       pointblast \
+       ray \
+       readpix \
+       reflect \
+       renormal \
+       spectex \
+       stex3d \
+       teapot \
+       terrain \
+       tessdemo \
+       texcyl \
+       texdown \
+       texenv \
+       texobj \
+       trispd \
+       tunnel \
+       tunnel2 \
+       winpos
 
 
 ##### RULES #####
@@ -27,9 +64,14 @@ PROGS = bounce clearspd cubemap drawpix gamma gears geartrain glinfo gloss \
 .SUFFIXES:
 .SUFFIXES: .c
 
+
+# make executable from .c file:
 .c: $(LIB_DEP)
-       $(CC) -I$(INCDIR) $(CFLAGS) $< $(GL_LIBS) -o $@
+       $(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
 
+# special case: need the -lOSMesa library:
+osdemo: osdemo.c
+       $(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
 
 
 ##### TARGETS #####