diff options
| author |  Hal Canary <halcanary@google.com> | 2018-02-14 11:25:31 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-14 21:25:14 +0000 |
| commit | 28728e4bba68dc2a895d63b29dbe10ad1e325bc5 (patch) | |
| tree | f0e7a47edbff8efc4b01c282e26a84f2970ee3f0 | |
| parent | 7080a431a70c8323f127ee4ed76375d438c9a860 (diff) | |
BUILD(win): find 'Build Tools for VS 2017', doc update
Docs-Preview: https://skia.org/user/build?cl=107282
Change-Id: I23b46051dd75e496b3fe87d7f1ea637a0541e950
Reviewed-on: https://skia-review.googlesource.com/107282
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Hal Canary <halcanary@google.com>
| -rw-r--r-- | gn/BUILDCONFIG.gn | 7 | ||||
| -rw-r--r-- | site/user/build.md | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 259b0d14b3..d7c3439b00 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -137,6 +137,8 @@ if (target_os == "win") { "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC" vc_2017_com_default = "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC" + vc_2017_bt_default = + "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC" vc_2015_default = "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC" if (win_vc == "") { @@ -151,6 +153,11 @@ if (target_os == "win") { win_vc = vc_2017_com_default msvc = 2017 } else if ("True" == exec_script("//gn/checkdir.py", + [ "$vc_2017_bt_default" ], + "trim string")) { + win_vc = vc_2017_bt_default + msvc = 2017 + } else if ("True" == exec_script("//gn/checkdir.py", [ "$vc_2015_default" ], "trim string")) { win_vc = vc_2015_default diff --git a/site/user/build.md b/site/user/build.md index 818f5e7b3e..1ddcfd812f 100644 --- a/site/user/build.md +++ b/site/user/build.md @@ -236,6 +236,9 @@ Skia can build on Windows with Visual Studio 2017 or Visual Studio 2015 Update 3 If GN is unable to locate either of those, it will print an error message. In that case, you can pass your `VC` path to GN via `win_vc`. +Skia can be compiled with the free [Build Tools for Visual Studio +2017](https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017). + The bots use a packaged 2017 toolchain, which Googlers can download like this: python infra/bots/assets/win_toolchain/download.py -t C:/toolchain |