From fe1ec9d510200a906c0ede6e9ee6176094ebb999 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 5 Sep 2015 22:49:57 +0200 Subject: [PATCH] Fixed mac compile. Moved sqlcipher.a to libretroshare.pro --- libretroshare/src/libretroshare.pro | 4 ++++ retroshare-gui/src/retroshare-gui.pro | 3 --- retroshare-nogui/src/retroshare-nogui.pro | 6 ------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 381567c2d..6862c1b6c 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -281,6 +281,10 @@ mac { INCLUDEPATH += . $${UPNPC_DIR} #INCLUDEPATH += . $${UPNPC_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src + + # We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database. + LIBS += ../../../lib/libsqlcipher.a + #LIBS += -lsqlite3 } ################################# FreeBSD ########################################## diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index be66e1f12..c2a513519 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -220,9 +220,6 @@ macx { LIBS += -framework CoreFoundation LIBS += -framework Security - LIBS += ../../../lib/libsqlcipher.a - #LIBS += -lsqlite3 - INCLUDEPATH += . #DEFINES* = MAC_IDLE # for idle feature CONFIG -= uitools diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro index 74f3c9fdb..043933278 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -102,12 +102,6 @@ macx { LIBS += -framework CoreFoundation LIBS += -framework Security - gxs { - # We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database. - # LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a - LIBS += ../../../lib/libsqlcipher.a - } - sshserver { LIBS += -L../../../lib #LIBS += -L../../../lib/libssh-0.6.0