Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed compile of libbitdht on Windows

Browse Source 
Enabled bitdht in RetroShare.pro and retroshare-nogui.pro too
Fixed link of RetroShare on Windows
-> added ws2_32 after bitdht, maybe someone has a better solution

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-08-03 12:15:20 +00:00
parent 627b0f88a2
commit 6000233267
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/tcponudp/udppeer.h
View File

@ -26,7 +26,9 @@
* *
*/ */
#ifndef WINDOWS_SYS
#include <netinet/in.h> #include <netinet/in.h>
#endif
#include "util/rsthreads.h" #include "util/rsthreads.h"

11
retroshare-gui/src/RetroShare.pro
View File

@ -1,4 +1,4 @@
CONFIG += qt gui uic qrc resources uitools idle # bitdht blogs CONFIG += qt gui uic qrc resources uitools idle bitdht # blogs
QT += network xml script opengl QT += network xml script opengl
TEMPLATE = app TEMPLATE = app
@ -88,7 +88,9 @@ win32 {
LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += -L"../../../../lib" LIBS += -L"../../../../lib"
LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz
LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 # added after bitdht
# LIBS += -lws2_32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
LIBS += -lole32 -lwinmm LIBS += -lole32 -lwinmm
RC_FILE = gui/images/retroshare_win.rc RC_FILE = gui/images/retroshare_win.rc
@ -124,6 +126,11 @@ bitdht {
LIBS += ../../libbitdht/src/lib/libbitdht.a LIBS += ../../libbitdht/src/lib/libbitdht.a
} }
win32 {
# must be added after bitdht
LIBS += -lws2_32
}
DEPENDPATH += . \ DEPENDPATH += . \
rsiface \ rsiface \
control \ control \

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

@ -1,5 +1,6 @@
TEMPLATE = app TEMPLATE = app
TARGET = retroshare-nogui TARGET = retroshare-nogui
CONFIG += bitdht
################################# Linux ########################################## ################################# Linux ##########################################
linux-* { linux-* {
@ -55,7 +56,9 @@ win32 {
LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += -L"../../../../lib" -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz LIBS += -L"../../../../lib" -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz
LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz
LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 # added after bitdht
# LIBS += -lws2_32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
LIBS += -lole32 -lwinmm LIBS += -lole32 -lwinmm
RC_FILE = resources/retroshare_win.rc RC_FILE = resources/retroshare_win.rc
@ -78,6 +81,12 @@ macx {
bitdht { bitdht {
LIBS += ../../libbitdht/src/lib/libbitdht.a LIBS += ../../libbitdht/src/lib/libbitdht.a
} }
win32 {
# must be added after bitdht
LIBS += -lws2_32
}
DEPENDPATH += ../../libretroshare/src DEPENDPATH += ../../libretroshare/src
INCLUDEPATH += . ../../libretroshare/src INCLUDEPATH += . ../../libretroshare/src