generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-01 01:16:55 +02:00
Code Issues Projects Releases Wiki Activity

add openssl autolink to NetSSL

Browse Source
This commit is contained in:
Alex Fabijanic 2017-09-23 16:19:14 -05:00
parent b7fbdabf5f
commit 741fead666
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Crypto/include/Poco/Crypto/Crypto.h
View File

@ -87,18 +87,6 @@ enum RSAPaddingMode
// Automatically link Crypto and OpenSSL libraries. // Automatically link Crypto and OpenSSL libraries.
// //
#if defined(_MSC_VER) #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_NO_AUTOMATIC_LIBS)
#if !defined(POCO_EXTERNAL_OPENSSL) #if !defined(POCO_EXTERNAL_OPENSSL)
#pragma comment(lib, "libcrypto.lib") #pragma comment(lib, "libcrypto.lib")

10
NetSSL_OpenSSL/include/Poco/Net/NetSSL.h
View File

@ -50,12 +50,18 @@
// //
// Automatically link NetSSL library. // Automatically link NetSSL and OpenSSL libraries.
// //
#if defined(_MSC_VER) #if defined(_MSC_VER)
#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(NetSSL_EXPORTS) #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) #pragma comment(lib, "PocoNetSSL" POCO_LIB_SUFFIX)
#endif #endif
#endif // POCO_NO_AUTOMATIC_LIBS
#endif #endif

2
openssl

@ -1 +1 @@
Subproject commit 6dc14894cb5cb32d8079acca9cd7d2853ba425da Subproject commit 91c24b8028baf6cc91e77e154d6a90a850bcb558