<!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>[160574] trunk/Source</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/160574">160574</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 17:01:38 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Unreviewed build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/160548">r160548</a>
Source/ThirdParty/ANGLE:
I missed the ANGLE files, since we aren't building these
on the Apple Windows port at the moment.
* ANGLE.vcxproj/libEGL.vcxproj: Update to VS2013
* ANGLE.vcxproj/libGLESv2.vcxproj: Ditto
* ANGLE.vcxproj/preprocessor.vcxproj: Ditto
* ANGLE.vcxproj/translator_common.vcxproj: Ditto
* ANGLE.vcxproj/translator_glsl.vcxproj: Ditto
* ANGLE.vcxproj/translator_hlsl.vcxproj: Ditto
Source/WebKit:
* WebKit.vcxproj/WebKit.sln: Revised to build under VS2013.</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="#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_glslvcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitsln">trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln</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 (160573 => 160574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2013-12-14 00:39:45 UTC (rev 160573)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2013-12-14 01:01:38 UTC (rev 160574)
</span><span class="lines">@@ -52,37 +52,47 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><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><ins>+ <PlatformToolset>v120_xp</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><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2vcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj (160573 => 160574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2013-12-14 00:39:45 UTC (rev 160573)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2013-12-14 01:01:38 UTC (rev 160574)
</span><span class="lines">@@ -51,9 +51,11 @@
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -67,12 +69,15 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><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><ins>+ <PlatformToolset>v120_xp</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="trunkSourceThirdPartyANGLEANGLEvcxprojpreprocessorvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj (160573 => 160574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj 2013-12-14 00:39:45 UTC (rev 160573)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj 2013-12-14 01:01:38 UTC (rev 160574)
</span><span class="lines">@@ -50,9 +50,11 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -65,6 +67,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><ins>+ <PlatformToolset>v120_xp</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">@@ -74,9 +77,11 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_commonvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj (160573 => 160574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2013-12-14 00:39:45 UTC (rev 160573)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2013-12-14 01:01:38 UTC (rev 160574)
</span><span class="lines">@@ -50,9 +50,11 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -65,6 +67,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><ins>+ <PlatformToolset>v120_xp</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">@@ -74,9 +77,11 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_glslvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj (160573 => 160574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2013-12-14 00:39:45 UTC (rev 160573)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2013-12-14 01:01:38 UTC (rev 160574)
</span><span class="lines">@@ -50,9 +50,11 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -65,6 +67,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><ins>+ <PlatformToolset>v120_xp</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">@@ -74,9 +77,11 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj (160573 => 160574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2013-12-14 00:39:45 UTC (rev 160573)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2013-12-14 01:01:38 UTC (rev 160574)
</span><span class="lines">@@ -50,9 +50,11 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -65,6 +67,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><ins>+ <PlatformToolset>v120_xp</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">@@ -74,9 +77,11 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (160573 => 160574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-12-14 00:39:45 UTC (rev 160573)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-12-14 01:01:38 UTC (rev 160574)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-13 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build fix after r160548
+
+ I missed the ANGLE files, since we aren't building these
+ on the Apple Windows port at the moment.
+
+ * ANGLE.vcxproj/libEGL.vcxproj: Update to VS2013
+ * ANGLE.vcxproj/libGLESv2.vcxproj: Ditto
+ * ANGLE.vcxproj/preprocessor.vcxproj: Ditto
+ * ANGLE.vcxproj/translator_common.vcxproj: Ditto
+ * ANGLE.vcxproj/translator_glsl.vcxproj: Ditto
+ * ANGLE.vcxproj/translator_hlsl.vcxproj: Ditto
+
</ins><span class="cx"> 2013-12-06 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r159543.
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (160573 => 160574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2013-12-14 00:39:45 UTC (rev 160573)
+++ trunk/Source/WebKit/ChangeLog 2013-12-14 01:01:38 UTC (rev 160574)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2013-12-13 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build fix after r160548
+
+ * WebKit.vcxproj/WebKit.sln: Revised to build under VS2013.
+
</ins><span class="cx"> 2013-12-13 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Post-process exported WebKit headers based on PLATFORM_NAME
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitsln"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln (160573 => 160574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-12-14 00:39:45 UTC (rev 160573)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-12-14 01:01:38 UTC (rev 160574)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "..\..\WebCore\WebCore.vcxproj\WebCore.vcxproj", "{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}"
</span><span class="cx"> ProjectSection(ProjectDependencies) = postProject
</span><span class="cx"> {22413D41-3A18-42B7-92A8-CEDC6CE86920} = {22413D41-3A18-42B7-92A8-CEDC6CE86920}
</span><del>- {E498CA9D-3BD2-4D52-8E37-C8DC76526325} = {E498CA9D-3BD2-4D52-8E37-C8DC76526325}
</del><span class="cx"> EndProjectSection
</span><span class="cx"> EndProject
</span><span class="cx"> Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCoreGenerated", "..\..\WebCore\WebCore.vcxproj\WebCoreGenerated.vcxproj", "{A4159B6F-3106-4F75-9EDD-582307BDB96A}"
</span><span class="lines">@@ -50,11 +49,6 @@
</span><span class="cx"> {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843} = {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}
</span><span class="cx"> EndProjectSection
</span><span class="cx"> EndProject
</span><del>-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QTMovieWin", "..\..\WebCore\WebCore.vcxproj\QTMovieWin\QTMovieWin.vcxproj", "{E498CA9D-3BD2-4D52-8E37-C8DC76526325}"
- ProjectSection(ProjectDependencies) = postProject
- {A4159B6F-3106-4F75-9EDD-582307BDB96A} = {A4159B6F-3106-4F75-9EDD-582307BDB96A}
- EndProjectSection
-EndProject
</del><span class="cx"> Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "WebKit\WebKit.vcxproj", "{0662A8A9-82A3-4638-97D8-EC425D8D87C9}"
</span><span class="cx"> ProjectSection(ProjectDependencies) = postProject
</span><span class="cx"> {0F837117-8C0B-4596-A373-A37E14A01223} = {0F837117-8C0B-4596-A373-A37E14A01223}
</span><span class="lines">@@ -365,22 +359,6 @@
</span><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release|Win32.Build.0 = Release|Win32
</span><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release|x64.ActiveCfg = Release|x64
</span><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release|x64.Build.0 = Release|x64
</span><del>- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.ActiveCfg = Debug|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.Build.0 = Debug|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|x64.ActiveCfg = Debug|x64
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|x64.Build.0 = Debug|x64
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Production|Win32.ActiveCfg = Production|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Production|Win32.Build.0 = Production|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Production|x64.ActiveCfg = Production|x64
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Production|x64.Build.0 = Production|x64
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.ActiveCfg = Release|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.Build.0 = Release|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|x64.ActiveCfg = Release|x64
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|x64.Build.0 = Release|x64
</del><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
</span><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
</span><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
</span><span class="lines">@@ -897,7 +875,6 @@
</span><span class="cx"> {9221744B-5715-4F56-9590-42F7AB23DD8B} = {F9F5E7FE-5C5F-4CE9-8665-A84633F49E12}
</span><span class="cx"> {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {4A894588-A951-4E76-A085-50E10304DC40}
</span><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A} = {4A894588-A951-4E76-A085-50E10304DC40}
</span><del>- {E498CA9D-3BD2-4D52-8E37-C8DC76526325} = {4A894588-A951-4E76-A085-50E10304DC40}
</del><span class="cx"> {83414B15-1C0D-490B-990E-03F4D49170E4} = {4A894588-A951-4E76-A085-50E10304DC40}
</span><span class="cx"> {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB} = {39286F46-BA75-4997-8065-1909090A60F0}
</span><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9} = {39286F46-BA75-4997-8065-1909090A60F0}
</span></span></pre>
</div>
</div>
</body>
</html>