From d1b13d7b10e2edeb4faf23caec84a9851c0b3aa7 Mon Sep 17 00:00:00 2001
From: "sgk@google.com" <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 30 Oct 2008 05:35:44 +0000
Subject: Accumulated SCons changes for Windows chrome build and other recent
additions (doesn't fix everything, but gets significant pieces back on
track). * New/additional library dependencies in various test executables
(too many to be worth listing). * Portability: put library base names in
$LIBS instead of explicitly listing .lib files. * Have interactive_ui
re-use various object files from test/ui instead of (re-)listing the .cc
files. * Add new files: chrome\browser\bookmarks\bookmark_drag_data.cc
chrome\browser\bookmarks\bookmark_drag_utils.cc
chrome\browser\bookmarks\bookmark_table_model.cc
chrome\browser\browser_trial.cc
chrome\browser\download\download_request_manager_unittest.cc
chrome\browser\greasmonkey_master.cc chrome\browser\spellcheck_unittest.cc
chrome\browser\views\find_bar_view.cc chrome\browser\views\find_bar_win.cc
chrome\renderer\greasemonkey_slave.cc * Remove old files:
chrome\browser\find_in_page_controller.cc
chrome\browser\find_in_page_view.cc chrome\renderer\spellcheck_unittest.cc
* Remove relative reference to ../../app/google_update_settings$OBJSUFFIX. *
Get rid of by-hand /IMPLIB and /MAP flags. * Prefix / suffix portability in
the jscre library. * Rename $LIBXML_DIR/scons => $LIBXML_DIR/DerivedSources.
* Add $CHROME_DIR/app/resources to CPPPATH. * Add icu38 directories to
CPPPATH for building chrome/views files. Review URL:
http://codereview.chromium.org/8725
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4205 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/browser/SConscript | 5 +++++
chrome/browser/views/SConscript | 6 ++++++
2 files changed, 11 insertions(+)
(limited to 'chrome/browser')
diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript
index 5dbf23e..5b6cc6f 100644
--- a/chrome/browser/SConscript
+++ b/chrome/browser/SConscript
@@ -128,8 +128,11 @@ if env['PLATFORM'] == 'win32':
'bookmark_bar_context_menu_controller.cc',
'bookmarks/bookmark_codec.cc',
'bookmarks/bookmark_drag_data.cc',
+ 'bookmarks/bookmark_drag_utils.cc',
+ 'bookmarks/bookmark_folder_tree_model.cc',
'bookmarks/bookmark_model.cc',
'bookmarks/bookmark_storage.cc',
+ 'bookmarks/bookmark_table_model.cc',
'browser.cc',
'browser_about_handler.cc',
'browser_accessibility.cc',
@@ -141,6 +144,7 @@ if env['PLATFORM'] == 'win32':
'browser_prefs.cc',
'browser_process_impl.cc',
'browser_shutdown.cc',
+ 'browser_trial.cc',
'browser_url_handler.cc',
'browser_window.cc',
'browsing_data_remover.cc',
@@ -175,6 +179,7 @@ if env['PLATFORM'] == 'win32':
'first_run.cc',
'frame_util.cc',
'gears_integration.cc',
+ 'greasemonkey_master.cc',
'hang_monitor/hung_plugin_action.cc',
'hang_monitor/hung_window_detector.cc',
'history/download_database.cc',
diff --git a/chrome/browser/views/SConscript b/chrome/browser/views/SConscript
index d99443e..f882bc2 100644
--- a/chrome/browser/views/SConscript
+++ b/chrome/browser/views/SConscript
@@ -68,6 +68,7 @@ input_files = [
'edit_keyword_controller.cc',
'event_utils.cc',
'external_protocol_dialog.cc',
+ 'find_bar_view.cc',
'first_run_bubble.cc',
'first_run_customize_view.cc',
'first_run_view.cc',
@@ -136,4 +137,9 @@ input_files = [
'user_data_dir_dialog.cc',
]
+if env['PLATFORM'] == 'win32':
+ input_files.extend([
+ 'find_bar_win.cc',
+ ])
+
env.ChromeStaticLibrary('browser_views', input_files)
--
cgit v1.1