diff options
| author | Dawson Coleman <dawsonmcoleman@gmail.com> | 2019-01-08 17:37:43 -0600 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2019-01-09 14:27:34 +0000 |
| commit | 3c88857838ec468d443ec722321f5c285681ea5d (patch) | |
| tree | f1ddff110f7f07c915ba3fe36b757d0eaaf86f38 /gn | |
| parent | 3de7684fb648b387a5869604090cfb945ee66453 (diff) | |
| download | skqp-3c88857838ec468d443ec722321f5c285681ea5d.tar.gz | |
Update BUILDCONFIG.gn to support Visual Studio 2017 Enterprise
Bug: skia:
Change-Id: I7723a545d2f5ed78f6637aa9b8990e28785f86fb
Reviewed-on: https://skia-review.googlesource.com/c/182191
Auto-Submit: Dawson Coleman <dawsonmcoleman@gmail.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/BUILDCONFIG.gn | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 5a1c4d00b4..9f1d0be080 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -134,8 +134,10 @@ if (is_android) { msvc = "" if (target_os == "win") { - # By default we look for 2017 (Pro & Community), then 2015. If MSVC is installed in a + # By default we look for 2017 (Enterprise, Pro, and Community), then 2015. If MSVC is installed in a # non-default location, you can set win_vc to inform us where it is. + vc_2017_ent_default = + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC" vc_2017_pro_default = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC" vc_2017_com_default = @@ -146,8 +148,13 @@ if (target_os == "win") { if (win_vc == "") { if ("True" == exec_script("//gn/checkdir.py", - [ "$vc_2017_pro_default" ], + [ "$vc_2017_ent_default" ], "trim string")) { + win_vc = vc_2017_ent_default + msvc = 2017 + } else if ("True" == exec_script("//gn/checkdir.py", + [ "$vc_2017_pro_default" ], + "trim string")) { win_vc = vc_2017_pro_default msvc = 2017 } else if ("True" == exec_script("//gn/checkdir.py", |