diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-16 21:31:11 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-16 21:31:11 +0000 |
| commit | 9afa44be3e86fde82d22187a6a8dcb60562aa257 (patch) | |
| tree | 9f1833a9bb9916f65b750daa71646c52501aa4ee | |
| parent | 4fc4ce130b4798c185124e6eb721068ee2cc670f (diff) | |
| download | chromium_src-9afa44be3e86fde82d22187a6a8dcb60562aa257.zip chromium_src-9afa44be3e86fde82d22187a6a8dcb60562aa257.tar.gz chromium_src-9afa44be3e86fde82d22187a6a8dcb60562aa257.tar.bz2 | |
Reenable building views under Linux.
Review URL: http://codereview.chromium.org/48028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11780 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/SConscript | 2 | ||||
| -rw-r--r-- | chrome/views/SConscript | 37 |
2 files changed, 21 insertions, 18 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index b2071f4..1e7c797 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -130,6 +130,7 @@ env_dll.Append( 'sdch', 'sqlite', 'v8_snapshot', + 'views', 'X11', 'Xrender', @@ -162,7 +163,6 @@ if env_dll.Bit('windows'): LIBS = [ 'activex_shim', 'browser_views', - 'views', #'comctl32.lib', #'dwmapi.lib', diff --git a/chrome/views/SConscript b/chrome/views/SConscript index 90f2b95..18771fa 100644 --- a/chrome/views/SConscript +++ b/chrome/views/SConscript @@ -188,23 +188,26 @@ if env.Bit('linux'): # TODO(port?): Incomplete and undecided Views stuff. These compile but aren't # currently needed, and they break the shared build due to missing symbols # (from files that aren't yet ported). - input_files.Remove( - 'background.cc', - 'border.cc', - 'external_focus_tracker.cc', - 'grid_layout.cc', - 'image_view.cc', - 'label.cc', - 'layout_manager.cc', - 'painter.cc', - 'repeat_controller.cc', - 'root_view.cc', - 'scroll_bar.cc', - 'scroll_view.cc', - 'throbber.cc', - 'view.cc', - 'view_storage.cc', - ) + # + # TOD(erg): Commenting this section out because we're trying to get views to + # compile under Linux again. +# input_files.Remove( +# 'background.cc', +# 'border.cc', +# 'external_focus_tracker.cc', +# 'grid_layout.cc', +# 'image_view.cc', +# 'label.cc', +# 'layout_manager.cc', +# 'painter.cc', +# 'repeat_controller.cc', +# 'root_view.cc', +# 'scroll_bar.cc', +# 'scroll_view.cc', +# 'throbber.cc', +# 'view.cc', +# 'view_storage.cc', +# ) # TODO(port): Port to Linux. input_files.Remove( |