diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 20:53:11 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 20:53:11 +0000 |
| commit | 56af67211dafd93bc12756655e20b66b527da7e1 (patch) | |
| tree | cc2cc06a36b9c8fd187223788e855672d50423f2 /crypto | |
| parent | 86c5a1e9c1b5d1121ed12fb4b47719d7786af4e8 (diff) | |
| download | chromium_src-56af67211dafd93bc12756655e20b66b527da7e1.zip chromium_src-56af67211dafd93bc12756655e20b66b527da7e1.tar.gz chromium_src-56af67211dafd93bc12756655e20b66b527da7e1.tar.bz2 | |
Crypto: Build crypto.dll on Windows.
BUG=85776
TEST=none
Review URL: http://codereview.chromium.org/7272045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto.gyp | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 859fb44..e3d6c84 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -10,7 +10,6 @@ { 'target_name': 'crypto', 'product_name': 'crcrypto', # Avoid colliding with OpenSSL's libcrypto - 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', @@ -60,17 +59,31 @@ ], }], [ 'OS == "mac" or OS == "win"', { - 'dependencies': [ - '../third_party/nss/nss.gyp:nspr', - '../third_party/nss/nss.gyp:nss', - ], - },], - [ 'OS != "win"', { - 'sources!': [ - 'capi_util.h', - 'capi_util.cc', + 'dependencies': [ + '../third_party/nss/nss.gyp:nspr', + '../third_party/nss/nss.gyp:nss', + ], + }], + [ 'OS == "win"', { + 'type': '<(component)', + }, { # else OS != "win" + 'type': 'static_library', + 'sources!': [ + 'capi_util.h', + 'capi_util.cc', + ], + }], + [ 'OS == "win" and component == "shared_library"', { + 'defines': [ + 'CRYPTO_DLL', + 'CRYPTO_IMPLEMENTATION', + ], + 'direct_dependent_settings': { + 'defines': [ + 'CRYPTO_DLL', ], - },], + }, + }], [ 'use_openssl==1', { # TODO(joth): Use a glob to match exclude patterns once the # OpenSSL file set is complete. |