glsl2: Use --nounistd to fix MSVC build

Also remove the --never-interactive command line option for the
preprocessor lexer.  This was already done for main compiler lexer.

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 3e480685bdfa881fec284fdad4a0a997fda9e8a1..2f62517e95dcdc92089c8c47fdd2b2b4b9d516e3 100644 (file)
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -151,13 +151,13 @@ glcpp/glcpp: $(GLCPP_OBJECTS) libglsl.a
        $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 
 glsl_lexer.cpp: glsl_lexer.lpp
-       flex -o$@  $<
+       flex --nounistd -o$@  $<
 
 glsl_parser.cpp: glsl_parser.ypp
        bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
 
 glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
-       flex --never-interactive --outfile="$@" $<
+       flex --nounistd -o$@  $<
 
 glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
        bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<

diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index fa6289135400841621e913f69a47738e34214f8f..1cd95b238d2f0de8d05b3c363f294d3656a2e5b3 100644 (file)
--- a/src/glsl/glcpp/glcpp-lex.l
+++ b/src/glsl/glcpp/glcpp-lex.l
@@ -50,6 +50,7 @@ void glcpp_set_column (int  column_no , yyscan_t yyscanner);
 %option extra-type="glcpp_parser_t *"
 %option prefix="glcpp_"
 %option stack
+%option never-interactive
 
 %x DONE COMMENT UNREACHABLE