From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed, 5 Nov 2008 11:59:12 +0000 (+0000)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2382dc8aff9983da9ef1be03de38d4ab82105b19;p=mesa.git

Merge commit 'origin/master' into gallium-0.2
---

2382dc8aff9983da9ef1be03de38d4ab82105b19
diff --cc progs/glsl/Makefile
index 04c1d25ed7f,41d58499195..0874cfc59e3
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@@ -142,17 -135,24 +143,24 @@@ points: points.o shaderutil.
  
  
  pointcoord.o: pointcoord.c readtex.h extfuncs.h shaderutil.h
 -	$(CC) -c -I$(INCDIR) $(CFLAGS) pointcoord.c
 +	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) pointcoord.c
  
  pointcoord: pointcoord.o readtex.o shaderutil.o
 -	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) pointcoord.o readtex.o shaderutil.o $(LIBS) -o $@
 +	$(APP_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
 +	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) texdemo1.c
  
  texdemo1: texdemo1.o readtex.o shaderutil.o
 -	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) texdemo1.o readtex.o shaderutil.o $(LIBS) -o $@
 +	$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) texdemo1.o readtex.o shaderutil.o $(LIBS) -o $@
  
  
  toyball.o: toyball.c extfuncs.h shaderutil.h