aboutsummaryrefslogtreecommitdiffhomepage
path: root/gn/BUILD.gn
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2017-12-06 15:21:44 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-12-06 22:32:59 +0000
commit5f872625959c8088572f138254aec2f41cf8773c (patch)
treea67a5a69ce9e7e9d0bbbd4507c6a6f6f65c90ace /gn/BUILD.gn
parentf5ab269a9d8168e01b92007716323d90b4de2716 (diff)
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 <mtklein@chromium.org> > Commit-Queue: Brian Osman <brianosman@google.com> Bug: skia: Change-Id: Ide0d6bd3413c4fe7a8bada7d3d32bdba9709d11b Reviewed-on: https://skia-review.googlesource.com/81501 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'gn/BUILD.gn')
-rw-r--r--gn/BUILD.gn62
1 files changed, 17 insertions, 45 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index fa2f91d4ab..5c2baf08f1 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -55,33 +55,17 @@ config("default") {
]
if (msvc == 2015) {
- _include_dirs = [
- "$windk/VC/include",
-
- # For local builds.
- "$windk/../Windows Kits/8.1/Include/shared",
- "$windk/../Windows Kits/10/Include/10.0.10150.0/ucrt",
- "$windk/../Windows Kits/8.1/Include/um",
- "$windk/../Windows Kits/8.1/Include/winrt",
-
- # For builds using win_toolchain asset (currently 2015).
- "$windk/win_sdk/Include/10.0.14393.0/shared",
- "$windk/win_sdk/Include/10.0.14393.0/ucrt",
- "$windk/win_sdk/Include/10.0.14393.0/um",
- "$windk/win_sdk/Include/10.0.14393.0/winrt",
- ]
- } else {
- # 2017
- _include_dirs = [
- "$windk/VC/Tools/MSVC/$win_toolchain_version/include",
-
- # For local builds.
- "$windk/../../../Windows Kits/10/Include/10.0.14393.0/shared",
- "$windk/../../../Windows Kits/10/Include/10.0.14393.0/ucrt",
- "$windk/../../../Windows Kits/10/Include/10.0.14393.0/um",
- "$windk/../../../Windows Kits/10/Include/10.0.14393.0/winrt",
- ]
+ _include_dirs = [ "$windk/VC/include" ]
+ } else { # 2017
+ _include_dirs = [ "$windk/VC/Tools/MSVC/$win_toolchain_version/include" ]
}
+ _include_dirs += [
+ "$win_sdk/Include/$win_sdk_version/shared",
+ "$win_sdk/Include/$win_sdk_version/ucrt",
+ "$win_sdk/Include/$win_sdk_version/um",
+ "$win_sdk/Include/$win_sdk_version/winrt",
+ ]
+
if (is_clang) {
foreach(dir, _include_dirs) {
cflags += [
@@ -93,31 +77,19 @@ config("default") {
include_dirs = _include_dirs
}
+ lib_dirs = [
+ "$win_sdk/Lib/$win_sdk_version/ucrt/$target_cpu",
+ "$win_sdk/Lib/$win_sdk_version/um/$target_cpu",
+ ]
if (msvc == 2015) {
- lib_dirs = [
- # For local builds.
- "$windk/../Windows Kits/10/Lib/10.0.10150.0/ucrt/$target_cpu",
- "$windk/../Windows Kits/8.1/Lib/winv6.3/um/$target_cpu",
-
- # For builds using win_toolchain asset (currently 2015).
- "$windk/win_sdk/Lib/10.0.14393.0/ucrt/$target_cpu",
- "$windk/win_sdk/Lib/10.0.14393.0/um/$target_cpu",
- ]
-
if (target_cpu == "x86") {
lib_dirs += [ "$windk/VC/lib" ]
} else {
lib_dirs += [ "$windk/VC/lib/amd64" ]
}
- } else {
- # 2017
- lib_dirs = [
- "$windk/VC/Tools/MSVC/$win_toolchain_version/lib/$target_cpu",
-
- # For local builds.
- "$windk/../../../Windows Kits/10/Lib/10.0.14393.0/ucrt/$target_cpu",
- "$windk/../../../Windows Kits/10/Lib/10.0.14393.0/um/$target_cpu",
- ]
+ } else { # 2017
+ lib_dirs +=
+ [ "$windk/VC/Tools/MSVC/$win_toolchain_version/lib/$target_cpu" ]
}
} else {
cflags += [