diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-06-27 11:20:22 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-27 18:27:57 +0000 |
| commit | c070939fd1a954b7a492bc30f0cf64a664b90181 (patch) | |
| tree | 6b1167726bc9ac4d2073f893c699b40c70f63ba1 /gn/BUILDCONFIG.gn | |
| parent | 26249e0e1d1b18a1e67195a2998b49958426f8ba (diff) | |
Re-land sksl fragment processor support
This reverts commit ed50200682e0de72c3abecaa4d5324ebcd1ed9f9.
Bug: skia:
Change-Id: I9caa7454b391450620d6989dc472abb3cf7a2cab
Reviewed-on: https://skia-review.googlesource.com/20965
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'gn/BUILDCONFIG.gn')
| -rw-r--r-- | gn/BUILDCONFIG.gn | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 2b3ae33292..43f66f8832 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -17,9 +17,21 @@ declare_args() { ndk_api = 21 } sanitize = "" + + ar = "ar" + cc = "cc" + cxx = "c++" + + msvc = 2015 } declare_args() { is_debug = !is_official_build + + if (msvc == 2015) { + windk = "C:/Program Files (x86)/Microsoft Visual Studio 14.0" + } else { + windk = "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional" + } } assert(!(is_debug && is_official_build)) @@ -164,8 +176,12 @@ set_defaults("component") { if (is_win) { # Windows tool chain - set_default_toolchain("//gn:msvc") + set_default_toolchain("//gn/toolchain:msvc") + default_toolchain_name = "msvc" + host_toolchain = "msvc" } else { # GCC-like toolchains, including Clang. - set_default_toolchain("//gn:gcc_like") + set_default_toolchain("//gn/toolchain:gcc_like") + default_toolchain_name = "gcc_like" + host_toolchain = "gcc_like_host" } |