summaryrefslogtreecommitdiff
path: root/src/input_common/main.cpp
diff options
context:
space:
mode:
authorGravatar wwylele2017-01-21 17:33:48 +0200
committerGravatar wwylele2017-03-01 23:30:57 +0200
commit51b1c1f211bf8112eba845256bd52cbd36a5932a (patch)
treead685410ae7b83df0474b9de206f99b68e5be398 /src/input_common/main.cpp
parentInputCommon: add AnalogFromButton (diff)
downloadyuzu-51b1c1f211bf8112eba845256bd52cbd36a5932a.tar.gz
yuzu-51b1c1f211bf8112eba845256bd52cbd36a5932a.tar.xz
yuzu-51b1c1f211bf8112eba845256bd52cbd36a5932a.zip
InputCommon: add SDL joystick support
Diffstat (limited to 'src/input_common/main.cpp')
-rw-r--r--src/input_common/main.cpp10
1 files changed, 10 insertions, 0 deletions
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 @@
7#include "input_common/analog_from_button.h" 7#include "input_common/analog_from_button.h"
8#include "input_common/keyboard.h" 8#include "input_common/keyboard.h"
9#include "input_common/main.h" 9#include "input_common/main.h"
10#ifdef HAVE_SDL2
11#include "input_common/sdl/sdl.h"
12#endif
10 13
11namespace InputCommon { 14namespace InputCommon {
12 15
@@ -17,12 +20,19 @@ void Init() {
17 Input::RegisterFactory<Input::ButtonDevice>("keyboard", keyboard); 20 Input::RegisterFactory<Input::ButtonDevice>("keyboard", keyboard);
18 Input::RegisterFactory<Input::AnalogDevice>("analog_from_button", 21 Input::RegisterFactory<Input::AnalogDevice>("analog_from_button",
19 std::make_shared<InputCommon::AnalogFromButton>()); 22 std::make_shared<InputCommon::AnalogFromButton>());
23#ifdef HAVE_SDL2
24 SDL::Init();
25#endif
20} 26}
21 27
22void Shutdown() { 28void Shutdown() {
23 Input::UnregisterFactory<Input::ButtonDevice>("keyboard"); 29 Input::UnregisterFactory<Input::ButtonDevice>("keyboard");
24 keyboard.reset(); 30 keyboard.reset();
25 Input::UnregisterFactory<Input::AnalogDevice>("analog_from_button"); 31 Input::UnregisterFactory<Input::AnalogDevice>("analog_from_button");
32
33#ifdef HAVE_SDL2
34 SDL::Shutdown();
35#endif
26} 36}
27 37
28Keyboard* GetKeyboard() { 38Keyboard* GetKeyboard() {