fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 02:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
Fixes:
draw_buffers-08.frag
draw_buffers-09.frag
glsl-vs-texturematrix-2
This commit is contained in:
Eric Anholt 2010-07-22 15:17:23 -07:00
parent 1bef4c8c4b
commit a711ad6bf2
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/glsl/Makefile
View file

@ -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="$@" $<