diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-12 15:21:19 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-12 15:21:19 +0000 |
| commit | e0058f158bae56c5a10cad4f9ace808a27022a9d (patch) | |
| tree | 0daf3e4bafd8a1c53f8228c41ffd1637c158bb29 /mesalib/windows/VC8 | |
| parent | b639ce1e238ac06882d504aca591ab62475459c1 (diff) | |
| parent | 77ec02adbc8f9657e7749b307d3cc86ccbd163ea (diff) | |
| download | vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.tar.gz vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.tar.bz2 vcxsrv-e0058f158bae56c5a10cad4f9ace808a27022a9d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/windows/VC8')
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 4 | ||||
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index 4705b413d..d0250fea3 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -200,7 +200,8 @@ <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\buffers.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c" />
+ <ClCompile Include="..\..\..\..\src\mesa\main\ff_fragment_shader.cpp" />
<ClCompile Include="..\..\..\..\src\mesa\main\clear.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\clip.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\colortab.c" />
@@ -300,7 +301,6 @@ <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_rgtc.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\texenv.c" />
- <ClCompile Include="..\..\..\..\src\mesa\main\texenvprogram.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\texfetch.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\texformat.c" />
<ClCompile Include="..\..\..\..\src\mesa\main\texgen.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 2c1aa68db..db053ee63 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -38,6 +38,9 @@ <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\mesa\main\ff_fragment_shader.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\..\src\mesa\main\buffers.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -266,9 +269,6 @@ <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\mesa\main\texenvprogram.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\mesa\main\texfetch.c">
<Filter>Source Files</Filter>
</ClCompile>
|