aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-18 10:34:28 +0100
committermarha <marha@users.sourceforge.net>2013-11-18 10:34:28 +0100
commitcb043e6091c966fa8b772ec86fbc026ddcac9d87 (patch)
tree1b66e87b2b71b6ec4e27ea5501f1311047cfdcb3
parent72ba71645132923bb8e0b93f7683aef8bc485aa2 (diff)
downloadvcxsrv-cb043e6091c966fa8b772ec86fbc026ddcac9d87.tar.gz
vcxsrv-cb043e6091c966fa8b772ec86fbc026ddcac9d87.tar.bz2
vcxsrv-cb043e6091c966fa8b772ec86fbc026ddcac9d87.zip
Solved link error due to latest merge
-rw-r--r--libX11/libX11.def1
-rw-r--r--mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj1
-rw-r--r--mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters3
-rw-r--r--mesalib/windows/VC8/mesa/mesa/mesa.vcxproj1
-rw-r--r--mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters3
5 files changed, 9 insertions, 0 deletions
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">