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

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 47292bdb156f941ce41bb5c9f227899603c9047c..f4b0fb55a784bce76acac67dca3bb9d31a4c7ec3 100644 (file)
--- 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="$@"  $<