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 | 6f270bf3e235274cdf061285c50bbacaa312511d (patch) | |
| tree | 9b672d23458334abc6358a233205332e9dd02b88 /src | |
| parent | 0064e5c662e39f2efe9d53a9a8604a37aa53f9f8 (diff) | |
| parent | 5e10cd9902f0646f7ce0e373aa2b5daf805b3aea (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile index 9f5a2b7d..5419dfc7 100644 --- a/src/glsl/Makefile +++ b/src/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 |