diff options
| author | Brice Goglin <bgoglin@debian.org> | 2009-09-04 10:53:45 +0200 |
|---|---|---|
| committer | Brice Goglin <bgoglin@debian.org> | 2009-09-04 10:53:45 +0200 |
| commit | 8222bfc1d1b130ca9f8839d8d647e19f7c656feb (patch) | |
| tree | ccc86b7a652eea348e7a6e5abea97dcd5cf263f0 /windows | |
| parent | 3f970a6d4e7298b3d6df3dd3c1604e90098e06d7 (diff) | |
| parent | 7d3af894d692e1b4c39eb6b24210bd53993723d7 (diff) | |
Merge tag 'mesa_7_5_1' into debian-unstable
Conflicts:
progs/tests/fbotest1.c
progs/tests/texwrap.c
progs/trivial/.gitignore
progs/trivial/Makefile
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/VC8/mesa/mesa/mesa.vcproj | 52 | ||||
| -rw-r--r-- | windows/VC8/mesa/osmesa/osmesa.vcproj | 4 |
2 files changed, 40 insertions, 16 deletions
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj index 51a837f0219..068da1612d4 100644 --- a/windows/VC8/mesa/mesa/mesa.vcproj +++ b/windows/VC8/mesa/mesa/mesa.vcproj @@ -52,6 +52,7 @@ WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
+ ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -122,6 +123,7 @@ SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
+ ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -192,6 +194,7 @@ SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
+ ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -262,6 +265,7 @@ WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
+ ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -379,6 +383,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\cpuinfo.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\debug.c"
>
</File>
@@ -651,10 +659,6 @@ >
</File>
<File
- RelativePath="..\..\..\..\src\mesa\shader\prog_debug.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\shader\prog_execute.c"
>
</File>
@@ -667,6 +671,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\prog_optimize.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.c"
>
</File>
@@ -1035,6 +1043,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\texgetimage.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\teximage.c"
>
</File>
@@ -1063,10 +1075,6 @@ >
</File>
<File
- RelativePath="..\..\..\..\src\mesa\main\viewport.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.c"
>
</File>
@@ -1123,6 +1131,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\viewport.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\vsnprintf.c"
>
<FileConfiguration
@@ -1264,6 +1276,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\cpuinfo.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\dd.h"
>
</File>
@@ -1520,10 +1536,6 @@ >
</File>
<File
- RelativePath="..\..\..\..\src\mesa\shader\prog_debug.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\shader\prog_execute.h"
>
</File>
@@ -1536,6 +1548,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\prog_optimize.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.h"
>
</File>
@@ -1880,6 +1896,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\texgetimage.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\teximage.h"
>
</File>
@@ -1912,10 +1932,6 @@ >
</File>
<File
- RelativePath="..\..\..\..\src\mesa\main\viewport.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\vbo\vbo.h"
>
</File>
@@ -1948,6 +1964,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\main\viewport.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\vtxfmt.h"
>
</File>
diff --git a/windows/VC8/mesa/osmesa/osmesa.vcproj b/windows/VC8/mesa/osmesa/osmesa.vcproj index d7cd47a6c14..10f2dc9717a 100644 --- a/windows/VC8/mesa/osmesa/osmesa.vcproj +++ b/windows/VC8/mesa/osmesa/osmesa.vcproj @@ -55,6 +55,7 @@ WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
+ ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -145,6 +146,7 @@ SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
+ ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -236,6 +238,7 @@ SuppressStartupBanner="true"
DebugInformationFormat="3"
CompileAs="0"
+ ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -327,6 +330,7 @@ WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
+ ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
|