diff options
Diffstat (limited to 'app/app_base.gypi')
| -rw-r--r-- | app/app_base.gypi | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index e5faf0c..d8cb796 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -18,21 +18,21 @@ '../ui/base/models/tree_model.h', '../ui/base/models/tree_node_iterator.h', '../ui/base/models/tree_node_model.h', - 'app_paths.h', - 'app_paths.cc', - 'app_switches.h', - 'app_switches.cc', '../ui/base/system_monitor/system_monitor.cc', '../ui/base/system_monitor/system_monitor.h', '../ui/base/system_monitor/system_monitor_mac.mm', '../ui/base/system_monitor/system_monitor_posix.cc', '../ui/base/system_monitor/system_monitor_win.cc', + 'app_paths.h', + 'app_paths.cc', + 'app_switches.h', + 'app_switches.cc', ], 'conditions': [ ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', { 'sources!': [ - 'gtk_dnd_util.cc', - 'gtk_dnd_util.h', + '../ui/base/dragdrop/gtk_dnd_util.cc', + '../ui/base/dragdrop/gtk_dnd_util.h', 'gtk_signal.h', 'gtk_signal_registrar.cc', 'gtk_signal_registrar.h', @@ -112,6 +112,15 @@ '../ui/base/clipboard/clipboard_win.cc', '../ui/base/clipboard/scoped_clipboard_writer.cc', '../ui/base/clipboard/scoped_clipboard_writer.h', + '../ui/base/dragdrop/drag_drop_types_gtk.cc', + '../ui/base/dragdrop/drag_drop_types_win.cc', + '../ui/base/dragdrop/drag_drop_types.h', + '../ui/base/dragdrop/drag_source.cc', + '../ui/base/dragdrop/drag_source.h', + '../ui/base/dragdrop/drop_target.cc', + '../ui/base/dragdrop/drop_target.h', + '../ui/base/dragdrop/gtk_dnd_util.cc', + '../ui/base/dragdrop/gtk_dnd_util.h', '../ui/base/dragdrop/os_exchange_data_provider_gtk.cc', '../ui/base/dragdrop/os_exchange_data_provider_gtk.h', '../ui/base/dragdrop/os_exchange_data_provider_win.cc', @@ -149,9 +158,6 @@ 'bidi_line_iterator.cc', 'data_pack.cc', 'data_pack.h', - 'drag_drop_types_gtk.cc', - 'drag_drop_types_win.cc', - 'drag_drop_types.h', 'event_synthesis_gtk.cc', 'event_synthesis_gtk.h', 'gfx/font_util.h', @@ -174,8 +180,6 @@ 'gfx/gl/gl_implementation_win.cc', 'gfx/gl/gl_interface.h', 'gfx/gl/gl_interface.cc', - 'gtk_dnd_util.cc', - 'gtk_dnd_util.h', 'gtk_signal.h', 'gtk_signal_registrar.cc', 'gtk_signal_registrar.h', @@ -221,10 +225,6 @@ 'theme_provider.h', 'view_prop.cc', 'view_prop.h', - 'win/drag_source.cc', - 'win/drag_source.h', - 'win/drop_target.cc', - 'win/drop_target.h', 'win/hwnd_util.cc', 'win/hwnd_util.h', 'win/iat_patch_function.cc', @@ -299,11 +299,11 @@ # Note: because of gyp predence rules this has to be defined as # 'sources/' rather than 'sources!'. 'sources/': [ + ['exclude', '^../ui/base/dragdrop/drag_drop_types_gtk.cc'], ['exclude', '^../ui/base/dragdrop/os_exchange_data.cc'], ['exclude', '^../ui/base/dragdrop/os_exchange_data.h'], ['exclude', '^../ui/base/dragdrop/os_exchange_data_provider_gtk.cc'], ['exclude', '^../ui/base/dragdrop/os_exchange_data_provider_gtk.h'], - ['exclude', '^drag_drop_types_gtk.cc'], ], }], ['toolkit_views==1', { @@ -317,8 +317,12 @@ }], ['OS!="win"', { 'sources!': [ + '../ui/base/dragdrop/drag_source.cc', + '../ui/base/dragdrop/drag_source.h', + '../ui/base/dragdrop/drag_drop_types.h', + '../ui/base/dragdrop/drop_target.cc', + '../ui/base/dragdrop/drop_target.h', '../ui/base/dragdrop/os_exchange_data.cc', - 'drag_drop_types.h', 'gfx/gdi_util.cc', 'gfx/gdi_util.h', 'gfx/icon_util.cc', |