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 /webkit | |
| 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 'webkit')
| -rw-r--r-- | webkit/activex_shim_dll/SConscript | 22 | ||||
| -rw-r--r-- | webkit/glue/plugins/test/SConscript | 22 | ||||
| -rw-r--r-- | webkit/tools/npapi_layout_test_plugin/SConscript | 19 | ||||
| -rw-r--r-- | webkit/tools/test_shell/SConscript | 22 |
4 files changed, 2 insertions, 83 deletions
diff --git a/webkit/activex_shim_dll/SConscript b/webkit/activex_shim_dll/SConscript index b8e0bfb..85ca5f6 100644 --- a/webkit/activex_shim_dll/SConscript +++ b/webkit/activex_shim_dll/SConscript @@ -55,28 +55,6 @@ env.Append( '/DEBUG',
],
- LIBS = [
- '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',
- ],
)
libs = [
diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript index 3d8b0e4..7566c65 100644 --- a/webkit/glue/plugins/test/SConscript +++ b/webkit/glue/plugins/test/SConscript @@ -60,29 +60,9 @@ env.Append( LIBS = [ 'comctl32.lib', - 'shlwapi.lib', 'rpcrt4.lib', + 'shlwapi.lib', 'winmm.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', ], LINKFLAGS = [ diff --git a/webkit/tools/npapi_layout_test_plugin/SConscript b/webkit/tools/npapi_layout_test_plugin/SConscript index 7f8a30b..fbcb9f8 100644 --- a/webkit/tools/npapi_layout_test_plugin/SConscript +++ b/webkit/tools/npapi_layout_test_plugin/SConscript @@ -47,29 +47,10 @@ env.Append( ], LIBS = [ - 'advapi32.lib', 'comctl32.lib', - 'comdlg32.lib', - 'delayimp.lib', - 'gdi32.lib', - 'kernel32.lib', - 'msimg32.lib', - 'odbc32.lib', - 'odbccp32.lib', - 'ole32.lib', - 'oleaut32.lib', - 'psapi.lib', 'rpcrt4.lib', - 'shell32.lib', 'shlwapi.lib', - 'user32.lib', - 'usp10.lib', - 'uuid.lib', - 'version.lib', - 'wininet.lib', 'winmm.lib', - 'winspool.lib', - 'ws2_32.lib', ], LINKFLAGS = [ diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index 36393a0..85f7091 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -74,29 +74,9 @@ env.Append( LIBS = [ 'comctl32.lib', - 'shlwapi.lib', 'rpcrt4.lib', + 'shlwapi.lib', 'winmm.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', ], LINKFLAGS = [ |