diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-08-18 18:42:28 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-08-19 09:24:14 +0000 |
| commit | 1d51acbf99c5617ff7bb0dcb118b894ce4992e6c (patch) | |
| tree | eb017f242e656866c830c4abe83850fc2e40aa67 | |
| parent | 136a49c9cd5b974ff8d6410492d7e13ff1a74196 (diff) | |
| download | qtwebengine-chromium-1d51acbf99c5617ff7bb0dcb118b894ce4992e6c.tar.gz | |
<chromium> FIXUP: Fix the build with a GL ES2 configured Qt.
Conditionally re-add khronos header export for OS X.
Change-Id: Ifa89ff97d1cfe9b3d35a79c596442e22114c5abd
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | chromium/gpu/command_buffer_common.gypi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chromium/gpu/command_buffer_common.gypi b/chromium/gpu/command_buffer_common.gypi index d793b485ef9..2b17bd4d960 100644 --- a/chromium/gpu/command_buffer_common.gypi +++ b/chromium/gpu/command_buffer_common.gypi @@ -6,6 +6,13 @@ 'dependencies': [ '../third_party/khronos/khronos.gyp:khronos_headers', ], + 'conditions': [ + ['qt_os=="mac"', { + 'export_dependent_settings': [ + '../third_party/khronos/khronos.gyp:khronos_headers', + ], + }], + ], 'sources': [ 'command_buffer/common/bitfield_helpers.h', 'command_buffer/common/buffer.cc', |