diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-02 09:10:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-02 09:10:58 +0100 |
| commit | e55cec4a40f407555ac74585c82c7739bd464cdb (patch) | |
| tree | 41dc6518870fb4b99306726809af65b328f0619a | |
| parent | 8feebcf43bd6cebacbc035a6ca1a3a23e97cafad (diff) | |
| download | MPC-revert-77-jwi-inclibdir.tar.gz | |
Revert "Don't use expand, just add the new variables to the paths, in some wa…"revert-77-jwi-inclibdir
| -rw-r--r-- | config/openssl.mpb | 13 | ||||
| -rw-r--r-- | config/xerces.mpb | 13 |
2 files changed, 22 insertions, 4 deletions
diff --git a/config/openssl.mpb b/config/openssl.mpb index c9d6f873..8af0fef4 100644 --- a/config/openssl.mpb +++ b/config/openssl.mpb @@ -4,8 +4,17 @@ // default. If we ever add a new ssl library, then you // would likely enable only one ssl library feature. feature(openssl) { - includes += $(SSL_INCDIR) $(SSL_ROOT)/include - libpaths += $(SSL_LIBDIR) $(SSL_ROOT)/lib + expand(SSL_INCDIR) { + $SSL_INCDIR + $(SSL_ROOT)/include + } + expand(SSL_LIBDIR) { + $SSL_LIBDIR + $(SSL_ROOT)/lib + } + + includes += $(SSL_INCDIR) + libpaths += $(SSL_LIBDIR) specific(prop:windows) { lit_libs += libeay32 ssleay32 diff --git a/config/xerces.mpb b/config/xerces.mpb index 84e1c82b..85f7e8aa 100644 --- a/config/xerces.mpb +++ b/config/xerces.mpb @@ -29,8 +29,17 @@ feature(xerces2) { lit_libs += $(XERCESLIB) } feature(xerces3) { - includes += $(XERCESC_INCDIR) $(XERCESCROOT)/include - libpaths += $(XERCESC_LIBDIR) $(XERCESCROOT)/lib + expand(XERCESC_INCDIR) { + $XERCESC_INCDIR + $(XERCESCROOT)/include + } + expand(XERCESC_LIBDIR) { + $XERCESC_LIBDIR + $(XERCESCROOT)/lib + } + + includes += $(XERCESC_INCDIR) + libpaths += $(XERCESC_LIBDIR) specific(prop:microsoft) { xerceslib = xerces-c_3 |