diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-15 22:49:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-15 22:49:12 +0000 |
| commit | 8285341e69cd721c6871b553e45437c767200545 (patch) | |
| tree | 551508bddc84d1c16c15d961878cd2d2f6edb365 /mesalib/windows | |
| parent | 52b8618bfdaa4725fc403f50fe682d02e7f16435 (diff) | |
| parent | 5e633abcca598289d0423d89bb400b41e6417259 (diff) | |
| download | vcxsrv-8285341e69cd721c6871b553e45437c767200545.tar.gz vcxsrv-8285341e69cd721c6871b553e45437c767200545.tar.bz2 vcxsrv-8285341e69cd721c6871b553e45437c767200545.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/windows')
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 3 | ||||
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index d0250fea3..136d45652 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -200,7 +200,7 @@ <ClCompile Include="..\..\..\..\src\mesa\main\attrib.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\blend.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c" />
- <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\buffers.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\ff_fragment_shader.cpp" />
<ClCompile Include="..\..\..\..\src\mesa\main\clear.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\clip.c" />
@@ -220,6 +220,7 @@ <ClCompile Include="..\..\..\..\src\mesa\main\eval.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\execmem.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\extensions.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\texturebarrier.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\fbobject.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\feedback.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\ffvertex_prog.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index db053ee63..48e05317c 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -98,6 +98,9 @@ <ClCompile Include="..\..\..\..\src\mesa\main\extensions.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\texturebarrier.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\..\src\mesa\main\fbobject.c">
<Filter>Source Files</Filter>
</ClCompile>
|