diff options
author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 23:54:52 +0000 |
---|---|---|
committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-12 23:54:52 +0000 |
commit | 2a3a3c38e7c0b2b1059d383e228f73ab807f6cdc (patch) | |
tree | 461d0e6ad29130568be08530502af1708642bc55 /webkit/activex_shim_dll | |
parent | 269cf86aa4ebc523a869a9a68535e5e9a7f358f8 (diff) | |
download | chromium_src-2a3a3c38e7c0b2b1059d383e228f73ab807f6cdc.zip chromium_src-2a3a3c38e7c0b2b1059d383e228f73ab807f6cdc.tar.gz chromium_src-2a3a3c38e7c0b2b1059d383e228f73ab807f6cdc.tar.bz2 |
Pulling in newer version of gyp.
This version puts all the libs back in lib/
Additionally activex_shim_dll.gyp now uses product_name to specify an
alternate output name.
Review URL: http://codereview.chromium.org/115274
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/activex_shim_dll')
-rw-r--r-- | webkit/activex_shim_dll/activex_shim_dll.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/activex_shim_dll/activex_shim_dll.gyp b/webkit/activex_shim_dll/activex_shim_dll.gyp index 29c12ef..5ba9b67 100644 --- a/webkit/activex_shim_dll/activex_shim_dll.gyp +++ b/webkit/activex_shim_dll/activex_shim_dll.gyp @@ -20,12 +20,12 @@ '../../third_party/npapi/npapi.gyp:npapi', '../activex_shim/activex_shim.gyp:activex_shim', ], + 'product_name': 'npaxshim', 'msvs_guid': '494E414B-1655-48CE-996D-6413ECFB7829', 'msvs_settings': { 'VCLinkerTool': { 'RegisterOutput': 'false', 'IgnoreImportLibrary': 'true', - 'OutputFile': '$(OutDir)/npaxshim.dll', }, }, 'sources': [ |