diff options
| author |  Brian Osman <brianosman@google.com> | 2017-12-06 15:21:44 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-06 21:02:09 +0000 |
| commit | 6da1d32c16a0598e9b32a4e5b60f99aca871a399 (patch) | |
| tree | 2447ef3f31ff95d89b8e601594c4ffe5d4a1d55f /gn/BUILDCONFIG.gn | |
| parent | a3ad18344c64784bed8a948e7470d0ef98be82a7 (diff) | |
Always use the Win 10 SDK, and optionally detect/use the latest version
For bot toolchain builds, we were already using the Win 10 SDK. Local
2015 builds were using a strange hybrid of Win 10 and Win 8 SDKs. Now
we always use the Win 10 SDK exclusively.
This adds two new GN arguments: win_sdk, which points at the top level
Windows 10 SDK directory, and win_sdk_version, which can be used to
pin to a specific version. (Otherwise we use a script to detect the
most recent version).
Bug: skia:
Change-Id: I5aabb5eb9e7f483e3676b67b50356ddd0421cf7d
Reviewed-on: https://skia-review.googlesource.com/81304
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'gn/BUILDCONFIG.gn')
| -rw-r--r-- | gn/BUILDCONFIG.gn | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 413f660a79..05dc3573b5 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -37,6 +37,8 @@ declare_args() { windk = "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional" win_toolchain_version = "" } + win_sdk = "C:/Program Files (x86)/Windows Kits/10" + win_sdk_version = "" } assert(!(is_debug && is_official_build)) @@ -188,6 +190,11 @@ if (is_win) { [ "$windk/VC/Tools/MSVC" ], "trim string") } + if (win_sdk_version == "") { + win_sdk_version = exec_script("//gn/highest_version_dir.py", + [ "$win_sdk/Include" ], + "trim string") + } # Windows tool chain set_default_toolchain("//gn/toolchain:msvc") |