diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 00:31:12 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 00:31:12 +0000 |
| commit | f2baf167bba91fd24087427969fa4c616535640f (patch) | |
| tree | be0180965abf22c98dd77ac36387879c7b771358 /base | |
| parent | 0006f107ce835ea234dc8ae0bc8b220d9cef0f31 (diff) | |
| download | chromium_src-f2baf167bba91fd24087427969fa4c616535640f.zip chromium_src-f2baf167bba91fd24087427969fa4c616535640f.tar.gz chromium_src-f2baf167bba91fd24087427969fa4c616535640f.tar.bz2 | |
SCons build updates:
* Add base\file_util_linux.cc.
* Add unit tests base\{idletimer,string_escape}_unittest.cc.
* Add chrome\browser\views\hwnd_html_view.cc.
* Add chrome\browser\tabs\tab_dragging_test.cc.
* Add chrome\browser\views\bookmark_bar_view_test.cc
* Add chrome\test\ui\view_event_test_base.cc.
* Only define on Windows build of base: _Win32_WINNT=0x0600, WINVER=0x0600, _HAS_EXCEPTIONS=0.
TBR: bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/SConscript | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/base/SConscript b/base/SConscript index 24dfe86..f4fc47a 100644 --- a/base/SConscript +++ b/base/SConscript @@ -131,7 +131,12 @@ if env['PLATFORM'] == 'darwin': 'sys_string_conversions_mac.cc', ]) -if env['PLATFORM'] in ('darwin', 'linux2'): +if env['PLATFORM'] == 'posix': + input_files.extend([ + 'file_util_linux.cc', + ]) + +if env['PLATFORM'] in ('darwin', 'posix'): input_files.extend([ 'condition_variable_posix.cc', 'lock_impl_posix.cc', @@ -160,9 +165,6 @@ env_tests.Prepend( 'PNG_USER_CONFIG', 'CHROME_PNG_WRITE_SUPPORT', 'U_STATIC_IMPLEMENTATION', - '_WIN32_WINNT=0x0600', - 'WINVER=0x0600', - '_HAS_EXCEPTIONS=0', ], LIBS = [ 'base', @@ -188,6 +190,11 @@ if env['PLATFORM'] == 'win32': '/WX', '/Wp64', ], + CPPDEFINES = [ + '_WIN32_WINNT=0x0600', + 'WINVER=0x0600', + '_HAS_EXCEPTIONS=0', + ], LINKFLAGS = [ '/MANIFEST', '/DELAYLOAD:"dwmapi.dll"', @@ -223,6 +230,7 @@ test_files = [ 'gfx/rect_unittest.cc', 'gfx/uniscribe_unittest.cc', 'gfx/vector_canvas_unittest.cc', + 'idletimer_unittest.cc', 'hmac_unittest.cc', 'json_reader_unittest.cc', 'json_writer_unittest.cc', @@ -242,19 +250,20 @@ test_files = [ 'singleton_unittest.cc', 'stack_container_unittest.cc', 'stats_table_unittest.cc', - 'string_tokenizer_unittest.cc', + 'string_escape_unittest.cc', 'string_piece_unittest.cc', + 'string_tokenizer_unittest.cc', 'string_util_unittest.cc', 'thread_local_storage_unittest.cc', 'thread_unittest.cc', - 'tracked_objects_test.cc', 'time_unittest.cc', 'timer_unittest.cc', + 'tracked_objects_test.cc', 'values_unittest.cc', 'waitable_event_unittest.cc', 'win_util_unittest.cc', - 'word_iterator_unittest.cc', 'wmi_util_unittest.cc', + 'word_iterator_unittest.cc', ] if env['PLATFORM'] == 'win32': |