diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 05:18:29 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-04 05:18:29 +0000 |
| commit | 6a4994f4ae4e2462de032a1c8595e9dfb82376d5 (patch) | |
| tree | a1f7a2e138ae38dac4a7bf7854ee46bc99728377 /chrome/installer | |
| parent | 4d74cc2ef9a46f78e086d499b9680d5028fd3df2 (diff) | |
| download | chromium_src-6a4994f4ae4e2462de032a1c8595e9dfb82376d5.zip chromium_src-6a4994f4ae4e2462de032a1c8595e9dfb82376d5.tar.gz chromium_src-6a4994f4ae4e2462de032a1c8595e9dfb82376d5.tar.bz2 | |
Pull the block of common Windows system libraries that we link with everywhere into the base Windows environment.
TBR: evanm,bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer/SConscript | 28 | ||||
| -rw-r--r-- | chrome/installer/setup/SConscript | 22 |
2 files changed, 5 insertions, 45 deletions
diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript index d3e73b5..1abaa14 100644 --- a/chrome/installer/mini_installer/SConscript +++ b/chrome/installer/mini_installer/SConscript @@ -31,6 +31,9 @@ Import('env', 'env_res', 'env_test') env = env.Clone()
+
+env['LIBS'].remove('DelayImp.lib')
+
env_res = env_res.Clone()
env_test = env_test.Clone()
@@ -76,34 +79,13 @@ env.Prepend( '/PDB:${TARGETS[1]}',
'/MAP:${TARGETS[2]}',
],
-)
-
-env['CCFLAGS'].remove('/RTC1')
-
-env.Append(
LIBS = [
'shlwapi.lib',
- 'wininet.lib',
- 'version.lib',
- 'msimg32.lib',
- 'ws2_32.lib',
- 'usp10.lib',
- 'psapi.lib',
- 'kernel32.lib',
- 'user32.lib',
- 'gdi32.lib',
- 'winspool.lib',
- 'comdlg32.lib',
- 'advapi32.lib',
- 'shell32.lib',
- 'ole32.lib',
- 'oleaut32.lib',
- 'uuid.lib',
- 'odbc32.lib',
- 'odbccp32.lib',
],
)
+env['CCFLAGS'].remove('/RTC1')
+
components = [
"$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj",
"$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj",
diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript index 0914a99..f4b2048 100644 --- a/chrome/installer/setup/SConscript +++ b/chrome/installer/setup/SConscript @@ -80,29 +80,7 @@ env.Prepend( ],
LIBS = [
'shlwapi.lib',
-
'msi.lib',
-
- 'wininet.lib',
- 'version.lib',
- 'msimg32.lib',
- 'ws2_32.lib',
- 'usp10.lib',
- 'psapi.lib',
- 'kernel32.lib',
- 'user32.lib',
- 'gdi32.lib',
- 'winspool.lib',
- 'comdlg32.lib',
- 'advapi32.lib',
- 'shell32.lib',
- 'ole32.lib',
- 'oleaut32.lib',
- 'uuid.lib',
- 'odbc32.lib',
- 'odbccp32.lib',
-
- 'DelayImp.lib',
],
)
|