Chromium Code Reviews| Index: ui/gfx/gl/gl.gyp |
| diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp |
| index 5771682e34375e928ed7f288332f3ea13626948d..abf3759d1af4f7d73bf96b524e36596831148d06 100644 |
| --- a/ui/gfx/gl/gl.gyp |
| +++ b/ui/gfx/gl/gl.gyp |
| @@ -58,6 +58,7 @@ |
| 'gl_surface_mac.cc', |
| 'gl_surface_stub.cc', |
| 'gl_surface_stub.h', |
| + 'gl_surface_wayland.cc', |
|
sky
2011/07/27 15:51:05
Does this need to be excluded if wayland isn't def
|
| 'gl_surface_win.cc', |
| 'gl_surface_osmesa.cc', |
| 'gl_surface_osmesa.h', |
| @@ -112,11 +113,20 @@ |
| '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', |
| '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', |
| ], |
| - 'include_dirs': [ |
| - '<(DEPTH)/third_party/angle/include', |
| + 'conditions': [ |
| + ['use_wayland != 1', { |
| + 'include_dirs': [ |
| + '<(DEPTH)/third_party/angle/include', |
| + ], |
| + }], |
| ], |
| }], |
| - ['use_x11 == 1', { |
| + ['use_wayland == 1', { |
| + 'sources!': [ |
| + 'gl_surface_linux.cc', |
| + ], |
| + }], |
| + ['use_x11 == 1 and use_wayland != 1', { |
| 'sources': [ |
| 'gl_context_glx.cc', |
| 'gl_context_glx.h', |