summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-04 04:50:00 +0000
committerbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-04 04:50:00 +0000
commit88af41c2203595c4b73da3e26dceaff4766d76ce (patch)
tree7ba6d57da30ebddb272e9adbc9497715274ac13e /webkit
parent585bc6f40fc00347270c11c27380d58a9b9c9a4e (diff)
downloadchromium_src-88af41c2203595c4b73da3e26dceaff4766d76ce.zip
chromium_src-88af41c2203595c4b73da3e26dceaff4766d76ce.tar.gz
chromium_src-88af41c2203595c4b73da3e26dceaff4766d76ce.tar.bz2
Adding missing lib to fix windows webkit build.
Review URL: http://codereview.chromium.org/13119 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/activex_shim_dll/SConscript2
-rw-r--r--webkit/tools/test_shell/SConscript1
2 files changed, 2 insertions, 1 deletions
diff --git a/webkit/activex_shim_dll/SConscript b/webkit/activex_shim_dll/SConscript
index f451ac2..d47c246 100644
--- a/webkit/activex_shim_dll/SConscript
+++ b/webkit/activex_shim_dll/SConscript
@@ -16,6 +16,7 @@ env.Prepend(
'googleurl',
env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed
'base',
+ 'Urlmon',
],
)
@@ -46,4 +47,3 @@ input_files = [
dll = env.ChromeSharedLibrary('npaxshim', input_files)
i = env.Install('$TARGET_ROOT', dll)
env.Alias('webkit', i)
-
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index c5a3fbf..6408872 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -74,6 +74,7 @@ if env['PLATFORM'] == 'win32':
'rpcrt4.lib',
'shlwapi.lib',
'winmm.lib',
+ 'Urlmon',
],
LINKFLAGS = [