Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Unified Diff: webkit/activex_shim_dll/activex_shim_dll.gyp

Issue 62089: Moving activex shim to gyp. (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/activex_shim/activex_shim.vcproj ('k') | webkit/activex_shim_dll/activex_shim_dll.vcproj » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/activex_shim_dll/activex_shim_dll.gyp
===================================================================
--- webkit/activex_shim_dll/activex_shim_dll.gyp (revision 13224)
+++ webkit/activex_shim_dll/activex_shim_dll.gyp (working copy)
@@ -9,27 +9,39 @@
'includes': [
'../../build/common.gypi',
],
- 'targets': [
- {
- 'target_name': 'activex_shim_dll',
- 'type': 'shared_library',
- 'dependencies': [
- '../../base/base.gyp:base',
- '../../third_party/npapi/npapi.gyp:npapi',
- '../activex_shim/activex_shim.gyp:activex_shim',
+ 'conditions': [
+ [ 'OS=="win"', {
+ 'targets': [
+ {
+ 'target_name': 'activex_shim_dll',
+ 'type': 'shared_library',
+ 'dependencies': [
+ '../../base/base.gyp:base',
+ '../../third_party/npapi/npapi.gyp:npapi',
+ '../activex_shim/activex_shim.gyp:activex_shim',
+ ],
+ 'msvs_guid': '494E414B-1655-48CE-996D-6413ECFB7829',
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'RegisterOutput': 'false',
+ 'IgnoreImportLibrary': 'true',
+ 'OutputFile': '$(OutDir)/npaxshim.dll',
+ 'ModuleDefinitionFile': 'activex_shim_dll.def',
+ },
+ },
+ 'sources': [
+ 'activex_shim_dll.cc',
+ 'activex_shim_dll.def',
+ 'activex_shim_dll.rc',
+ 'resource.h',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-lurlmon.lib',
+ ],
+ },
+ },
],
- 'msvs_guid': '494E414B-1655-48CE-996D-6413ECFB7829',
- 'sources': [
- 'activex_shim_dll.cc',
- 'activex_shim_dll.def',
- 'activex_shim_dll.rc',
- 'resource.h',
- ],
- 'link_settings': {
- 'libraries': [
- '-lurlmon.lib',
- ],
- },
- },
+ }],
],
}
« no previous file with comments | « webkit/activex_shim/activex_shim.vcproj ('k') | webkit/activex_shim_dll/activex_shim_dll.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698