diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 18:11:39 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 18:11:39 +0000 |
| commit | 372d63e5389ff61ac6043302a14711497be2999f (patch) | |
| tree | 98f5eacc467f410fbc36f3e795326a8507df9765 /chrome/SConscript.unit_tests | |
| parent | eb0c1e406f837d590055021a753015feb67b6fc9 (diff) | |
| download | chromium_src-372d63e5389ff61ac6043302a14711497be2999f.zip chromium_src-372d63e5389ff61ac6043302a14711497be2999f.tar.gz chromium_src-372d63e5389ff61ac6043302a14711497be2999f.tar.bz2 | |
Cross-platform: Let SCons abstract library names by getting rid of .lib suffixes when linking with the libraries we build, replacing the lists of explicitly-suffixed "source files" with library base names in the environment LIBS variables. This requires having ChromeStaticLibrary() install .lib files in a $BUILD_TYPE/Libs directory, and adding that directory to $LIBPATH.
R=evanm,bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/SConscript.unit_tests')
| -rw-r--r-- | chrome/SConscript.unit_tests | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests index cfd3ff5..09d51c1 100644 --- a/chrome/SConscript.unit_tests +++ b/chrome/SConscript.unit_tests @@ -55,6 +55,35 @@ env_test.Prepend( 'CHROME_PNG_WRITE_SUPPORT',
'UNIT_TEST',
],
+ LIBS = [
+ 'base',
+ 'base_gfx',
+ 'bzip2',
+ 'googleurl',
+ 'gtest',
+ 'icuuc',
+ 'libjpeg',
+ 'libpng',
+ 'libxml',
+ 'libxslt',
+ 'modp_b64',
+ 'net',
+ 'skia',
+ 'v8',
+ 'zlib',
+
+ 'activex_shim',
+ 'WTF',
+ 'V8Bindings',
+ 'WebCore',
+ 'default_plugin',
+ 'Glue',
+ 'JavaScriptCore_pcre',
+ 'Port',
+ ],
+)
+
+env_test.Prepend(
LINKFLAGS = [
'/INCREMENTAL',
@@ -94,30 +123,6 @@ libs = [ 'third_party/hunspell/hunspell.lib',
'third_party/sqlite/sqlite.lib',
'views/views.lib',
-
- '$BASE_DIR/base.lib',
- '$BASE_DIR/gfx/base_gfx.lib',
- '$BZIP2_DIR/bzip2.lib',
- '$GOOGLEURL_DIR/googleurl.lib',
- '$ICU38_DIR/icuuc.lib',
- '$LIBJPEG_DIR/libjpeg.lib',
- '$LIBPNG_DIR/libpng.lib',
- '$LIBXML_DIR/libxml.lib',
- '$LIBXSLT_DIR/libxslt.lib',
- '$MODP_B64_DIR/modp_b64.lib',
- '$NET_DIR/net.lib',
- '$SKIA_DIR/skia.lib',
- '$TESTING_DIR/gtest.lib',
- '$WEBKIT_DIR/activex_shim/activex_shim.lib',
- '$WEBKIT_DIR/build/JavaScriptCore/WTF.lib',
- '$WEBKIT_DIR/build/V8Bindings/V8Bindings.lib',
- '$WEBKIT_DIR/build/WebCore/WebCore.lib',
- '$WEBKIT_DIR/default_plugin/default_plugin.lib',
- '$WEBKIT_DIR/glue/Glue.lib',
- '$WEBKIT_DIR/JavaScriptCore_pcre.lib',
- '$WEBKIT_DIR/port.lib',
- '$V8_DIR/v8.lib',
- '$ZLIB_DIR/zlib.lib',
]
unit_test_files = [
|