Merge pull request #73 from bentley/master

Qt: Fix non-SDL2 build
2015-07-28 23:32:27 -07:00 · 2015-07-28 23:32:27 -07:00 · ec8911ce56
parent 9b4cca58f1 19d7d90119
commit ec8911ce56
1 changed files with 1 additions and 1 deletions
--- a/src/platform/qt/InputController.cpp
+++ b/src/platform/qt/InputController.cpp
@ -207,7 +207,7 @@ void InputController::setPreferredGamepad(uint32_t type, const QString& device)
 }

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