summaryrefslogtreecommitdiff
path: root/progs/demos/Makefile
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-06-12 12:09:34 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-06-12 12:09:34 -0400
commit1036ef2bf468611d37b5df06fc4424f2002e3837 (patch)
treef0859a6d903c2570a0a00c918da88139f8f7d065 /progs/demos/Makefile
parent917f8bc1a85e61311cef6478127b387df70fba14 (diff)
parent1cd0afffc9edbcac690f8ab436aecfced26b0aba (diff)
Merge master and fix conflicts
Diffstat (limited to 'progs/demos/Makefile')
-rw-r--r--progs/demos/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index 32c6072123..c17595ec79 100644
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -19,9 +19,11 @@ PROGS = \
clearspd \
copypix \
cubemap \
+ dinoshade \
drawpix \
engine \
fbo_firecube \
+ fbotexture \
fire \
fogcoord \
fplight \
@@ -32,9 +34,7 @@ PROGS = \
geartrain \
glinfo \
gloss \
- glslnoise \
gltestperf \
- glutfx \
isosurf \
ipers \
lodbias \
@@ -42,6 +42,7 @@ PROGS = \
multiarb \
paltex \
pointblast \
+ projtex \
rain \
ray \
readpix \
@@ -49,7 +50,6 @@ PROGS = \
renormal \
shadowtex \
singlebuffer \
- streaming_rect \
spectex \
spriteblast \
stex3d \
@@ -57,9 +57,7 @@ PROGS = \
terrain \
tessdemo \
texcyl \
- texdown \
texenv \
- texobj \
textures \
trispd \
tunnel \