diff options
| author |  Brian Osman <brianosman@google.com> | 2017-01-10 10:38:23 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-10 18:28:58 +0000 |
| commit | 3f28933478f93091969855228a99daaf12c3385d (patch) | |
| tree | 6ecdc83a0648d9103a965a3e3b4d6ca5e980af26 /gn/BUILD.gn | |
| parent | 84014f03a90d137c0f5c95e15c1e5f8503df7101 (diff) | |
Start including 'winrt' in Windows toolchain
Recent versions of ANGLE require this. See:
https://skia-review.googlesource.com/c/6698/
This also updates us to the latest version of the Windows SDK,
2015 Update 3 (Windows 10 SDK).
BUG=skia:
CQ_INCLUDE_TRYBOTS=skia.primary:Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI,Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan,Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release
Change-Id: I42c8cabc87717f8695763f2c5573b27ab8ab65be
Reviewed-on: https://skia-review.googlesource.com/6801
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'gn/BUILD.gn')
| -rw-r--r-- | gn/BUILD.gn | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 32794ab832..42bb8c9556 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -84,9 +84,9 @@ config("default") { "$windk/../Windows Kits/8.1/Include/um", # For builds using win_toolchain asset. - "$windk/win_sdk/Include/10.0.10586.0/shared", - "$windk/win_sdk/Include/10.0.10586.0/ucrt", - "$windk/win_sdk/Include/10.0.10586.0/um", + "$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", ] lib_dirs = [ # For local builds. @@ -94,8 +94,8 @@ config("default") { "$windk/../Windows Kits/8.1/Lib/winv6.3/um/$target_cpu", # For builds using win_toolchain asset. - "$windk/win_sdk/Lib/10.0.10586.0/ucrt/$target_cpu", - "$windk/win_sdk/Lib/10.0.10586.0/um/$target_cpu", + "$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" ] |