diff options
| author | deanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 14:18:54 +0000 |
|---|---|---|
| committer | deanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 14:18:54 +0000 |
| commit | 23ba7ddb32445bf4a5722d7f6d990ab1610865b7 (patch) | |
| tree | d79bc5adcd90980b8fee0e20e6cde9230d6741d3 /chrome | |
| parent | b644f92a75bdc4cc40edf561f576cd58478c3491 (diff) | |
| download | chromium_src-23ba7ddb32445bf4a5722d7f6d990ab1610865b7.zip chromium_src-23ba7ddb32445bf4a5722d7f6d990ab1610865b7.tar.gz chromium_src-23ba7ddb32445bf4a5722d7f6d990ab1610865b7.tar.bz2 | |
Build hunspell on Linux.
Patch from Pawel Hajdan Jr.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/SConscript | 2 | ||||
| -rw-r--r-- | chrome/third_party/hunspell/SConscript | 27 | ||||
| -rw-r--r-- | chrome/third_party/hunspell/src/hunspell/affixmgr.cxx | 2 | ||||
| -rw-r--r-- | chrome/third_party/hunspell/src/hunspell/hashmgr.cxx | 2 |
4 files changed, 22 insertions, 11 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 3775688..2ff2347 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -430,6 +430,7 @@ env.SConscript(test_sconscript_files, exports=['env_test']) sconscript_files = [ 'browser/SConscript', 'common/SConscript', + 'third_party/hunspell/SConscript', '$THIRD_PARTY_DIR/sqlite/SConscript', ] @@ -460,7 +461,6 @@ if env['PLATFORM'] == 'win32': 'tools/crash_service/SConscript', 'tools/perf/flush_cache/SConscript', 'tools/test/image_diff/SConscript', - 'third_party/hunspell/SConscript', 'views/SConscript', ]) diff --git a/chrome/third_party/hunspell/SConscript b/chrome/third_party/hunspell/SConscript index d55c592..0162dad 100644 --- a/chrome/third_party/hunspell/SConscript +++ b/chrome/third_party/hunspell/SConscript @@ -42,18 +42,33 @@ env.Prepend( env.Append( CPPDEFINES = [ - 'W32', 'OPENOFFICEORG', 'CHROME_SPELL', 'HUNSPELL_CHROME_CLIENT', ], +) - CCFLAGS = [ - '/TP', +if env['PLATFORM'] == 'win32': + env.Append( + CPPDEFINES = [ + 'W32', + ], + CCFLAGS = [ + '/TP', - '/wd4800', - ], -) + '/wd4800', + ], + ) + +if env['PLATFORM'] == 'posix': + env.Append( + CCFLAGS = [ + '-Wno-parentheses', + '-Wno-unused-value', + '-Wno-unused-variable', + '-Wno-write-strings', + ], + ) input_files = [ 'google/bdict_reader.cc', diff --git a/chrome/third_party/hunspell/src/hunspell/affixmgr.cxx b/chrome/third_party/hunspell/src/hunspell/affixmgr.cxx index e21db6b..ac76ec2 100644 --- a/chrome/third_party/hunspell/src/hunspell/affixmgr.cxx +++ b/chrome/third_party/hunspell/src/hunspell/affixmgr.cxx @@ -13,8 +13,6 @@ #include <ctype.h> #endif -#include <io.h> - #include "affixmgr.hxx" #include "affentry.hxx" #include "langnum.hxx" diff --git a/chrome/third_party/hunspell/src/hunspell/hashmgr.cxx b/chrome/third_party/hunspell/src/hunspell/hashmgr.cxx index 51c054f..daa4247 100644 --- a/chrome/third_party/hunspell/src/hunspell/hashmgr.cxx +++ b/chrome/third_party/hunspell/src/hunspell/hashmgr.cxx @@ -13,8 +13,6 @@ #include <ctype.h>
#endif
-#include <io.h>
-
#include "hashmgr.hxx"
#include "csutil.hxx"
#include "atypes.hxx"
|