diff options
| -rw-r--r-- | chrome/app/chrome_dll.vcproj | 4 | ||||
| -rw-r--r-- | chrome/test/unit/unittests.vcproj | 4 | ||||
| -rw-r--r-- | webkit/activex_shim/activex_shim.gyp | 6 | ||||
| -rw-r--r-- | webkit/default_plugin/default_plugin.gyp | 5 |
4 files changed, 7 insertions, 12 deletions
diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj index d8d57ac..a8d7e84 100644 --- a/chrome/app/chrome_dll.vcproj +++ b/chrome/app/chrome_dll.vcproj @@ -56,7 +56,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(OutDir)\obj\global_intermediate\tcmalloc\libcmt.lib" + AdditionalDependencies="urlmon.lib $(OutDir)\obj\global_intermediate\tcmalloc\libcmt.lib" OutputFile="$(IntDir)\chrome.dll" LinkIncremental="1" IgnoreDefaultLibraryNames="libcmtd.lib" @@ -126,7 +126,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(OutDir)\obj\global_intermediate\tcmalloc\libcmt.lib" + AdditionalDependencies="urlmon.lib $(OutDir)\obj\global_intermediate\tcmalloc\libcmt.lib" OutputFile="$(OutDir)\chrome.dll" IgnoreDefaultLibraryNames="libcmt.lib" ImportLibrary="$(OutDir)\lib\$(ProjectName).lib" diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index f0a8040..2e35b33 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -56,7 +56,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="winmm.lib" + AdditionalDependencies="urlmon.lib winmm.lib" LinkIncremental="1" /> <Tool @@ -123,7 +123,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="winmm.lib" + AdditionalDependencies="urlmon.lib winmm.lib" /> <Tool Name="VCALinkTool" diff --git a/webkit/activex_shim/activex_shim.gyp b/webkit/activex_shim/activex_shim.gyp index 7f08aaf..585be5b 100644 --- a/webkit/activex_shim/activex_shim.gyp +++ b/webkit/activex_shim/activex_shim.gyp @@ -42,12 +42,6 @@ 'web_activex_site.cc', 'web_activex_site.h', ], - # TODO(bradnelson): Add direct support for this kind of thing to gyp. - 'msvs_settings': { - 'VCLibrarianTool': { - 'AdditionalDependencies': 'urlmon.lib', - }, - }, 'link_settings': { 'libraries': [ '-lurlmon.lib', diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp index dd4ca16..2aeac4e 100644 --- a/webkit/default_plugin/default_plugin.gyp +++ b/webkit/default_plugin/default_plugin.gyp @@ -15,13 +15,14 @@ 'target_name': 'default_plugin', 'type': '<(library)', 'dependencies': [ - '../../third_party/libxml/libxml.gyp:libxml', + '../../net/net.gyp:net_resources', '../../third_party/icu38/icu38.gyp:icui18n', '../../third_party/icu38/icu38.gyp:icuuc', + '../../third_party/libxml/libxml.gyp:libxml', '../../third_party/npapi/npapi.gyp:npapi', + '../activex_shim/activex_shim.gyp:activex_shim', '../webkit.gyp:webkit_resources', '../webkit.gyp:webkit_strings', - '../../net/net.gyp:net_resources', ], 'include_dirs': [ '../..', |