From aab429c8df228271786890691a43786baf091b37 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 4 Nov 2008 16:56:59 -0700 Subject: added glsl/skinning.c test to test matrix blending/weighting --- progs/glsl/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'progs/glsl/Makefile') diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile index 850b6bdbd1c..41d58499195 100644 --- a/progs/glsl/Makefile +++ b/progs/glsl/Makefile @@ -20,6 +20,7 @@ PROGS = \ noise \ points \ pointcoord \ + skinning \ texdemo1 \ toyball \ twoside \ @@ -140,6 +141,13 @@ pointcoord: pointcoord.o readtex.o shaderutil.o $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) pointcoord.o readtex.o shaderutil.o $(LIBS) -o $@ +skinning.o: skinning.c readtex.h extfuncs.h shaderutil.h + $(CC) -c -I$(INCDIR) $(CFLAGS) skinning.c + +skinning: skinning.o readtex.o shaderutil.o + $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) skinning.o readtex.o shaderutil.o $(LIBS) -o $@ + + texdemo1.o: texdemo1.c readtex.h extfuncs.h shaderutil.h $(CC) -c -I$(INCDIR) $(CFLAGS) texdemo1.c -- cgit v1.2.3 From 2c204bbf7749ed0517c5826e2aae66997a0c4623 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 5 Nov 2008 17:14:23 -0700 Subject: use APP_CC, not CC for skinning demo --- progs/glsl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'progs/glsl/Makefile') diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile index 0874cfc59e3..c5d62d2370d 100644 --- a/progs/glsl/Makefile +++ b/progs/glsl/Makefile @@ -150,10 +150,10 @@ pointcoord: pointcoord.o readtex.o shaderutil.o skinning.o: skinning.c readtex.h extfuncs.h shaderutil.h - $(CC) -c -I$(INCDIR) $(CFLAGS) skinning.c + $(APP_CC) -c -I$(INCDIR) $(CFLAGS) skinning.c skinning: skinning.o readtex.o shaderutil.o - $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) skinning.o readtex.o shaderutil.o $(LIBS) -o $@ + $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) skinning.o readtex.o shaderutil.o $(LIBS) -o $@ texdemo1.o: texdemo1.c readtex.h extfuncs.h shaderutil.h -- cgit v1.2.3