diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-12 20:56:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-12 20:56:18 +0000 |
| commit | ca14143b18b939ee4506936e77478f8c593802b5 (patch) | |
| tree | 83cf183c0a8814b67d664d002611da95bc78a98f /mesalib/windows/VC8/mesa | |
| parent | 0f84d9e7c6d9556e3b00adc5db3235c9291eeaa1 (diff) | |
| parent | 2ebdcfeee38bed8c65daa78aa7d18d8d1d93ed85 (diff) | |
| download | vcxsrv-ca14143b18b939ee4506936e77478f8c593802b5.tar.gz vcxsrv-ca14143b18b939ee4506936e77478f8c593802b5.tar.bz2 vcxsrv-ca14143b18b939ee4506936e77478f8c593802b5.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/windows/VC8/mesa')
4 files changed, 8 insertions, 8 deletions
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj index ff54b3b49..e99f286a9 100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj @@ -100,7 +100,7 @@ <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\builtin_function.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\getopt.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />
<ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" />
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters index 61b196883..e0d76d931 100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters @@ -27,9 +27,6 @@ <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\builtin_function.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -225,6 +222,9 @@ <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index 1c3377e89..7b912523c 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -106,7 +106,7 @@ <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />
- <ClCompile Include="..\..\..\..\src\glsl\builtin_function.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp" />
<ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />
<ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" />
<ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 5c196ca6e..a86c99d82 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -494,9 +494,6 @@ <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\builtin_function.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -653,6 +650,9 @@ <ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">
|