Move 'sdch' into the Windows-specific LIBS lists until it's integrated

with the Linux and Mac SCons-based builds.

Also, indent a set of Windows-specific flags under a Windows-only block.
Review URL: http://codereview.chromium.org/4314

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2656 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 32 insertions, 25 deletions

diff --git a/chrome/SConscript b/chrome/SConscript
index 79f82f3..18ca57c 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -102,7 +102,6 @@ env_dll.Append(
         'breakpad_handler',
         'googleurl',
         'net',
-        'sdch',
         'skia',
         'bzip2',
         env_dll['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
@@ -127,6 +126,9 @@ env_dll.Append(
 if env_dll['PLATFORM'] == 'win32':
   env_dll.Append(
       LIBS = [
+          # TODO(sgk):  to be ported to Mac and Linux
+          'sdch',
+
           'comctl32.lib',
           'dwmapi.lib',
           'rpcrt4.lib',
diff --git a/chrome/SConscript.ui_tests b/chrome/SConscript.ui_tests
index 4a89250..0c8dc42 100644
--- a/chrome/SConscript.ui_tests
+++ b/chrome/SConscript.ui_tests
@@ -37,7 +37,6 @@ env_test.Prepend(
         'libpng',
         'npapi_layout_test_plugin',
         'gtest',
-        'sdch',
         'base_gfx',
         env_test['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
         'zlib',
@@ -49,31 +48,35 @@ env_test.Prepend(
     ],
 )
 
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
+if env['PLATFORM'] == 'win32':
+  env_test.Prepend(
+      LINKFLAGS = [
+          '/INCREMENTAL',
 
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
+          '/safeseh',
+          '/dynamicbase',
+          '/ignore:4199',
+          '/nxcompat',
 
-        '/MANIFEST',
-        '/DELAYLOAD:"ws2_32.dll"',
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
+          '/MANIFEST',
+          '/DELAYLOAD:"ws2_32.dll"',
+          '/DELAYLOAD:"dwmapi.dll"',
+          '/DELAYLOAD:"uxtheme.dll"',
 
-        '/DEBUG',
-        '/MACHINE:X86',
-        '/FIXED:No',
-    ],
-    LIBS = [
-        'comsupp.lib',
-        'oleacc.lib',
-        'rpcrt4.lib',
-        'winmm.lib',
-    ],
-)
+          '/DEBUG',
+          '/MACHINE:X86',
+          '/FIXED:No',
+      ],
+      LIBS = [
+          # TODO(sgk):  to be ported to Mac and Linux
+          'sdch',
+
+          'comsupp.lib',
+          'oleacc.lib',
+          'rpcrt4.lib',
+          'winmm.lib',
+      ],
+  )
 
 libs = [
     'test/security_tests/security_tests.lib',
diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests
index d860aea..60110fe 100644
--- a/chrome/SConscript.unit_tests
+++ b/chrome/SConscript.unit_tests
@@ -53,7 +53,6 @@ env_test.Prepend(
         'libxml',
         'libxslt',
         'modp_b64',
-        'sdch',
         'skia',
         'v8',
         'zlib',
@@ -71,6 +70,9 @@ if env_test['PLATFORM'] == 'win32':
   # TODO(port): Port or mark as Windows-specific.
   env_test.Prepend(
       LIBS = [
+          # TODO(sgk):  to be ported to Mac and Linux
+          'sdch',
+
           'WebCore',
       ],
   )