mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-14 08:59:50 -05:00
Fixed compile on Windows
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7090 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
307404fa0f
commit
98e4271695
@ -39,8 +39,6 @@
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include <openssl/ssl.h>
|
||||
|
||||
#include "retroshare/rsinit.h"
|
||||
#include "rsaccounts.h"
|
||||
|
||||
@ -52,6 +50,7 @@
|
||||
#include "pqi/sslfns.h"
|
||||
#include "pqi/authgpg.h"
|
||||
|
||||
#include <openssl/ssl.h>
|
||||
|
||||
// Global singleton declaration of data.
|
||||
RsAccountsDetail rsAccounts;
|
||||
|
@ -23,13 +23,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef WINDOWS_SYS
|
||||
#include "util/rswin.h"
|
||||
#endif // WINDOWS_SYS
|
||||
|
||||
#include <openssl/ssl.h>
|
||||
#include <openssl/evp.h>
|
||||
|
||||
#include "pqi/pqi_base.h"
|
||||
|
||||
#include "util/rsrecogn.h"
|
||||
@ -38,6 +31,9 @@
|
||||
|
||||
#include "gxs/gxssecurity.h"
|
||||
|
||||
#include <openssl/ssl.h>
|
||||
#include <openssl/evp.h>
|
||||
|
||||
/***
|
||||
* #define DEBUG_RECOGN 1
|
||||
***/
|
||||
|
@ -79,7 +79,7 @@ win32 {
|
||||
LIBS += ../../libretroshare/src/lib/libretroshare.a
|
||||
LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
|
||||
LIBS += -L"$$PWD/../../../lib"
|
||||
LIBS += -lssl -lcrypto -lminiupnpc -lz
|
||||
LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz
|
||||
# added after bitdht
|
||||
# LIBS += -lcrypto -lws2_32 -lgdi32
|
||||
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin
|
||||
|
Loading…
Reference in New Issue
Block a user