- Enabled compile on Windows (bzip2 library needed).

- Fixed crash after the second call to RsInit::InitRetroShare when keyring does not exist.
The instance of AuthSSL was created twice and AuthGPG was deleted without stopping the thread. Stopped the AuthGPG thread on exit of RetroShare.
- Added the correct path to the keyring for Windows in RsInit::copyGnuPGKeyrings.
- Changed the detection of the portable version on Windows from the file "gpg.exe" to the file "portable".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5211 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-06-10 00:29:46 +00:00
parent a91e859b66
commit 1885fb66c4
14 changed files with 92 additions and 15 deletions

View file

@ -10,6 +10,16 @@ DESTDIR = ../lib
DEPENDPATH += .
INCLUDEPATH += . ../include
#################################### Windows #####################################
win32 {
SSL_DIR = ../../../../OpenSSL
ZLIB_DIR = ../../../zlib-1.2.3
BZIP_DIR = ../../../bzip2-1.0.6
INCLUDEPATH += . $${SSL_DIR}/include $${ZLIB_DIR} $${BZIP_DIR}
}
# Input
HEADERS += keyring_local.h parse_local.h
SOURCES += accumulate.c \