From e305ab547d77288b9218cba6ea271655d8e459e2 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sat, 21 Jul 2012 23:21:39 +0000 Subject: [PATCH] Moved the include folder OpenSSL to the other external includes for Windows compile. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5319 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/libretroshare.pro | 2 +- openpgpsdk/src/openpgpsdk.pro | 2 +- plugins/Common/retroshare_plugin.pri | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 36378f298..6678e7749 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -291,7 +291,7 @@ win32 { PTHREADS_DIR = ../../../pthreads-w32-2-8-0-release ZLIB_DIR = ../../../zlib-1.2.3 - SSL_DIR = ../../../../OpenSSL + SSL_DIR = ../../../OpenSSL OPENPGPSDK_DIR = ../../openpgpsdk/src INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR} $${OPENPGPSDK_DIR} diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro index ebdee404b..b3f6de26b 100644 --- a/openpgpsdk/src/openpgpsdk.pro +++ b/openpgpsdk/src/openpgpsdk.pro @@ -17,7 +17,7 @@ linux-* { } win32 { - SSL_DIR = ../../../../OpenSSL + SSL_DIR = ../../../OpenSSL 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 c3ffc1f58..42bde74f5 100644 --- a/plugins/Common/retroshare_plugin.pri +++ b/plugins/Common/retroshare_plugin.pri @@ -42,7 +42,7 @@ win32 { UPNPC_DIR = ../../../lib/miniupnpc-1.3 PTHREADS_DIR = ../../../lib/pthreads-w32-2-8-0-release ZLIB_DIR = ../../../lib/zlib-1.2.3 - SSL_DIR = ../../../../OpenSSL + SSL_DIR = ../../../OpenSSL INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR}