From 372d63e5389ff61ac6043302a14711497be2999f Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Mon, 4 Aug 2008 18:11:39 +0000 Subject: 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 --- chrome/SConscript.ui_tests | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) (limited to 'chrome/SConscript.ui_tests') diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests index 5821d5a..dc98e98 100644 --- a/chrome/SConscript.ui_tests +++ b/chrome/SConscript.ui_tests @@ -55,6 +55,25 @@ env_test.Prepend( 'UI_TEST', 'UNIT_TEST', ], + LIBS = [ + 'libxml', + 'googleurl', + 'skia', + 'libpng', + 'npapi_layout_test_plugin', + 'gtest', + 'base_gfx', + 'icuuc', + 'zlib', + 'modp_b64', + 'net', + 'bzip2', + 'base', + 'npapi_test_plugin', + ], +) + +env_test.Prepend( LINKFLAGS = [ '/INCREMENTAL', @@ -81,24 +100,10 @@ env_test.Prepend( ) libs = [ - '$LIBXML_DIR/libxml.lib', - '$GOOGLEURL_DIR/googleurl.lib', 'test/security_tests/security_tests.lib', - '$SKIA_DIR/skia.lib', - '$LIBPNG_DIR/libpng.lib', - '$TARGET_ROOT/plugins/npapi_layout_test_plugin.lib', - '$TESTING_DIR/gtest.lib', - '$BASE_DIR/gfx/base_gfx.lib', - '$ICU38_DIR/icuuc.lib', 'common/common.lib', - '$ZLIB_DIR/zlib.lib', - '$MODP_B64_DIR/modp_b64.lib', 'browser/browser.lib', - '$NET_DIR/net.lib', - '$BZIP2_DIR/bzip2.lib', - '$BASE_DIR/base.lib', 'test/automation/automation.lib', - '$TARGET_ROOT/npapi_test_plugin.lib', ] ui_test_files = [ -- cgit v1.1