Merge branch 'mesa_7_6_branch'

[mesa.git] / progs / demos / Makefile

diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index a1c99c6c545fc1920b926ce4c3d13491dcf9c007..65fdbaaad8e5d20863b924a8e8223cc37f95a10d 100644 (file)
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -19,6 +19,7 @@ PROGS = \
        clearspd \
        copypix \
        cubemap \
+       dinoshade \
        drawpix \
        engine \
        fbo_firecube \
@@ -41,6 +42,7 @@ PROGS = \
        multiarb \
        paltex \
        pointblast \
+       projtex \
        rain \
        ray \
        readpix \
@@ -56,7 +58,6 @@ PROGS = \
        tessdemo \
        texcyl \
        texenv \
-       texobj \
        textures \
        trispd \
        tunnel \
@@ -144,6 +145,13 @@ engine.o: engine.c trackball.h
        $(APP_CC) -c -I$(INCDIR) $(CFLAGS) engine.c
 
 
+fbotexture: fbotexture.o
+       $(APP_CC) $(CFLAGS) $(LDFLAGS) fbotexture.o $(LIBS) -o $@
+
+fbotexture.o: fbotexture.c extfuncs.h
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) fbotexture.c
+
+
 fslight: fslight.o
        $(APP_CC) $(CFLAGS) $(LDFLAGS) fslight.o $(LIBS) -o $@