summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-07-22 15:17:23 -0700
committerEric Anholt <eric@anholt.net>2010-07-22 15:22:57 -0700
commita711ad6bf2407f63110de8e8f216eacd09dd8e82 (patch)
treecbabc69d7979dc23f9d81ff2957cc5ecfc473b4c /src
parent1bef4c8c4bc11e7f4150500def6e6a4291ceb587 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/glsl/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 47292bdb15..f4b0fb55a7 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="$@" $<