From 8b794a8f8f4dfe61758c1a36ac381a6e8ff7b8f6 Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Tue, 18 Dec 2012 19:48:31 +0000
Subject: [PATCH] retroshare-nogui - 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
---
 retroshare-nogui/src/retroshare-nogui.pro | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

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