From f98ace64f0fd04b1cfe6373ac792524b026cdaf8 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu, 1 Nov 2018 08:23:51 +0100
Subject: Introduce new SSL_INCDIR/SSL_LIBDIR and XERCESC_INCDIR/XERCESC_LIBDIR
 to specify a custom include/lib dir as needed for vcpkg versions of
 openssl/xercesc

    * config/openssl.mpb:
    * config/wxbase.mpb:
    * config/xerces.mpb:
---
 config/openssl.mpb | 13 +++++++++++--
 config/wxbase.mpb  |  2 +-
 config/xerces.mpb  | 13 +++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'config')

diff --git a/config/openssl.mpb b/config/openssl.mpb
index bba77d3f..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_ROOT)/include
-  libpaths += $(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/wxbase.mpb b/config/wxbase.mpb
index 60486d89..4fb55ba7 100644
--- a/config/wxbase.mpb
+++ b/config/wxbase.mpb
@@ -25,7 +25,7 @@ project {
   macros   += WXUSINGDLL $(WX_PORT_MACRO)
   libpaths += $(WXWINDOWS_ROOT)/lib
 
-  specific(prop:windows) {                                  
+  specific(prop:windows) {
     Debug::lit_libs   += wxbase$(WX_VERSION)$(WX_UNICODE)d
     Release::lit_libs += wxbase$(WX_VERSION)$(WX_UNICODE)
   } else {
diff --git a/config/xerces.mpb b/config/xerces.mpb
index 292d9b6d..85f7e8aa 100644
--- a/config/xerces.mpb
+++ b/config/xerces.mpb
@@ -29,8 +29,17 @@ feature(xerces2) {
   lit_libs += $(XERCESLIB)
 }
 feature(xerces3) {
-  includes += $(XERCESCROOT)/include
-  libpaths += $(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
-- 
cgit v1.2.1