diff options
| author | Brian Paul <[email protected]> | 2009-01-02 16:32:26 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-01-02 16:32:26 -0700 |
| commit | 0815ebccfc0a12d8f3e831928f1c4210b7f75ad8 (patch) | |
| tree | 1e7db7e1d44e741215e5b4b11d33df91fe5b39a0 /progs/glsl/Makefile | |
| parent | eb9bbc5265562cb6f93688fc027ea76f91601e37 (diff) | |
| parent | 1fad6ccb756ae33ca3115f59c99ca8abbeb0321e (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/main/ffvertex_prog.c
src/mesa/main/texenvprogram.c
Diffstat (limited to 'progs/glsl/Makefile')
| -rw-r--r-- | progs/glsl/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile index ff6359d0344..9c31ef67b01 100644 --- a/progs/glsl/Makefile +++ b/progs/glsl/Makefile @@ -23,6 +23,7 @@ PROGS = \ noise \ points \ pointcoord \ + samplers \ skinning \ texdemo1 \ toyball \ @@ -159,6 +160,13 @@ pointcoord: pointcoord.o readtex.o shaderutil.o $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) pointcoord.o readtex.o shaderutil.o $(LIBS) -o $@ +samplers.o: samplers.c readtex.h extfuncs.h shaderutil.h + $(CC) -c -I$(INCDIR) $(CFLAGS) samplers.c + +samplers: samplers.o readtex.o shaderutil.o + $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) samplers.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 |