diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-01-19 10:15:04 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-01-19 10:15:04 +0000 |
| commit | b5db6b039c34117be4e441a2b95abbf97df928c3 (patch) | |
| tree | 8efb8698304b70f67cc408e8d12b93ae01a13015 /progs/glsl/Makefile | |
| parent | 8f3fac6107460b6d9b011b5c76246468bb16004b (diff) | |
| parent | 76753e30781e88912c0465642616ab16bbc1b4f3 (diff) | |
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
Diffstat (limited to 'progs/glsl/Makefile')
| -rw-r--r-- | progs/glsl/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile index a39170b8c9..7099eeadbd 100644 --- a/progs/glsl/Makefile +++ b/progs/glsl/Makefile @@ -24,6 +24,7 @@ PROGS = \ points \ pointcoord \ samplers \ + samplers_array \ skinning \ texdemo1 \ toyball \ @@ -166,6 +167,11 @@ samplers.o: samplers.c readtex.h extfuncs.h shaderutil.h samplers: samplers.o readtex.o shaderutil.o $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) samplers.o readtex.o shaderutil.o $(LIBS) -o $@ +samplers_array.o: samplers.c readtex.h extfuncs.h shaderutil.h + $(APP_CC) -c -DSAMPLERS_ARRAY -I$(INCDIR) $(CFLAGS) samplers.c -o samplers_array.o + +samplers_array: samplers_array.o readtex.o shaderutil.o + $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) samplers_array.o readtex.o shaderutil.o $(LIBS) -o $@ skinning.o: skinning.c readtex.h extfuncs.h shaderutil.h $(APP_CC) -c -I$(INCDIR) $(CFLAGS) skinning.c |