diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-19 10:34:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-23 14:57:49 +0000 |
| commit | 7a1e0d57d1a1683442ef33cd196bf73094152a2a (patch) | |
| tree | ffad89558db6b4daeba1a3b59f6ed9334127203d /tools | |
| parent | 63c94b7a2565f38a2e922420be0da2223f56f663 (diff) | |
Fix MSVC builds
Chromium now expects the MSVS version to be set in GYP_MSVS_VERSION,
so we need to set that. Fortunately we can use the VisualStudioVersion
environment to do so.
Note we should be setting it to "2013e" when using Express, but I can
not currently detect that.
Change-Id: Id51c04c8d3292c05809d4aa1301a50b12b2d57fd
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/buildscripts/gyp_qtwebengine | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index 116f8f2bd..1fc7ab7a9 100755 --- a/tools/buildscripts/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine @@ -25,6 +25,12 @@ if sys.platform in ('cygwin', 'win32'): if os.path.isdir(gnuwin_tools_dir): os.environ['PATH'] = gnuwin_tools_dir + os.pathsep + os.environ['PATH'] +if 'VisualStudioVersion' in os.environ: + if os.environ['VisualStudioVersion'] == '12.0': + os.environ['GYP_MSVS_VERSION'] = '2013' + elif os.environ['VisualStudioVersion'] == '14.0': + os.environ['GYP_MSVS_VERSION'] = '2015' + sys.path.insert(1, script_dir) import gyp_helper sys.path.insert(1, os.path.join(chrome_src, 'tools', 'gyp', 'pylib')) |