Fix SCons modules build on Windows:...

chrome/SConscript

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 Import(['env'])
 
 env_res = env.Clone()
 env_test = env.Clone()
@@ skipping 182 matching lines @@
     'renderer/renderer.lib',
     'third_party/hunspell/hunspell.lib',
     # TODO(sgk):  libevent isn't used on Windows, revisit when Linux gets here
     #'third_party/libevent/libevent.lib',
     'third_party/sqlite/sqlite.lib',
     'views/views.lib',
     '$V8_DIR/v8.lib',
 ]
 
 
-if env_dll['PLATFORM'] == 'win32':
-  targets = [
-      'chrome.dll',
-      'chrome_dll.pdb',
-      'chrome_dll.lib',
-  ]
-else:
-  targets = ['chrome']
-
-
 
 # TODO(sgk): make a pseudo-Builder for these
 import sys
 sys.path.append(env.Dir('$CHROME_SRC_DIR/tools/grit').abspath)
 
 env_grd = env.Clone()
 env_grd.Tool('scons', toolpath=[env_grd.Dir('$CHROME_SRC_DIR/tools/grit/grit')])
 
 # NOTE: fake target gets replaced with real targets from reading .grd
 generated = env_grd.GRIT('app/resources/fake_generated_target',
                          '$CHROME_SRC_DIR/chrome/app/generated_resources.grd')
 grit_files.extend(generated)
 
 # NOTE: fake target gets replaced with real targets from reading .grd
 chromium = env_grd.GRIT('app/resources/fake_chromium_target',
                          '$CHROME_SRC_DIR/chrome/app/chromium_strings.grd')
 grit_files.extend(chromium)
 
 # NOTE: fake target gets replaced with real targets from reading .grd
 google_chrome = env_grd.GRIT('app/resources/fake_google_chrome_target',
                          '$CHROME_SRC_DIR/chrome/app/google_chrome_strings.grd')
 grit_files.extend(google_chrome)
 
 
 
 # TODO(port)
 if env_dll['PLATFORM'] == 'win32':
-  dll_targets = env_dll.ChromeSharedLibrary(targets,
-                                            dll_resources + input_files + libs)
+  dll_targets = env_dll.ChromeSharedLibrary('chrome.dll',
+                                            dll_resources + input_files + libs,
+                                            PDB='chrome_dll.pdb')
   install_targets.extend(dll_targets)
 
   for g in [ g for g in grit_files if str(g).endswith('.rc') ]:
     env_res.RES(g)
 
   def chrome_version_emitter(target, source, env):
-      source.append('$CHROME_SRC_DIR/chrome/VERSION')
+      source.append(env.File('$CHROME_SRC_DIR/chrome/VERSION'))
       # TODO(sgk):  parameterize for chromium-vs.-google_chrome
-      source.append('$CHROME_SRC_DIR/chrome/app/theme/google_chrome/BRANDING')
+      source.append(env.File('$CHROME_SRC_DIR/chrome/app/theme/google_chrome/BRANDING'))
       return target, source
 
   b = Builder(action = '$CHROME_VERSION_RC_COM',
               emitter = chrome_version_emitter)
 
   env['BUILDERS']['ChromeVersionRC'] = b
 
   env.Replace(
       CHROME_VERSION_RC_COM =
           '$VERSION_BAT $SOURCE $CHROME_SRC_DIR/chrome $PWD $TARGET',
@@ skipping 55 matching lines @@
         '/safeseh',
         '/dynamicbase',
         '/ignore:4199',
         '/nxcompat',
 
         '/PDB:${TARGETS[1]}',
         '/IMPLIB:${TARGETS[2]}',
     ],
 )
 
-if env['PLATFORM'] == 'win32':
-  targets = [
-      'chrome.exe',
-      'chrome_exe.pdb',
-      'chrome_exe_implib.lib',
-  ]
-else:
-  targets = ['chrome']
-
 # TODO(port)
 if env['PLATFORM'] == 'win32':
   chrome_exe = env_exe.ChromeProgram(
-      targets,
+      'chrome',
       [
           env_res.RES('app/chrome_exe.rc'),
           'app/breakpad.cc',
           'app/chrome_exe_main.cc',
           'app/client_util.cc',
           'app/google_update_client.cc',
 
           'common/common.lib',
           '$CHROME_DIR/chrome_dll.lib',
       ]
@@ skipping 132 matching lines @@
   env.Alias('chrome', i)
 
 
 i = env.Command('$TARGET_ROOT/resources/inspector',
             '$CHROME_SRC_DIR/webkit/port/page/inspector',
             Copy('$TARGET', '$SOURCE'),
             source_scanner=DirScanner)
 env.Alias('chrome', i)
 
 env.Alias('chrome', env.Alias('webkit'))