diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-09-01 16:35:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 16:35:20 +0200 |
| commit | b664a273a317c406569aa6097ef716e34b33e1a5 (patch) | |
| tree | d0bfe19168b5fbd1ee82c58fdb6e2285c7ec936a | |
| parent | 2598de309776ca003713b918d1cdbaeaf74fe5f3 (diff) | |
| parent | 8bc704878ab941dfb74b9ef372aad067afcd3730 (diff) | |
| download | MPC-b664a273a317c406569aa6097ef716e34b33e1a5.tar.gz | |
Merge pull request #42 from jwillemsen/jwi-openssl110ACE+TAO-6_4_5
Introduce a new feature openssl11 which has to be set in addition to …
| -rw-r--r-- | config/global.features | 1 | ||||
| -rw-r--r-- | config/openssl.mpb | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/config/global.features b/config/global.features index 7e8de7d9..e89117b0 100644 --- a/config/global.features +++ b/config/global.features @@ -20,6 +20,7 @@ erlang = 0 java = 0 mfc = 0 libpng = 0 +openssl11 = 0 python = 0 qt = 0 rpc = 0 diff --git a/config/openssl.mpb b/config/openssl.mpb index 52abc396..bba77d3f 100644 --- a/config/openssl.mpb +++ b/config/openssl.mpb @@ -28,3 +28,10 @@ feature(openssl) { libpaths += $(SSL_ROOT)/lib/VC } } + +feature(openssl11) { + specific(prop:windows) { + lit_libs -= libeay32 ssleay32 + lit_libs += libssl libcrypto + } +} |