From 233953cab92288e83bfe932b6414e17440711033 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sun, 23 Jun 2013 00:00:40 +0000 Subject: [PATCH] Set path to sqlcipher instead of sqlite for Windows compile. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6457 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/libretroshare.pro | 3 ++- retroshare-gui/src/retroshare-gui.pro | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index a5b7255b7..ec6010858 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -234,7 +234,8 @@ win32 { # SQLite include path is required to compile GXS. gxs { - SQLITE_DIR = ../../../sqlite-autoconf-3070900 + SQLITE_DIR = ../../../sqlcipher-2.1.1 + DEFINES += SQLITE_HAS_CODEC INCLUDEPATH += $${SQLITE_DIR} } } diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 737900711..e9c4d2baf 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -146,6 +146,12 @@ win32 { LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2 LIBS += -L"../../../lib" + + gxs { + LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a + LIBS += -lsqlite3 + } + LIBS += -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz # added after bitdht # LIBS += -lws2_32 @@ -153,11 +159,6 @@ win32 { LIBS += -lole32 -lwinmm RC_FILE = gui/images/retroshare_win.rc - 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