<!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>[172296] trunk/Source/ThirdParty/ANGLE</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172296">172296</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 15:47:33 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>
[Win] Unreviewed gardening.
DebugSuffix targets should use our debugsuffix property sheet, and
will therefore build to the proper output location with the proper
suffix tags.
Also, we must use the WebKit_Libraries environment variable, not a set
of relative paths to the property sheets.
* ANGLE.vcxproj/libEGL.vcxproj: Use 'debugsuffix.props' sheet.
* ANGLE.vcxproj/libGLESv2.vcxproj: Ditto.
* ANGLE.vcxproj/preprocessor.vcxproj: Ditto.
* ANGLE.vcxproj/translator_common.vcxproj: Ditto.
* ANGLE.vcxproj/translator_glsl.vcxproj: Ditto.
* ANGLE.vcxproj/translator_hlsl.vcxproj: Ditto.
* ANGLE.vcxproj/libEGLCommon.props: Use $(DebugSuffix) endings.
* ANGLE.vcxproj/libGLESv2Common.props: Ditto.
* ANGLE.vcxproj/translatorCommon.props: Output to 'lib' folder,
not 'bin' folder. These are libraries!</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojlibEGLvcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojlibEGLCommonprops">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2vcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2Commonprops">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojpreprocessorvcxproj">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj</a></li>
<li><a href="#trunkSourceThirdPartyANGLEANGLEvcxprojtranslatorCommonprops">trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translatorCommon.props</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojlibEGLvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj (172295 => 172296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2014-08-07 22:34:30 UTC (rev 172295)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2014-08-07 22:47:33 UTC (rev 172296)
</span><span class="lines">@@ -1,6 +1,14 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><ins>+ <ProjectConfiguration Include="DebugSuffix|Win32">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="DebugSuffix|x64">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> <ProjectConfiguration Include="Debug_WinCairo|Win32">
</span><span class="cx"> <Configuration>Debug_WinCairo</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="lines">@@ -59,6 +67,11 @@
</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)'=='DebugSuffix|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="lines">@@ -70,6 +83,11 @@
</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)'=='DebugSuffix|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="lines">@@ -99,60 +117,74 @@
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libEGLCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> <Import Project="DirectX32.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libEGLCommon.props" />
</span><span class="cx"> <Import Project="DirectX32.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" 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="libEGLCommon.props" />
+ <Import Project="DirectX32.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libEGLCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> <Import Project="DirectX64.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libEGLCommon.props" />
</span><span class="cx"> <Import Project="DirectX64.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="libEGLCommon.props" />
+ <Import Project="DirectX64.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libEGLCommon.props" />
</span><span class="cx"> <Import Project="DirectX32.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libEGLCommon.props" />
</span><span class="cx"> <Import Project="DirectX64.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libEGLCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> <Import Project="DirectX32.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libEGLCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> <Import Project="DirectX64.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libEGLCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> <Import Project="DirectX32.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libEGLCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> <Import Project="DirectX64.props" />
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojlibEGLCommonprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props (172295 => 172296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props 2014-08-07 22:34:30 UTC (rev 172295)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props 2014-08-07 22:47:33 UTC (rev 172296)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> <PreprocessorDefinitions>ANGLE_WEBKIT_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <Link>
</span><del>- <AdditionalDependencies>d3d9.lib;libGLESv2.lib;%(AdditionalDependencies)</AdditionalDependencies>
</del><ins>+ <AdditionalDependencies>d3d9.lib;libGLESv2$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
</ins><span class="cx"> <AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
</span><span class="cx"> <ModuleDefinitionFile>../src/libEGL/libEGL.def</ModuleDefinitionFile>
</span><span class="cx"> <GenerateDebugInformation>true</GenerateDebugInformation>
</span><span class="lines">@@ -19,4 +19,4 @@
</span><span class="cx"> </ResourceCompile>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup />
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2vcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj (172295 => 172296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2014-08-07 22:34:30 UTC (rev 172295)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2014-08-07 22:47:33 UTC (rev 172296)
</span><span class="lines">@@ -1,6 +1,14 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><ins>+ <ProjectConfiguration Include="DebugSuffix|Win32">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="DebugSuffix|x64">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> <ProjectConfiguration Include="Debug_WinCairo|Win32">
</span><span class="cx"> <Configuration>Debug_WinCairo</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="lines">@@ -57,6 +65,10 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
</ins><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><span class="lines">@@ -66,6 +78,10 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="lines">@@ -95,60 +111,74 @@
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libGLESv2Common.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> <Import Project="DirectX32.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libGLESv2Common.props" />
</span><span class="cx"> <Import Project="DirectX32.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" 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="libGLESv2Common.props" />
+ <Import Project="DirectX32.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libGLESv2Common.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> <Import Project="DirectX64.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libGLESv2Common.props" />
</span><span class="cx"> <Import Project="DirectX64.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|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="libGLESv2Common.props" />
+ <Import Project="DirectX64.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libGLESv2Common.props" />
</span><span class="cx"> <Import Project="DirectX32.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libGLESv2Common.props" />
</span><span class="cx"> <Import Project="DirectX64.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libGLESv2Common.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> <Import Project="DirectX32.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libGLESv2Common.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> <Import Project="DirectX64.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libGLESv2Common.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> <Import Project="DirectX32.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="libGLESv2Common.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> <Import Project="DirectX64.props" />
</span><span class="lines">@@ -197,11 +227,13 @@
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\VertexArray.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\third_party\murmurhash\MurmurHash3.cpp">
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
</span><ins>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">NotUsing</PrecompiledHeader>
</ins><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
</span><ins>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">NotUsing</PrecompiledHeader>
</ins><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|x64'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">NotUsing</PrecompiledHeader>
</span><span class="lines">@@ -210,11 +242,13 @@
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\Context.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\common\debug.cpp">
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
</span><ins>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">NotUsing</PrecompiledHeader>
</ins><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
</span><ins>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">NotUsing</PrecompiledHeader>
</ins><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|x64'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">NotUsing</PrecompiledHeader>
</span><span class="lines">@@ -228,11 +262,13 @@
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\main.cpp" />
</span><span class="cx"> <ClCompile Include="..\src\libGLESv2\precompiled.cpp">
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
</span><ins>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">NotUsing</PrecompiledHeader>
</ins><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
</span><ins>+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">NotUsing</PrecompiledHeader>
</ins><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|x64'">NotUsing</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">NotUsing</PrecompiledHeader>
</span><span class="lines">@@ -396,4 +432,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojlibGLESv2Commonprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props (172295 => 172296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2014-08-07 22:34:30 UTC (rev 172295)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2014-08-07 22:47:33 UTC (rev 172296)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <Link>
</span><span class="cx"> <ModuleDefinitionFile>../src/libGLESv2/libGLESv2.def</ModuleDefinitionFile>
</span><del>- <AdditionalDependencies>d3d9.lib;dxguid.lib;translator_common.lib;translator_hlsl.lib;translator_glsl.lib;preprocessor.lib;%(AdditionalDependencies)</AdditionalDependencies>
</del><ins>+ <AdditionalDependencies>d3d9.lib;dxguid.lib;translator_common$(DebugSuffix).lib;translator_hlsl$(DebugSuffix).lib;translator_glsl$(DebugSuffix).lib;preprocessor$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
</ins><span class="cx"> <AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
</span><span class="cx"> <GenerateDebugInformation>true</GenerateDebugInformation>
</span><span class="cx"> </Link>
</span><span class="lines">@@ -18,4 +18,4 @@
</span><span class="cx"> </ResourceCompile>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup />
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojpreprocessorvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj (172295 => 172296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj 2014-08-07 22:34:30 UTC (rev 172295)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj 2014-08-07 22:47:33 UTC (rev 172296)
</span><span class="lines">@@ -1,6 +1,14 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><ins>+ <ProjectConfiguration Include="DebugSuffix|Win32">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="DebugSuffix|x64">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> <ProjectConfiguration Include="Debug_WinCairo|Win32">
</span><span class="cx"> <Configuration>Debug_WinCairo</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="lines">@@ -56,6 +64,10 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120</PlatformToolset>
</span><span class="lines">@@ -64,6 +76,10 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="lines">@@ -92,48 +108,58 @@
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="translatorCommon.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="PropertySheets">
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="translatorCommon.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="lines">@@ -174,4 +200,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslatorCommonprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translatorCommon.props (172295 => 172296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translatorCommon.props 2014-08-07 22:34:30 UTC (rev 172295)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translatorCommon.props 2014-08-07 22:47:33 UTC (rev 172296)
</span><span class="lines">@@ -2,6 +2,9 @@
</span><span class="cx"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ImportGroup Label="PropertySheets" />
</span><span class="cx"> <PropertyGroup Label="UserMacros" />
</span><ins>+ <PropertyGroup>
+ <OutDir>$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
+ </PropertyGroup>
</ins><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><span class="cx"> <AdditionalIncludeDirectories>../src;../include;../include/KHR</AdditionalIncludeDirectories>
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_commonvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj (172295 => 172296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2014-08-07 22:34:30 UTC (rev 172295)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2014-08-07 22:47:33 UTC (rev 172296)
</span><span class="lines">@@ -1,6 +1,14 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><ins>+ <ProjectConfiguration Include="DebugSuffix|Win32">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="DebugSuffix|x64">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> <ProjectConfiguration Include="Debug_WinCairo|Win32">
</span><span class="cx"> <Configuration>Debug_WinCairo</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="lines">@@ -56,6 +64,10 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120</PlatformToolset>
</span><span class="lines">@@ -64,6 +76,10 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="lines">@@ -92,48 +108,58 @@
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="translatorCommon.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="PropertySheets">
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="translatorCommon.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="lines">@@ -256,4 +282,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_glslvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj (172295 => 172296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2014-08-07 22:34:30 UTC (rev 172295)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2014-08-07 22:47:33 UTC (rev 172296)
</span><span class="lines">@@ -1,6 +1,14 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><ins>+ <ProjectConfiguration Include="DebugSuffix|Win32">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="DebugSuffix|x64">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> <ProjectConfiguration Include="Debug_WinCairo|Win32">
</span><span class="cx"> <Configuration>Debug_WinCairo</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="lines">@@ -56,6 +64,10 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120</PlatformToolset>
</span><span class="lines">@@ -64,6 +76,10 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="lines">@@ -92,48 +108,58 @@
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="translatorCommon.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="PropertySheets">
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="translatorCommon.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj (172295 => 172296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2014-08-07 22:34:30 UTC (rev 172295)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2014-08-07 22:47:33 UTC (rev 172296)
</span><span class="lines">@@ -1,6 +1,14 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><ins>+ <ProjectConfiguration Include="DebugSuffix|Win32">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="DebugSuffix|x64">
+ <Configuration>DebugSuffix</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ins><span class="cx"> <ProjectConfiguration Include="Debug_WinCairo|Win32">
</span><span class="cx"> <Configuration>Debug_WinCairo</Configuration>
</span><span class="cx"> <Platform>Win32</Platform>
</span><span class="lines">@@ -56,6 +64,10 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v120_xp</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120</PlatformToolset>
</span><span class="lines">@@ -64,6 +76,10 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120</PlatformToolset>
</span><span class="cx"> </PropertyGroup>
</span><ins>+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <PlatformToolset>v120_xp</PlatformToolset>
</span><span class="lines">@@ -92,48 +108,58 @@
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="translatorCommon.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><ins>+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="PropertySheets">
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
+ <Import Project="translatorCommon.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\debugsuffix.props" />
+ </ImportGroup>
</ins><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><del>- <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
</del><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</ins><span class="cx"> <Import Project="translatorCommon.props" />
</span><span class="cx"> <Import Project="ANGLERelease.props" />
</span><span class="cx"> </ImportGroup>
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (172295 => 172296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-08-07 22:34:30 UTC (rev 172295)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-08-07 22:47:33 UTC (rev 172296)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-08-07 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed gardening.
+
+ DebugSuffix targets should use our debugsuffix property sheet, and
+ will therefore build to the proper output location with the proper
+ suffix tags.
+
+ Also, we must use the WebKit_Libraries environment variable, not a set
+ of relative paths to the property sheets.
+
+ * ANGLE.vcxproj/libEGL.vcxproj: Use 'debugsuffix.props' sheet.
+ * ANGLE.vcxproj/libGLESv2.vcxproj: Ditto.
+ * ANGLE.vcxproj/preprocessor.vcxproj: Ditto.
+ * ANGLE.vcxproj/translator_common.vcxproj: Ditto.
+ * ANGLE.vcxproj/translator_glsl.vcxproj: Ditto.
+ * ANGLE.vcxproj/translator_hlsl.vcxproj: Ditto.
+ * ANGLE.vcxproj/libEGLCommon.props: Use $(DebugSuffix) endings.
+ * ANGLE.vcxproj/libGLESv2Common.props: Ditto.
+ * ANGLE.vcxproj/translatorCommon.props: Output to 'lib' folder,
+ not 'bin' folder. These are libraries!
+
</ins><span class="cx"> 2014-08-02 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix.
</span></span></pre>
</div>
</div>
</body>
</html>