Mesa (glsl2): glsl2: Use --nounistd to fix MSVC build
Ian Romanick
idr at kemper.freedesktop.org
Fri Aug 13 22:56:05 UTC 2010
Module: Mesa
Branch: glsl2
Commit: ab18be74ac5f95ba1ebe6a52259d77e0940b2dbd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab18be74ac5f95ba1ebe6a52259d77e0940b2dbd
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Aug 13 13:08:54 2010 -0700
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.
---
src/glsl/Makefile | 4 ++--
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 3e48068..2f62517 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 fa62891..1cd95b2 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
More information about the mesa-commit
mailing list