Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1421)

Unified Diff: base/base_lib.scons

Issue 10769: Move dmg_fp in scons build to compile from (Closed)
Patch Set: linux too Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/base_unittests.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base_lib.scons
diff --git a/base/base_lib.scons b/base/base_lib.scons
index 487d5d808d7b1a0d97a680af04d865ca655a6638..f230d3e2bd5014dbcbcd718c429546230ac98aa6 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.
« no previous file with comments | « no previous file | base/base_unittests.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698