Title: [186220] trunk/Source
- Revision
- 186220
- Author
- achristen...@apple.com
- Date
- 2015-07-01 23:59:50 -0700 (Wed, 01 Jul 2015)
Log Message
Source/ThirdParty/ANGLE:
Re-enable WebGL on WinCairo
https://bugs.webkit.org/show_bug.cgi?id=146537
Reviewed by Csaba Osztrogonác.
* ANGLE.vcxproj/DirectX32.props:
* ANGLE.vcxproj/DirectX64.props:
* ANGLE.vcxproj/libGLESv2Common.props:
Update DirectX directories to use the Windows SDK instead of the June 2010 DirectX SDK.
Source/WebKit:
Re-enable WebGL on WinCairo.
https://bugs.webkit.org/show_bug.cgi?id=146537
Reviewed by Csaba Osztrogonác.
* WebKit.vcxproj/WebKit.sln:
Build the ANGLE projects on WinCairo again.
Source/WTF:
Re-enable WebGL on WinCairo
https://bugs.webkit.org/show_bug.cgi?id=146537
Reviewed by Csaba Osztrogonác.
* wtf/FeatureDefines.h:
Enable WebGL on WinCairo again.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX32.props (186219 => 186220)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX32.props 2015-07-02 06:41:31 UTC (rev 186219)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX32.props 2015-07-02 06:59:50 UTC (rev 186220)
@@ -5,7 +5,7 @@
<PropertyGroup />
<ItemDefinitionGroup>
<Link>
- <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(WindowsSDK_LibraryPath_x86);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX64.props (186219 => 186220)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX64.props 2015-07-02 06:41:31 UTC (rev 186219)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/DirectX64.props 2015-07-02 06:59:50 UTC (rev 186220)
@@ -5,7 +5,7 @@
<PropertyGroup />
<ItemDefinitionGroup>
<Link>
- <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(WindowsSDK_LibraryPath_x64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props (186219 => 186220)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2015-07-02 06:41:31 UTC (rev 186219)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2015-07-02 06:59:50 UTC (rev 186220)
@@ -4,13 +4,13 @@
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>..\src;..\src\libGLESv2;..\include;..\include\KHR;$(DXSDK_DIR)\Include</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\src;..\src\libGLESv2;..\include;..\include\KHR;$(WindowsSDK_IncludePath)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>LIBGLESV2_IMPLEMENTATION;ANGLE_DEFAULT_D3D11=1;ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11;NOMINMAX;ANGLE_WEBKIT_WIN;ANGLE_SKIP_DXGI_1_2_CHECK=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<ModuleDefinitionFile>../src/libGLESv2/libGLESv2.def</ModuleDefinitionFile>
<AdditionalDependencies>d3d9.lib;dxguid.lib;translator_common$(DebugSuffix).lib;translator_hlsl$(DebugSuffix).lib;translator_glsl$(DebugSuffix).lib;preprocessor$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(DXSDK_DIR)\Lib\$(PlatformTarget);$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<ResourceCompile>
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (186219 => 186220)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-07-02 06:41:31 UTC (rev 186219)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-07-02 06:59:50 UTC (rev 186220)
@@ -1,5 +1,17 @@
2015-07-01 Alex Christensen <achristen...@webkit.org>
+ Re-enable WebGL on WinCairo
+ https://bugs.webkit.org/show_bug.cgi?id=146537
+
+ Reviewed by Csaba Osztrogonác.
+
+ * ANGLE.vcxproj/DirectX32.props:
+ * ANGLE.vcxproj/DirectX64.props:
+ * ANGLE.vcxproj/libGLESv2Common.props:
+ Update DirectX directories to use the Windows SDK instead of the June 2010 DirectX SDK.
+
+2015-07-01 Alex Christensen <achristen...@webkit.org>
+
Fix ANGLE Windows build after r186169.
https://bugs.webkit.org/show_bug.cgi?id=146532
Modified: trunk/Source/WTF/ChangeLog (186219 => 186220)
--- trunk/Source/WTF/ChangeLog 2015-07-02 06:41:31 UTC (rev 186219)
+++ trunk/Source/WTF/ChangeLog 2015-07-02 06:59:50 UTC (rev 186220)
@@ -1,5 +1,15 @@
2015-07-01 Alex Christensen <achristen...@webkit.org>
+ Re-enable WebGL on WinCairo
+ https://bugs.webkit.org/show_bug.cgi?id=146537
+
+ Reviewed by Csaba Osztrogonác.
+
+ * wtf/FeatureDefines.h:
+ Enable WebGL on WinCairo again.
+
+2015-07-01 Alex Christensen <achristen...@webkit.org>
+
Ignore Visual Studio warning in SegmentedVector
https://bugs.webkit.org/show_bug.cgi?id=146514
Modified: trunk/Source/WTF/wtf/FeatureDefines.h (186219 => 186220)
--- trunk/Source/WTF/wtf/FeatureDefines.h 2015-07-02 06:41:31 UTC (rev 186219)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2015-07-02 06:59:50 UTC (rev 186220)
@@ -300,7 +300,7 @@
#if defined(BUILDING_WITH_CMAKE)
#define ENABLE_WEBGL 0
#else
-#define ENABLE_WEBGL 0
+#define ENABLE_WEBGL 1
#endif
#endif
Modified: trunk/Source/WebKit/ChangeLog (186219 => 186220)
--- trunk/Source/WebKit/ChangeLog 2015-07-02 06:41:31 UTC (rev 186219)
+++ trunk/Source/WebKit/ChangeLog 2015-07-02 06:59:50 UTC (rev 186220)
@@ -1,3 +1,13 @@
+2015-07-01 Alex Christensen <achristen...@webkit.org>
+
+ Re-enable WebGL on WinCairo.
+ https://bugs.webkit.org/show_bug.cgi?id=146537
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WebKit.vcxproj/WebKit.sln:
+ Build the ANGLE projects on WinCairo again.
+
2015-06-30 Alex Christensen <achristen...@webkit.org>
[Win] Unreviewed build fix after r186169.
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln (186219 => 186220)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2015-07-02 06:41:31 UTC (rev 186219)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2015-07-02 06:59:50 UTC (rev 186220)
@@ -878,6 +878,54 @@
{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
+ {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
+ {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {B5871A7A-968C-42E3-A33B-981E6F448E78}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {B5871A7A-968C-42E3-A33B-981E6F448E78}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {B5871A7A-968C-42E3-A33B-981E6F448E78}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {B5871A7A-968C-42E3-A33B-981E6F448E78}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
{0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
{0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
{0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
