aboutsummaryrefslogtreecommitdiff
path: root/mesalib/windows
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-08 11:47:30 +0100
committermarha <marha@users.sourceforge.net>2013-11-08 11:47:30 +0100
commitc8483dc2831dc37d93a36804022f6b064f5962ea (patch)
tree599f145a848e10b75a1a8c314ed9c51031446506 /mesalib/windows
parentc97d11aec40d8fa07d6b456bf8694133a77d35f4 (diff)
downloadvcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.tar.gz
vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.tar.bz2
vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.zip
Solved compilation and link problems after last merge
Diffstat (limited to 'mesalib/windows')
-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.vcxproj2
-rw-r--r--mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters6
4 files changed, 12 insertions, 0 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 c1da6f80b..c5a7f0b88 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
@@ -236,6 +236,7 @@
<ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_cse.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_varyings.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.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 f36471bbd..5d8f12725 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
@@ -291,6 +291,9 @@
<ClCompile Include="..\..\..\..\src\glsl\builtin_functions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\opt_cse.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 bcf32b379..dc27f6461 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -275,6 +275,7 @@
<ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\opt_cse.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_varyings.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" />
@@ -320,6 +321,7 @@
<ClCompile Include="..\..\..\..\src\mesa\main\uniform_query.cpp" />
<ClCompile Include="..\..\..\..\src\mesa\main\transformfeedback.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\uniforms.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\vdpau.c" />
<ClCompile Include="..\..\..\..\src\mesa\program\arbprogparse.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\arrayobj.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\attrib.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index d8e801ffc..d406ae5d0 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -758,6 +758,12 @@
<ClCompile Include="..\..\..\..\src\mesa\main\performance_monitor.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\vdpau.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\opt_cse.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">