From 5f872625959c8088572f138254aec2f41cf8773c Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Wed, 6 Dec 2017 15:21:44 -0500 Subject: Reland "Always use the Win 10 SDK, and optionally detect/use the latest version" This is a reland of 6da1d32c16a0598e9b32a4e5b60f99aca871a399 Original change's description: > 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 > Commit-Queue: Brian Osman Bug: skia: Change-Id: Ide0d6bd3413c4fe7a8bada7d3d32bdba9709d11b Reviewed-on: https://skia-review.googlesource.com/81501 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- gn/BUILDCONFIG.gn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gn/BUILDCONFIG.gn') 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") -- cgit v1.2.3