From 741fead666050e7fcd93a25fbf48cb7f1a66ff28 Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Sat, 23 Sep 2017 16:19:14 -0500 Subject: [PATCH] add openssl autolink to NetSSL --- Crypto/include/Poco/Crypto/Crypto.h | 12 ------------ NetSSL_OpenSSL/include/Poco/Net/NetSSL.h | 14 ++++++++++---- openssl | 2 +- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/Crypto/include/Poco/Crypto/Crypto.h b/Crypto/include/Poco/Crypto/Crypto.h index b66d115e0..b51c1eb27 100644 --- a/Crypto/include/Poco/Crypto/Crypto.h +++ b/Crypto/include/Poco/Crypto/Crypto.h @@ -87,18 +87,6 @@ enum RSAPaddingMode // Automatically link Crypto and OpenSSL libraries. // #if defined(_MSC_VER) - #if defined(_WIN64) - #define POCO_PLATFORM_BITS "64" - #else - #define POCO_PLATFORM_BITS "32" - #endif - - #if defined (_DEBUG) - #define POCO_DEBUG_POSTFIX "d" - #else - #define POCO_DEBUG_POSTFIX "" - #endif - #if !defined(POCO_NO_AUTOMATIC_LIBS) #if !defined(POCO_EXTERNAL_OPENSSL) #pragma comment(lib, "libcrypto.lib") diff --git a/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h b/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h index 3a40769e1..b4b1eeac0 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h +++ b/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h @@ -50,12 +50,18 @@ // -// Automatically link NetSSL library. +// Automatically link NetSSL and OpenSSL libraries. // #if defined(_MSC_VER) - #if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(NetSSL_EXPORTS) - #pragma comment(lib, "PocoNetSSL" POCO_LIB_SUFFIX) - #endif + #if !defined(POCO_NO_AUTOMATIC_LIBS) + #if !defined(POCO_EXTERNAL_OPENSSL) + #pragma comment(lib, "libcrypto.lib") + #pragma comment(lib, "libssl.lib") + #endif // POCO_EXTERNAL_OPENSSL + #if !defined(Crypto_EXPORTS) + #pragma comment(lib, "PocoNetSSL" POCO_LIB_SUFFIX) + #endif + #endif // POCO_NO_AUTOMATIC_LIBS #endif diff --git a/openssl b/openssl index 6dc14894c..91c24b802 160000 --- a/openssl +++ b/openssl @@ -1 +1 @@ -Subproject commit 6dc14894cb5cb32d8079acca9cd7d2853ba425da +Subproject commit 91c24b8028baf6cc91e77e154d6a90a850bcb558