diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-20 16:33:58 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-20 16:37:03 +0100 |
| commit | fc83ab987c84518c31793515c4f99a0df8ccd1cc (patch) | |
| tree | 2f8e01251e2faba8369f28b85ba9c48de87136c6 /mesalib/windows | |
| parent | 96f2a4b36eb811fa1f12dcde03bffc86cfd1781d (diff) | |
| download | vcxsrv-fc83ab987c84518c31793515c4f99a0df8ccd1cc.tar.gz vcxsrv-fc83ab987c84518c31793515c4f99a0df8ccd1cc.tar.bz2 vcxsrv-fc83ab987c84518c31793515c4f99a0df8ccd1cc.zip | |
Solved compile problems due to latest merge
Diffstat (limited to 'mesalib/windows')
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 6 | ||||
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index 59bed9019..1067a177d 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -198,6 +198,7 @@ <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\format_pack.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\glformats.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\hash_table.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\pack.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\querymatrix.c" />
@@ -243,7 +244,10 @@ <ClCompile Include="..\..\..\..\src\mesa\main\get.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\getstring.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\hash.c" />
- <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">
+ <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)/hash_table_program.obj</ObjectFileName>
+ <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)/hash_table_program.obj</ObjectFileName>
+ </ClCompile>
<ClCompile Include="..\..\..\..\src\mesa\program\ir_to_mesa.cpp" />
<ClCompile Include="..\..\..\..\src\mesa\program\string_to_uint_map.cpp" />
<ClCompile Include="..\..\..\..\src\mesa\program\lex.yy.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 2010982ca..633a706b9 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -404,9 +404,6 @@ <ClCompile Include="..\..\..\..\src\mesa\program\prog_statevars.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\mesa\program\lex.yy.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -704,6 +701,12 @@ <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\hash_table.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\program\hash_table.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">
|