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.

8 files changed, 35 insertions, 56 deletions

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/dobison.bat b/mesalib/src/glsl/doflexbison.bat
index 72fde0ade..8a5e4f0a6 100644
--- a/mesalib/src/glsl/dobison.bat
+++ b/mesalib/src/glsl/doflexbison.bat
@@ -4,13 +4,18 @@ 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/doflexbison.bat
index bd3ccb0e0..d54e5ac65 100644
--- a/mesalib/src/mesa/program/doflex.bat
+++ b/mesalib/src/mesa/program/doflexbison.bat
@@ -4,14 +4,14 @@ setlocal
 cd "%~dp0"

 

 set M4=..\..\..\..\tools\mhmake\m4.exe

+set BISON_PKGDATADIR=../../../../tools/mhmake/src/bisondata

 

 set path=..\..\..\..\tools\mhmake;%path%

 

-copy "..\..\..\..\tools\mhmake\flex++.exe" flex.exe

+..\..\..\..\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 @@
   <ItemGroup>

     <CustomBuild Include="..\..\..\..\src\glsl\glsl_lexer.ll">

       <FileType>Document</FileType>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\doflex.bat</Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_lexer.cpp ..\..\..\..\src\glsl\glcpp\glcpp-lex.c</Outputs>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\doflex.bat</Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_lexer.cpp ..\..\..\..\src\glsl\glcpp\glcpp-lex.c</Outputs>

-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.h;%(AdditionalInputs)</AdditionalInputs>

-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.h;%(AdditionalInputs)</AdditionalInputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\doflexbison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\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</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\doflexbison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\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</Outputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs>

     </CustomBuild>

-    <CustomBuild Include="..\..\..\..\src\glsl\glsl_parser.yy">

-      <FileType>Document</FileType>

+    <None Include="..\..\..\..\src\glsl\glsl_parser.yy">

       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\dobison.bat</Command>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>

       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\dobison.bat</Command>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>

-    </CustomBuild>

+      <FileType>Document</FileType>

+    </None>

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

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 @@
     <CustomBuild Include="..\..\..\..\src\glsl\glsl_lexer.ll">

       <Filter>Source Files</Filter>

     </CustomBuild>

-    <CustomBuild Include="..\..\..\..\src\glsl\glsl_parser.yy">

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\..\..\src\glsl\glsl_parser.yy">

       <Filter>Source Files</Filter>

-    </CustomBuild>

+    </None>

   </ItemGroup>

 </Project>
\ 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 @@
   <ItemGroup>

     <CustomBuild Include="..\..\..\..\src\mesa\program\program_lexer.l">

       <FileType>Document</FileType>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\doflex.bat</Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\lex.yy.c;%(Outputs)</Outputs>

-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\doflex.bat</Command>

-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\lex.yy.c;%(Outputs)</Outputs>

-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\program_parse.tab.h;%(AdditionalInputs)</AdditionalInputs>

-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\program_parse.tab.h;%(AdditionalInputs)</AdditionalInputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\doflexbison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>

+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\doflexbison.bat</Command>

+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs>

     </CustomBuild>

-    <CustomBuild Include="..\..\..\..\src\mesa\program\program_parse.y">

-      <FileType>Document</FileType>

+    <None Include="..\..\..\..\src\mesa\program\program_parse.y">

       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\dobison.bat</Command>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>

       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\dobison.bat</Command>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>

-    </CustomBuild>

+      <FileType>Document</FileType>

+    </None>

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

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 @@
     <CustomBuild Include="..\..\..\..\src\mesa\program\program_lexer.l">

       <Filter>Source Files</Filter>

     </CustomBuild>

-    <CustomBuild Include="..\..\..\..\src\mesa\program\program_parse.y">

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="..\..\..\..\src\mesa\program\program_parse.y">

       <Filter>Source Files</Filter>

-    </CustomBuild>

+    </None>

   </ItemGroup>

 </Project>
\ No newline at end of file