diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index a0f1ed842..8957e17e4 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -303,7 +303,7 @@ win32 { ZLIB_DIR = ../../../zlib-1.2.3 SSL_DIR = ../../../../OpenSSL - OPENPGPSDK_DIR = ../../openpgpsdk/include + OPENPGPSDK_DIR = ../../openpgpsdk/src INCLUDEPATH *= $${OPENPGPSDK_DIR} INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src diff --git a/libretroshare/src/pgp/pgphandler.cc b/libretroshare/src/pgp/pgphandler.cc index 338dd3cdb..c4e28319a 100644 --- a/libretroshare/src/pgp/pgphandler.cc +++ b/libretroshare/src/pgp/pgphandler.cc @@ -6,6 +6,10 @@ #include #include +#ifdef WINDOWS_SYS +#include "util/rsstring.h" +#endif + extern "C" { #include #include @@ -952,6 +956,7 @@ bool PGPHandler::locked_syncSecretKeyring() { struct stat64 buf ; #ifdef WINDOWS_SYS + std::wstring wfullname; librs::util::ConvertUtf8ToUtf16(_secring_path, wfullname); if(-1 == _wstati64(wfullname.c_str(), &buf)) #else diff --git a/openpgpsdk/src/src.pro b/openpgpsdk/src/src.pro index e62a39f1e..ebdee404b 100644 --- a/openpgpsdk/src/src.pro +++ b/openpgpsdk/src/src.pro @@ -21,7 +21,7 @@ win32 { ZLIB_DIR = ../../../zlib-1.2.3 BZIP_DIR = ../../../bzip2-1.0.6 - INCLUDEPATH += . $${SSL_DIR}/include $${ZLIB_DIR} $${BZIP_DIR} + INCLUDEPATH += $${SSL_DIR}/include $${ZLIB_DIR} $${BZIP_DIR} } # Input