diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
| commit | 2c345c9da4dedfafe791557ca3fcf891ce26249d (patch) | |
| tree | 18dc73394bd3921415b57b5847f03a9753374e99 /mesalib/windows/VC8 | |
| parent | 7c531937cfab42f2fd3233c096c409ebdd5b59af (diff) | |
| parent | 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (diff) | |
| download | vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.gz vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.bz2 vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 5 nov 2012
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/mesa/main/.gitignore
xorg-server/Xi/chgdctl.c
xorg-server/dix/getevents.c
xorg-server/hw/xwin/winprefs.c
xorg-server/os/utils.c
Diffstat (limited to 'mesalib/windows/VC8')
4 files changed, 12 insertions, 12 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 7b085be5d..b723270a4 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 @@ -94,7 +94,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_stubs.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\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 020239bc4..5389735d7 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 @@ -231,9 +231,6 @@ <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>
<ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -249,6 +246,9 @@ <ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\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 28dafee1f..f9b8adbbd 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -107,7 +107,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_stubs.cpp" />
+ <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\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" />
@@ -367,4 +367,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index 1b0466fa1..0105596e4 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
@@ -656,9 +656,6 @@ <ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -698,6 +695,9 @@ <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_cpal.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\glsl\strtod.h">
@@ -714,4 +714,4 @@ <Filter>Source Files</Filter>
</None>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file |