diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/base_lib.scons | 21 | ||||
| -rw-r--r-- | base/base_unittests.scons | 1 | ||||
| -rw-r--r-- | base/using_base.scons | 2 |
3 files changed, 21 insertions, 3 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. diff --git a/base/base_unittests.scons b/base/base_unittests.scons index 496a12c..7b1cc28 100644 --- a/base/base_unittests.scons +++ b/base/base_unittests.scons @@ -13,7 +13,6 @@ env = env.Clone() env.SConscript([ '$BASE_DIR/using_base.scons', '$BASE_DIR/gfx/using_base_gfx.scons', - '$DMG_FP_DIR/using_dmg_fp.scons', '$GTEST_DIR/../using_gtest.scons', '$ICU38_DIR/using_icu38.scons', '$LIBPNG_DIR/using_libpng.scons', diff --git a/base/using_base.scons b/base/using_base.scons index 08ab6c1..f3d58b4 100644 --- a/base/using_base.scons +++ b/base/using_base.scons @@ -11,7 +11,5 @@ Import("env") env.Append( LIBS = [ 'base', - # TODO(tc): remove when dmg_fp gets moved to base/third_party - 'dmg_fp', ], ) |