Index: ui/gl/BUILD.gn |
diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn |
index 55218bcf6a6cab44429384158635d2c2ce77b3c6..2af7aa95ddd34a060389c94fdf112a9aab28c721 100644 |
--- a/ui/gl/BUILD.gn |
+++ b/ui/gl/BUILD.gn |
@@ -20,6 +20,12 @@ config("gl_config") { |
include_dirs = [ gl_binding_output_dir ] |
} |
+# Dependents of this component must separatedly add |
+# "//third_party/mesa/src/include" to include_dirs. Although this can be done |
+# through all_dependent_configs, that does not ensure that this directory will |
+# be before Windows SDK include directory. But we must guarantee that, in other |
+# case we will pick gl.h header from SDK rather from mesa, |
+# and compilation will fail. |
Slava Chigrin
2014/12/16 17:53:49
Unfortunatelly, I can not find any more elegant so
no sievers
2014/12/16 19:38:46
hmm yea gyp has something to inject dependencies f
Slava Chigrin
2014/12/16 22:32:38
Sorry, let me explain problem, arising here, in mo
|
component("gl") { |
output_name = "gl_wrapper" # Avoid colliding with OS X"s libGL.dylib. |
@@ -318,6 +324,8 @@ source_set("gl_unittest_utils") { |
"$gl_binding_output_dir/gl_mock_autogen_gl.h", |
] |
+ # See commend before :gl target. |
+ include_dirs = [ "//third_party/mesa/src/include" ] |
no sievers
2014/12/16 19:38:46
why do we need this? we usually prefer khronos hea
Slava Chigrin
2014/12/16 22:32:38
OK, will change include path, if khronos have gl.h
|
configs += [ "//third_party/khronos:khronos_headers" ] |
public_configs = [ ":gl_unittest_utils_config" ] |