AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update BUILDCONFIG.gn to support Visual Studio 2017 Enterprise

Browse Source 
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>
This commit is contained in:
Dawson Coleman 2019-01-08 17:37:43 -06:00 committed by Skia Commit-Bot
parent 3de7684fb6
commit 3c88857838
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -15,6 +15,7 @@ ACCESS CO., LTD. <*@access-company.com>
Amazon, Inc <*@amazon.com>
Anthony Catel <paraboul@gmail.com>
ARM <*@arm.com>
Dawson Coleman <dawsonmcoleman@gmail.com>
Ehsan Akhgari <ehsan.akhgari@gmail.com>
Facebook, Inc. <*fb.com>
George Wright <george@mozilla.com>

11
gn/BUILDCONFIG.gn
View File

@ -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",