Skip to content
Permalink
Browse files

android: fix build

  • Loading branch information...
selsta committed Aug 10, 2019
1 parent 55b4425 commit 049cef9ce327af40cf8222976f88d08f103dc364
Showing with 5 additions and 5 deletions.
  1. +3 −3 monero-wallet-gui.pro
  2. +2 −2 oshelper.cpp
@@ -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
@@ -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) {

0 comments on commit 049cef9

Please sign in to comment.
You can’t perform that action at this time.