Chromium Code Reviews| Index: base/base.gypi |
| diff --git a/base/base.gypi b/base/base.gypi |
| index 8c7945ae0c724a12dcf5c40d9bad737a3bf3330b..7aa4f729e7a3d07a341b79fb3dc15183d96038ff 100644 |
| --- a/base/base.gypi |
| +++ b/base/base.gypi |
| @@ -364,6 +364,17 @@ |
| '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks', |
| ], |
| 'conditions': [ |
| + [ 'use_wayland == 1', { |
| + 'sources!': [ |
| + 'message_pump_gtk.cc', |
| + 'message_pump_x.cc', |
| + ], |
| + }, { |
| + 'sources!': [ |
| + 'message_pump_wayland.cc', |
| + 'message_pump_wayland.h', |
| + ], |
| + }], |
| [ 'toolkit_uses_gtk==0', { |
| 'sources/': [ |
| ['exclude', '^nix/'], |
| @@ -454,6 +465,11 @@ |
| ], |
| }, |
| 'conditions': [ |
| + ['use_wayland == 1', { |
| + 'dependencies': [ |
| + '../build/linux/system.gyp:dbus-glib', |
|
Evan Martin
2011/07/21 18:40:07
What is this needed for? I don't see glib in any
|
| + ], |
| + }], |
| [ 'toolkit_uses_gtk==1', { |
| 'conditions': [ |
| [ 'chromeos==1', { |
| @@ -576,6 +592,8 @@ |
| 'message_pump_libevent.h', |
| 'message_pump_mac.h', |
| 'message_pump_mac.mm', |
| + 'message_pump_wayland.cc', |
| + 'message_pump_wayland.h', |
| 'metrics/field_trial.cc', |
| 'metrics/field_trial.h', |
| 'string16.cc', |