diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-08 18:15:38 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-08 18:15:38 +0000 |
| commit | 4a4067352ac4ec5e258e69c00f634c4704425c8f (patch) | |
| tree | e2bd13257840c57b5b6b63cb4cbc22eb9952139e | |
| parent | 0bf1290e675e027726127d74e5210239ebf76dbb (diff) | |
| download | chromium_src-4a4067352ac4ec5e258e69c00f634c4704425c8f.zip chromium_src-4a4067352ac4ec5e258e69c00f634c4704425c8f.tar.gz chromium_src-4a4067352ac4ec5e258e69c00f634c4704425c8f.tar.bz2 | |
Catch up SCons build with latest changes:
Add new *_posix.cc, and condition_variable_win.cc files, replacing old condition_variable.cc file.
Additional updates:
Remove reference to deleted FontMetrics.cpp.
Add word_iterator_unittest.cc.
Add two overlooked language .rc files (es-419 and nb).
TBR: mmentovai
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@576 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/SConscript | 11 | ||||
| -rw-r--r-- | chrome/app/resources/SConscript | 2 | ||||
| -rw-r--r-- | webkit/SConscript.port | 1 |
3 files changed, 12 insertions, 2 deletions
diff --git a/base/SConscript b/base/SConscript index 39ccdda..b37b6f4 100644 --- a/base/SConscript +++ b/base/SConscript @@ -61,7 +61,6 @@ input_files = [ 'clipboard.cc', 'clipboard_util.cc', 'command_line.cc', - 'condition_variable.cc', 'debug_on_start.cc', 'debug_util.cc', 'event_recorder.cc', @@ -117,6 +116,7 @@ input_files = [ if env['PLATFORM'] == 'win32': input_files.extend([ 'base_paths_win.cc', + 'condition_variable_win.cc', 'file_util_win.cc', 'lock_impl_win.cc', 'string_util_win.cc', @@ -130,6 +130,14 @@ if env['PLATFORM'] == 'darwin': 'sys_string_conversions_mac.cc', ]) +if env['PLATFORM'] in ('darwin', 'linux2'): + input_files.extend([ + 'condition_variable_posix.cc', + 'lock_impl_posix.cc', + 'thread_posix.cc', + 'thread_local_storage_posix.cc', + ]) + env.ChromeStaticLibrary('base', input_files) @@ -258,6 +266,7 @@ test_files = [ 'timer_unittest.cc', 'values_unittest.cc', 'win_util_unittest.cc', + 'word_iterator_unittest.cc', 'wmi_util_unittest.cc', dll[1], diff --git a/chrome/app/resources/SConscript b/chrome/app/resources/SConscript index 05d2efa2..501bd60 100644 --- a/chrome/app/resources/SConscript +++ b/chrome/app/resources/SConscript @@ -54,6 +54,7 @@ rc_files = [ 'locale_settings_el.rc',
'locale_settings_en-GB.rc',
'locale_settings_en-US.rc',
+ 'locale_settings_es-419.rc',
'locale_settings_es.rc',
'locale_settings_et.rc',
'locale_settings_fi.rc',
@@ -69,6 +70,7 @@ rc_files = [ 'locale_settings_ko.rc',
'locale_settings_lt.rc',
'locale_settings_lv.rc',
+ 'locale_settings_nb.rc',
'locale_settings_nl.rc',
'locale_settings_pl.rc',
'locale_settings_pt-BR.rc',
diff --git a/webkit/SConscript.port b/webkit/SConscript.port index 8e3409e..204587e2 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -116,7 +116,6 @@ input_files = [ '$PORT_DIR/platform/KeyEventWin.cpp', '$PORT_DIR/platform/GKURL.cpp', '$PORT_DIR/platform/FramelessScrollView.cpp', - '$PORT_DIR/platform/FontMetrics.cpp', '$PORT_DIR/platform/FileChooserWin.cpp', '$PORT_DIR/platform/EditorWin.cpp', '$PORT_DIR/platform/DragImageWin.cpp', |