From 51b1c1f211bf8112eba845256bd52cbd36a5932a Mon Sep 17 00:00:00 2001 From: wwylele Date: Sat, 21 Jan 2017 17:33:48 +0200 Subject: InputCommon: add SDL joystick support --- src/input_common/main.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/input_common/main.cpp') diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index 8455fdc17..699f41e6b 100644 --- a/src/input_common/main.cpp +++ b/src/input_common/main.cpp @@ -7,6 +7,9 @@ #include "input_common/analog_from_button.h" #include "input_common/keyboard.h" #include "input_common/main.h" +#ifdef HAVE_SDL2 +#include "input_common/sdl/sdl.h" +#endif namespace InputCommon { @@ -17,12 +20,19 @@ void Init() { Input::RegisterFactory("keyboard", keyboard); Input::RegisterFactory("analog_from_button", std::make_shared()); +#ifdef HAVE_SDL2 + SDL::Init(); +#endif } void Shutdown() { Input::UnregisterFactory("keyboard"); keyboard.reset(); Input::UnregisterFactory("analog_from_button"); + +#ifdef HAVE_SDL2 + SDL::Shutdown(); +#endif } Keyboard* GetKeyboard() { -- cgit v1.2.3