Merge pull request #1625

3e9df9d Linking libsodium (skftn)
This commit is contained in:
luigi1111 2018-10-10 11:48:31 -05:00
commit b4e0dd107c
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -118,7 +118,8 @@ LIBS += -L$$WALLET_ROOT/lib \
-llmdb \ -llmdb \
-lepee \ -lepee \
-lunbound \ -lunbound \
-leasylogging \ -lsodium \
-leasylogging
} }
android { android {
@ -128,6 +129,7 @@ android {
-llmdb \ -llmdb \
-lepee \ -lepee \
-lunbound \ -lunbound \
-lsodium \
-leasylogging -leasylogging
} }
@ -147,6 +149,7 @@ ios {
-llmdb \ -llmdb \
-lepee \ -lepee \
-lunbound \ -lunbound \
-lsodium \
-leasylogging -leasylogging
LIBS+= \ LIBS+= \
@ -246,6 +249,7 @@ win32 {
-licutu \ -licutu \
-liconv \ -liconv \
-lssl \ -lssl \
-lsodium \
-lcrypto \ -lcrypto \
-Wl,-Bdynamic \ -Wl,-Bdynamic \
-lwinscard \ -lwinscard \
@ -291,6 +295,7 @@ linux {
-lboost_program_options \ -lboost_program_options \
-lssl \ -lssl \
-llmdb \ -llmdb \
-lsodium \
-lcrypto -lcrypto
if(!android) { if(!android) {
@ -329,6 +334,7 @@ macx {
-lboost_chrono \ -lboost_chrono \
-lboost_program_options \ -lboost_program_options \
-lssl \ -lssl \
-lsodium \
-lcrypto \ -lcrypto \
-ldl -ldl
LIBS+= -framework PCSC LIBS+= -framework PCSC