diff --git a/CMakeLists.txt b/CMakeLists.txt index c4ee78f68..cce226d56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,7 +172,7 @@ Please see https://github.com/love2d/megasource find_package(ModPlug REQUIRED) find_package(OpenAL REQUIRED) find_package(OpenGL REQUIRED) - find_package(SDL2 REQUIRED) + find_package(SDL2 2.0.9 REQUIRED) find_package(Theora REQUIRED) find_package(Vorbis REQUIRED) find_package(ZLIB REQUIRED) diff --git a/platform/unix/deps.m4 b/platform/unix/deps.m4 index d84f01ac1..e087a88e8 100644 --- a/platform/unix/deps.m4 +++ b/platform/unix/deps.m4 @@ -21,7 +21,7 @@ AC_DEFUN([ACLOVE_DEP_LIBM], [ AC_DEFUN([ACLOVE_DEP_SDL2], [ aclove_sdl2_found=no - AM_PATH_SDL2([], [aclove_sdl2_found=yes], []) + AM_PATH_SDL2([2.0.9], [aclove_sdl2_found=yes], []) AS_VAR_IF([aclove_sdl2_found], [no], [LOVE_MSG_ERROR([SDL 2])], [])]) AC_DEFUN([ACLOVE_DEP_PTHREAD], [ diff --git a/src/modules/event/sdl/Event.cpp b/src/modules/event/sdl/Event.cpp index 37f1c4640..7dfec19a4 100644 --- a/src/modules/event/sdl/Event.cpp +++ b/src/modules/event/sdl/Event.cpp @@ -374,7 +374,6 @@ Message *Event::convert(const SDL_Event &e) case SDL_WINDOWEVENT: msg = convertWindowEvent(e); break; -#if SDL_VERSION_ATLEAST(2, 0, 9) case SDL_DISPLAYEVENT: if (e.display.event == SDL_DISPLAYEVENT_ORIENTATION) { @@ -408,7 +407,6 @@ Message *Event::convert(const SDL_Event &e) msg = new Message("displayrotated", vargs); } break; -#endif case SDL_DROPFILE: filesystem = Module::getInstance(Module::M_FILESYSTEM); if (filesystem != nullptr) diff --git a/src/modules/joystick/sdl/Joystick.cpp b/src/modules/joystick/sdl/Joystick.cpp index 9b68b4485..2d5a2cc01 100644 --- a/src/modules/joystick/sdl/Joystick.cpp +++ b/src/modules/joystick/sdl/Joystick.cpp @@ -413,7 +413,6 @@ int Joystick::getID() const void Joystick::getDeviceInfo(int &vendorID, int &productID, int &productVersion) const { -#if SDL_VERSION_ATLEAST(2, 0, 6) if (joyhandle != nullptr) { vendorID = SDL_JoystickGetVendor(joyhandle); @@ -421,7 +420,6 @@ void Joystick::getDeviceInfo(int &vendorID, int &productID, int &productVersion) productVersion = SDL_JoystickGetProductVersion(joyhandle); } else -#endif { vendorID = 0; productID = 0; @@ -525,10 +523,8 @@ bool Joystick::setVibration(float left, float right, float duration) bool success = false; -#if SDL_VERSION_ATLEAST(2, 0, 9) if (SDL_JoystickRumble(joyhandle, (Uint16)(left * LOVE_UINT16_MAX), (Uint16)(right * LOVE_UINT16_MAX), length) == 0) success = true; -#endif if (!success && !checkCreateHaptic()) return false; @@ -610,10 +606,8 @@ bool Joystick::setVibration() { bool success = false; -#if SDL_VERSION_ATLEAST(2, 0, 9) if (!success) success = isConnected() && SDL_JoystickRumble(joyhandle, 0, 0, 0) == 0; -#endif if (!success && SDL_WasInit(SDL_INIT_HAPTIC) && haptic && SDL_HapticIndex(haptic) != -1) success = (SDL_HapticStopEffect(haptic, vibration.id) == 0); diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp index 1baf17244..ebf08e5cd 100644 --- a/src/modules/window/sdl/Window.cpp +++ b/src/modules/window/sdl/Window.cpp @@ -588,12 +588,8 @@ bool Window::setWindow(int width, int height, WindowSettings *settings) if (!f.fullscreen) SDL_SetWindowSize(window, width, height); - // On linux systems 2.0.5+ might not be available... - // TODO: require at least 2.0.5? -#if SDL_VERSION_ATLEAST(2, 0, 5) if (this->settings.resizable != f.resizable) SDL_SetWindowResizable(window, f.resizable ? SDL_TRUE : SDL_FALSE); -#endif if (this->settings.borderless != f.borderless) SDL_SetWindowBordered(window, f.borderless ? SDL_FALSE : SDL_TRUE); @@ -909,9 +905,6 @@ const char *Window::getDisplayName(int displayindex) const Window::DisplayOrientation Window::getDisplayOrientation(int displayindex) const { - // TODO: We can expose this everywhere, we just need to watch out for the - // SDL binary being older than the headers on Linux. -#if SDL_VERSION_ATLEAST(2, 0, 9) && (defined(LOVE_ANDROID) || !defined(LOVE_LINUX)) switch (SDL_GetDisplayOrientation(displayindex)) { case SDL_ORIENTATION_UNKNOWN: return ORIENTATION_UNKNOWN; @@ -920,9 +913,6 @@ Window::DisplayOrientation Window::getDisplayOrientation(int displayindex) const case SDL_ORIENTATION_PORTRAIT: return ORIENTATION_PORTRAIT; case SDL_ORIENTATION_PORTRAIT_FLIPPED: return ORIENTATION_PORTRAIT_FLIPPED; } -#else - LOVE_UNUSED(displayindex); -#endif return ORIENTATION_UNKNOWN; }