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

links with wsock32 only if the jsonapi is built

Browse Source
This commit is contained in:
zapek 2018-09-20 23:29:36 +02:00
parent 458a8b0878
commit dc926d30c8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretroshare/src/use_libretroshare.pri
View File

@ -57,6 +57,9 @@ rs_jsonapi {
QMAKE_LIBDIR *= $$clean_path($${RESTBED_BUILD_PATH}/library/) QMAKE_LIBDIR *= $$clean_path($${RESTBED_BUILD_PATH}/library/)
# Using sLibs would fail as librestbed.a is generated at compile-time # Using sLibs would fail as librestbed.a is generated at compile-time
LIBS *= -L$$clean_path($${RESTBED_BUILD_PATH}/library/) -lrestbed LIBS *= -L$$clean_path($${RESTBED_BUILD_PATH}/library/) -lrestbed
win32-g++ {
LIBS += -lwsock32
}
} }
linux-* { linux-* {

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

@ -170,7 +170,7 @@ win32-g++ {
OBJECTS_DIR = temp/obj OBJECTS_DIR = temp/obj
dLib = ws2_32 wsock32 gdi32 uuid ole32 iphlpapi crypt32 winmm dLib = ws2_32 gdi32 uuid ole32 iphlpapi crypt32 winmm
LIBS *= $$linkDynamicLibs(dLib) LIBS *= $$linkDynamicLibs(dLib)
RC_FILE = gui/images/retroshare_win.rc RC_FILE = gui/images/retroshare_win.rc