diff options
author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 17:57:16 +0000 |
---|---|---|
committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 17:57:16 +0000 |
commit | 2c6f641798260fe11754b86fc566504596f7ef5d (patch) | |
tree | 29dbea094f1e84350611406c2fecdd6d368abf2d | |
parent | 963582352b0a890b3adf61884444208f8b8ad03d (diff) | |
download | chromium_src-2c6f641798260fe11754b86fc566504596f7ef5d.zip chromium_src-2c6f641798260fe11754b86fc566504596f7ef5d.tar.gz chromium_src-2c6f641798260fe11754b86fc566504596f7ef5d.tar.bz2 |
Update Linux / SCons build for SDCH.
Review URL: http://codereview.chromium.org/4046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2497 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | build/SConscript.main | 4 | ||||
-rw-r--r-- | net/SConscript | 13 | ||||
-rw-r--r-- | sdch/SConscript | 30 |
3 files changed, 41 insertions, 6 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index df6e80d..ad332cf 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -51,6 +51,7 @@ env = Environment( NET_DIR = '#/$BUILD_TYPE/net', RLZ_DIR = '#/$BUILD_TYPE/rlz', SANDBOX_DIR = '#/$BUILD_TYPE/sandbox', + SDCH_DIR = '#/$BUILD_TYPE/sdch', SKIA_DIR = '#/$BUILD_TYPE/skia', TESTING_DIR = '#/$BUILD_TYPE/testing', THIRD_PARTY_DIR = '#/$BUILD_TYPE/third_party', @@ -478,6 +479,9 @@ if LoadComponent('rlz'): if LoadComponent('sandbox'): sconscripts.append('$SANDBOX_DIR/src/SConscript') +if LoadComponent('sdch'): + sconscripts.append('$SDCH_DIR/SConscript') + if LoadComponent('skia'): sconscripts.append('$SKIA_DIR/SConscript') diff --git a/net/SConscript b/net/SConscript index ef50eb8..d359985 100644 --- a/net/SConscript +++ b/net/SConscript @@ -13,6 +13,7 @@ env.Prepend( '$ZLIB_DIR', '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', + '$SDCH_DIR/open_vcdiff/depot/opensource/open-vcdiff/src', '..', ], ) @@ -85,6 +86,8 @@ if env['PLATFORM'] == 'win32': 'base/directory_lister.cc', 'base/dns_resolution_observer.cc', 'base/listen_socket.cc', + 'base/sdch_filter.cc', + 'base/sdch_manager.cc', 'base/ssl_client_socket.cc', 'base/ssl_config_service.cc', 'base/tcp_client_socket.cc', @@ -109,11 +112,6 @@ if env['PLATFORM'] == 'win32': ]) if env['PLATFORM'] == 'win32': - env.Append( - CCFLAGS = [ - '/Wp64', - ], - ) input_files.extend([ 'base/net_util_win.cc', 'base/platform_mime_util_win.cc', @@ -189,7 +187,6 @@ if env['PLATFORM'] == 'win32': CCFLAGS = [ '/TP', '/WX', - '/Wp64', ], CPPDEFINES = [ '_WIN32_WINNT=0x0600', @@ -206,6 +203,9 @@ if env['PLATFORM'] == 'win32': '/ignore:4199', '/nxcompat', ], + LIBS =[ + 'sdch', + ], ) if env['PLATFORM'] == 'posix': @@ -250,6 +250,7 @@ unittest_files = [ if env['PLATFORM'] == 'win32': unittest_files.extend([ 'base/directory_lister_unittest.cc', + 'base/sdch_filter_unitest.cc', 'base/ssl_config_service_unittest.cc', 'base/ssl_client_socket_unittest.cc', 'base/wininet_util_unittest.cc', diff --git a/sdch/SConscript b/sdch/SConscript new file mode 100644 index 0000000..08e756a --- /dev/null +++ b/sdch/SConscript @@ -0,0 +1,30 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Import('env') + +env = env.Clone(OPEN_VCDIFF_DIR='open_vcdiff/depot/opensource/open-vcdiff') + +env.Prepend( + CPPPATH = [ + '$OPEN_VCDIFF_DIR/src', + '$OPEN_VCDIFF_DIR/vsprojects', + ], +) + +input_files = [ + '$OPEN_VCDIFF_DIR/src/addrcache.cc', + '$OPEN_VCDIFF_DIR/src/adler32.c', + '$OPEN_VCDIFF_DIR/src/blockhash.cc', + '$OPEN_VCDIFF_DIR/src/codetable.cc', + '$OPEN_VCDIFF_DIR/src/decodetable.cc', + '$OPEN_VCDIFF_DIR/src/encodetable.cc', + '$OPEN_VCDIFF_DIR/src/headerparser.cc', + '$OPEN_VCDIFF_DIR/src/logging.cc', + '$OPEN_VCDIFF_DIR/src/varint_bigendian.cc', + '$OPEN_VCDIFF_DIR/src/vcdecoder.cc', + '$OPEN_VCDIFF_DIR/src/vcdiffengine.cc', +] + +env.ChromeStaticLibrary('sdch', input_files) |