Roll gyp and use Windows 10 SDK by default.

We want to require use of the Windows 10 SDK in ANGLE - Chrome already uses a newer SDK. A new gyp feature added by munyirik@microsoft.com allows us to use the latest Win 10 SDK installed on the system, irrespective of the minor version number. Also update the docs. BUG=angleproject:1943 Change-Id: Iaafbba858fb7565ab09672eadc403dbb8abab3dd Reviewed-on: https://chromium-review.googlesource.com/458516 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Roll gyp and use Windows 10 SDK by default.
c1ebf5bd · Jamie Madill · Commit Bot · 95f6cedd · c1ebf5bd · c1ebf5bd
Commit c1ebf5bd authored Mar 22, 2017 by Jamie Madill Committed by Commit Bot Mar 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

DEPS DEPS +1 -1

DevSetup.md doc/DevSetup.md +5 -4

common.gypi gyp/common.gypi +2 -0

No files found.
--- a/DEPS
+++ b/DEPS
@@ -25,7 +25,7 @@ deps = {
    Var('android_git') + '/platform/external/shaderc/glslang' + '@' + '1e275c8486325aaab34734ad9a650c0121c5efdb',
  'third_party/gyp':
-    Var('chromium_git') + '/external/gyp' + '@' + '81c2e5ff92af29bab61c982808076ddce3d200a2',
+    Var('chromium_git') + '/external/gyp' + '@' + 'aae1e3efb50786df20e9572621fb746865f0df53',
  'third_party/libpng':
    Var('android_git') + '/platform/external/libpng' + '@' + '094e181e79a3d6c23fd005679025058b7df1ad6c',

--- a/doc/DevSetup.md
+++ b/doc/DevSetup.md
@@ -15,10 +15,12 @@ On all platforms:
 On Windows:
- * [Visual Studio Community 2015 Update 2](http://www.visualstudio.com/downloads/download-visual-studio-vs)
+ * [Visual Studio Community 2015 Update 3](https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs)
-     Required to build ANGLE on Windows and for the packaged Windows 8.1 SDK.
+   * Required to build ANGLE on Windows and for the packaged Windows 10 SDK. Note: Chrome is in the process of upgrading to Visual Studio 2017. ANGLE will switch over once Chrome does.
+ * [Windows 10 Standalone SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk) (recommended)
+    * Not required to build, but comes with additional features that aid ANGLE development, such as the Debug runtime for D3D11.
 * [Cygwin's Bison, flex, and patch](https://cygwin.com/setup-x86_64.exe) (optional)
-     This is only required if you need to modify GLSL ES grammar files (`glslang.l` and `glslang.y` under `src/compiler/translator`, or `ExpressionParser.y` and `Tokenizer.l` in `src/compiler/preprocessor`).
+    * This is only required if you need to modify GLSL ES grammar files (`glslang.l` and `glslang.y` under `src/compiler/translator`, or `ExpressionParser.y` and `Tokenizer.l` in `src/compiler/preprocessor`).
     Use the latest versions of bison, flex and patch from the 64-bit cygwin distribution.
 On Linux:
@@ -38,7 +40,6 @@ Set the following environment variables as needed:
 On Windows:
 * `GYP_GENERATORS` to `msvs` (other options include `ninja` and `make`)
- * `GYP_DEFINES` to `windows_sdk_path=YOUR_WIN_SDK_INSTALL_DIR` if you did not install the Windows 8.1 SDK in the default location.
 * `GYP_MSVS_VERSION` to `2015`
 On Linux and MacOS:

--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -80,6 +80,8 @@
            'Common_Base':
            {
                'abstract': 1,
+                # Require the version of the Windows 10 SDK installed on the local machine.
+                'msvs_windows_sdk_version': 'v10.0',
                'msvs_configuration_attributes':
                {
                    'OutputDirectory': '$(SolutionDir)$(ConfigurationName)_$(Platform)',