diff --git a/libretroshare/src/tcponudp/udppeer.h b/libretroshare/src/tcponudp/udppeer.h index b32dcc31d..73124f18b 100644 --- a/libretroshare/src/tcponudp/udppeer.h +++ b/libretroshare/src/tcponudp/udppeer.h @@ -26,7 +26,9 @@ * */ +#ifndef WINDOWS_SYS #include +#endif #include "util/rsthreads.h" diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index 51b13a21d..91fb42d67 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -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 TEMPLATE = app @@ -88,7 +88,9 @@ win32 { LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += -L"../../../../lib" 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 RC_FILE = gui/images/retroshare_win.rc @@ -124,6 +126,11 @@ bitdht { LIBS += ../../libbitdht/src/lib/libbitdht.a } +win32 { +# must be added after bitdht + LIBS += -lws2_32 +} + DEPENDPATH += . \ rsiface \ control \ diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro index 5f9d08f71..7f466ae07 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -1,5 +1,6 @@ TEMPLATE = app TARGET = retroshare-nogui +CONFIG += bitdht ################################# Linux ########################################## linux-* { @@ -55,7 +56,9 @@ win32 { LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += -L"../../../../lib" -lssl -lcrypto -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 RC_FILE = resources/retroshare_win.rc @@ -78,6 +81,12 @@ macx { bitdht { LIBS += ../../libbitdht/src/lib/libbitdht.a } + +win32 { +# must be added after bitdht + LIBS += -lws2_32 +} + DEPENDPATH += ../../libretroshare/src INCLUDEPATH += . ../../libretroshare/src