From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Dec 2008 23:56:56 +0000 (-0700)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=58a82ee57f1e1e67387dd860ac253223db250789;p=mesa.git

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

58a82ee57f1e1e67387dd860ac253223db250789
diff --cc progs/glsl/Makefile
index 0849223cd82,a944abe9085..ff6359d0344
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@@ -188,25 -181,25 +188,33 @@@ twoside: twoside.o shaderutil.
  
  
  trirast.o: trirast.c extfuncs.h shaderutil.h
 -	$(CC) -c -I$(INCDIR) $(CFLAGS) trirast.c
 +	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) trirast.c
  
  trirast: trirast.o shaderutil.o
 -	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
 +	$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
 +
 +
 +vert-or-frag-only.o: vert-or-frag-only.c extfuncs.h shaderutil.h
 +	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) vert-or-frag-only.c
 +
 +vert-or-frag-only: vert-or-frag-only.o shaderutil.o
 +	$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-or-frag-only.o shaderutil.o $(LIBS) -o $@
 +
  
  
+ vert-or-frag-only.o: vert-or-frag-only.c extfuncs.h shaderutil.h
+ 	$(CC) -c -I$(INCDIR) $(CFLAGS) vert-or-frag-only.c
+ 
+ vert-or-frag-only: vert-or-frag-only.o shaderutil.o
+ 	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-or-frag-only.o shaderutil.o $(LIBS) -o $@
+ 
+ 
+ 
  vert-tex.o: vert-tex.c extfuncs.h shaderutil.h
 -	$(CC) -c -I$(INCDIR) $(CFLAGS) vert-tex.c
 +	$(APP_CC) -c -I$(INCDIR) $(CFLAGS) vert-tex.c
  
  vert-tex: vert-tex.o shaderutil.o
 -	$(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-tex.o shaderutil.o $(LIBS) -o $@
 +	$(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-tex.o shaderutil.o $(LIBS) -o $@