<!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>[160655] trunk</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/160655">160655</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-16 12:44:01 -0800 (Mon, 16 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed Win64 build on VS2013.
https://bugs.webkit.org/show_bug.cgi?id=125753
Patch by Alex Christensen <achristensen@webkit.org> on 2013-12-16
Reviewed by Brent Fulgham.
Source/JavaScriptCore:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj:
* JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj:
* JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj:
* JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj:
* JavaScriptCore.vcxproj/jsc/jsc.vcxproj:
* JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj:
* JavaScriptCore.vcxproj/testapi/testapi.vcxproj:
Added correct PlatformToolset for 64-bit builds.
Source/ThirdParty/ANGLE:
* ANGLE.vcxproj/libGLESv2.vcxproj:
* ANGLE.vcxproj/preprocessor.vcxproj:
* ANGLE.vcxproj/translator_common.vcxproj:
* ANGLE.vcxproj/translator_glsl.vcxproj:
* ANGLE.vcxproj/translator_hlsl.vcxproj:
Added correct PlatformToolset for 64-bit builds.
Source/WebCore:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCoreTestSupport.vcxproj:
Added correct PlatformToolset for 64-bit builds.
Source/WebInspectorUI:
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
Added 64-bit configuration.
Source/WebKit:
* WebKit.vcxproj/WebKit.sln:
Use new 64-bit WebInspectorUI configurations.
* WebKit.vcxproj/Interfaces/Interfaces.vcxproj:
* WebKit.vcxproj/WebKit/WebKit.vcxproj:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj:
* WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj:
Added correct PlatformToolset for 64-bit builds.
Source/WTF:
* WTF.vcxproj/WTF.vcxproj:
Added correct PlatformToolset for 64-bit builds.
Tools:
* DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj:
* DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj:
* DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj:
* DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj:
* DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj:
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj:
* WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj:
* WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj:
* win/record-memory/record-memory.vcxproj:
Added correct PlatformToolset for 64-bit builds.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreGeneratedvcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblyLLIntAssemblyvcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsLLIntDesiredOffsetsvcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntOffsetsExtractorLLIntOffsetsExtractorvcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojjscjscvcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestRegExptestRegExpvcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapivcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj</a></li>
<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="#trunkSourceThirdPartygtestmsvcgtestmdvcxproj">trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxproj">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFGeneratedvcxproj">trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCoreGeneratedvcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCoreTestSupportvcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxproj">trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojInterfacesInterfacesvcxproj">trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitsln">trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportGeneratorvcxproj">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitGUIDWebKitGUIDvcxproj">trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreevcxprojDumpRenderTreeDumpRenderTreevcxproj">trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreevcxprojDumpRenderTreeDumpRenderTreeLaunchervcxproj">trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreevcxprojImageDiffImageDiffvcxproj">trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreevcxprojImageDiffImageDiffLaunchervcxproj">trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreevcxprojTestNetscapePluginTestNetscapePluginvcxproj">trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIvcxprojTestWebKitAPIvcxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj</a></li>
<li><a href="#trunkToolsWinLauncherWinLaunchervcxprojWinLaunchervcxproj">trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj</a></li>
<li><a href="#trunkToolsWinLauncherWinLaunchervcxprojWinLauncherLibvcxproj">trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj</a></li>
<li><a href="#trunkToolswinAssembleBuildLogsAssembleBuildLogsvcxproj">trunk/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj</a></li>
<li><a href="#trunkToolswinrecordmemoryrecordmemoryvcxproj">trunk/Tools/win/record-memory/record-memory.vcxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-12-16 Alex Christensen <achristensen@webkit.org>
+
+ Fixed Win64 build on VS2013.
+ https://bugs.webkit.org/show_bug.cgi?id=125753
+
+ Reviewed by Brent Fulgham.
+
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj:
+ * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj:
+ * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj:
+ * JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj:
+ * JavaScriptCore.vcxproj/jsc/jsc.vcxproj:
+ * JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj:
+ * JavaScriptCore.vcxproj/testapi/testapi.vcxproj:
+ Added correct PlatformToolset for 64-bit builds.
+
</ins><span class="cx"> 2013-12-16 Peter Szanka <h868064@stud.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Delete RVCT related code parts.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="lines">@@ -78,6 +79,7 @@
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="lines">@@ -89,6 +91,7 @@
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -100,6 +103,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -111,6 +115,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -122,6 +127,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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 class="lines">@@ -1361,11 +1367,15 @@
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <MASM Include="..\jit\JITStubsMSVC64.asm">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
</span><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </MASM>
</span><span class="lines">@@ -1374,4 +1384,4 @@
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreGeneratedvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</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="trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblyLLIntAssemblyvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</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="trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsLLIntDesiredOffsetsvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</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="trunkSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntOffsetsExtractorLLIntOffsetsExtractorvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -75,6 +76,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</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)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -84,6 +86,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -93,6 +96,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -102,6 +106,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -111,6 +116,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkSourceJavaScriptCoreJavaScriptCorevcxprojjscjscvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -77,6 +78,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -88,6 +90,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -99,6 +102,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -110,6 +114,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -121,6 +126,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestRegExptestRegExpvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -78,6 +79,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -89,6 +91,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -100,6 +103,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -111,6 +115,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -122,6 +127,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapivcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -77,6 +78,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -88,6 +90,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -99,6 +102,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -110,6 +114,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -121,6 +126,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkSourceThirdPartyANGLEANGLEvcxprojlibEGLvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</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="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|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)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
</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"> <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 (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -60,12 +60,15 @@
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</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><span class="lines">@@ -81,9 +84,11 @@
</span><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</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="trunkSourceThirdPartyANGLEANGLEvcxprojpreprocessorvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -58,12 +58,15 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</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)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -71,9 +74,11 @@
</span><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><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>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><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></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_commonvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -58,12 +58,15 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</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)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -71,9 +74,11 @@
</span><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><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>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><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></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_glslvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -58,12 +58,15 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</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)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -71,9 +74,11 @@
</span><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><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>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><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></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -58,12 +58,15 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</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)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -71,9 +74,11 @@
</span><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><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>StaticLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><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></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-16 Alex Christensen <achristensen@webkit.org>
+
+ Fixed Win64 build on VS2013.
+ https://bugs.webkit.org/show_bug.cgi?id=125753
+
+ Reviewed by Brent Fulgham.
+
+ * ANGLE.vcxproj/libGLESv2.vcxproj:
+ * ANGLE.vcxproj/preprocessor.vcxproj:
+ * ANGLE.vcxproj/translator_common.vcxproj:
+ * ANGLE.vcxproj/translator_glsl.vcxproj:
+ * ANGLE.vcxproj/translator_hlsl.vcxproj:
+ Added correct PlatformToolset for 64-bit builds.
+
</ins><span class="cx"> 2013-12-13 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix after r160548
</span></span></pre></div>
<a id="trunkSourceThirdPartygtestmsvcgtestmdvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -82,6 +84,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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><span class="lines">@@ -91,6 +94,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -100,6 +104,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><ins>+ <PlatformToolset>v120_xp</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -109,6 +114,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WTF/ChangeLog 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-16 Alex Christensen <achristensen@webkit.org>
+
+ Fixed Win64 build on VS2013.
+ https://bugs.webkit.org/show_bug.cgi?id=125753
+
+ Reviewed by Brent Fulgham.
+
+ * WTF.vcxproj/WTF.vcxproj:
+ Added correct PlatformToolset for 64-bit builds.
+
</ins><span class="cx"> 2013-12-16 Peter Szanka <h868064@stud.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Delete RVCT related code parts.
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -335,6 +335,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -346,6 +347,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -357,6 +359,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -368,6 +371,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -379,6 +383,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -390,6 +395,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkSourceWTFWTFvcxprojWTFGeneratedvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WebCore/ChangeLog 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-16 Alex Christensen <achristensen@webkit.org>
+
+ Fixed Win64 build on VS2013.
+ https://bugs.webkit.org/show_bug.cgi?id=125753
+
+ Reviewed by Brent Fulgham.
+
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCoreTestSupport.vcxproj:
+ Added correct PlatformToolset for 64-bit builds.
+
</ins><span class="cx"> 2013-12-16 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Package up some data about scrollability into a struct for use in the scrolling tree
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -82,6 +84,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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><span class="lines">@@ -91,6 +94,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -100,6 +104,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -109,6 +114,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkSourceWebCoreWebCorevcxprojWebCoreGeneratedvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</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="trunkSourceWebCoreWebCorevcxprojWebCoreTestSupportvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -82,6 +84,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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><span class="lines">@@ -91,6 +94,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -100,6 +104,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -109,6 +114,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WebInspectorUI/ChangeLog 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-16 Alex Christensen <achristensen@webkit.org>
+
+ Fixed Win64 build on VS2013.
+ https://bugs.webkit.org/show_bug.cgi?id=125753
+
+ Reviewed by Brent Fulgham.
+
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
+ Added 64-bit configuration.
+
</ins><span class="cx"> 2013-12-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Move Inspector and Debugger protocol domains into JavaScriptCore
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -21,6 +21,26 @@
</span><span class="cx"> <Configuration>Release</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="cx"> </ProjectConfiguration>
</span><ins>+ <ProjectConfiguration Include="Debug_WinCairo|x64">
+ <Configuration>Debug_WinCairo</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Production|x64">
+ <Configuration>Production</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release_WinCairo|x64">
+ <Configuration>Release_WinCairo</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <PropertyGroup Label="Globals">
</span><span class="cx"> <ProjectGuid>{0473724F-0AB3-4F12-892E-9FAB0186C804}</ProjectGuid>
</span><span class="lines">@@ -60,6 +80,39 @@
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="cx"> </ImportGroup>
</span><span class="lines">@@ -88,6 +141,31 @@
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
+ </ImportGroup>
</ins><span class="cx"> <PropertyGroup Label="UserMacros" />
</span><span class="cx"> <PropertyGroup />
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WebKit/ChangeLog 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-16 Alex Christensen <achristensen@webkit.org>
+
+ Fixed Win64 build on VS2013.
+ https://bugs.webkit.org/show_bug.cgi?id=125753
+
+ Reviewed by Brent Fulgham.
+
+ * WebKit.vcxproj/WebKit.sln:
+ Use new 64-bit WebInspectorUI configurations.
+ * WebKit.vcxproj/Interfaces/Interfaces.vcxproj:
+ * WebKit.vcxproj/WebKit/WebKit.vcxproj:
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj:
+ * WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj:
+ Added correct PlatformToolset for 64-bit builds.
+
</ins><span class="cx"> 2013-12-15 Brent Fulgham <bfulgham@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojInterfacesInterfacesvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="lines">@@ -76,6 +77,7 @@
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <ConfigurationType>StaticLibrary</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="lines">@@ -87,6 +89,7 @@
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -98,6 +101,7 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -109,6 +113,7 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -120,6 +125,7 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</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="trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -65,6 +65,7 @@
</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><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -74,6 +75,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|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 Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -83,6 +85,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="lines">@@ -92,6 +95,7 @@
</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</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -101,6 +105,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|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 Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -110,6 +115,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkSourceWebKitWebKitvcxprojWebKitsln"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -985,22 +985,22 @@
</span><span class="cx"> {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release|x64.ActiveCfg = Release|x64
</span><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
</span><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
</span><del>- {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|x64.ActiveCfg = Debug|Win32
</del><ins>+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|x64.ActiveCfg = Debug|x64
</ins><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|Win32.Build.0 = Debug|Win32
</span><del>- {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|x64.ActiveCfg = Debug|Win32
</del><ins>+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|x64.ActiveCfg = Debug|x64
</ins><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.DebugSuffix|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.DebugSuffix|Win32.Build.0 = Debug|Win32
</span><del>- {0473724F-0AB3-4F12-892E-9FAB0186C804}.DebugSuffix|x64.ActiveCfg = Debug|Win32
</del><ins>+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.DebugSuffix|x64.ActiveCfg = Debug|x64
</ins><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|Win32.Build.0 = Production|Win32
</span><del>- {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|x64.ActiveCfg = Release|Win32
</del><ins>+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|x64.ActiveCfg = Release|x64
</ins><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
</span><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
</span><del>- {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|x64.ActiveCfg = Release|Win32
</del><ins>+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|x64.ActiveCfg = Release|x64
</ins><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|Win32.Build.0 = Release|Win32
</span><del>- {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|x64.ActiveCfg = Release|Win32
</del><ins>+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|x64.ActiveCfg = Release|x64
</ins><span class="cx"> EndGlobalSection
</span><span class="cx"> GlobalSection(SolutionProperties) = preSolution
</span><span class="cx"> HideSolutionNode = FALSE
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportGeneratorvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -78,6 +79,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -89,6 +91,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -100,6 +103,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -111,6 +115,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -122,6 +127,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkSourceWebKitWebKitvcxprojWebKitGUIDWebKitGUIDvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -76,6 +77,7 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -87,6 +89,7 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -98,6 +101,7 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -109,6 +113,7 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><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><span class="lines">@@ -122,6 +127,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</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="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Tools/ChangeLog 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-12-16 Alex Christensen <achristensen@webkit.org>
+
+ Fixed Win64 build on VS2013.
+ https://bugs.webkit.org/show_bug.cgi?id=125753
+
+ Reviewed by Brent Fulgham.
+
+ * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj:
+ * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj:
+ * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj:
+ * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj:
+ * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj:
+ * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj:
+ * WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj:
+ * WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj:
+ * win/record-memory/record-memory.vcxproj:
+ Added correct PlatformToolset for 64-bit builds.
+
</ins><span class="cx"> 2013-12-16 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a menu option to MiniBrowser to enable UI-side compositing
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreevcxprojDumpRenderTreeDumpRenderTreevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -64,6 +64,7 @@
</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><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|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 Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -82,6 +84,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="lines">@@ -91,6 +94,7 @@
</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</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -100,6 +104,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|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 Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -109,6 +114,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkToolsDumpRenderTreeDumpRenderTreevcxprojDumpRenderTreeDumpRenderTreeLaunchervcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -82,6 +84,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -91,6 +94,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -100,6 +104,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -109,6 +114,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkToolsDumpRenderTreeDumpRenderTreevcxprojImageDiffImageDiffvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -63,6 +63,7 @@
</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><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -72,6 +73,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|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 Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -81,6 +83,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="lines">@@ -90,6 +93,7 @@
</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</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -99,6 +103,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|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 Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -108,6 +113,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkToolsDumpRenderTreeDumpRenderTreevcxprojImageDiffImageDiffLaunchervcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -82,6 +84,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -91,6 +94,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -100,6 +104,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -109,6 +114,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkToolsDumpRenderTreeDumpRenderTreevcxprojTestNetscapePluginTestNetscapePluginvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -116,6 +116,7 @@
</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><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -125,6 +126,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|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 Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -134,6 +136,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="lines">@@ -143,6 +146,7 @@
</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</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -152,6 +156,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|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 Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -161,6 +166,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkToolsTestWebKitAPITestWebKitAPIvcxprojTestWebKitAPIvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -77,6 +78,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -88,6 +90,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -99,6 +102,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -110,6 +114,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -121,6 +126,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkToolsWinLauncherWinLaunchervcxprojWinLaunchervcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -82,6 +84,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -91,6 +94,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -100,6 +104,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -109,6 +114,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkToolsWinLauncherWinLaunchervcxprojWinLauncherLibvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -64,6 +64,7 @@
</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><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|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 Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -82,6 +84,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="lines">@@ -91,6 +94,7 @@
</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</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -100,6 +104,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|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 Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -109,6 +114,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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="trunkToolswinAssembleBuildLogsAssembleBuildLogsvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Tools/win/AssembleBuildLogs/AssembleBuildLogs.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</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="trunkToolswinrecordmemoryrecordmemoryvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/win/record-memory/record-memory.vcxproj (160654 => 160655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/win/record-memory/record-memory.vcxproj 2013-12-16 20:41:03 UTC (rev 160654)
+++ trunk/Tools/win/record-memory/record-memory.vcxproj 2013-12-16 20:44:01 UTC (rev 160655)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -77,6 +78,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</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)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -88,6 +90,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -99,6 +102,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -110,6 +114,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</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)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -121,6 +126,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</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>
</div>
</body>
</html>