diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-14 20:09:53 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-14 20:09:53 +0000 |
| commit | 0751ddc6d5451dbc6a80392b22d24deda93e0e79 (patch) | |
| tree | f0a89d279d2ec62d9f75f63d68b76fb3e2a9a75a /chrome | |
| parent | 4982f883ca59b89e031bbbd3458fa5085d6fb137 (diff) | |
| download | chromium_src-0751ddc6d5451dbc6a80392b22d24deda93e0e79.zip chromium_src-0751ddc6d5451dbc6a80392b22d24deda93e0e79.tar.gz chromium_src-0751ddc6d5451dbc6a80392b22d24deda93e0e79.tar.bz2 | |
Wean activex_shim from urlmon.lib:
Remove urlmon.lib from activex_shim's AdditionalDependencies.
Add urlmon.lib to AdditionalDependencies in chrome_dll.vcproj
and unittests.vcproj.
Add activex_shim as a dependency of default_plugin, so the things
that link against default_plugin get urlmon.lib from the
activex_shim link_settings.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/126103
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/chrome_dll.vcproj | 4 | ||||
| -rw-r--r-- | chrome/test/unit/unittests.vcproj | 4 |
2 files changed, 4 insertions, 4 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" |