From edc469353a41710cf12a78211b9bc88adc4be9fe Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Wed, 30 Oct 2013 14:27:28 +0100 Subject: 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: Id4d98fe22ef8b778b5ba8da300dad28e69507732 Reviewed-by: Zeno Albisser Reviewed-by: Pierre Rossi --- chromium/third_party/khronos/khronos.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chromium/third_party/khronos') diff --git a/chromium/third_party/khronos/khronos.gyp b/chromium/third_party/khronos/khronos.gyp index 8a855728d52..88130d26b9d 100644 --- a/chromium/third_party/khronos/khronos.gyp +++ b/chromium/third_party/khronos/khronos.gyp @@ -7,7 +7,7 @@ { 'target_name': 'khronos_headers', 'type': 'none', - 'all_dependent_settings': { + 'direct_dependent_settings': { 'include_dirs': [ '.', '../../gpu', # Contains GLES2/gl2chromium.h -- cgit v1.2.1