<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164575] trunk/Source/ThirdParty/ANGLE</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164575">164575</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-02-23 18:24:36 -0800 (Sun, 23 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WinCairo] Unreviewed build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/164565">r164565</a>.
* ANGLE.vcxproj/libEGL.vcxproj: Use correct path to files.
* ANGLE.vcxproj/libGLESv2.vcxproj: Ditto.
* ANGLE.vcxproj/libGLESv2.vcxproj.filters: Ditto.
* ANGLE.vcxproj/preprocessor.vcxproj: Ditto.
* ANGLE.vcxproj/translator_common.vcxproj: Ditto.
* ANGLE.vcxproj/translator_common.vcxproj.filters: Ditto.
* ANGLE.vcxproj/translator_glsl.vcxproj: Ditto.
* ANGLE.vcxproj/translator_glsl.vcxproj.filters: Ditto.
* ANGLE.vcxproj/translator_hlsl.vcxproj: Ditto.
* ANGLE.vcxproj/translator_hlsl.vcxproj.filters: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojlibEGLvcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2vcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2vcxprojfilters">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojpreprocessorvcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_commonvcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_commonvcxprojfilters">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_glslvcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_glslvcxprojfilters">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxprojfilters">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojlibEGLvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj (164574 => 164575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2014-02-24 02:24:36 UTC (rev 164575)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2vcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj (164574 => 164575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2014-02-24 02:24:36 UTC (rev 164575)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2vcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters (164574 => 164575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters 2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters 2014-02-24 02:24:36 UTC (rev 164575)
</span><span class="lines">@@ -185,9 +185,6 @@
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\renderer9_utils.cpp">
</span><span class="cx"> <Filter>Source Files\Renderer9</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d9\RenderTarget9.cpp">
- <Filter>Source Files\Renderer9</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.cpp">
</span><span class="cx"> <Filter>Source Files\Renderer9</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -200,18 +197,6 @@
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\renderer\d3d9\VertexBuffer9.cpp">
</span><span class="cx"> <Filter>Source Files\Renderer9</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\libGLESv2\renderer\d3d9\Blit.cpp">
- <Filter>Source Files\Renderer9</Filter>
- </ClCompile>
- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\InputLayoutCache.cpp">
- <Filter>Source Files\Renderer11</Filter>
- </ClCompile>
- <ClCompile Include="..\src\libGLESv2\renderer\d3d11\RenderStateCache.cpp">
- <Filter>Source Files\Renderer11</Filter>
- </ClCompile>
- <ClCompile Include="..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.cpp">
- <Filter>Source Files\Renderer9</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\src\libGLESv2\precompiled.cpp">
</span><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -224,6 +209,21 @@
</span><span class="cx"> <ClCompile Include="..\src\common\event_tracer.cpp">
</span><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\src\libGLESv2\renderer\Blit.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\InputLayoutCache.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\RenderTarget9.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\RenderStateCache.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\VertexDeclarationCache.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\BinaryStream.h">
</span><span class="lines">@@ -385,9 +385,6 @@
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\VertexBuffer.h">
</span><span class="cx"> <Filter>Header Files\Renderer</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\vertexconversion.h">
- <Filter>Header Files\Renderer</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\VertexDataManager.h">
</span><span class="cx"> <Filter>Header Files\Renderer</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -469,18 +466,6 @@
</span><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Query11.h">
</span><span class="cx"> <Filter>Header Files\Renderer\Renderer11</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\libGLESv2\renderer\d3d9\Blit.h">
- <Filter>Header Files\Renderer9</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\d3d9\ShaderCache.h">
- <Filter>Header Files\Renderer9</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\InputLayoutCache.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
- <ClInclude Include="..\src\libGLESv2\renderer\d3d11\RenderStateCache.h">
- <Filter>Header Files\Renderer11</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\src\libGLESv2\renderer\VertexDeclarationCache.h">
</span><span class="cx"> <Filter>Header Files\Renderer9</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -496,17 +481,23 @@
</span><span class="cx"> <ClInclude Include="..\src\common\event_tracer.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\src\libGLESv2\renderer\Blit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\InputLayoutCache.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\RenderStateCache.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\ShaderCache.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d9\vertexconversion.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><del>- <None Include="..\src\libGLESv2\renderer\shaders\Blit.ps">
- <Filter>Shaders</Filter>
- </None>
- <None Include="..\src\libGLESv2\renderer\shaders\Blit.vs">
- <Filter>Shaders</Filter>
- </None>
- <None Include="..\src\libGLESv2\renderer\shaders\generate_shaders.bat">
- <Filter>Shaders</Filter>
- </None>
</del><span class="cx"> <None Include="..\src\libGLESv2\renderer\d3d11\shaders\Passthrough11.hlsl">
</span><span class="cx"> <Filter>Shaders</Filter>
</span><span class="cx"> </None>
</span><span class="lines">@@ -514,6 +505,11 @@
</span><span class="cx"> <Filter>Shaders</Filter>
</span><span class="cx"> </None>
</span><span class="cx"> <None Include="..\src\libGLESv2\libGLESv2.def" />
</span><ins>+ <None Include="..\src\libGLESv2\renderer\d3d9\shaders\Blit.ps" />
+ <None Include="..\src\libGLESv2\renderer\d3d9\shaders\Blit.vs" />
+ <None Include="..\src\libGLESv2\renderer\d3d9\shaders\generate_shaders.bat">
+ <Filter>Source Files</Filter>
+ </None>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ResourceCompile Include="..\src\libGLESv2\libGLESv2.rc" />
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojpreprocessorvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj (164574 => 164575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj 2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj 2014-02-24 02:24:36 UTC (rev 164575)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_commonvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj (164574 => 164575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2014-02-24 02:24:36 UTC (rev 164575)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_commonvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters (164574 => 164575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters 2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters 2014-02-24 02:24:36 UTC (rev 164575)
</span><span class="lines">@@ -149,6 +149,9 @@
</span><span class="cx"> <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuitAST.cpp">
</span><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\src\compiler\translator\RewriteElseBlocks.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\glslang_tab.h">
</span><span class="lines">@@ -280,6 +283,9 @@
</span><span class="cx"> <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuitAST.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\src\compiler\translator\RewriteElseBlocks.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <CustomBuild Include="..\src\compiler\translator\glslang.l">
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_glslvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj (164574 => 164575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2014-02-24 02:24:36 UTC (rev 164575)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -139,30 +139,30 @@
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <PropertyGroup Label="UserMacros" />
</span><span class="cx"> <ItemGroup>
</span><del>- <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp" />
- <ClCompile Include="..\src\compiler\OutputESSL.cpp" />
- <ClCompile Include="..\src\compiler\OutputGLSL.cpp" />
- <ClCompile Include="..\src\compiler\OutputGLSLBase.cpp" />
- <ClCompile Include="..\src\compiler\SearchSymbol.cpp" />
- <ClCompile Include="..\src\compiler\TranslatorESSL.cpp" />
- <ClCompile Include="..\src\compiler\TranslatorGLSL.cpp" />
- <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp" />
- <ClCompile Include="..\src\compiler\Uniform.cpp" />
- <ClCompile Include="..\src\compiler\VersionGLSL.cpp" />
</del><ins>+ <ClCompile Include="..\src\compiler\translator\DetectDiscontinuity.cpp" />
+ <ClCompile Include="..\src\compiler\translator\OutputESSL.cpp" />
+ <ClCompile Include="..\src\compiler\translator\OutputGLSL.cpp" />
+ <ClCompile Include="..\src\compiler\translator\OutputGLSLBase.cpp" />
+ <ClCompile Include="..\src\compiler\translator\SearchSymbol.cpp" />
+ <ClCompile Include="..\src\compiler\translator\TranslatorESSL.cpp" />
+ <ClCompile Include="..\src\compiler\translator\TranslatorGLSL.cpp" />
+ <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuit.cpp" />
+ <ClCompile Include="..\src\compiler\translator\Uniform.cpp" />
+ <ClCompile Include="..\src\compiler\translator\VersionGLSL.cpp" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><del>- <ClInclude Include="..\src\compiler\DetectDiscontinuity.h" />
- <ClInclude Include="..\src\compiler\OutputESSL.h" />
- <ClInclude Include="..\src\compiler\OutputGLSL.h" />
- <ClInclude Include="..\src\compiler\OutputGLSLBase.h" />
- <ClInclude Include="..\src\compiler\SearchSymbol.h" />
- <ClInclude Include="..\src\compiler\TranslatorESSL.h" />
- <ClInclude Include="..\src\compiler\TranslatorGLSL.h" />
- <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h" />
- <ClInclude Include="..\src\compiler\Uniform.h" />
- <ClInclude Include="..\src\compiler\VersionGLSL.h" />
</del><ins>+ <ClInclude Include="..\src\compiler\translator\DetectDiscontinuity.h" />
+ <ClInclude Include="..\src\compiler\translator\OutputESSL.h" />
+ <ClInclude Include="..\src\compiler\translator\OutputGLSL.h" />
+ <ClInclude Include="..\src\compiler\translator\OutputGLSLBase.h" />
+ <ClInclude Include="..\src\compiler\translator\SearchSymbol.h" />
+ <ClInclude Include="..\src\compiler\translator\TranslatorESSL.h" />
+ <ClInclude Include="..\src\compiler\translator\TranslatorGLSL.h" />
+ <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuit.h" />
+ <ClInclude Include="..\src\compiler\translator\Uniform.h" />
+ <ClInclude Include="..\src\compiler\translator\VersionGLSL.h" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_glslvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters (164574 => 164575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters 2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters 2014-02-24 02:24:36 UTC (rev 164575)
</span><span class="lines">@@ -11,67 +11,67 @@
</span><span class="cx"> </Filter>
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><del>- <ClCompile Include="..\src\compiler\VersionGLSL.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\VersionGLSL.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\DetectDiscontinuity.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\OutputESSL.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\OutputESSL.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\OutputGLSL.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\OutputGLSL.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\OutputGLSLBase.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\OutputGLSLBase.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\SearchSymbol.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\SearchSymbol.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\TranslatorESSL.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\TranslatorESSL.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\TranslatorGLSL.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\TranslatorGLSL.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuit.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\Uniform.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\Uniform.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><del>- <ClInclude Include="..\src\compiler\DetectDiscontinuity.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\DetectDiscontinuity.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\VersionGLSL.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\VersionGLSL.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\OutputESSL.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\OutputESSL.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\OutputGLSL.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\OutputGLSL.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\OutputGLSLBase.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\OutputGLSLBase.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\SearchSymbol.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\SearchSymbol.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\TranslatorESSL.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\TranslatorESSL.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\TranslatorGLSL.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\TranslatorGLSL.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuit.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\Uniform.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\Uniform.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> </ItemGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj (164574 => 164575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2014-02-24 02:24:36 UTC (rev 164575)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -139,22 +139,22 @@
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <PropertyGroup Label="UserMacros" />
</span><span class="cx"> <ItemGroup>
</span><del>- <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp" />
- <ClCompile Include="..\src\compiler\OutputHLSL.cpp" />
- <ClCompile Include="..\src\compiler\SearchSymbol.cpp" />
- <ClCompile Include="..\src\compiler\TranslatorHLSL.cpp" />
- <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp" />
- <ClCompile Include="..\src\compiler\Uniform.cpp" />
</del><ins>+ <ClCompile Include="..\src\compiler\translator\DetectDiscontinuity.cpp" />
+ <ClCompile Include="..\src\compiler\translator\OutputHLSL.cpp" />
+ <ClCompile Include="..\src\compiler\translator\SearchSymbol.cpp" />
+ <ClCompile Include="..\src\compiler\translator\TranslatorHLSL.cpp" />
+ <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuit.cpp" />
+ <ClCompile Include="..\src\compiler\translator\Uniform.cpp" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><del>- <ClInclude Include="..\src\compiler\DetectDiscontinuity.h" />
- <ClInclude Include="..\src\compiler\OutputHLSL.h" />
- <ClInclude Include="..\src\compiler\SearchSymbol.h" />
- <ClInclude Include="..\src\compiler\TranslatorHLSL.h" />
- <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h" />
- <ClInclude Include="..\src\compiler\Uniform.h" />
</del><ins>+ <ClInclude Include="..\src\compiler\translator\DetectDiscontinuity.h" />
+ <ClInclude Include="..\src\compiler\translator\OutputHLSL.h" />
+ <ClInclude Include="..\src\compiler\translator\SearchSymbol.h" />
+ <ClInclude Include="..\src\compiler\translator\TranslatorHLSL.h" />
+ <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuit.h" />
+ <ClInclude Include="..\src\compiler\translator\Uniform.h" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters (164574 => 164575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters 2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters 2014-02-24 02:24:36 UTC (rev 164575)
</span><span class="lines">@@ -11,43 +11,43 @@
</span><span class="cx"> </Filter>
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><del>- <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\DetectDiscontinuity.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\SearchSymbol.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\SearchSymbol.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuit.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\Uniform.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\Uniform.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\OutputHLSL.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\OutputHLSL.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\src\compiler\TranslatorHLSL.cpp">
</del><ins>+ <ClCompile Include="..\src\compiler\translator\TranslatorHLSL.cpp">
</ins><span class="cx"> <Filter>Source Files</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><del>- <ClInclude Include="..\src\compiler\DetectDiscontinuity.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\DetectDiscontinuity.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\SearchSymbol.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\SearchSymbol.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuit.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\Uniform.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\Uniform.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\OutputHLSL.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\OutputHLSL.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\src\compiler\TranslatorHLSL.h">
</del><ins>+ <ClInclude Include="..\src\compiler\translator\TranslatorHLSL.h">
</ins><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> </ItemGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (164574 => 164575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-02-24 02:24:36 UTC (rev 164575)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-23 Brent Fulgham <bfulgham@apple.com>
+
+ [WinCairo] Unreviewed build fix after r164565.
+
+ * ANGLE.vcxproj/libEGL.vcxproj: Use correct path to files.
+ * ANGLE.vcxproj/libGLESv2.vcxproj: Ditto.
+ * ANGLE.vcxproj/libGLESv2.vcxproj.filters: Ditto.
+ * ANGLE.vcxproj/preprocessor.vcxproj: Ditto.
+ * ANGLE.vcxproj/translator_common.vcxproj: Ditto.
+ * ANGLE.vcxproj/translator_common.vcxproj.filters: Ditto.
+ * ANGLE.vcxproj/translator_glsl.vcxproj: Ditto.
+ * ANGLE.vcxproj/translator_glsl.vcxproj.filters: Ditto.
+ * ANGLE.vcxproj/translator_hlsl.vcxproj: Ditto.
+ * ANGLE.vcxproj/translator_hlsl.vcxproj.filters: Ditto.
+
</ins><span class="cx"> 2014-02-23 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Missing files from previous commit.
</span></span></pre>
</div>
</div>
</body>
</html>