Index: ui/gfx/gl/gl.gyp |
diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp |
index f7c787992cfec4d208db9ea93595e16dd3ee45e1..7ed0aaeec33dd086fd8e23b7640e0a92892e76ab 100644 |
--- a/ui/gfx/gl/gl.gyp |
+++ b/ui/gfx/gl/gl.gyp |
@@ -41,11 +41,13 @@ |
'gl_context_osmesa.h', |
'gl_context_stub.cc', |
'gl_context_stub.h', |
+ 'gl_context_wayland.cc', |
'gl_context_win.cc', |
'gl_implementation.cc', |
'gl_implementation.h', |
'gl_implementation_linux.cc', |
'gl_implementation_mac.cc', |
+ 'gl_implementation_wayland.cc', |
'gl_implementation_win.cc', |
'gl_interface.cc', |
'gl_interface.h', |
@@ -57,6 +59,7 @@ |
'gl_surface_mac.cc', |
'gl_surface_stub.cc', |
'gl_surface_stub.h', |
+ 'gl_surface_wayland.cc', |
'gl_surface_win.cc', |
'gl_surface_osmesa.cc', |
'gl_surface_osmesa.h', |
@@ -111,11 +114,24 @@ |
'<(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/': [ |
+ ['exclude', '_(linux)\\.cc$'], |
+ ], |
+ }, { |
+ 'sources/': [ |
+ ['exclude', '_(wayland)\\.cc$'], |
+ ], |
+ }], |
jonathan.backer
2011/07/26 14:56:27
My understanding is that setting chromium_code to
|
+ ['use_x11 == 1 and use_wayland != 1', { |
'sources': [ |
'gl_context_glx.cc', |
'gl_context_glx.h', |