summaryrefslogtreecommitdiff
path: root/tools/buildscripts/gyp_qtwebengine
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-07-06 09:47:16 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-07-06 18:05:30 +0000
commit9b70ebd22d58a89ca605f1f7ea602148b183055f (patch)
tree99b9a60962387bff36325fcd5f5df2a9532e11cc /tools/buildscripts/gyp_qtwebengine
parent0cc881b5bf8a4a6da8277d5166da92a1675f4654 (diff)
parentb3f7d3a62e00e611e8d7f592ae048a9536b635c6 (diff)
downloadqtwebengine-9b70ebd22d58a89ca605f1f7ea602148b183055f.tar.gz
Merge "Merge Chromium 44 and fixes" into refs/staging/dev
Diffstat (limited to 'tools/buildscripts/gyp_qtwebengine')
-rwxr-xr-xtools/buildscripts/gyp_qtwebengine8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine
index 970cce54e..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'))
@@ -140,6 +146,8 @@ if __name__ == '__main__':
args.extend(['-D', 'linux_use_bundled_binutils=0'])
args.extend(['-D', 'linux_use_gold_flags=0'])
args.extend(['-D', 'clang_use_chrome_plugins=0'])
+ # We do not want to ship more external binary blobs, so let v8 embed its startup data.
+ args.extend(['-D', 'v8_use_external_startup_data=0'])
# Trigger Qt-specific build conditions.
args.extend(['-D', 'use_qt=1'])
# Tweak the output location and format (hardcode ninja for now if not set)