X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=progs%2Fglsl%2FMakefile;h=ce82468168d40b6c5e67f503823c03bb80760c1c;hb=33a1f495d4bb19288680b9812c6ec1235302d215;hp=c5d62d2370dadee135e75cbfd1597a45b8f16910;hpb=5aaeb13a768f0c7d3706f6c170901b118ae1aa2d;p=android-x86%2Fexternal-mesa.git

diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index c5d62d2370d..ce82468168d 100644
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -16,6 +16,7 @@ PROGS = \
 	convolutions \
 	deriv \
 	identity \
+	fragcoord \
 	mandelbrot \
 	multitex \
 	noise \
@@ -26,7 +27,7 @@ PROGS = \
 	toyball \
 	twoside \
 	trirast \
-	texdemo1 
+	vert-tex
 
 
 ##### RULES #####
@@ -115,6 +116,13 @@ identity: identity.o shaderutil.o
 	$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) identity.o shaderutil.o $(LIBS) -o $@
 
 
+fragcoord.o: fragcoord.c extfuncs.h shaderutil.h
+	$(CC) -c -I$(INCDIR) $(CFLAGS) fragcoord.c
+
+fragcoord: fragcoord.o shaderutil.o
+	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) fragcoord.o shaderutil.o $(LIBS) -o $@
+
+
 mandelbrot.o: mandelbrot.c extfuncs.h shaderutil.h
 	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) mandelbrot.c
 
@@ -181,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