From fc83ab987c84518c31793515c4f99a0df8ccd1cc Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 20 Nov 2012 16:33:58 +0100
Subject: Solved compile problems due to latest merge

---
 mesalib/windows/VC8/mesa/mesa/mesa.vcxproj         | 6 +++++-
 mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters | 9 ++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'mesalib/windows/VC8/mesa')

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">
-- 
cgit v1.2.3