From 372d63e5389ff61ac6043302a14711497be2999f Mon Sep 17 00:00:00 2001 From: "sgk@google.com" <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> 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/installer/mini_installer/SConscript | 13 +++++++++---- chrome/installer/setup/SConscript | 15 ++++++++++----- 2 files changed, 19 insertions(+), 9 deletions(-) (limited to 'chrome/installer') diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript index 1cc3232..64b770d 100644 --- a/chrome/installer/mini_installer/SConscript +++ b/chrome/installer/mini_installer/SConscript @@ -130,6 +130,15 @@ env_test.Prepend( '$GTEST_DIR', '#/..', ], + LIBS = [ + 'gtest', + 'icuuc', + 'common', + 'base', + ], +) + +env_test.Prepend( LINKFLAGS = [ '/INCREMENTAL', '/DEBUG', @@ -168,10 +177,6 @@ input_files = [ libs = [ '../util/util.lib', - '$TESTING_DIR/gtest.lib', - '$ICU38_DIR/icuuc.lib', - '$CHROME_DIR/common/common.lib', - '$BASE_DIR/base.lib', ] exe = env_test.ChromeTestProgram(['installer_unittests', diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript index f4b2048..3f71843 100644 --- a/chrome/installer/setup/SConscript +++ b/chrome/installer/setup/SConscript @@ -58,6 +58,16 @@ env.Prepend( '.', '#/..', ], + LIBS = [ + 'bspatch', + 'lzma_sdk', + 'icuuc', + 'common', + 'base', + ], +) + +env.Prepend( LINKFLAGS = [ '/INCREMENTAL', '/DEBUG', @@ -94,11 +104,6 @@ input_files = [ libs = [ '../util/util.lib', - '$BSPATCH_DIR/bspatch.lib', - '$LZMA_SDK_DIR/lzma_sdk.lib', - '$ICU38_DIR/icuuc.lib', - '$CHROME_DIR/common/common.lib', - '$BASE_DIR/base.lib', ] exe = env.ChromeProgram(['setup', -- cgit v1.1