From d2bdfe9f8d895ac64619f7bc2f7443ce886146e9 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 2 Mar 2011 13:29:46 +0000 Subject: Solved build problem in mesa because dependency checking in VS in not working like expected. Now build the lex and bison files in the same script. --- mesalib/src/glsl/dobison.bat | 16 ---------------- mesalib/src/glsl/doflex.bat | 17 ----------------- mesalib/src/glsl/doflexbison.bat | 21 +++++++++++++++++++++ mesalib/src/mesa/program/dobison.bat | 13 ------------- mesalib/src/mesa/program/doflex.bat | 18 ------------------ mesalib/src/mesa/program/doflexbison.bat | 18 ++++++++++++++++++ .../glsl_apps_compile/glsl_apps_compile.vcxproj | 18 +++++++++--------- .../glsl_apps_compile.vcxproj.filters | 6 ++++-- mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 18 +++++++++--------- mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters | 6 ++++-- 10 files changed, 65 insertions(+), 86 deletions(-) delete mode 100644 mesalib/src/glsl/dobison.bat delete mode 100644 mesalib/src/glsl/doflex.bat create mode 100644 mesalib/src/glsl/doflexbison.bat delete mode 100644 mesalib/src/mesa/program/dobison.bat delete mode 100644 mesalib/src/mesa/program/doflex.bat create mode 100644 mesalib/src/mesa/program/doflexbison.bat diff --git a/mesalib/src/glsl/dobison.bat b/mesalib/src/glsl/dobison.bat deleted file mode 100644 index 72fde0ade..000000000 --- a/mesalib/src/glsl/dobison.bat +++ /dev/null @@ -1,16 +0,0 @@ -@echo off -setlocal - -cd "%~dp0" - -set M4=..\..\..\tools\mhmake\m4.exe - -set BISON_PKGDATADIR=../../../tools/mhmake/src/bisondata - -..\..\..\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 - - -endlocal - diff --git a/mesalib/src/glsl/doflex.bat b/mesalib/src/glsl/doflex.bat deleted file mode 100644 index 9a0c71200..000000000 --- a/mesalib/src/glsl/doflex.bat +++ /dev/null @@ -1,17 +0,0 @@ -@echo off -setlocal - -cd "%~dp0" - -set M4=..\..\..\tools\mhmake\m4.exe - -set path=..\..\..\tools\mhmake;%path% - -copy "..\..\..\tools\mhmake\flex++.exe" flex.exe - -flex.exe --nounistd -oglsl_lexer.cpp glsl_lexer.ll -flex.exe --nounistd -oglcpp/glcpp-lex.c glcpp/glcpp-lex.l -del flex.exe - -endlocal - diff --git a/mesalib/src/glsl/doflexbison.bat b/mesalib/src/glsl/doflexbison.bat new file mode 100644 index 000000000..8a5e4f0a6 --- /dev/null +++ b/mesalib/src/glsl/doflexbison.bat @@ -0,0 +1,21 @@ +@echo off +setlocal + +cd "%~dp0" + +set M4=..\..\..\tools\mhmake\m4.exe +set BISON_PKGDATADIR=../../../tools/mhmake/src/bisondata + +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 + +copy "..\..\..\tools\mhmake\flex++.exe" flex.exe +flex.exe --nounistd -oglsl_lexer.cpp glsl_lexer.ll +flex.exe --nounistd -oglcpp/glcpp-lex.c glcpp/glcpp-lex.l +del flex.exe + +endlocal + diff --git a/mesalib/src/mesa/program/dobison.bat b/mesalib/src/mesa/program/dobison.bat deleted file mode 100644 index 33f27a235..000000000 --- a/mesalib/src/mesa/program/dobison.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off -setlocal - -cd "%~dp0" - -set M4=..\..\..\..\tools\mhmake\m4.exe - -set BISON_PKGDATADIR=../../../../tools/mhmake/src/bisondata - -..\..\..\..\tools\mhmake\bison.exe -v -d --output=program_parse.tab.c program_parse.y - -endlocal - diff --git a/mesalib/src/mesa/program/doflex.bat b/mesalib/src/mesa/program/doflex.bat deleted file mode 100644 index bd3ccb0e0..000000000 --- a/mesalib/src/mesa/program/doflex.bat +++ /dev/null @@ -1,18 +0,0 @@ -@echo off -setlocal - -cd "%~dp0" - -set M4=..\..\..\..\tools\mhmake\m4.exe - -set path=..\..\..\..\tools\mhmake;%path% - -copy "..\..\..\..\tools\mhmake\flex++.exe" flex.exe - - -flex.exe --never-interactive --outfile=lex.yy.c program_lexer.l - -del flex.exe - -endlocal - diff --git a/mesalib/src/mesa/program/doflexbison.bat b/mesalib/src/mesa/program/doflexbison.bat new file mode 100644 index 000000000..d54e5ac65 --- /dev/null +++ b/mesalib/src/mesa/program/doflexbison.bat @@ -0,0 +1,18 @@ +@echo off +setlocal + +cd "%~dp0" + +set M4=..\..\..\..\tools\mhmake\m4.exe +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 + +copy "..\..\..\..\tools\mhmake\flex++.exe" flex.exe +flex.exe --never-interactive --outfile=lex.yy.c program_lexer.l +del flex.exe + +endlocal + diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj index daf50521e..c34f08e20 100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj @@ -168,20 +168,20 @@ Document - ..\..\..\..\src\glsl\doflex.bat - ..\..\..\..\src\glsl\glsl_lexer.cpp ..\..\..\..\src\glsl\glcpp\glcpp-lex.c - ..\..\..\..\src\glsl\doflex.bat - ..\..\..\..\src\glsl\glsl_lexer.cpp ..\..\..\..\src\glsl\glcpp\glcpp-lex.c - ..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.h;%(AdditionalInputs) - ..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.h;%(AdditionalInputs) + ..\..\..\..\src\glsl\doflexbison.bat + ..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h + ..\..\..\..\src\glsl\doflexbison.bat + ..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h + ..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs) + ..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs) - - Document + ..\..\..\..\src\glsl\dobison.bat ..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h ..\..\..\..\src\glsl\dobison.bat ..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h - + Document + diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters index d087667c0..57c32b876 100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters @@ -238,8 +238,10 @@ Source Files - + + + Source Files - + \ No newline at end of file diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index c1fc109ca..4705b413d 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -336,20 +336,20 @@ Document - ..\..\..\..\src\mesa\program\doflex.bat - ..\..\..\..\src\mesa\program\lex.yy.c;%(Outputs) - ..\..\..\..\src\mesa\program\doflex.bat - ..\..\..\..\src\mesa\program\lex.yy.c;%(Outputs) - ..\..\..\..\src\mesa\program\program_parse.tab.h;%(AdditionalInputs) - ..\..\..\..\src\mesa\program\program_parse.tab.h;%(AdditionalInputs) + ..\..\..\..\src\mesa\program\doflexbison.bat + ..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs) + ..\..\..\..\src\mesa\program\doflexbison.bat + ..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs) + ..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs) + ..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs) - - Document + ..\..\..\..\src\mesa\program\dobison.bat ..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs) ..\..\..\..\src\mesa\program\dobison.bat ..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs) - + Document + diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 7b2efa709..2c1aa68db 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -672,8 +672,10 @@ Source Files - + + + Source Files - + \ No newline at end of file -- cgit v1.2.3