From cb043e6091c966fa8b772ec86fbc026ddcac9d87 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 18 Nov 2013 10:34:28 +0100
Subject: Solved link error due to latest merge

---
 libX11/libX11.def                                                      | 1 +
 mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj   | 1 +
 .../VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters       | 3 +++
 mesalib/windows/VC8/mesa/mesa/mesa.vcxproj                             | 1 +
 mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters                     | 3 +++
 5 files changed, 9 insertions(+)

diff --git a/libX11/libX11.def b/libX11/libX11.def
index 22d3eb9e2..9d2977e93 100644
--- a/libX11/libX11.def
+++ b/libX11/libX11.def
@@ -4,6 +4,7 @@ EXPORTS
   _XAllocTemp
   _XDeqAsyncHandler
   _XEatData
+  _XEatDataWords
   _XFlushGCCache
   _XFlushIt
   _XFreeTemp
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 382544612..a27071af0 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
@@ -187,6 +187,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\ir_builder.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_equals.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp" />
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 101fa4324..56f3ed290 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
@@ -297,6 +297,9 @@
     <ClCompile Include="..\..\..\..\src\glsl\link_atomics.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_equals.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index 4378bc40e..0a41643c6 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -209,6 +209,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\ir_builder.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\ir_equals.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index 8fff3f313..db2776af9 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -767,6 +767,9 @@
     <ClCompile Include="..\..\..\..\src\glsl\link_atomics.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\ir_equals.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
-- 
cgit v1.2.3