From a44be8b74adf7e8b92ae72be13521c0b81aa748e Mon Sep 17 00:00:00 2001 From: Jacob Walser Date: Fri, 27 Jan 2017 17:31:24 -0500 Subject: [PATCH] Fix non-SDL builds --- src/Joystick/JoystickManager.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Joystick/JoystickManager.cc b/src/Joystick/JoystickManager.cc index 0e3fa6a2d..9b55ccea4 100644 --- a/src/Joystick/JoystickManager.cc +++ b/src/Joystick/JoystickManager.cc @@ -57,11 +57,17 @@ void JoystickManager::setToolbox(QGCToolbox *toolbox) void JoystickManager::init() { +#ifdef __sdljoystick__ if (JoystickSDL::init()) { _setActiveJoystickFromSettings(); connect(&_joystickCheckTimer, &QTimer::timeout, this, &JoystickManager::_updateAvailableJoysticks); _joystickCheckTimer.start(250); } +#elif defined(__android__) + /* + * Android Joystick not yet supported + */ +#endif } void JoystickManager::_setActiveJoystickFromSettings(void) @@ -182,6 +188,7 @@ void JoystickManager::setActiveJoystickName(const QString& name) void JoystickManager::_updateAvailableJoysticks(void) { +#ifdef __sdljoystick__ SDL_Event event; while (SDL_PollEvent(&event)) { switch(event.type) { @@ -200,4 +207,9 @@ void JoystickManager::_updateAvailableJoysticks(void) break; } } +#elif defined(__android__) + /* + * Android Joystick not yet supported + */ +#endif } -- 2.22.0