generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 19:10:20 +01:00
Code Issues Projects Releases Wiki Activity

Vs140 vs150 builds (#1903)

Browse Source 
* Remove protecting guard #if __cplusplus >= 201103L

* Fix for building vs140 testsuite projects

* Remove protecting guard #if __cplusplus >= 201103L

* Fix vs150 testsuite projects

* Add   - git submodule update --init --recursive

* set PLATFORMSW=/p:Platform=Win32 or set PLATFORMSW=/p:Platform=x64

* Fix usage of POCO_EXTERNAL_OPENSSL

* Reorder build matrix

* Add FTPS client tests

* Remove useless string constants

* Update xcopy prebuild step ith new openssl lib/dll names

* Remove input lib libeayxx.lib
This commit is contained in:
zosrothko
2017-09-25 17:49:24 +02:00
committed by Aleksandar Fabijanic
parent 38c4e35c43
commit 029f06d986
21 changed files with 91 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,18 +60,6 @@
// Automatically link NetSSL and OpenSSL library.
//
#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")