diff options
| author | Peter Bright <drpizza@quiscalusmexicanus.org> | 2011-08-20 06:05:08 +0100 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-08-22 11:30:47 -0700 |
| commit | 0110c90382f9a1e8f7aa3cc5388651ec2391a9a6 (patch) | |
| tree | 3eb18a48aec4a14ccbd815362b7f414d448c16c9 /deps/openssl/openssl.gyp | |
| parent | e80cac622569dda0f6753b452ba3e5085a9d09e5 (diff) | |
| download | android-node-v8-0110c90382f9a1e8f7aa3cc5388651ec2391a9a6.tar.gz android-node-v8-0110c90382f9a1e8f7aa3cc5388651ec2391a9a6.tar.bz2 android-node-v8-0110c90382f9a1e8f7aa3cc5388651ec2391a9a6.zip | |
Upgrade to 0.9.8r.
Build in Win32.
Diffstat (limited to 'deps/openssl/openssl.gyp')
| -rw-r--r-- | deps/openssl/openssl.gyp | 80 |
1 files changed, 47 insertions, 33 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index e72d1f1ce9..9dd7f747fa 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -8,17 +8,58 @@ 'target_name': 'openssl', 'type': '<(library)', 'defines': [ - # ENGINESDIR must be defined if OPENSSLDIR is. - 'ENGINESDIR="/dev/null"', 'L_ENDIAN', - # Set to ubuntu default path for convenience. If necessary, override - # this at runtime with the SSL_CERT_DIR environment variable. - 'OPENSSLDIR="/etc/ssl"', + 'OPENSSLDIR="ssl"', + 'ENGINESDIR="ssl/lib/engines"', 'OPENSSL_THREADS', 'PURIFY', - 'TERMIO', '_REENTRANT', ], + + 'conditions': [ + ['OS=="win"', { + 'defines': [ + 'WIN32_LEAN_AND_MEAN', # needed to avoid some name clashes that break the build. + 'MK1MF_BUILD', # trick buildinf.h into believing that we're building from nmake + 'MK1MF_PLATFORM_VC_WIN32', # ditto + ], + }], + ['OS=="mac"', { + 'defines': [ + 'TERMIOS' + ], + }], + ['OS=="linux"', { + 'defines': [ + 'TERMIO', + ], + }], + ['target_arch=="ia32"', { + 'include_dirs': [ + 'config/piii', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + 'openssl/include', + 'config/piii', + ], + }, + } + # commented out until we have node producing 64-bit builds. + #, { + # 'include_dirs': [ + # 'config/k8', + # ], + # 'direct_dependent_settings': { + # 'include_dirs': [ + # 'openssl/include', + # 'config/k8', + # ], + # }, + #} + ], + ], + 'copts': [ '-w', '-Wno-cast-qual', @@ -588,33 +629,6 @@ 'openssl/crypto/evp', 'openssl/include', ], - 'conditions': [ - ['OS=="mac"', { - 'defines!': [ 'TERMIO' ], - 'defines': [ 'TERMIOS' ], - }], - ['target_arch=="ia32"', { - 'include_dirs': [ - 'config/piii', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'openssl/include', - 'config/piii', - ], - }, - }, { - 'include_dirs': [ - 'config/k8', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'openssl/include', - 'config/k8', - ], - }, - }], - ], }, ], } |