diff options
author | marha <marha@users.sourceforge.net> | 2011-03-02 13:29:46 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-03-02 13:29:46 +0000 |
commit | d2bdfe9f8d895ac64619f7bc2f7443ce886146e9 (patch) | |
tree | ca81fc6e4d669bcdb9cda75b76aa9ff8cafe844e /mesalib/windows/VC8/mesa/glsl_apps_compile | |
parent | 8cb75221034e881472c2463819b71f8bf6876345 (diff) | |
download | vcxsrv-d2bdfe9f8d895ac64619f7bc2f7443ce886146e9.tar.gz vcxsrv-d2bdfe9f8d895ac64619f7bc2f7443ce886146e9.tar.bz2 vcxsrv-d2bdfe9f8d895ac64619f7bc2f7443ce886146e9.zip |
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.
Diffstat (limited to 'mesalib/windows/VC8/mesa/glsl_apps_compile')
-rw-r--r-- | mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj | 18 | ||||
-rw-r--r-- | mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters | 6 |
2 files changed, 13 insertions, 11 deletions
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 |