diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-12-16 15:50:14 -0700 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-12-16 15:50:14 -0700 |
| commit | b0caa10a85b39f0e657dc0c4816884c9356b0b1a (patch) | |
| tree | 812ec91f0cf375921533c2722de313461004aa20 /windows | |
| parent | 3616fb08da8ef392db1d5ccab55b8eb9f6a6f32b (diff) | |
| parent | 3be8d6db9e8bfbd1b3ebf9ac382857ad1e6ef753 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/VC7/mesa/mesa/mesa.vcproj | 12 | ||||
| -rw-r--r-- | windows/VC8/mesa/mesa/mesa.vcproj | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj index 8a682585cda..4d5d4c744b6 100644 --- a/windows/VC7/mesa/mesa/mesa.vcproj +++ b/windows/VC7/mesa/mesa/mesa.vcproj @@ -338,6 +338,9 @@ RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.c">
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\prog_noise.c">
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.c">
</File>
<File
@@ -488,9 +491,6 @@ RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.c">
</File>
<File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.c">
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.c">
</File>
<File
@@ -927,6 +927,9 @@ RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.h">
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\prog_noise.h">
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.h">
</File>
<File
@@ -1080,9 +1083,6 @@ RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.h">
</File>
<File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.h">
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.h">
</File>
<File
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj index acbbf18cb40..91e1849669d 100644 --- a/windows/VC8/mesa/mesa/mesa.vcproj +++ b/windows/VC8/mesa/mesa/mesa.vcproj @@ -502,6 +502,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\prog_noise.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.c"
>
</File>
@@ -770,10 +774,6 @@ >
</File>
<File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.c"
>
</File>
@@ -1359,6 +1359,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\prog_noise.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.h"
>
</File>
@@ -1567,10 +1571,6 @@ >
</File>
<File
- RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.h"
>
</File>
|