diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-10-30 14:27:28 +0100 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 14:04:48 +0200 |
| commit | 812036dfedd89cd4eb772e3570d88bcae80d0728 (patch) | |
| tree | 8d62bfb3dde61810c38f50757bfe83e17e6850ad /chromium/gpu/gpu.gyp | |
| parent | a9d7d1f49adefcd1d2aed853eedc78d65fbe7ca0 (diff) | |
<chromium> Fix the build with a GL ES2 configured Qt.
GLES/gl2.h is included through Qt public headers and the copy of
Chromium is used since its include path comes before /usr/include.
The problem is that this header is incompatible for some reasons,
one of them being that it converts all GL function symbols from
gl* to GLES2*.
Qt layer code should always need to go through GL directly,
so make sure that only GYP targets that depend directly on gpu.gyp,
khronos.gyp or webkit_gpu.gyp will have an include path
pointing to those headers.
Replace all_dependent_settings with direct_dependent_settings and
control which target inherits this include_dirs from its dependencies
by using export_dependent_settings.
Change-Id: I82ae8a5a62f7d968375b971757b2126670a02461
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/gpu/gpu.gyp')
| -rw-r--r-- | chromium/gpu/gpu.gyp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/chromium/gpu/gpu.gyp b/chromium/gpu/gpu.gyp index 5aa1c05c1f8..01df691398c 100644 --- a/chromium/gpu/gpu.gyp +++ b/chromium/gpu/gpu.gyp @@ -22,6 +22,9 @@ 'command_buffer/command_buffer.gyp:gles2_utils', 'gles2_cmd_helper', ], + 'export_dependent_settings': [ + '../third_party/khronos/khronos.gyp:khronos_headers', + ], 'defines': [ 'GLES2_IMPL_IMPLEMENTATION', ], @@ -109,6 +112,9 @@ 'command_buffer_client', 'gles2_implementation', ], + 'export_dependent_settings': [ + 'command_buffer_client', + ], 'defines': [ 'GLES2_C_LIB_IMPLEMENTATION', ], @@ -134,6 +140,9 @@ 'command_buffer_client', 'gles2_implementation_client_side_arrays_no_check', ], + 'export_dependent_settings': [ + 'command_buffer_client', + ], 'sources': [ '<@(gles2_c_lib_source_files)', ], @@ -412,6 +421,9 @@ 'gpu_config', 'gpu_ipc', ], + 'export_dependent_settings': [ + 'command_buffer_common', + ], 'sources': [ 'gpu_export.h', ], @@ -454,6 +466,9 @@ 'dependencies': [ 'command_buffer_common', ], + 'export_dependent_settings': [ + 'command_buffer_common', + ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, @@ -479,6 +494,9 @@ 'dependencies': [ 'command_buffer_common', ], + 'export_dependent_settings': [ + 'command_buffer_common', + ], }, { 'target_name': 'gpu_config', |