diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-26 23:50:21 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-26 23:50:21 +0000 |
| commit | 0a509159a4ac5802e7f7c471637f7625a487d333 (patch) | |
| tree | 5ccaeefd3d986fd3446800e9e9ff33876b545146 /chrome/SConscript | |
| parent | 92db537b4746c329ba9ed15b028f9a33f5fb09e4 (diff) | |
| download | chromium_src-0a509159a4ac5802e7f7c471637f7625a487d333.zip chromium_src-0a509159a4ac5802e7f7c471637f7625a487d333.tar.gz chromium_src-0a509159a4ac5802e7f7c471637f7625a487d333.tar.bz2 | |
Catch up SCons Windows build with recent file shuffling and other changes:
* New browser\download\ subdirectory.
* New browser\importer\ subdirectory.
* New browser\views\old_frames subdirectory.
* Add common/notification_registrar.cc.
* Remove title_chomper{,_unittest}.cc.
* Link against sdch where empirically necessary.
* No libevent.lib on Windows, comment out until Linux hits the .dll logic.
Review URL: http://codereview.chromium.org/4310
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2655 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/SConscript')
| -rw-r--r-- | chrome/SConscript | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 958d8ab..79f82f3 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -102,6 +102,7 @@ env_dll.Append( 'breakpad_handler', 'googleurl', 'net', + 'sdch', 'skia', 'bzip2', env_dll['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed @@ -174,6 +175,7 @@ input_files = [] if env_dll['PLATFORM'] == 'win32': input_files.extend([ 'app/chrome_dll_main.cc', + '$V8_DIR/snapshot-empty$OBJSUFFIX', ]) libs = [ @@ -186,11 +188,11 @@ libs = [ 'plugin/plugin.lib', 'renderer/renderer.lib', 'third_party/hunspell/hunspell.lib', - 'third_party/libevent/libevent.lib', + # TODO(sgk): libevent isn't used on Windows, revisit when Linux gets here + #'third_party/libevent/libevent.lib', 'third_party/sqlite/sqlite.lib', 'views/views.lib', '$V8_DIR/v8.lib', - '$V8_DIR/snapshot-empty$OBJSUFFIX', ] @@ -239,7 +241,8 @@ if env_dll['PLATFORM'] == 'win32': def chrome_version_emitter(target, source, env): source.append('$CHROME_SRC_DIR/VERSION') - source.append('$CHROME_SRC_DIR/BRANDING') + # TODO(sgk): parameterize for chromium-vs.-google_chrome + source.append('$CHROME_SRC_DIR/app/theme/google_chrome/BRANDING') return target, source b = Builder(action = '$CHROME_VERSION_RC_COM', |