fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 20:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl2: Use --nounistd to fix MSVC build

Browse source 
Also remove the --never-interactive command line option for the
preprocessor lexer.  This was already done for main compiler lexer.
This commit is contained in:
Ian Romanick 2010-08-13 13:08:54 -07:00
parent c33e78f62b
commit ab18be74ac
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/glsl/Makefile
View file

@ -151,13 +151,13 @@ glcpp/glcpp: $(GLCPP_OBJECTS) libglsl.a
$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
glsl_lexer.cpp: glsl_lexer.lpp glsl_lexer.cpp: glsl_lexer.lpp
flex -o$@ $< flex --nounistd -o$@ $<
glsl_parser.cpp: glsl_parser.ypp glsl_parser.cpp: glsl_parser.ypp
bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $< bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
glcpp/glcpp-lex.c: glcpp/glcpp-lex.l glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
flex --never-interactive --outfile="$@" $< flex --nounistd -o$@ $<
glcpp/glcpp-parse.c: glcpp/glcpp-parse.y glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
bison -v -o "$@" --defines=glcpp/glcpp-parse.h $< bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<

1
src/glsl/glcpp/glcpp-lex.l
View file

@ -50,6 +50,7 @@ void glcpp_set_column (int column_no , yyscan_t yyscanner);
%option extra-type="glcpp_parser_t *" %option extra-type="glcpp_parser_t *"
%option prefix="glcpp_" %option prefix="glcpp_"
%option stack %option stack
%option never-interactive
%x DONE COMMENT UNREACHABLE %x DONE COMMENT UNREACHABLE