diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 13:40:08 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 13:40:08 +0000 |
| commit | e9f17ab968e051627b02b6e02305417d5aee6f37 (patch) | |
| tree | 753e33146667acdfc2a41720199d7c4887286423 | |
| parent | 073baf53d8385f72f57210691a70080d79fa3103 (diff) | |
| download | chromium_src-e9f17ab968e051627b02b6e02305417d5aee6f37.zip chromium_src-e9f17ab968e051627b02b6e02305417d5aee6f37.tar.gz chromium_src-e9f17ab968e051627b02b6e02305417d5aee6f37.tar.bz2 | |
Restore /IMPLIB in the target lists for chrome.exe and chrome.dll,
and /MAP in the target lists for setup.exe and mini_installer.exe.
TBR: tc
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@868 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/SConscript | 28 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/SConscript | 12 | ||||
| -rw-r--r-- | chrome/installer/setup/SConscript | 11 |
3 files changed, 41 insertions, 10 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 92f24cd..4a30151 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -205,10 +205,17 @@ libs = [ '$V8_DIR/snapshot-empty.obj', ] -dll_targets = env_dll.ChromeSharedLibrary(['chrome', - 'chrome_dll.pdb', - 'chrome_dll.lib'], - dll_resources + input_files + libs) +if env['PLATFORM'] == 'win32': + targets = [ + 'chrome.dll', + 'chrome_dll.pdb', + 'chrome_dll.lib', + ] +else: + targets = ['chrome'] + +dll_targets = env_dll.ChromeSharedLibrary(targets, + dll_resources + input_files + libs) install_targets.extend(dll_targets) @@ -303,10 +310,17 @@ env_exe.Append( ], ) +if env['PLATFORM'] == 'win32': + targets = [ + 'chrome.exe', + 'chrome_exe.pdb', + 'chrome_exe_implib.lib', + ] +else: + targets = ['chrome'] + chrome_exe = env_exe.ChromeProgram( - ['chrome', - 'chrome_exe.pdb', - ], + targets, [ env_res.RES('app/chrome_exe.rc'), 'app/breakpad.cc', diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript index 104f4a4..5a99a21 100644 --- a/chrome/installer/mini_installer/SConscript +++ b/chrome/installer/mini_installer/SConscript @@ -97,8 +97,16 @@ input_files = [ "pe_resource.cc", ] -exe = env.ChromeProgram('mini_installer', - components + resources + input_files) +if env['PLATFORM'] == 'win32': + targets = [ + 'mini_installer.exe', + 'mini_installer.pdb', + 'mini_installer.map', + ] +else: + targets = ['mini_installer'] + +exe = env.ChromeProgram(targets, components + resources + input_files) i = env.Install('$TARGET_ROOT', exe) env.Alias('chrome', i) diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript index efa20505..a625d64 100644 --- a/chrome/installer/setup/SConscript +++ b/chrome/installer/setup/SConscript @@ -106,7 +106,16 @@ libs = [ '../util/util.lib', ] -exe = env.ChromeProgram('setup', resources + input_files + libs) +if env['PLATFORM'] == 'win32': + targets = [ + 'setup.exe', + 'setup.pdb', + 'setup.lib', + ] +else: + targets = ['setup'] + +exe = env.ChromeProgram(targets, resources + input_files + libs) i = env.Install('$TARGET_ROOT', exe) env.Alias('chrome', i) |