From b89fbce9f2e24c6ca80b8e5fafef1ab1a188cf5f Mon Sep 17 00:00:00 2001
From: Frank Morgner <frankmorgner@gmail.com>
Date: Sat, 29 Feb 2020 02:50:40 +0100
Subject: [PATCH] make OPENSSL_DIR configurable

---
 appveyor.yml         | 2 +-
 win32/Make.rules.mak | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index f3af565b..84e6eb0b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,7 +40,7 @@ install:
       If ($env:Configuration -Like "*Light*") {
         $env:ARTIFACT="${env:ARTIFACT}-Light"
       } Else {
-        $env:NMAKE_EXTRA="OPENSSL_DEF=/DENABLE_OPENSSL ${env:NMAKE_EXTRA}"
+        $env:NMAKE_EXTRA="OPENSSL_DEF=/DENABLE_OPENSSL OPENSSL_DIR=C:\OpenSSL-v111-${env:OPENSSL_PF} ${env:NMAKE_EXTRA}"
         $env:NMAKE_EXTRA="OPENSSL_EXTRA_CFLAGS=/DOPENSSL_SECURE_MALLOC_SIZE=65536 ${env:NMAKE_EXTRA}"
         If (!(Test-Path C:\zlib )) {
           appveyor DownloadFile "https://github.com/madler/zlib/archive/v${env:ZLIB_VER_DOT}.zip" -FileName zlib.zip
diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak
index 0fcd80b6..9a422c5a 100644
--- a/win32/Make.rules.mak
+++ b/win32/Make.rules.mak
@@ -36,11 +36,13 @@ SM_DEF = /DENABLE_SM
 # - set the OPENSSL_LIB below to your openssl lib file
 #OPENSSL_DEF= /DENABLE_OPENSSL
 !IF "$(OPENSSL_DEF)" == "/DENABLE_OPENSSL"
+!IF "$(OPENSSL_DIR)" == ""
 !IF "$(PLATFORM)" == "x86"
 OPENSSL_DIR = C:\OpenSSL-Win32
 !ELSE
 OPENSSL_DIR = C:\OpenSSL-Win64
 !ENDIF
+!ENDIF
 OPENSSL_INCL_DIR = /I$(OPENSSL_DIR)\include
 
 #define OPENSSL_STATIC if you have visual studio compatible with OpenSSL's static binaries