diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-19 21:37:13 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-19 21:37:13 +0000 |
| commit | 5e1d37e5d4c6c573b4e9d0e3290fb3b2748981c3 (patch) | |
| tree | 0387c6424afcfa662393afd64dfb89fa53853357 | |
| parent | ff9b986cb33d05c87eb188215770f6a833a08b2b (diff) | |
| download | chromium_src-5e1d37e5d4c6c573b4e9d0e3290fb3b2748981c3.zip chromium_src-5e1d37e5d4c6c573b4e9d0e3290fb3b2748981c3.tar.gz chromium_src-5e1d37e5d4c6c573b4e9d0e3290fb3b2748981c3.tar.bz2 | |
Linux GYP: build fix
Review URL: http://codereview.chromium.org/42412
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12161 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome.gyp | 292 |
1 files changed, 182 insertions, 110 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 732da66..a0e7fe8 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1065,6 +1065,8 @@ 'browser/views/event_utils.h', 'browser/views/external_protocol_dialog.cc', 'browser/views/external_protocol_dialog.h', + 'browser/views/fill_layout.cc', + 'browser/views/fill_layout.h', 'browser/views/find_bar_view.cc', 'browser/views/find_bar_view.h', 'browser/views/find_bar_win.cc', @@ -1535,6 +1537,11 @@ }], ], }], + ['OS=="linux"', { + 'dependencies': [ + 'views', + ] + }], ['OS=="win"', { 'include_dirs': [ 'third_party/wtl/include', @@ -1873,6 +1880,9 @@ 'test/ui/layout_plugin_uitest.cpp', 'test/ui/omnibox_uitest.cc', ], + 'dependencies': [ + 'views', + ], }], ['OS=="mac"', { # mac tests load the resources from the built app beside the test @@ -2080,6 +2090,11 @@ 'test/v8_unit_test.h', ], 'conditions': [ + ['OS=="linux"', { + 'dependencies': [ + 'views', + ], + }], ['OS=="win"', { 'defines': [ '__STD_C', @@ -2262,7 +2277,7 @@ }, ], }], # OS!="mac" - ['OS=="win"', + ['OS=="win" or OS=="linux"', { 'targets': [ { 'target_name': 'views', @@ -2280,139 +2295,148 @@ '../webkit/webkit.gyp:glue', ], 'sources': [ - # All .cc, .h, .m, and .mm files under browser except for tests and - # mocks. + # All .cc, .h under views, except unittests 'views/accelerator.cc', 'views/accelerator.h', - 'views/accelerator_handler.cc', - 'views/accelerator_handler.h', - 'views/accessibility/accessible_wrapper.cc', - 'views/accessibility/accessible_wrapper.h', 'views/accessibility/view_accessibility.cc', 'views/accessibility/view_accessibility.h', - 'views/aero_tooltip_manager.cc', - 'views/aero_tooltip_manager.h', - 'views/app_modal_dialog_delegate.h', + 'views/accessibility/view_accessibility_wrapper.cc', + 'views/accessibility/view_accessibility_wrapper.h', 'views/background.cc', 'views/background.h', - 'views/base_button.cc', - 'views/base_button.h', - 'views/bitmap_scroll_bar.cc', - 'views/bitmap_scroll_bar.h', 'views/border.cc', 'views/border.h', - 'views/button.cc', - 'views/button.h', - 'views/button_dropdown.cc', - 'views/button_dropdown.h', - 'views/checkbox.cc', - 'views/checkbox.h', - 'views/chrome_menu.cc', - 'views/chrome_menu.h', - 'views/client_view.cc', - 'views/client_view.h', - 'views/combo_box.cc', - 'views/combo_box.h', - 'views/controller.h', - 'views/custom_frame_view.cc', - 'views/custom_frame_view.h', - 'views/decision.cc', - 'views/decision.h', - 'views/dialog_client_view.cc', - 'views/dialog_client_view.h', - 'views/dialog_delegate.cc', - 'views/dialog_delegate.h', + 'views/controls/button/button.cc', + 'views/controls/button/button.h', + 'views/controls/button/button_dropdown.cc', + 'views/controls/button/button_dropdown.h', + 'views/controls/button/checkbox.cc', + 'views/controls/button/checkbox.h', + 'views/controls/button/custom_button.cc', + 'views/controls/button/custom_button.h', + 'views/controls/button/image_button.cc', + 'views/controls/button/image_button.h', + 'views/controls/button/menu_button.cc', + 'views/controls/button/menu_button.h', + 'views/controls/button/native_button.cc', + 'views/controls/button/native_button.h', + 'views/controls/button/native_button_win.cc', + 'views/controls/button/native_button_win.h', + 'views/controls/button/native_button_wrapper.h', + 'views/controls/button/radio_button.cc', + 'views/controls/button/radio_button.h', + 'views/controls/button/text_button.cc', + 'views/controls/button/text_button.h', + 'views/controls/combo_box.cc', + 'views/controls/combo_box.h', + 'views/controls/hwnd_view.cc', + 'views/controls/hwnd_view.h', + 'views/controls/image_view.cc', + 'views/controls/image_view.h', + 'views/controls/label.cc', + 'views/controls/label.h', + 'views/controls/link.cc', + 'views/controls/link.h', + 'views/controls/menu/chrome_menu.cc', + 'views/controls/menu/chrome_menu.h', + 'views/controls/menu/controller.h', + 'views/controls/menu/menu.cc', + 'views/controls/menu/menu.h', + 'views/controls/menu/view_menu_delegate.h', + 'views/controls/message_box_view.cc', + 'views/controls/message_box_view.h', + 'views/controls/native_control.cc', + 'views/controls/native_control.h', + 'views/controls/native_control_win.cc', + 'views/controls/native_control_win.h', + 'views/controls/scroll_view.cc', + 'views/controls/scroll_view.h', + 'views/controls/scrollbar/bitmap_scroll_bar.cc', + 'views/controls/scrollbar/bitmap_scroll_bar.h', + 'views/controls/scrollbar/native_scroll_bar.cc', + 'views/controls/scrollbar/native_scroll_bar.h', + 'views/controls/scrollbar/scroll_bar.cc', + 'views/controls/scrollbar/scroll_bar.h', + 'views/controls/separator.cc', + 'views/controls/separator.h', + 'views/controls/single_split_view.cc', + 'views/controls/single_split_view.h', + 'views/controls/tabbed_pane.cc', + 'views/controls/tabbed_pane.h', + 'views/controls/table/group_table_view.cc', + 'views/controls/table/group_table_view.h', + 'views/controls/table/table_view.cc', + 'views/controls/table/table_view.h', + 'views/controls/text_field.cc', + 'views/controls/text_field.h', + 'views/controls/throbber.cc', + 'views/controls/throbber.h', + 'views/controls/tree/tree_model.h', + 'views/controls/tree/tree_node_iterator.h', + 'views/controls/tree/tree_node_model.h', + 'views/controls/tree/tree_view.cc', + 'views/controls/tree/tree_view.h', 'views/event.cc', 'views/event.h', - 'views/external_focus_tracker.cc', - 'views/external_focus_tracker.h', - 'views/focus_manager.cc', - 'views/focus_manager.h', + 'views/fill_layout.cc', + 'views/fill_layout.h', + 'views/focus/external_focus_tracker.cc', + 'views/focus/external_focus_tracker.h', + 'views/focus/focus_manager.cc', + 'views/focus/focus_manager.h', + 'views/focus/view_storage.cc', + 'views/focus/view_storage.h', 'views/grid_layout.cc', 'views/grid_layout.h', - 'views/group_table_view.cc', - 'views/group_table_view.h', - 'views/hwnd_notification_source.h', - 'views/hwnd_view.cc', - 'views/hwnd_view.h', - 'views/image_view.cc', - 'views/image_view.h', - 'views/label.cc', - 'views/label.h', 'views/layout_manager.cc', 'views/layout_manager.h', - 'views/link.cc', - 'views/link.h', - 'views/menu.cc', - 'views/menu.h', - 'views/menu_button.cc', - 'views/menu_button.h', - 'views/message_box_view.cc', - 'views/message_box_view.h', - 'views/native_button.cc', - 'views/native_button.h', - 'views/native_control.cc', - 'views/native_control.h', - 'views/native_frame_view.cc', - 'views/native_frame_view.h', - 'views/native_scroll_bar.cc', - 'views/native_scroll_bar.h', - 'views/non_client_view.cc', - 'views/non_client_view.h', 'views/painter.cc', 'views/painter.h', - 'views/radio_button.cc', - 'views/radio_button.h', 'views/repeat_controller.cc', 'views/repeat_controller.h', - 'views/root_view.cc', - 'views/root_view.h', - 'views/root_view_drop_target.cc', - 'views/root_view_drop_target.h', - 'views/root_view_gtk.cc', - 'views/root_view_win.cc', - 'views/scroll_bar.cc', - 'views/scroll_bar.h', - 'views/scroll_view.cc', - 'views/scroll_view.h', - 'views/separator.cc', - 'views/separator.h', - 'views/single_split_view.cc', - 'views/single_split_view.h', - 'views/tabbed_pane.cc', - 'views/tabbed_pane.h', - 'views/table_view.cc', - 'views/table_view.h', - 'views/text_button.cc', - 'views/text_button.h', - 'views/text_field.cc', - 'views/text_field.h', - 'views/throbber.cc', - 'views/throbber.h', - 'views/tooltip_manager.cc', - 'views/tooltip_manager.h', - 'views/tree_model.h', - 'views/tree_node_iterator.h', - 'views/tree_node_model.h', - 'views/tree_view.cc', - 'views/tree_view.h', 'views/view.cc', 'views/view.h', 'views/view_constants.cc', 'views/view_constants.h', 'views/view_gtk.cc', - 'views/view_menu_delegate.h', - 'views/view_storage.cc', - 'views/view_storage.h', 'views/view_win.cc', - 'views/widget.h', - 'views/widget_win.cc', - 'views/widget_win.h', - 'views/window.cc', - 'views/window.h', - 'views/window_delegate.cc', - 'views/window_delegate.h', - 'views/window_resources.h', + 'views/widget/accelerator_handler.cc', + 'views/widget/accelerator_handler.h', + 'views/widget/aero_tooltip_manager.cc', + 'views/widget/aero_tooltip_manager.h', + 'views/widget/hwnd_notification_source.h', + 'views/widget/root_view.cc', + 'views/widget/root_view.h', + 'views/widget/root_view_drop_target.cc', + 'views/widget/root_view_drop_target.h', + 'views/widget/root_view_gtk.cc', + 'views/widget/root_view_win.cc', + 'views/widget/tooltip_manager.cc', + 'views/widget/tooltip_manager.h', + 'views/widget/widget.h', + 'views/widget/widget_gtk.cc', + 'views/widget/widget_gtk.h', + 'views/widget/widget_win.cc', + 'views/widget/widget_win.h', + 'views/window/app_modal_dialog_delegate.h', + 'views/window/client_view.cc', + 'views/window/client_view.h', + 'views/window/custom_frame_view.cc', + 'views/window/custom_frame_view.h', + 'views/window/dialog_client_view.cc', + 'views/window/dialog_client_view.h', + 'views/window/dialog_delegate.cc', + 'views/window/dialog_delegate.h', + 'views/window/native_frame_view.cc', + 'views/window/native_frame_view.h', + 'views/window/non_client_view.cc', + 'views/window/non_client_view.h', + 'views/window/window.h', + 'views/window/window_delegate.cc', + 'views/window/window_delegate.h', + 'views/window/window_resources.h', + 'views/window/window_win.cc', + 'views/window/window_win.h', ], # These are layered in conditionals in the event other platforms # end up using this module as well. @@ -2427,6 +2451,54 @@ 'third_party/wtl/include', ], },], + ['OS=="linux"', { + 'sources!': [ + 'views/accelerator.cc', + 'views/accessibility/accessible_wrapper.cc', + 'views/accessibility/view_accessibility.cc', + 'views/accessibility/view_accessibility_wrapper.cc', + 'views/controls/button/button.cc', + 'views/controls/button/custom_button.cc', + 'views/controls/scrollbar/bitmap_scroll_bar.cc', + 'views/controls/button/image_button.cc', + 'views/controls/button/button_dropdown.cc', + 'views/controls/button/checkbox.cc', + 'views/controls/menu/chrome_menu.cc', + 'views/controls/combo_box.cc', + 'views/focus/focus_manager.cc', + 'views/controls/table/group_table_view.cc', + 'views/controls/hwnd_view.cc', + 'views/controls/link.cc', + 'views/controls/menu/menu.cc', + 'views/controls/button/menu_button.cc', + 'views/controls/message_box_view.cc', + 'views/controls/button/native_button.cc', + 'views/controls/native_control.cc', + 'views/controls/scrollbar/native_scroll_bar.cc', + 'views/controls/button/radio_button.cc', + 'views/resize_corner.cc', + 'views/controls/separator.cc', + 'views/controls/single_split_view.cc', + 'views/controls/tabbed_pane.cc', + 'views/controls/table/table_view.cc', + 'views/controls/button/text_button.cc', + 'views/controls/text_field.cc', + 'views/controls/tree/tree_view.cc', + 'views/widget/accelerator_handler.cc', + 'views/widget/aero_tooltip_manager.cc', + 'views/widget/root_view_drop_target.cc', + 'views/widget/tooltip_manager.cc', + 'views/widget/widget_win.cc', + 'views/window/client_view.cc', + 'views/window/custom_frame_view.cc', + 'views/window/dialog_delegate.cc', + 'views/window/dialog_client_view.cc', + 'views/window/native_frame_view.cc', + 'views/window/non_client_view.cc', + 'views/window/window_delegate.cc', + 'views/window/window_win.cc', + ], + }], ], }, { |