From ab18be74ac5f95ba1ebe6a52259d77e0940b2dbd Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 13 Aug 2010 13:08:54 -0700
Subject: 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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/glsl/Makefile')

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 3e480685bd..2f62517e95 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 $<
-- 
cgit v1.2.3