diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2014-09-25 08:16:00 -0700 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2014-10-06 20:34:19 +0200 |
| commit | 363ce7231af21f14017c4c59da9aa90249f36f4e (patch) | |
| tree | 8184e09bb43bfb557f01bf3d09e6a525a2edf852 /src/core/qtwebengine_extras.gypi | |
| parent | 819a0905b29ad7be5599ed2b7285e8a12f3e228f (diff) | |
Update build configuration for eLinux after update to Chromium 37.
The build configuration requires the following changes:
- toolkit_views=1: for native_theme_aura, as otherwise
nine_image_painter_factory.cc would be excluded.
- use_system_harfbuzz=0: we do not want to rely on this
being provided on the system, therefore being explicit.
- want_separate_host_toolset=1: assures that icuuc gyp
target will be available.
The file gl_surface_ozone.cc must be added to the exclusion
list to avoid duplicate symbols with gl_surface_at.cpp.
The defines EGL_API_FB and LINUX must be set to 1,
to explicitly define that we are using EGL and are building
for a linux target.
Change-Id: If6722ecbfd0655fe7852d52a606f27c18304f717
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/core/qtwebengine_extras.gypi')
| -rw-r--r-- | src/core/qtwebengine_extras.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi index 916dd4195..f30c16401 100644 --- a/src/core/qtwebengine_extras.gypi +++ b/src/core/qtwebengine_extras.gypi @@ -50,6 +50,7 @@ ['exclude', 'gl_surface_glx\\.cc$'], ['exclude', 'gl_surface_x11\\.cc$'], ['exclude', 'gl_surface_win\\.cc$'], + ['exclude', 'gl_surface_ozone\\.cc$'], # Avoid the ATL dependency to allow building with VS Express ['exclude', 'browser/accessibility/accessibility_tree_formatter\\.(cc|h)$',], ['exclude', 'browser/accessibility/accessibility_tree_formatter_android\\.(cc|h)$',], @@ -78,6 +79,8 @@ # At runtime the env variable SSL_CERT_DIR can be used to override this 'OPENSSLDIR="/usr/lib/ssl"', 'OPENSSL_LOAD_CONF', + 'EGL_API_FB=1', + 'LINUX=1', ], 'defines!': [ 'OPENSSLDIR="/etc/ssl"', |