Title: [159681] trunk/Source
- Revision
- 159681
- Author
- [email protected]
- Date
- 2013-11-21 21:12:47 -0800 (Thu, 21 Nov 2013)
Log Message
Remove ANGLEGenerated from Windows build.
https://bugs.webkit.org/show_bug.cgi?id=124759
Patch by Alex Christensen <[email protected]> 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.
Modified Paths
Removed Paths
Diff
Deleted: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj (159680 => 159681)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj 2013-11-22 05:03:26 UTC (rev 159680)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj 2013-11-22 05:12:47 UTC (rev 159681)
@@ -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
Deleted: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj.filters (159680 => 159681)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj.filters 2013-11-22 05:03:26 UTC (rev 159680)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/ANGLEGenerated.vcxproj.filters 2013-11-22 05:12:47 UTC (rev 159681)
@@ -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
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (159680 => 159681)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-11-22 05:03:26 UTC (rev 159680)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-11-22 05:12:47 UTC (rev 159681)
@@ -1,5 +1,15 @@
2013-11-21 Alex Christensen <[email protected]>
+ 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 <[email protected]>
+
Unreviewed build fix.
* src/libGLESv2/Constants.h: Added from checkout a60e0805721f62c28a55faf2df74472cc5fc91fc.
Modified: trunk/Source/WebKit/ChangeLog (159680 => 159681)
--- trunk/Source/WebKit/ChangeLog 2013-11-22 05:03:26 UTC (rev 159680)
+++ trunk/Source/WebKit/ChangeLog 2013-11-22 05:12:47 UTC (rev 159681)
@@ -1,3 +1,13 @@
+2013-11-21 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
Remove ENABLE_WORKERS
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln (159680 => 159681)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-11-22 05:03:26 UTC (rev 159680)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-11-22 05:12:47 UTC (rev 159681)
@@ -164,8 +164,6 @@
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 @@
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 @@
{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 @@
{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}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
