From adc0fc28c932ae503d5392577c4d232bc478b8fb Mon Sep 17 00:00:00 2001
From: "sgk@google.com" <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 13 Jun 2009 15:12:59 +0000
Subject: Remove unnecessary addition of urlmon.lib to AdditionalDependencies
of activex_shim. Add it as a dependency of default_plugin. Add urlmon.lib to
AdditionalDependencies in unittests.vcproj (going away soon, but this makes
the transition smooth). BUG=none TEST=none Review URL:
http://codereview.chromium.org/125099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18354 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/test/unit/unittests.vcproj | 4 ++--
webkit/activex_shim/activex_shim.gyp | 6 ------
webkit/default_plugin/default_plugin.gyp | 5 +++--
3 files changed, 5 insertions(+), 10 deletions(-)
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': [
'../..',
--
cgit v1.1