diff options
author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-15 00:53:54 +0000 |
---|---|---|
committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-15 00:53:54 +0000 |
commit | 1241fe9067adf91ba3ef055bb5011c3e25250df7 (patch) | |
tree | 9cb27d2134b728313cc85fe6c38bca9436d8f0c1 /base/base_lib.scons | |
parent | bc9a5157e6843721680e49185dc86ac5885a0c11 (diff) | |
download | chromium_src-1241fe9067adf91ba3ef055bb5011c3e25250df7.zip chromium_src-1241fe9067adf91ba3ef055bb5011c3e25250df7.tar.gz chromium_src-1241fe9067adf91ba3ef055bb5011c3e25250df7.tar.bz2 |
Move dmg_fp in scons build to compile from
base/third_party/dmg_fp and compile it into base_lib.
Review URL: http://codereview.chromium.org/10769
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base_lib.scons')
-rw-r--r-- | base/base_lib.scons | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/base/base_lib.scons b/base/base_lib.scons index 487d5d8..5118f04 100644 --- a/base/base_lib.scons +++ b/base/base_lib.scons @@ -87,6 +87,27 @@ input_files = [ 'word_iterator.cc', ] +# Add object files David M Gay's dtoa and g_fmt third party lib. We +# compile these separately so we can disable warnings. +env_dmg_fp = env.Clone() +if env_dmg_fp['PLATFORM'] == 'win32': + env_dmg_fp.Append( + CCFLAGS = [ + '/wd4018', + '/wd4102', + '/wd4244', + '/wd4554', + ], + ) +else: + env_dmg_fp['CXXFLAGS'].remove('-Wall') + env_dmg_fp['CXXFLAGS'].append('-Wno-write-strings') + +input_files.extend([ + env_dmg_fp.Object('third_party/dmg_fp/dtoa.cc'), + env_dmg_fp.Object('third_party/dmg_fp/g_fmt.cc'), +]) + if env['PLATFORM'] in ('posix', 'darwin'): # Remove files that still need to be ported from the input_files list. # TODO(port): delete files from this list as they get ported. |