mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-23 05:44:45 -04:00
Fixed mac compile. Moved sqlcipher.a to libretroshare.pro
This commit is contained in:
parent
571336e1f4
commit
fe1ec9d510
3 changed files with 4 additions and 9 deletions
|
@ -281,6 +281,10 @@ mac {
|
||||||
INCLUDEPATH += . $${UPNPC_DIR}
|
INCLUDEPATH += . $${UPNPC_DIR}
|
||||||
|
|
||||||
#INCLUDEPATH += . $${UPNPC_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
|
#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 ##########################################
|
################################# FreeBSD ##########################################
|
||||||
|
|
|
@ -220,9 +220,6 @@ macx {
|
||||||
LIBS += -framework CoreFoundation
|
LIBS += -framework CoreFoundation
|
||||||
LIBS += -framework Security
|
LIBS += -framework Security
|
||||||
|
|
||||||
LIBS += ../../../lib/libsqlcipher.a
|
|
||||||
#LIBS += -lsqlite3
|
|
||||||
|
|
||||||
INCLUDEPATH += .
|
INCLUDEPATH += .
|
||||||
#DEFINES* = MAC_IDLE # for idle feature
|
#DEFINES* = MAC_IDLE # for idle feature
|
||||||
CONFIG -= uitools
|
CONFIG -= uitools
|
||||||
|
|
|
@ -102,12 +102,6 @@ macx {
|
||||||
LIBS += -framework CoreFoundation
|
LIBS += -framework CoreFoundation
|
||||||
LIBS += -framework Security
|
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 {
|
sshserver {
|
||||||
LIBS += -L../../../lib
|
LIBS += -L../../../lib
|
||||||
#LIBS += -L../../../lib/libssh-0.6.0
|
#LIBS += -L../../../lib/libssh-0.6.0
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue