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
This commit is contained in:
thunder2 2013-06-23 00:00:40 +00:00
parent 4252270cd6
commit 233953cab9
2 changed files with 8 additions and 6 deletions

View File

@ -234,7 +234,8 @@ win32 {
# SQLite include path is required to compile GXS. # SQLite include path is required to compile GXS.
gxs { gxs {
SQLITE_DIR = ../../../sqlite-autoconf-3070900 SQLITE_DIR = ../../../sqlcipher-2.1.1
DEFINES += SQLITE_HAS_CODEC
INCLUDEPATH += $${SQLITE_DIR} INCLUDEPATH += $${SQLITE_DIR}
} }
} }

View File

@ -146,6 +146,12 @@ win32 {
LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2 LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
LIBS += -L"../../../lib" LIBS += -L"../../../lib"
gxs {
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
LIBS += -lsqlite3
}
LIBS += -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz LIBS += -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz
# added after bitdht # added after bitdht
# LIBS += -lws2_32 # LIBS += -lws2_32
@ -153,11 +159,6 @@ win32 {
LIBS += -lole32 -lwinmm LIBS += -lole32 -lwinmm
RC_FILE = gui/images/retroshare_win.rc RC_FILE = gui/images/retroshare_win.rc
gxs {
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
LIBS += -lsqlite3
}
# export symbols for the plugins # export symbols for the plugins
LIBS += -Wl,--export-all-symbols,--out-implib,lib/libretroshare-gui.a LIBS += -Wl,--export-all-symbols,--out-implib,lib/libretroshare-gui.a