Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-27 15:57:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

retroshare-nogui

Browse Source 
- fixed path to libssh
- link static ssh on Windows
- fixed compiler warning on Windows

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6015 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-12-18 19:48:31 +00:00
parent 5f27f64ad3
commit 8b794a8f8f
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
TEMPLATE = app TEMPLATE = app
TARGET = retroshare-nogui TARGET = retroshare-nogui
CONFIG += bitdht release CONFIG += bitdht
#CONFIG += introserver #CONFIG += introserver
CONFIG += sshserver CONFIG += sshserver
@ -159,11 +159,16 @@ sshserver {
# ./retroshare-nogui -h provides some more instructions. # ./retroshare-nogui -h provides some more instructions.
# #
win32 {
DEFINES *= LIBSSH_STATIC
}
INCLUDEPATH += $$LIBSSH_DIR/include/ INCLUDEPATH += $$LIBSSH_DIR/include/
LIBS += $$LIBSSH_DIR/build/src/libssh.a #LIBS += $$LIBSSH_DIR/build/src/libssh.a
LIBS += $$LIBSSH_DIR/build/src/threads/libssh_threads.a #LIBS += $$LIBSSH_DIR/build/src/threads/libssh_threads.a
#LIBS += -lssh LIBS += -lssh
#LIBS += -lssh_threads LIBS += -lssh_threads
HEADERS += ssh/rssshd.h HEADERS += ssh/rssshd.h
SOURCES += ssh/rssshd.cc SOURCES += ssh/rssshd.cc
@ -245,8 +250,11 @@ protorpc {
# ../../rsctrl/src/gencc/search.pb.cc \ # ../../rsctrl/src/gencc/search.pb.cc \
# ../../rsctrl/src/gencc/files.pb.cc \ # ../../rsctrl/src/gencc/files.pb.cc \
QMAKE_CFLAGS += -pthread !win32 {
QMAKE_CXXFLAGS += -pthread # unrecognized option
QMAKE_CFLAGS += -pthread
QMAKE_CXXFLAGS += -pthread
}
LIBS += -lprotobuf LIBS += -lprotobuf
win32 { win32 {