diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 20:14:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-02 12:15:51 +0100 |
| commit | ab666930fbcd06dc55cd86468ca0b23d459813a4 (patch) | |
| tree | dbf48fd8a349fb22f5a378f24f303a1ff639ad1f /src | |
| parent | 2d0633bdbfaaef816bc5c555fd11da4193572395 (diff) | |
Adding target specific options based on _target_name does not work
Remove the condition for the defines and define them if we
compile for the target. If these end up causing issues in
the future we have will have to patch gl.gyp in chromium.
Also move the TOOLKIT_QT define so that it is always defined.
Change-Id: If80f057a277b22fd7e0c9b049eeb137b4876c4cb
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/qtwebengine_extras.gypi | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi index 2937ee423..f4e8ad113 100644 --- a/src/core/qtwebengine_extras.gypi +++ b/src/core/qtwebengine_extras.gypi @@ -19,23 +19,21 @@ ['exclude', 'browser/renderer_host/render_widget_host_view_qnx\\.(cc|h)$'], ['exclude', 'browser/web_contents/web_contents_view_qnx\\.(cc|h)$'], ], + 'defines': [ + 'TOOLKIT_QT', + ], }, 'conditions': [ [ 'OS=="linux" and qt_cross_compile==1', { 'target_defaults': { - 'defines': [ - 'TOOLKIT_QT', - ], 'target_conditions': [ ['_toolset=="target"', { 'ldflags!': ['-L/usr/lib'], # garbage added by icu-config + 'defines': [ + 'GL_GLEXT_PROTOTYPES', + 'EGL_EGLEXT_PROTOTYPES', + ], 'conditions': [ - [ '_target_name=="gl"', { - 'defines': [ - 'GL_GLEXT_PROTOTYPES', - 'EGL_EGLEXT_PROTOTYPES', - ], - }], ['_type=="shared_library"', { 'ldflags': [ # Tell the linker to prefer symbols within the library before looking outside |