diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-14 06:58:28 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-14 06:58:28 +0000 |
| commit | b85ba8e6379d6649bb2144839cdd5ca695ead7fb (patch) | |
| tree | 59209ee8aadcc7eb1192b610e2b73cf924fbce0a | |
| parent | 64a68f93d28045ef9062c9e225b80b72e1fa5505 (diff) | |
| download | chromium_src-b85ba8e6379d6649bb2144839cdd5ca695ead7fb.zip chromium_src-b85ba8e6379d6649bb2144839cdd5ca695ead7fb.tar.gz chromium_src-b85ba8e6379d6649bb2144839cdd5ca695ead7fb.tar.bz2 | |
Revert r18359.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/125106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18360 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome.gyp | 1 | ||||
| -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, 11 insertions, 5 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 95baaec..a2a8162 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3953,6 +3953,7 @@ 'type': 'shared_library', 'product_name': 'chrome', 'msvs_guid': 'C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9', + 'msvs_existing_vcproj': 'app/chrome_dll.vcproj', 'include_dirs': [ 'third_party/wtl/include', ], 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': [ '../..', |