From d15942011421b486b1eb0daf3fe86b87d78bb82c Mon Sep 17 00:00:00 2001 From: thunder2 Date: Fri, 6 Jun 2014 00:03:33 +0000 Subject: [PATCH] Updated external library to openssl-1.0.1h for Windows compile (merged from trunk) git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.5@7401 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/libretroshare.pro | 2 +- openpgpsdk/src/openpgpsdk.pro | 2 +- plugins/Common/retroshare_plugin.pri | 2 +- retroshare-nogui/src/retroshare-nogui.pro | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 31caee629..fd5f1a745 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -256,7 +256,7 @@ win32 { UPNPC_DIR = ../../../miniupnpc-1.3 ZLIB_DIR = ../../../zlib-1.2.3 - SSL_DIR = ../../../openssl-1.0.1g + SSL_DIR = ../../../openssl-1.0.1h OPENPGPSDK_DIR = ../../openpgpsdk/src INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${ZLIB_DIR} $${OPENPGPSDK_DIR} diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro index b564075da..cce61367b 100644 --- a/openpgpsdk/src/openpgpsdk.pro +++ b/openpgpsdk/src/openpgpsdk.pro @@ -33,7 +33,7 @@ win32 { #QMAKE_CXXFLAGS_DEBUG += -O2 #QMAKE_CFLAGS_DEBUG += -O2 - SSL_DIR = ../../../openssl-1.0.1g + SSL_DIR = ../../../openssl-1.0.1h ZLIB_DIR = ../../../zlib-1.2.3 BZIP_DIR = ../../../bzip2-1.0.6 diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri index a056ff0c1..4d2817302 100644 --- a/plugins/Common/retroshare_plugin.pri +++ b/plugins/Common/retroshare_plugin.pri @@ -46,7 +46,7 @@ win32 { UPNPC_DIR = ../../../lib/miniupnpc-1.3 ZLIB_DIR = ../../../lib/zlib-1.2.3 - SSL_DIR = ../../../openssl-1.0.1g + SSL_DIR = ../../../openssl-1.0.1h INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR} diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro index b0f73cbd6..5cf486af1 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -91,7 +91,7 @@ win32 { DEFINES *= WINDOWS_SYS _USE_32BIT_TIME_T - SSL_DIR = ../../../openssl-1.0.1g + SSL_DIR = ../../../openssl-1.0.1h INCLUDEPATH += . $${SSL_DIR}/include