diff options
| author |  Brian Osman <brianosman@google.com> | 2017-12-07 16:16:21 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-08 01:46:30 +0000 |
| commit | 852ca318a16f9c455d2bed3efb2063dff0e4d068 (patch) | |
| tree | 33a87ecf931b014864cb214ab88685683f033df7 /site/user/build.md | |
| parent | 43646533fa6fb7cd6724cf00f6b8af15ac1649ea (diff) | |
Updated MSVC toolchain to 2017, and further refactored GN
'windk' is no longer a thing. There are two separate variables to point
at your compiler (win_vc), and SDK (win_sdk).
'msvc' is no longer a thing, either. By default, we look for 2017 and
then 2015 (in the default locations). If neither is located, use an
assert to let users know they should set win_vc. Then, detect if win_vc
points at a 2017 or 2015 installation, and configure it automatically.
Because the toolchain is now 2017, update the GN files to handle building
x86 in that configuration. In fact, we only support x86 builds (with 2017
or 2015) using the toolchain assets. Keep a 2015 toolchain around as a
new asset, so we can add bot coverage.
Docs-Preview: https://skia.org/?cl=81841
Bug: skia:
Change-Id: I8c68a6f949e54c0e798a219450bbb9406f8dc6ac
Reviewed-on: https://skia-review.googlesource.com/81841
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'site/user/build.md')
| -rw-r--r-- | site/user/build.md | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/site/user/build.md b/site/user/build.md index 4d5600579f..0cdf322b22 100644 --- a/site/user/build.md +++ b/site/user/build.md @@ -228,17 +228,21 @@ to the desired OS version. Windows ------- -Skia can build on Windows with Visual Studio 2015 Update 3, or Visual Studio -2017 by setting `msvc = 2017` in GN. No older versions are supported. The bots -use a packaged 2015 toolchain, which Googlers can download like this: +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`. + +The bots use a packaged 2017 toolchain, which Googlers can download like this: python infra/bots/assets/win_toolchain/download.py -t C:/toolchain -If you pass that downloaded path to GN via `windk`, you can build using that -toolchain instead of your own from Visual Studio. This toolchain is the only -way we support 32-bit builds with 2015, by also setting `target_cpu="x86"`. -32-bit builds should work with the default 2017 install if you follow the -directions GN prints to set up your environment. +You can then pass the VC and SDK paths to GN by setting your GN args: + + win_vc = "C:\toolchain\depot_tools\win_toolchain\vs_files\a9e1098bba66d2acccc377d5ee81265910f29272\VC" + win_sdk = "C:\toolchain\depot_tools\win_toolchain\vs_files\a9e1098bba66d2acccc377d5ee81265910f29272\win_sdk" + +This toolchain is the only way we support 32-bit builds, by also setting `target_cpu="x86"`. +There is also a corresponding 2015 toolchain, downloaded via `infra/bots/assets/win_toolchain_2015`. ### Visual Studio Solutions |