Mesa (glsl2): glsl2: Add the API defines to the glsl2 build so we get the right GLcontext

[Eric Anholt]

Module: Mesa
Branch: glsl2
Commit: a711ad6bf2407f63110de8e8f216eacd09dd8e82
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a711ad6bf2407f63110de8e8f216eacd09dd8e82

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jul 22 15:17:23 2010 -0700

glsl2: Add the API defines to the glsl2 build so we get the right GLcontext

Fixes:
draw_buffers-08.frag
draw_buffers-09.frag
glsl-vs-texturematrix-2

---

 src/glsl/Makefile |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 47292bd..f4b0fb5 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -81,6 +81,10 @@ GLSL2_OBJECTS = \
 
 ### Basic defines ###
 
+DEFINES = \
+	$(LIBRARY_DEFINES) \
+	$(API_DEFINES)
+
 GLCPP_OBJECTS = \
 	$(GLCPP_SOURCES:.c=.o) \
 	../mesa/shader/hash_table.o
@@ -134,10 +138,10 @@ glcpp/glcpp: $(GLCPP_OBJECTS) libglsl.a
 	$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) $(LIBS) -o $@
 
 .cpp.o:
-	$(CXX) -c $(INCLUDES) $(CXXFLAGS) $(LIBRARY_DEFINES) $< -o $@
+	$(CXX) -c $(INCLUDES) $(CXXFLAGS) $(DEFINES) $< -o $@
 
 .c.o:
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@
+	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 
 glsl_lexer.cpp: glsl_lexer.lpp
 	flex --never-interactive --outfile="$@"  $<