Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-24 06:11:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed compile on Windows.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5264 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-07-01 20:08:28 +00:00
parent e723c8739d
commit eac2c010c3
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/libretroshare.pro
View File

@ -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

5
libretroshare/src/pgp/pgphandler.cc
View File

@ -6,6 +6,10 @@
#include <string.h>
#include <sys/stat.h>
#ifdef WINDOWS_SYS
#include "util/rsstring.h"
#endif
extern "C" {
#include <openpgpsdk/util.h>
#include <openpgpsdk/crypto.h>
@ -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

2
openpgpsdk/src/src.pro
View File

@ -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