diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 18:46:02 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 18:46:02 +0000 |
| commit | 113736ca60dff0d00fe7ae03eeb095ac50af48c5 (patch) | |
| tree | e22ec778bdc601bbdfcee42d45f507e6a6da9de5 /net | |
| parent | 968e56aeb9ac7c51f7b1cb36cd7a5586fd13e966 (diff) | |
| download | chromium_src-113736ca60dff0d00fe7ae03eeb095ac50af48c5.zip chromium_src-113736ca60dff0d00fe7ae03eeb095ac50af48c5.tar.gz chromium_src-113736ca60dff0d00fe7ae03eeb095ac50af48c5.tar.bz2 | |
Checking in the rest of the .lib changes, previous commit was only done from chrome/ and only got those SConscript files.
R=evanm,bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/SConscript | 32 | ||||
| -rw-r--r-- | net/tools/tld_cleanup/SConscript | 17 |
2 files changed, 25 insertions, 24 deletions
diff --git a/net/SConscript b/net/SConscript index 01bd489..6b83174 100644 --- a/net/SConscript +++ b/net/SConscript @@ -162,6 +162,19 @@ env_tests.Prepend( 'WINVER=0x0600',
'_HAS_EXCEPTIONS=0',
],
+ LIBS = [
+ 'googleurl',
+ 'base',
+ 'gtest',
+ 'bzip2',
+ 'icuuc',
+ 'modp_b64',
+ 'zlib',
+ 'net',
+ ]
+)
+
+env_tests.Prepend(
CCFLAGS = [
'/TP',
'/WX',
@@ -185,17 +198,6 @@ env_tests.Append( ],
)
-libs = [
- '$GOOGLEURL_DIR/googleurl.lib',
- '$BASE_DIR/base.lib',
- '$TESTING_DIR/gtest.lib',
- '../third_party/bzip2/bzip2.lib',
- '$ICU38_DIR/icuuc.lib',
- '$MODP_B64_DIR/modp_b64.lib',
- '$ZLIB_DIR/zlib.lib',
- 'net.lib',
-]
-
unittest_files = [
'base/auth_cache_unittest.cc',
@@ -241,7 +243,7 @@ net_unittests = env_tests.ChromeTestProgram( ['net_unittests.exe',
'net_unittests.ilk',
'net_unittests.pdb'],
- unittest_files + libs
+ unittest_files
)
@@ -251,7 +253,7 @@ stress_cache = env_tests.ChromeTestProgram( 'stress_cache.ilk',
'stress_cache.pdb'],
['disk_cache/stress_cache.cc',
- 'disk_cache/disk_cache_test_util.cc'] + libs
+ 'disk_cache/disk_cache_test_util.cc']
)
@@ -260,7 +262,7 @@ crash_cache = env_tests.ChromeTestProgram( 'crash_cache.ilk',
'crash_cache.pdb'],
['tools/crash_cache/crash_cache.cc',
- 'disk_cache/disk_cache_test_util.cc'] + libs
+ 'disk_cache/disk_cache_test_util.cc']
)
@@ -273,7 +275,7 @@ net_perftests = env_tests.ChromeTestProgram( 'base/cookie_monster_perftest.cc',
# TODO(sgk): avoid using .cc from base directly
'$BASE_DIR/run_all_perftests$OBJSUFFIX',
- '$BASE_DIR/perftimer$OBJSUFFIX'] + libs
+ '$BASE_DIR/perftimer$OBJSUFFIX']
)
diff --git a/net/tools/tld_cleanup/SConscript b/net/tools/tld_cleanup/SConscript index 16f2286..4a0ca47 100644 --- a/net/tools/tld_cleanup/SConscript +++ b/net/tools/tld_cleanup/SConscript @@ -35,6 +35,13 @@ env.Prepend( CPPPATH = [
'../../..',
],
+ LIBS = [
+ 'googleurl',
+ 'icuuc',
+ 'base',
+ # We only need to link with net due to use precompiled_net.pch.
+ 'net',
+ ],
)
env.Append(
@@ -62,18 +69,10 @@ input_files = [ 'tld_cleanup.cc',
]
-libs = [
- '$GOOGLEURL_DIR/googleurl.lib',
- '$ICU38_DIR/icuuc.lib',
- '$BASE_DIR/base.lib',
- # We only need to link with net.lib due to use precompiled_net.pch.
- '$NET_DIR/net.lib',
-]
-
exe_targets = env.ChromeProgram(['tld_cleanup',
'tld_cleanup.ilk',
'tld_cleanup.pdb'],
- input_files + libs)
+ input_files)
i = env.Install('$TARGET_ROOT', exe_targets)
env.Alias('net', i)
|