diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-24 14:08:58 -0700 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-24 14:08:58 -0700 |
| commit | df6155fcff66034457b3165f5df0a61ccfc41314 (patch) | |
| tree | 533a3edc14a84d654ce5dd1f2eb305a42a138991 /progs | |
| parent | 868c607c1751fc3e6df1a8dc45e8b70e6bc315f6 (diff) | |
| parent | b730d0d3e9b202b17a0815cb820fc9905f35cb98 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/glsl/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile index 9f5a2b7df5..5419dfc7f4 100644 --- a/progs/glsl/Makefile +++ b/progs/glsl/Makefile @@ -123,6 +123,13 @@ fragcoord: fragcoord.o shaderutil.o $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) fragcoord.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 |