diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-07-15 18:38:32 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-07-15 18:38:32 -0500 |
| commit | 3a9f0e11003168a13c3648d02c193402e67e95b2 (patch) | |
| tree | 8d26e46e068633395358f5dc5fa9b1009efc452b /monero-wallet-gui.pro | |
| parent | 702b654f09785d7aacd0794293947a09d611c5ad (diff) | |
| parent | 35a0f25b5702a13696aec4bc679d0c25b576ca17 (diff) | |
| download | monzero-gui-3a9f0e11003168a13c3648d02c193402e67e95b2.tar.gz monzero-gui-3a9f0e11003168a13c3648d02c193402e67e95b2.tar.xz monzero-gui-3a9f0e11003168a13c3648d02c193402e67e95b2.zip | |
Merge pull request #2240
35a0f25 PasswordDialog: merge components and bug fixes (selsta)
Diffstat (limited to 'monero-wallet-gui.pro')
| -rw-r--r-- | monero-wallet-gui.pro | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index 04648aee..745fa1bd 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -68,7 +68,8 @@ HEADERS += \ src/qt/mime.h \ src/qt/KeysFiles.h \ src/qt/utils.h \ - src/qt/prices.h + src/qt/prices.h \ + src/qt/macoshelper.h SOURCES += main.cpp \ filter.cpp \ @@ -334,7 +335,8 @@ linux { -llmdb \ -lsodium \ -lhidapi-libusb \ - -lcrypto $$TREZOR_LINKER + -lcrypto $$TREZOR_LINKER \ + -lX11 if(!android) { LIBS+= \ @@ -359,6 +361,8 @@ macx { # message("using static libraries") # LIBS+= -Wl,-Bstatic # } + QT += macextras + OBJECTIVE_SOURCES += src/qt/macoshelper.mm LIBS+= \ -L/usr/local/lib \ -L/usr/local/opt/openssl/lib \ @@ -372,6 +376,7 @@ macx { -lboost_chrono \ -lboost_program_options \ -framework CoreFoundation \ + -framework AppKit \ -lhidapi \ -lssl \ -lsodium \ |