all repos — mgba @ ec8911ce56da596f8d522344f2a7b4e564fc1538

mGBA Game Boy Advance Emulator

Merge pull request #73 from bentley/master

Qt: Fix non-SDL2 build
endrift jeffrey@endrift.com
Tue, 28 Jul 2015 23:32:27 -0700
commit

ec8911ce56da596f8d522344f2a7b4e564fc1538

parent

9b4cca58f140ae9e68806c4a078201ff33c88734

1 files changed, 1 insertions(+), 1 deletions(-)

jump to
M src/platform/qt/InputController.cppsrc/platform/qt/InputController.cpp

@@ -207,7 +207,7 @@ GBAInputSetPreferredDevice(m_config->input(), type, m_playerId, device.toUtf8().constData());

} GBARumble* InputController::rumble() { -#ifdef BUILD_SDL +#if defined(BUILD_SDL) && SDL_VERSION_ATLEAST(2, 0, 0) if (m_playerAttached) { return &m_sdlPlayer.rumble.d; }