Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-26 23:36:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

patch from serhaf to fix auto-detection of sqlcipher

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7445 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-07-09 18:11:10 +00:00
parent eb22610145
commit e7489ea2dc
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
retroshare-gui/src/retroshare-gui.pro
View File

@ -75,8 +75,19 @@ linux-* {
gxs { gxs {
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database. SQLCIPHER_OK = $$system(pkg-config --exists sqlcipher && echo yes)
LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a isEmpty(SQLCIPHER_OK) {
# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
! exists(../../../lib/sqlcipher/.libs/libsqlcipher.a) {
message(../../../lib/sqlcipher/.libs/libsqlcipher.a does not exist)
error(Please fix this and try again. Will stop now.)
}
LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
} else {
LIBS += -lsqlcipher
}
} }
LIBS *= -lglib-2.0 LIBS *= -lglib-2.0

15
retroshare-nogui/src/retroshare-nogui.pro
View File

@ -32,8 +32,19 @@ linux-* {
LIBS *= -rdynamic LIBS *= -rdynamic
gxs { gxs {
# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database. SQLCIPHER_OK = $$system(pkg-config --exists sqlcipher && echo yes)
LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a isEmpty(SQLCIPHER_OK) {
# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
! exists(../../../lib/sqlcipher/.libs/libsqlcipher.a) {
message(../../../lib/sqlcipher/.libs/libsqlcipher.a does not exist)
error(Please fix this and try again. Will stop now.)
}
LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
} else {
LIBS += -lsqlcipher
}
} }
} }