diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 17:43:13 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 17:43:13 +0000 |
| commit | 3c8808a2b5e3d01505443e4fdcba2a0e0620644a (patch) | |
| tree | b3150cff918ebb04227c55a9463f13cafc553cc6 /chrome/installer | |
| parent | a2cf67e5986cdbdba24eb2b4ee0ef7be810e7cc7 (diff) | |
| download | chromium_src-3c8808a2b5e3d01505443e4fdcba2a0e0620644a.zip chromium_src-3c8808a2b5e3d01505443e4fdcba2a0e0620644a.tar.gz chromium_src-3c8808a2b5e3d01505443e4fdcba2a0e0620644a.tar.bz2 | |
Accumulated SCons changes for Windows chrome build, round II:
Includes other recent additions, and 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/8742
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer/SConscript | 5 | ||||
| -rw-r--r-- | chrome/installer/setup/SConscript | 1 | ||||
| -rw-r--r-- | chrome/installer/util/SConscript | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript index 606a112..bce8d00 100644 --- a/chrome/installer/mini_installer/SConscript +++ b/chrome/installer/mini_installer/SConscript @@ -52,7 +52,7 @@ env.Prepend( '/DYNAMICBASE:NO', '/PDB:${TARGETS[1]}', - '/MAP:${TARGETS[2]}', + #'/MAP:${TARGETS[2]}', ], LIBS = [ 'shlwapi.lib', @@ -64,7 +64,8 @@ env['CCFLAGS'].remove('/RTC1') components = [ "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj", "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj", - "$TARGET_ROOT/chrome_dll.lib", + #"$TARGET_ROOT/chrome_dll.lib", + "$TARGET_ROOT/chrome.lib", ] input_files = [ diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript index 3c99c45..e754c56 100644 --- a/chrome/installer/setup/SConscript +++ b/chrome/installer/setup/SConscript @@ -61,7 +61,6 @@ env.Prepend( '/nxcompat', '/PDB:${TARGETS[1]}', - '/MAP:${TARGETS[2]}', ], LIBS = [ 'msi.lib', diff --git a/chrome/installer/util/SConscript b/chrome/installer/util/SConscript index fde62a7a..eaa9fb5 100644 --- a/chrome/installer/util/SConscript +++ b/chrome/installer/util/SConscript @@ -38,7 +38,6 @@ env.Prepend( ) input_files = [ - '../../app/google_update_settings$OBJSUFFIX', 'browser_distribution.cc', 'copy_tree_work_item.cc', 'create_dir_work_item.cc', |