diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 05:31:48 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 05:31:48 +0000 |
| commit | 665a25f57ff6b21be3f6a87755ab784d6c18f9e5 (patch) | |
| tree | a426362f544f5a4aae2a7251f360186b9cb0539c /webkit/activex_shim_dll | |
| parent | c944a1e065f1778aa9de126ebdda1514c21634ae (diff) | |
| download | chromium_src-665a25f57ff6b21be3f6a87755ab784d6c18f9e5.zip chromium_src-665a25f57ff6b21be3f6a87755ab784d6c18f9e5.tar.gz chromium_src-665a25f57ff6b21be3f6a87755ab784d6c18f9e5.tar.bz2 | |
Moving activex shim to gyp.
Review URL: http://codereview.chromium.org/62089
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/activex_shim_dll')
| -rw-r--r-- | webkit/activex_shim_dll/activex_shim_dll.gyp | 54 | ||||
| -rw-r--r-- | webkit/activex_shim_dll/activex_shim_dll.vcproj | 162 |
2 files changed, 33 insertions, 183 deletions
diff --git a/webkit/activex_shim_dll/activex_shim_dll.gyp b/webkit/activex_shim_dll/activex_shim_dll.gyp index 2a6731d..2b70f84 100644 --- a/webkit/activex_shim_dll/activex_shim_dll.gyp +++ b/webkit/activex_shim_dll/activex_shim_dll.gyp @@ -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', - ], - }, - }, + }], ], } diff --git a/webkit/activex_shim_dll/activex_shim_dll.vcproj b/webkit/activex_shim_dll/activex_shim_dll.vcproj deleted file mode 100644 index 7ac5c2f..0000000 --- a/webkit/activex_shim_dll/activex_shim_dll.vcproj +++ /dev/null @@ -1,162 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="activex_shim_dll" - ProjectGUID="{494E414B-1655-48CE-996D-6413ECFB7829}" - RootNamespace="activex_shim_dll" - Keyword="AtlProj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="2" - InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\activex_shim_dll.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="TRACK_INTERFACE" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="2" - InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\activex_shim_dll.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\activex_shim_dll.cc" - > - </File> - <File - RelativePath=".\activex_shim_dll.def" - > - </File> - <File - RelativePath=".\activex_shim_dll.rc" - > - </File> - <File - RelativePath=".\resource.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> |