diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-07 16:00:29 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-07 16:00:29 +0000 |
| commit | b40894093babb10f3cd155f11ff2d6c710372395 (patch) | |
| tree | e6e94e5aa39ca9d5a653af567145e4b5dda25d61 /mesalib/windows/VC8/mesa | |
| parent | d27419efcdaaccb40e0f10c549a6b732a2f29e81 (diff) | |
| parent | 14b1cb8d5a27ec9716d3f790fce95f0469e35605 (diff) | |
| download | vcxsrv-b40894093babb10f3cd155f11ff2d6c710372395.tar.gz vcxsrv-b40894093babb10f3cd155f11ff2d6c710372395.tar.bz2 vcxsrv-b40894093babb10f3cd155f11ff2d6c710372395.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/windows/VC8/mesa')
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcproj | 40 | ||||
| -rw-r--r-- | mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj | 20 |
2 files changed, 44 insertions, 16 deletions
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj index 330cd26f4..77a1ffd95 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj @@ -459,6 +459,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\formats.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\framebuffer.c"
>
</File>
@@ -495,6 +499,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\hash_table.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\hint.c"
>
</File>
@@ -547,10 +555,6 @@ </FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\src\mesa\shader\hash_table.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\shader\lex.yy.c"
>
<FileConfiguration
@@ -843,10 +847,6 @@ >
</File>
<File
- RelativePath="..\..\..\..\src\mesa\swrast\s_imaging.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\swrast\s_lines.c"
>
</File>
@@ -883,10 +883,6 @@ >
</File>
<File
- RelativePath="..\..\..\..\src\mesa\swrast\s_texstore.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\swrast\s_triangle.c"
>
</File>
@@ -1011,11 +1007,11 @@ >
</File>
<File
- RelativePath="..\..\..\..\src\mesa\main\syncobj.c"
+ RelativePath="..\..\..\..\src\mesa\shader\symbol_table.c"
>
</File>
<File
- RelativePath="..\..\..\..\src\mesa\shader\symbol_table.c"
+ RelativePath="..\..\..\..\src\mesa\main\syncobj.c"
>
</File>
<File
@@ -1111,6 +1107,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\texfetch.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\texformat.c"
>
</File>
@@ -1644,6 +1644,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\remap.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\renderbuffer.h"
>
</File>
@@ -1944,11 +1948,15 @@ >
</File>
<File
- RelativePath="..\..\..\..\src\mesa\main\texformat.h"
+ RelativePath="..\..\..\..\src\mesa\main\texfetch.h"
>
</File>
<File
- RelativePath="..\..\..\..\src\mesa\main\texformat_tmp.h"
+ RelativePath="..\..\..\..\src\mesa\main\texfetch_tmp.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\src\mesa\main\texformat.h"
>
</File>
<File
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj index 194a9b0cf..d4086f118 100644 --- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj +++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj @@ -100,6 +100,9 @@ <Tool
Name="VCAppVerifierTool"
/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
@@ -191,6 +194,9 @@ <Tool
Name="VCAppVerifierTool"
/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Debug Static CRT|Win32"
@@ -277,6 +283,9 @@ <Tool
Name="VCAppVerifierTool"
/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release Static CRT|Win32"
@@ -368,6 +377,9 @@ <Tool
Name="VCAppVerifierTool"
/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -382,6 +394,14 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\drivers\common\meta.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\src\mesa\main\remap.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\drivers\dri\swrast\swrast.c"
>
</File>
|