summaryrefslogtreecommitdiff
path: root/progs/glsl/Makefile
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2008-12-08 14:29:50 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2008-12-08 14:29:50 +0000
commit33a1f495d4bb19288680b9812c6ec1235302d215 (patch)
treed47067fe24d530c660b75ee80cdcec72f10d9ed0 /progs/glsl/Makefile
parentbcd5dda4358a5e47551278477bd00d2c63415c44 (diff)
parentbdc8ac4426f00eaafbe8ca0d356563efe390294d (diff)
Merge commit 'origin/master' into gallium-0.2
Conflicts: progs/glsl/Makefile
Diffstat (limited to 'progs/glsl/Makefile')
-rw-r--r--progs/glsl/Makefile14
1 files changed, 13 insertions, 1 deletions
diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index 9f5a2b7df5..ce82468168 100644
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -27,7 +27,7 @@ PROGS = \
toyball \
twoside \
trirast \
- texdemo1
+ vert-tex
##### RULES #####
@@ -189,7 +189,19 @@ trirast.o: trirast.c extfuncs.h shaderutil.h
$(APP_CC) -c -I$(INCDIR) $(CFLAGS) trirast.c
trirast: trirast.o shaderutil.o
+<<<<<<< HEAD:progs/glsl/Makefile
$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
+=======
+ $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
+
+
+vert-tex.o: vert-tex.c extfuncs.h shaderutil.h
+ $(CC) -c -I$(INCDIR) $(CFLAGS) vert-tex.c
+
+vert-tex: vert-tex.o shaderutil.o
+ $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-tex.o shaderutil.o $(LIBS) -o $@
+
+>>>>>>> origin/master:progs/glsl/Makefile