Fixed mac compile. Moved sqlcipher.a to libretroshare.pro

This commit is contained in:
AsamK 2015-09-05 22:49:57 +02:00
parent 571336e1f4
commit fe1ec9d510
3 changed files with 4 additions and 9 deletions

View file

@ -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 ##########################################

View file

@ -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

View file

@ -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