diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-04 00:54:22 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-04 00:54:22 +0000 |
| commit | 3dd689d3310c531418a858a5fd3d1512351dd7a3 (patch) | |
| tree | 5110ddd05a9606d9eca12bf2ef860851148b4567 | |
| parent | 0c038377600911d1d79b6f5cf395224250c6b16e (diff) | |
| download | chromium_src-3dd689d3310c531418a858a5fd3d1512351dd7a3.zip chromium_src-3dd689d3310c531418a858a5fd3d1512351dd7a3.tar.gz chromium_src-3dd689d3310c531418a858a5fd3d1512351dd7a3.tar.bz2 | |
Update unit_tests.scons with patterns from later changes:
* Use using_hunspell.scons and using_wtl.scon instead of
by-hand additions to CPPPATH and CPPDEFINES.
* Only add $CHROME_DIR/tools/build/win on Windows systems.
* Add 'hunspell' to LIBS in using_hunspell.scons so we don't
have to add it by hand.
Review URL: http://codereview.chromium.org/9071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4531 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/unit/unit_tests.scons | 16 | ||||
| -rw-r--r-- | chrome/third_party/hunspell/using_hunspell.scons | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index 53170d1..d01fd9a 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -10,6 +10,8 @@ env.SConscript([ '$BASE_DIR/gfx/using_base_gfx.scons', '$BASE_DIR/using_base.scons', '$BZIP2_DIR/using_bzip2.scons', + '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', + '$CHROME_DIR/third_party/wtl/using_wtl.scons', '$CHROME_SRC_DIR/build/using_googleurl.scons', '$GTEST_DIR/../using_gtest.scons', '$ICU38_DIR/using_icu38.scons', @@ -35,19 +37,12 @@ if env['PLATFORM'] in ('posix', 'darwin'): env.Prepend( CPPPATH = [ - 'third_party/wtl/include', - 'tools/build/win', '$CHROME_DIR/app/resources', '$CHROME_SRC_DIR', ], - CPPDEFINES = [ - 'USE_HUNSPELL', - 'HUNSPELL_CHROME_CLIENT', - ], LIBS = [ 'browser', 'common', - 'hunspell', 'plugin', 'renderer', 'sqlite', @@ -66,6 +61,13 @@ env.Prepend( ) if env['PLATFORM'] == 'win32': + env.Prepend( + CPPPATH = [ + '$CHROME_DIR/tools/build/win', + ], + ) + +if env['PLATFORM'] == 'win32': # TODO(port): Port or mark as Windows-specific. env.Prepend( LIBS = [ diff --git a/chrome/third_party/hunspell/using_hunspell.scons b/chrome/third_party/hunspell/using_hunspell.scons index 5b836a6..51d430d 100644 --- a/chrome/third_party/hunspell/using_hunspell.scons +++ b/chrome/third_party/hunspell/using_hunspell.scons @@ -16,4 +16,7 @@ env.Append( CPPPATH = [ '$CHROME_DIR/third_party/hunspell/src/hunspell', ], + LIBS = [ + 'hunspell', + ], ) |