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/test/tab_switching/SConscript | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'chrome/test/tab_switching')

diff --git a/chrome/test/tab_switching/SConscript b/chrome/test/tab_switching/SConscript
index 034edce..420583f 100644
--- a/chrome/test/tab_switching/SConscript
+++ b/chrome/test/tab_switching/SConscript
@@ -44,6 +44,24 @@ env_test.Prepend(
         '$SKIA_DIR/platform',
         '#/..',
     ],
+    LIBS = [
+        'googleurl',
+        'skia',
+        'libpng',
+        'gtest',
+        'base_gfx',
+        'icuuc',
+        'common',
+        'zlib',
+        'modp_b64',
+        'browser',
+        'net',
+        'base',
+        'automation',
+    ],
+)
+
+env_test.Prepend(
     LINKFLAGS = [
         '/INCREMENTAL',
         '/DEBUG',
@@ -76,27 +94,11 @@ input_files = [
     'tab_switching_test.cc',
 ]
 
-libs = [
-    '$GOOGLEURL_DIR/googleurl.lib',
-    '$SKIA_DIR/skia.lib',
-    '$LIBPNG_DIR/libpng.lib',
-    '$TESTING_DIR/gtest.lib',
-    '$BASE_DIR/gfx/base_gfx.lib',
-    '$ICU38_DIR/icuuc.lib',
-    '$CHROME_DIR/common/common.lib',
-    '$ZLIB_DIR/zlib.lib',
-    '$MODP_B64_DIR/modp_b64.lib',
-    '$CHROME_DIR/browser/browser.lib',
-    '$NET_DIR/net.lib',
-    '$BASE_DIR/base.lib',
-    '$CHROME_DIR/test/automation/automation.lib',
-]
-
 #"..\..\Debug\obj\tab_switching_test\precompiled_wtl.obj"
 
 exe = env_test.ChromeTestProgram(['tab_switching_test',
                         'tab_switching_test.pdb'],
-                       input_files + libs)
+                       input_files)
 i = env_test.Install('$TARGET_ROOT', exe)
 
 env_test.Alias('chrome', i)
-- 
cgit v1.1