[webkit-changes] [172296] trunk/Source/ThirdParty/ANGLE

Thu, 07 Aug 2014 15:48:07 -0700

Title: [172296] trunk/Source/ThirdParty/ANGLE
Revision
172296
Author
[email protected]
Date
2014-08-07 15:47:33 -0700 (Thu, 07 Aug 2014)

Log Message

[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!

Modified Paths

Diff

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj (172295 => 172296)


--- 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)
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DebugSuffix|Win32">
+      <Configuration>DebugSuffix</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugSuffix|x64">
+      <Configuration>DebugSuffix</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug_WinCairo|Win32">
       <Configuration>Debug_WinCairo</Configuration>
       <Platform>Win32</Platform>
@@ -59,6 +67,11 @@
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
@@ -70,6 +83,11 @@
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120_xp</PlatformToolset>
@@ -99,60 +117,74 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
     <Import Project="ANGLERelease.props" />
     <Import Project="DirectX32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
     <Import Project="DirectX32.props" />
   </ImportGroup>
+  <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>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
     <Import Project="ANGLERelease.props" />
     <Import Project="DirectX64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
     <Import Project="DirectX64.props" />
   </ImportGroup>
+  <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>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
     <Import Project="DirectX32.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
     <Import Project="DirectX64.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
     <Import Project="ANGLERelease.props" />
     <Import Project="DirectX32.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
     <Import Project="ANGLERelease.props" />
     <Import Project="DirectX64.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
     <Import Project="ANGLERelease.props" />
     <Import Project="DirectX32.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libEGLCommon.props" />
     <Import Project="ANGLERelease.props" />
     <Import Project="DirectX64.props" />

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props (172295 => 172296)


--- 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)
@@ -9,7 +9,7 @@
       <PreprocessorDefinitions>ANGLE_WEBKIT_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>d3d9.lib;libGLESv2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>d3d9.lib;libGLESv2$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>../src/libEGL/libEGL.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -19,4 +19,4 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj (172295 => 172296)


--- 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)
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DebugSuffix|Win32">
+      <Configuration>DebugSuffix</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugSuffix|x64">
+      <Configuration>DebugSuffix</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug_WinCairo|Win32">
       <Configuration>Debug_WinCairo</Configuration>
       <Platform>Win32</Platform>
@@ -57,6 +65,10 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -66,6 +78,10 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120_xp</PlatformToolset>
@@ -95,60 +111,74 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
     <Import Project="ANGLERelease.props" />
     <Import Project="DirectX32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
     <Import Project="DirectX32.props" />
   </ImportGroup>
+  <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>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
     <Import Project="ANGLERelease.props" />
     <Import Project="DirectX64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
     <Import Project="DirectX64.props" />
   </ImportGroup>
+  <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>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
     <Import Project="DirectX32.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
     <Import Project="DirectX64.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
     <Import Project="ANGLERelease.props" />
     <Import Project="DirectX32.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
     <Import Project="ANGLERelease.props" />
     <Import Project="DirectX64.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
     <Import Project="ANGLERelease.props" />
     <Import Project="DirectX32.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="libGLESv2Common.props" />
     <Import Project="ANGLERelease.props" />
     <Import Project="DirectX64.props" />
@@ -197,11 +227,13 @@
     <ClCompile Include="..\src\libGLESv2\VertexArray.cpp" />
     <ClCompile Include="..\src\third_party\murmurhash\MurmurHash3.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">NotUsing</PrecompiledHeader>
@@ -210,11 +242,13 @@
     <ClCompile Include="..\src\libGLESv2\Context.cpp" />
     <ClCompile Include="..\src\common\debug.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">NotUsing</PrecompiledHeader>
@@ -228,11 +262,13 @@
     <ClCompile Include="..\src\libGLESv2\main.cpp" />
     <ClCompile Include="..\src\libGLESv2\precompiled.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Production|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">NotUsing</PrecompiledHeader>
@@ -396,4 +432,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props (172295 => 172296)


--- 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)
@@ -9,7 +9,7 @@
     </ClCompile>
     <Link>
       <ModuleDefinitionFile>../src/libGLESv2/libGLESv2.def</ModuleDefinitionFile>
-      <AdditionalDependencies>d3d9.lib;dxguid.lib;translator_common.lib;translator_hlsl.lib;translator_glsl.lib;preprocessor.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>d3d9.lib;dxguid.lib;translator_common$(DebugSuffix).lib;translator_hlsl$(DebugSuffix).lib;translator_glsl$(DebugSuffix).lib;preprocessor$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
@@ -18,4 +18,4 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj (172295 => 172296)


--- 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)
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DebugSuffix|Win32">
+      <Configuration>DebugSuffix</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugSuffix|x64">
+      <Configuration>DebugSuffix</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug_WinCairo|Win32">
       <Configuration>Debug_WinCairo</Configuration>
       <Platform>Win32</Platform>
@@ -56,6 +64,10 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
@@ -64,6 +76,10 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120_xp</PlatformToolset>
@@ -92,48 +108,58 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
+  <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>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
+  <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>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
@@ -174,4 +200,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translatorCommon.props (172295 => 172296)


--- 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)
@@ -2,6 +2,9 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>$(ConfigurationBuildDir)\lib$(PlatformArchitecture)\</OutDir>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>../src;../include;../include/KHR</AdditionalIncludeDirectories>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj (172295 => 172296)


--- 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)
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DebugSuffix|Win32">
+      <Configuration>DebugSuffix</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugSuffix|x64">
+      <Configuration>DebugSuffix</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug_WinCairo|Win32">
       <Configuration>Debug_WinCairo</Configuration>
       <Platform>Win32</Platform>
@@ -56,6 +64,10 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
@@ -64,6 +76,10 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120_xp</PlatformToolset>
@@ -92,48 +108,58 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
+  <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>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
+  <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>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
@@ -256,4 +282,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj (172295 => 172296)


--- 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)
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DebugSuffix|Win32">
+      <Configuration>DebugSuffix</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugSuffix|x64">
+      <Configuration>DebugSuffix</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug_WinCairo|Win32">
       <Configuration>Debug_WinCairo</Configuration>
       <Platform>Win32</Platform>
@@ -56,6 +64,10 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
@@ -64,6 +76,10 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120_xp</PlatformToolset>
@@ -92,48 +108,58 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
+  <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>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
+  <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>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj (172295 => 172296)


--- 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)
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DebugSuffix|Win32">
+      <Configuration>DebugSuffix</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugSuffix|x64">
+      <Configuration>DebugSuffix</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug_WinCairo|Win32">
       <Configuration>Debug_WinCairo</Configuration>
       <Platform>Win32</Platform>
@@ -56,6 +64,10 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120_xp</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
@@ -64,6 +76,10 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v120_xp</PlatformToolset>
@@ -92,48 +108,58 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
+  <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>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
+  <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>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
-    <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\common.props" />
+    <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
     <Import Project="translatorCommon.props" />
     <Import Project="ANGLERelease.props" />
   </ImportGroup>

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (172295 => 172296)


--- 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)
@@ -1,3 +1,25 @@
+2014-08-07  Brent Fulgham  <[email protected]>
+
+        [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!
+
 2014-08-02  Brent Fulgham  <[email protected]>
 
         [Win] Unreviewed build fix.

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to