aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-18 08:37:12 +0200
committermarha <marha@users.sourceforge.net>2012-09-18 08:37:12 +0200
commit821b51e814fe14d35f3807c525e4387022b9ed80 (patch)
tree45ef5cf78ad36c9bb833a36f857582ff049e7a2b /mesalib/src
parentd7ddd6ead83965a10d450a580a9b6042c7b86f38 (diff)
downloadvcxsrv-821b51e814fe14d35f3807c525e4387022b9ed80.tar.gz
vcxsrv-821b51e814fe14d35f3807c525e4387022b9ed80.tar.bz2
vcxsrv-821b51e814fe14d35f3807c525e4387022b9ed80.zip
Added -p option to bison command lines to avoid link problems
Diffstat (limited to 'mesalib/src')
-rw-r--r--mesalib/src/glsl/doflexbison.bat2
-rw-r--r--mesalib/src/mesa/program/doflexbison.bat2
2 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/doflexbison.bat b/mesalib/src/glsl/doflexbison.bat
index 8a5e4f0a6..28cf2706b 100644
--- a/mesalib/src/glsl/doflexbison.bat
+++ b/mesalib/src/glsl/doflexbison.bat
@@ -10,7 +10,7 @@ set path=..\..\..\tools\mhmake;%path%
..\..\..\tools\mhmake\bison.exe -v -o glsl_parser.cpp -p "_mesa_glsl_" --defines=glsl_parser.h glsl_parser.yy
-..\..\..\tools\mhmake\bison.exe -v -o glcpp/glcpp-parse.c --defines=glcpp/glcpp-parse.h glcpp/glcpp-parse.y
+..\..\..\tools\mhmake\bison.exe -v -o glcpp/glcpp-parse.c -d -p "glcpp_parser_" --defines=glcpp/glcpp-parse.h glcpp/glcpp-parse.y
copy "..\..\..\tools\mhmake\flex++.exe" flex.exe
flex.exe --nounistd -oglsl_lexer.cpp glsl_lexer.ll
diff --git a/mesalib/src/mesa/program/doflexbison.bat b/mesalib/src/mesa/program/doflexbison.bat
index d54e5ac65..b39b53cf8 100644
--- a/mesalib/src/mesa/program/doflexbison.bat
+++ b/mesalib/src/mesa/program/doflexbison.bat
@@ -8,7 +8,7 @@ set BISON_PKGDATADIR=../../../../tools/mhmake/src/bisondata
set path=..\..\..\..\tools\mhmake;%path%
-..\..\..\..\tools\mhmake\bison.exe -v -d --output=program_parse.tab.c program_parse.y
+..\..\..\..\tools\mhmake\bison.exe -v -d -p "_mesa_program_" --output=program_parse.tab.c program_parse.y
copy "..\..\..\..\tools\mhmake\flex++.exe" flex.exe
flex.exe --never-interactive --outfile=lex.yy.c program_lexer.l