aboutsummaryrefslogtreecommitdiffhomepage
path: root/site
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-05-04 11:16:57 -0400
committerGravatar Mike Klein <mtklein@chromium.org>2017-05-04 16:27:42 +0000
commitf2daf74760eaf3565490edb9247f8d546e84dff5 (patch)
tree5175afc283211b57ef2a0c9716ecfef610feaebc /site
parentb9641bd55a8f63757a63d9302755feb55d2e9502 (diff)
update Windows build docs
- mention 2017 - describe 32-bit builds a bit more Change-Id: I386c51bcf4863f91db2eade01bad1e54c1049e6c Reviewed-on: https://skia-review.googlesource.com/15314 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'site')
-rw-r--r--site/user/build.md10
1 files changed, 6 insertions, 4 deletions
diff --git a/site/user/build.md b/site/user/build.md
index 9d43fc2691..bfcb18a7c3 100644
--- a/site/user/build.md
+++ b/site/user/build.md
@@ -133,15 +133,17 @@ you'll want to have a read through go/appledev.
Windows
-------
-Skia can build on Windows with Visual Studio 2015 Update 3. No older or newer
-version is supported. The bots use a packaged toolchain, which you may be able
-to download like this:
+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:
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, by also setting `target_cpu="x86"`.
+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.
### Visual Studio Solutions