Title: [186172] trunk/Source
Revision
186172
Author
[email protected]
Date
2015-06-30 23:26:23 -0700 (Tue, 30 Jun 2015)

Log Message

[Win] Unreviewed build fix after r186169.

Source/WebKit:

* WebKit.vcxproj/WebKit.sln:
Temporarily don't build ANGLE projects on Windows.

Source/WTF:

* wtf/FeatureDefines.h:
Temporarily disable WebGL on WinCairo. It was already temporarily disabled on AppleWin.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (186171 => 186172)


--- trunk/Source/WTF/ChangeLog	2015-07-01 06:23:51 UTC (rev 186171)
+++ trunk/Source/WTF/ChangeLog	2015-07-01 06:26:23 UTC (rev 186172)
@@ -1,3 +1,10 @@
+2015-06-30  Alex Christensen  <[email protected]>
+
+        [Win] Unreviewed build fix after r186169.
+
+        * wtf/FeatureDefines.h:
+        Temporarily disable WebGL on WinCairo. It was already temporarily disabled on AppleWin.
+
 2015-06-30  Andy VanWagoner  <[email protected]>
 
         Implement ECMAScript Internationalization API

Modified: trunk/Source/WTF/wtf/FeatureDefines.h (186171 => 186172)


--- trunk/Source/WTF/wtf/FeatureDefines.h	2015-07-01 06:23:51 UTC (rev 186171)
+++ trunk/Source/WTF/wtf/FeatureDefines.h	2015-07-01 06:26:23 UTC (rev 186172)
@@ -300,7 +300,7 @@
 #if defined(BUILDING_WITH_CMAKE)
 #define ENABLE_WEBGL 0
 #else
-#define ENABLE_WEBGL 1
+#define ENABLE_WEBGL 0
 #endif
 #endif
 

Modified: trunk/Source/WebKit/ChangeLog (186171 => 186172)


--- trunk/Source/WebKit/ChangeLog	2015-07-01 06:23:51 UTC (rev 186171)
+++ trunk/Source/WebKit/ChangeLog	2015-07-01 06:26:23 UTC (rev 186172)
@@ -1,3 +1,10 @@
+2015-06-30  Alex Christensen  <[email protected]>
+
+        [Win] Unreviewed build fix after r186169.
+
+        * WebKit.vcxproj/WebKit.sln:
+        Temporarily don't build ANGLE projects on Windows.
+
 2015-06-26  Hyungwook Lee  <[email protected]>
 
         [Win] Implement WebViewGroup to support WebView::addxxxToGroup().

Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln (186171 => 186172)


--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln	2015-07-01 06:23:51 UTC (rev 186171)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln	2015-07-01 06:26:23 UTC (rev 186172)
@@ -878,144 +878,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
-		{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}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug|Win32.Build.0 = Debug|Win32
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug|x64.ActiveCfg = Debug|x64
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.DebugSuffix|Win32.ActiveCfg = Debug|Win32
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.DebugSuffix|Win32.Build.0 = Debug|Win32
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.DebugSuffix|x64.ActiveCfg = Debug|x64
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.DebugSuffix|x64.Build.0 = Debug|x64
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Production|Win32.ActiveCfg = Production|Win32
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Production|Win32.Build.0 = Production|Win32
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Production|x64.ActiveCfg = Production|x64
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Production|x64.Build.0 = Production|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
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|Win32.ActiveCfg = Release|Win32
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|Win32.Build.0 = Release|Win32
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|x64.ActiveCfg = Release|x64
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|x64.Build.0 = Release|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}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug|Win32.Build.0 = Debug|Win32
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug|x64.ActiveCfg = Debug|x64
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.DebugSuffix|Win32.ActiveCfg = Debug|Win32
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.DebugSuffix|Win32.Build.0 = Debug|Win32
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.DebugSuffix|x64.ActiveCfg = Debug|x64
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.DebugSuffix|x64.Build.0 = Debug|x64
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Production|Win32.ActiveCfg = Production|Win32
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Production|Win32.Build.0 = Production|Win32
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Production|x64.ActiveCfg = Production|x64
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Production|x64.Build.0 = Production|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
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|Win32.ActiveCfg = Release|Win32
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|Win32.Build.0 = Release|Win32
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.ActiveCfg = Release|x64
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.Build.0 = Release|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}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.Build.0 = Debug|Win32
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.ActiveCfg = Debug|x64
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.DebugSuffix|Win32.ActiveCfg = Debug|Win32
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.DebugSuffix|Win32.Build.0 = Debug|Win32
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.DebugSuffix|x64.ActiveCfg = Debug|x64
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.DebugSuffix|x64.Build.0 = Debug|x64
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Production|Win32.ActiveCfg = Production|Win32
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Production|Win32.Build.0 = Production|Win32
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Production|x64.ActiveCfg = Production|x64
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Production|x64.Build.0 = Production|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
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.ActiveCfg = Release|Win32
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.Build.0 = Release|Win32
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.ActiveCfg = Release|x64
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.Build.0 = Release|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}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug|Win32.Build.0 = Debug|Win32
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug|x64.ActiveCfg = Debug|x64
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.DebugSuffix|Win32.ActiveCfg = Debug|Win32
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.DebugSuffix|Win32.Build.0 = Debug|Win32
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.DebugSuffix|x64.ActiveCfg = Debug|x64
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.DebugSuffix|x64.Build.0 = Debug|x64
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Production|Win32.ActiveCfg = Production|Win32
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Production|Win32.Build.0 = Production|Win32
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Production|x64.ActiveCfg = Production|x64
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Production|x64.Build.0 = Production|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
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release|Win32.ActiveCfg = Release|Win32
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release|Win32.Build.0 = Release|Win32
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release|x64.ActiveCfg = Release|x64
-		{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release|x64.Build.0 = Release|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}.Debug|Win32.ActiveCfg = Debug|Win32
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug|Win32.Build.0 = Debug|Win32
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug|x64.ActiveCfg = Debug|x64
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.DebugSuffix|Win32.ActiveCfg = Debug|Win32
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.DebugSuffix|Win32.Build.0 = Debug|Win32
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.DebugSuffix|x64.ActiveCfg = Debug|x64
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.DebugSuffix|x64.Build.0 = Debug|x64
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Production|Win32.ActiveCfg = Production|Win32
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Production|Win32.Build.0 = Production|Win32
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Production|x64.ActiveCfg = Production|x64
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Production|x64.Build.0 = Production|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
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release|Win32.ActiveCfg = Release|Win32
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release|Win32.Build.0 = Release|Win32
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release|x64.ActiveCfg = Release|x64
-		{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release|x64.Build.0 = Release|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}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug|Win32.Build.0 = Debug|Win32
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug|x64.ActiveCfg = Debug|x64
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.DebugSuffix|Win32.ActiveCfg = Debug|Win32
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.DebugSuffix|Win32.Build.0 = Debug|Win32
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.DebugSuffix|x64.ActiveCfg = Debug|x64
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.DebugSuffix|x64.Build.0 = Debug|x64
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Production|Win32.ActiveCfg = Production|Win32
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Production|Win32.Build.0 = Production|Win32
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Production|x64.ActiveCfg = Production|x64
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Production|x64.Build.0 = Production|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
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release|Win32.ActiveCfg = Release|Win32
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release|Win32.Build.0 = Release|Win32
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release|x64.ActiveCfg = Release|x64
-		{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release|x64.Build.0 = Release|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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to