diff options
| author | Ian Romanick <[email protected]> | 2010-08-13 13:08:54 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2010-08-13 14:50:53 -0700 |
| commit | ab18be74ac5f95ba1ebe6a52259d77e0940b2dbd (patch) | |
| tree | 631bb08fb96107280ec03107dfa9bf06aba27b83 | |
| parent | c33e78f62bed762d8e5987e111a6e0424dc26c76 (diff) | |
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.
| -rw-r--r-- | src/glsl/Makefile | 4 | ||||
| -rw-r--r-- | src/glsl/glcpp/glcpp-lex.l | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile index 3e480685bdf..2f62517e95d 100644 --- 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 fa628913540..1cd95b238d2 100644 --- 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 |