diff options
| -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 |
3 files changed, 10 insertions, 5 deletions
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index 2e35b33..f0a8040 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -56,7 +56,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="urlmon.lib winmm.lib" + AdditionalDependencies="winmm.lib" LinkIncremental="1" /> <Tool @@ -123,7 +123,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="urlmon.lib winmm.lib" + AdditionalDependencies="winmm.lib" /> <Tool Name="VCALinkTool" diff --git a/webkit/activex_shim/activex_shim.gyp b/webkit/activex_shim/activex_shim.gyp index 585be5b..7f08aaf 100644 --- a/webkit/activex_shim/activex_shim.gyp +++ b/webkit/activex_shim/activex_shim.gyp @@ -42,6 +42,12 @@ '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 2aeac4e..dd4ca16 100644 --- a/webkit/default_plugin/default_plugin.gyp +++ b/webkit/default_plugin/default_plugin.gyp @@ -15,14 +15,13 @@ 'target_name': 'default_plugin', 'type': '<(library)', 'dependencies': [ - '../../net/net.gyp:net_resources', + '../../third_party/libxml/libxml.gyp:libxml', '../../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': [ '../..', |