[Win] Unreviewed build fix after r186169.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Jul 2015 06:26:23 +0000 (06:26 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Jul 2015 06:26:23 +0000 (06:26 +0000)
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.

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

Source/WTF/ChangeLog
Source/WTF/wtf/FeatureDefines.h
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/WebKit.sln

index c24377e85ddff7a4d148d3b9942a5f47d0eb6f74..3dee1a69673f4a3f04c47221dfa6f94bb1014b81 100644 (file)
@@ -1,3 +1,10 @@
+2015-06-30  Alex Christensen  <achristensen@webkit.org>
+
+        [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  <thetalecrafter@gmail.com>
 
         Implement ECMAScript Internationalization API
index ef0353ee7ace62a2f343b99b9abeb988abac6c26..369247d2c422ea405f2e249d80c6aa3d79f95a84 100644 (file)
@@ -300,7 +300,7 @@ the public iOS SDK. We will also need to update the FeatureDefines.xcconfig file
 #if defined(BUILDING_WITH_CMAKE)
 #define ENABLE_WEBGL 0
 #else
-#define ENABLE_WEBGL 1
+#define ENABLE_WEBGL 0
 #endif
 #endif
 
index eeb9291f8ff93b464a189bc6ceffef692eb122ff..ce5179cac12a4e1341f4f82406efc4dcf9c70e13 100644 (file)
@@ -1,3 +1,10 @@
+2015-06-30  Alex Christensen  <achristensen@webkit.org>
+
+        [Win] Unreviewed build fix after r186169.
+
+        * WebKit.vcxproj/WebKit.sln:
+        Temporarily don't build ANGLE projects on Windows.
+
 2015-06-26  Hyungwook Lee  <hyungwook.lee@navercorp.com>
 
         [Win] Implement WebViewGroup to support WebView::addxxxToGroup().
index ae3e0355337eabf66b6bdab6e70d6abe23fdf3c9..eb3956fb1488fef93b2f30cc19465a2540f096a9 100644 (file)
@@ -878,144 +878,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
-               {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