diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-08 14:29:50 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-12-08 14:29:50 +0000 |
| commit | 33a1f495d4bb19288680b9812c6ec1235302d215 (patch) | |
| tree | d47067fe24d530c660b75ee80cdcec72f10d9ed0 /progs/glsl/Makefile | |
| parent | bcd5dda4358a5e47551278477bd00d2c63415c44 (diff) | |
| parent | bdc8ac4426f00eaafbe8ca0d356563efe390294d (diff) | |
| download | external_mesa3d-33a1f495d4bb19288680b9812c6ec1235302d215.zip external_mesa3d-33a1f495d4bb19288680b9812c6ec1235302d215.tar.gz external_mesa3d-33a1f495d4bb19288680b9812c6ec1235302d215.tar.bz2 | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'progs/glsl/Makefile')
| -rw-r--r-- | progs/glsl/Makefile | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile index 9f5a2b7..ce82468 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 |