[Scummvm-git-logs] scummvm master -> 6161f4af6ef839b8dfb6c22ecb647d6928f5688a

[bgK]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6161f4af6e SDL: Fix SDL1 build


Commit: 6161f4af6ef839b8dfb6c22ecb647d6928f5688a
    https://github.com/scummvm/scummvm/commit/6161f4af6ef839b8dfb6c22ecb647d6928f5688a
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-03-09T21:10:22+01:00

Commit Message:
SDL: Fix SDL1 build

Changed paths:
    backends/events/sdl/legacy-sdl-events.cpp


diff --git a/backends/events/sdl/legacy-sdl-events.cpp b/backends/events/sdl/legacy-sdl-events.cpp
index 5cc061c317..b02dbd2532 100644
--- a/backends/events/sdl/legacy-sdl-events.cpp
+++ b/backends/events/sdl/legacy-sdl-events.cpp
@@ -285,6 +285,7 @@ bool LegacySdlEventSource::handleMouseButtonUp(SDL_Event &ev, Common::Event &eve
 	return SdlEventSource::handleMouseButtonUp(ev, event);
 }
 
+#if SDL_VERSION_ATLEAST(2, 0, 0)
 bool LegacySdlEventSource::handleControllerButton(const SDL_Event &ev, Common::Event &event, bool buttonUp) {
 	if (event.joystick.button == Common::JOYSTICK_BUTTON_RIGHT_SHOULDER) {
 		// Right shoulder is the modifier button that makes the mouse go slower.
@@ -305,5 +306,6 @@ bool LegacySdlEventSource::handleControllerAxisMotion(const SDL_Event &ev, Commo
 
 	return SdlEventSource::handleControllerAxisMotion(ev, event);
 }
+#endif
 
 #endif