diff options
| author | selsta <selsta@sent.at> | 2019-08-10 22:09:30 +0200 |
|---|---|---|
| committer | selsta <selsta@sent.at> | 2019-08-10 22:09:30 +0200 |
| commit | 049cef9ce327af40cf8222976f88d08f103dc364 (patch) | |
| tree | f21d8c6b9d3b6b6064b15ba2f8951c0f80c2bad7 | |
| parent | 55b4425c5db5d25e72dc9089d9ec5aac4f2c5ddf (diff) | |
| download | monzero-gui-049cef9ce327af40cf8222976f88d08f103dc364.tar.gz monzero-gui-049cef9ce327af40cf8222976f88d08f103dc364.tar.xz monzero-gui-049cef9ce327af40cf8222976f88d08f103dc364.zip | |
android: fix build
| -rw-r--r-- | monero-wallet-gui.pro | 6 | ||||
| -rw-r--r-- | oshelper.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index 737a6875..7af571e7 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -337,13 +337,13 @@ linux { -llmdb \ -lsodium \ -lhidapi-libusb \ - -lcrypto $$TREZOR_LINKER \ - -lX11 + -lcrypto $$TREZOR_LINKER if(!android) { LIBS+= \ -Wl,-Bdynamic \ - -lGL + -lGL \ + -lX11 } # currently monero has an issue with "static" build and linunwind-dev, # so we link libunwind-dev only for non-Ubuntu distros diff --git a/oshelper.cpp b/oshelper.cpp index d3e4d063..c1326c0f 100644 --- a/oshelper.cpp +++ b/oshelper.cpp @@ -37,7 +37,7 @@ #ifdef Q_OS_WIN32 #include <windows.h> #endif -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) #include <X11/XKBlib.h> #undef KeyPress #undef KeyRelease @@ -78,7 +78,7 @@ bool OSHelper::isCapsLock() const // platform dependent method of determining if CAPS LOCK is on #if defined(Q_OS_WIN32) // MS Windows version return GetKeyState(VK_CAPITAL) == 1; -#elif defined(Q_OS_LINUX) // X11 version +#elif defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) // X11 version Display * d = XOpenDisplay((char*)0); bool caps_state = false; if (d) { |