From f764a82408d7fc1d774f767138448ad24495c596 Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Sun, 16 Dec 2012 22:39:58 +0000
Subject: [PATCH] Fixed compile of gxs on Windows.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5999 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/libretroshare.pro       |  2 +-
 retroshare-gui/src/retroshare-gui.pro     |  9 ++++-----
 retroshare-nogui/src/retroshare-nogui.pro | 18 ++++++++----------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index 414b6c0bf..a361a3d4d 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -249,7 +249,7 @@ win32 {
 
 	# SQLite include path is required to compile GXS.
 	gxs {
-		SQLITE_DIR = ../../../../Libraries/sqlite/sqlite-autoconf-3070900
+		SQLITE_DIR = ../../../sqlite-autoconf-3070900
 		INCLUDEPATH += $${SQLITE_DIR}
 	}
 
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index b59f94b33..5b37736c8 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -152,11 +152,10 @@ win32 {
 	LIBS += -lole32 -lwinmm
 	RC_FILE = gui/images/retroshare_win.rc
 
-        gxs {
-                LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-		LIBS += C:\Development\Libraries\sqlite\sqlite-autoconf-3070900\.libs\libsqlite3.a
-                #LIBS += -lsqlite3
-        }
+	gxs {
+		LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+		LIBS += -lsqlite3
+	}
 
 	# export symbols for the plugins
 	LIBS += -Wl,--export-all-symbols,--out-implib,lib/libretroshare-gui.a
diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro
index 2b6a53b04..7285dea17 100644
--- a/retroshare-nogui/src/retroshare-nogui.pro
+++ b/retroshare-nogui/src/retroshare-nogui.pro
@@ -85,13 +85,15 @@ win32 {
 	RC_FILE = resources/retroshare_win.rc
 
 	DEFINES *= WINDOWS_SYS
-    
-    SSH_DIR = ../../../libssh-0.5.2
-    SSL_DIR = ../../../openssl-1.0.1c
 
-    INCLUDEPATH += . $${SSH_DIR}/include $${SSL_DIR}/include
-    
-    
+	SSL_DIR = ../../../openssl-1.0.1c
+
+	INCLUDEPATH += . $${SSL_DIR}/include
+
+	gxs {
+		LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+		LIBS += -lsqlite3
+	}
 }
 
 ##################################### MacOS ######################################
@@ -252,7 +254,3 @@ protorpc {
         QMAKE_CXXFLAGS += -pthread
 	LIBS += -lprotobuf
 }
-
-
-
-