From 9ea4ab24e06335e9d914ad0136c097e043b736e0 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Thu, 10 Apr 2014 23:15:24 +0000 Subject: [PATCH] Updated external library to openssl-1.0.1g for Windows compile (merged from v0.5.5) git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7262 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- openpgpsdk/src/openpgpsdk.pro | 2 +- plugins/Common/retroshare_plugin.pri | 2 +- retroshare-nogui/src/retroshare-nogui.pro | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro index e0c31fa8d..b564075da 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.1c + SSL_DIR = ../../../openssl-1.0.1g 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 73779d07a..a056ff0c1 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.1c + SSL_DIR = ../../../openssl-1.0.1g 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 6ef6e2f51..9e86e9f05 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.1c + SSL_DIR = ../../../openssl-1.0.1g INCLUDEPATH += . $${SSL_DIR}/include