From c070939fd1a954b7a492bc30f0cf64a664b90181 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Tue, 27 Jun 2017 11:20:22 -0400 Subject: 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 Commit-Queue: Ethan Nicholas --- gn/BUILDCONFIG.gn | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'gn/BUILDCONFIG.gn') 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" } -- cgit v1.2.3