diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2015-08-21 13:32:06 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-08-24 09:13:58 +0000 |
| commit | 4140f5c535bd1626c06c6be122da6b97e2a737bb (patch) | |
| tree | 3eee360a423c838f7474d2510e58352fae8e7d9e | |
| parent | 62209a6e46677f0f35e6169c52f414d3ccb7b618 (diff) | |
<chromium> FIXUP: Fix the build with a GL ES2 configured Qt.44-based
Add missing dependency revealed by the Windows CI.
Change-Id: I34c47afaa0e39a78bf0ff863599862a8f5bc542b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | chromium/gpu/command_buffer_common.gypi | 2 | ||||
| -rw-r--r-- | chromium/gpu/gles2_cmd_helper.gypi | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chromium/gpu/command_buffer_common.gypi b/chromium/gpu/command_buffer_common.gypi index 2b17bd4d960..f990516ec00 100644 --- a/chromium/gpu/command_buffer_common.gypi +++ b/chromium/gpu/command_buffer_common.gypi @@ -7,7 +7,7 @@ '../third_party/khronos/khronos.gyp:khronos_headers', ], 'conditions': [ - ['qt_os=="mac"', { + ['qt_os=="mac" or qt_os=="win32"', { 'export_dependent_settings': [ '../third_party/khronos/khronos.gyp:khronos_headers', ], diff --git a/chromium/gpu/gles2_cmd_helper.gypi b/chromium/gpu/gles2_cmd_helper.gypi index 523a7614bbb..87f971c4520 100644 --- a/chromium/gpu/gles2_cmd_helper.gypi +++ b/chromium/gpu/gles2_cmd_helper.gypi @@ -3,6 +3,9 @@ # found in the LICENSE file. { + 'dependencies': [ + '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers', + ], # Library helps make GLES2 command buffers. 'sources': [ 'command_buffer/client/gles2_cmd_helper.cc', |