Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-14 08:59:50 -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/trunk@7090 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-02-04 21:59:55 +00:00
parent 307404fa0f
commit 98e4271695
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretroshare/src/rsserver/rsaccounts.cc
View File

@ -39,8 +39,6 @@
#include <iostream> #include <iostream>
#include <openssl/ssl.h>
#include "retroshare/rsinit.h" #include "retroshare/rsinit.h"
#include "rsaccounts.h" #include "rsaccounts.h"
@ -52,6 +50,7 @@
#include "pqi/sslfns.h" #include "pqi/sslfns.h"
#include "pqi/authgpg.h" #include "pqi/authgpg.h"
#include <openssl/ssl.h>
// Global singleton declaration of data. // Global singleton declaration of data.
RsAccountsDetail rsAccounts; RsAccountsDetail rsAccounts;

10
libretroshare/src/util/rsrecogn.cc
View File

@ -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 "pqi/pqi_base.h"
#include "util/rsrecogn.h" #include "util/rsrecogn.h"
@ -38,6 +31,9 @@
#include "gxs/gxssecurity.h" #include "gxs/gxssecurity.h"
#include <openssl/ssl.h>
#include <openssl/evp.h>
/*** /***
* #define DEBUG_RECOGN 1 * #define DEBUG_RECOGN 1
***/ ***/

2
retroshare-nogui/src/retroshare-nogui.pro
View File

@ -79,7 +79,7 @@ win32 {
LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2 LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
LIBS += -L"$$PWD/../../../lib" LIBS += -L"$$PWD/../../../lib"
LIBS += -lssl -lcrypto -lminiupnpc -lz LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz
# added after bitdht # added after bitdht
# LIBS += -lcrypto -lws2_32 -lgdi32 # LIBS += -lcrypto -lws2_32 -lgdi32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin