Remove ANGLEGenerated from Windows build.

https://bugs.webkit.org/show_bug.cgi?id=124759

Patch by Alex Christensen <achristensen@webkit.org> on 2013-11-21
Reviewed by Darin Adler.

Source/ThirdParty/ANGLE:

* ANGLE.vcxproj/ANGLEGenerated.vcxproj: Removed.
* ANGLE.vcxproj/ANGLEGenerated.vcxproj.filters: Removed.

Source/WebKit:

* WebKit.vcxproj/WebKit.sln:
Remove references to ANGLEGenerated.vcxproj.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159681 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj
deleted file mode 100755 (executable)
index 53b7c52..0000000
--- a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj
+++ /dev/null
@@ -1,135 +0,0 @@
-<?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="Debug_WinCairo|Win32">
-      <Configuration>Debug_WinCairo</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_WinCairo|x64">
-      <Configuration>Debug_WinCairo</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Production|Win32">
-      <Configuration>Production</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Production|x64">
-      <Configuration>Production</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_WinCairo|Win32">
-      <Configuration>Release_WinCairo</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_WinCairo|x64">
-      <Configuration>Release_WinCairo</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{567CC448-ADB5-4FAF-8707-EEB08202452D}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakeOutput />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeOutput />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
-    <NMakeOutput />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
-    <NMakeOutput />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakeOutput>
-    </NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeOutput />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
-    <NMakeOutput />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
-    <NMakeOutput />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
-    <NMakeOutput />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
-    <NMakeOutput />
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

diff --git a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj.filters b/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj.filters
deleted file mode 100755 (executable)
index 9cd8510..0000000
--- a/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj.filters
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file

diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
index 34d7071d02b3bf6e9afb24371db780025c849187..4817745daa260a8144679321702bbfa837ddbe95 100644 (file)
--- a/Source/ThirdParty/ANGLE/ChangeLog
+++ b/Source/ThirdParty/ANGLE/ChangeLog
@@ -1,3 +1,13 @@
+2013-11-21  Alex Christensen  <achristensen@webkit.org>
+
+        Remove ANGLEGenerated from Windows build.
+        https://bugs.webkit.org/show_bug.cgi?id=124759
+
+        Reviewed by Darin Adler.
+
+        * ANGLE.vcxproj/ANGLEGenerated.vcxproj: Removed.
+        * ANGLE.vcxproj/ANGLEGenerated.vcxproj.filters: Removed.
+
 2013-11-21  Alex Christensen  <achristensen@webkit.org>
 
         Unreviewed build fix.

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index ab993d5392b8f05729e9b2dcac0179d052c6b6c3..9e4b8ad1d82e335996d2b01586d6df41ef9247a9 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2013-11-21  Alex Christensen  <achristensen@webkit.org>
+
+        Remove ANGLEGenerated from Windows build.
+        https://bugs.webkit.org/show_bug.cgi?id=124759
+
+        Reviewed by Darin Adler.
+
+        * WebKit.vcxproj/WebKit.sln:
+        Remove references to ANGLEGenerated.vcxproj.
+
 2013-11-21  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
 
         Remove ENABLE_WORKERS

diff --git a/Source/WebKit/WebKit.vcxproj/WebKit.sln b/Source/WebKit/WebKit.vcxproj/WebKit.sln
index dd3e842074ae3d91220a9eb1ea3714b85a8b2622..ecab0935d9e5ae91240b8d382442e73ae91b12a2 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKit.sln
+++ b/Source/WebKit/WebKit.vcxproj/WebKit.sln
@@ -164,8 +164,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssembleBuildLogs", "..\..\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ANGLE projects", "ANGLE projects", "{5E9B7191-CF7D-4EA4-8168-14A73749E585}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ANGLEGenerated", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\ANGLEGenerated.vcxproj", "{567CC448-ADB5-4FAF-8707-EEB08202452D}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\libEGL.vcxproj", "{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\libGLESv2.vcxproj", "{B5871A7A-968C-42E3-A33B-981E6F448E78}"
@@ -177,14 +175,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\..\ThirdPar
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\preprocessor.vcxproj", "{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}"
-       ProjectSection(ProjectDependencies) = postProject
-               {567CC448-ADB5-4FAF-8707-EEB08202452D} = {567CC448-ADB5-4FAF-8707-EEB08202452D}
-       EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_common", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\translator_common.vcxproj", "{23C3AC97-A1BF-4188-A092-8C78CF022DD7}"
-       ProjectSection(ProjectDependencies) = postProject
-               {567CC448-ADB5-4FAF-8707-EEB08202452D} = {567CC448-ADB5-4FAF-8707-EEB08202452D}
-       EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_glsl", "..\..\ThirdParty\ANGLE\ANGLE.vcxproj\translator_glsl.vcxproj", "{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}"
 EndProject
@@ -785,20 +777,6 @@ Global
                {67A61940-F80B-42A0-A29D-B6DB1C27BCEE}.Release|Win32.Build.0 = Release|Win32
                {67A61940-F80B-42A0-A29D-B6DB1C27BCEE}.Release|x64.ActiveCfg = Release|x64
                {67A61940-F80B-42A0-A29D-B6DB1C27BCEE}.Release|x64.Build.0 = Release|x64
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Debug|Win32.ActiveCfg = Debug|Win32
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Debug|x64.ActiveCfg = Debug|x64
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Production|Win32.ActiveCfg = Production|Win32
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Production|x64.ActiveCfg = Production|x64
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Release|Win32.ActiveCfg = Release|Win32
-               {567CC448-ADB5-4FAF-8707-EEB08202452D}.Release|x64.ActiveCfg = Release|x64
                {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
                {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
                {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
@@ -937,7 +915,6 @@ Global
                {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D} = {68A7C287-F9C4-4A31-9B49-995E64CAC100}
                {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5} = {74E05245-682B-4D12-98AD-BFC64C9C14CE}
                {67A61940-F80B-42A0-A29D-B6DB1C27BCEE} = {74E05245-682B-4D12-98AD-BFC64C9C14CE}
-               {567CC448-ADB5-4FAF-8707-EEB08202452D} = {5E9B7191-CF7D-4EA4-8168-14A73749E585}
                {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} = {5E9B7191-CF7D-4EA4-8168-14A73749E585}
                {B5871A7A-968C-42E3-A33B-981E6F448E78} = {5E9B7191-CF7D-4EA4-8168-14A73749E585}
                {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD} = {5E9B7191-CF7D-4EA4-8168-14A73749E585}