diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/SConscript | 7 | ||||
| -rw-r--r-- | chrome/tools/test/image_diff/SConscript | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index d691dd9..e87e38d 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -392,10 +392,13 @@ if env_flat['PLATFORM'] == 'win32': sconscript_files = [ 'test/chrome_plugin/SConscript', 'tools/test/image_diff/SConscript', - 'third_party/hunspell/SConscript', - '$THIRD_PARTY_DIR/sqlite/SConscript', ] +if not env.WantSystemLib('hunspell'): + sconscript_files.append('third_party/hunspell/SConscript') +if not env.WantSystemLib('sqlite'): + sconscript_files.append('$THIRD_PARTY_DIR/sqlite/SConscript') + # TODO(port) if env['PLATFORM'] == 'win32': sconscript_files.extend([ diff --git a/chrome/tools/test/image_diff/SConscript b/chrome/tools/test/image_diff/SConscript index 4a77cc2..b1cccf5 100644 --- a/chrome/tools/test/image_diff/SConscript +++ b/chrome/tools/test/image_diff/SConscript @@ -23,7 +23,7 @@ env_test.Prepend( 'libpng', 'base_gfx', env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'zlib', + env_test['ZLIB_LIB'], 'base', ], ) |