yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #3872 from FearlessTobi/reopen-3792 

input_common: fix build when SDL2 is disabled
This commit is contained in:
Mat M 2020-05-03 01:01:11 -04:00 committed by GitHub
parent 8db4feb5b4 3d1e741645
commit 3309a6cdf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/input_common/main.cpp
View File

@ -18,7 +18,9 @@ namespace InputCommon {
static std::shared_ptr<Keyboard> keyboard; static std::shared_ptr<Keyboard> keyboard;
static std::shared_ptr<MotionEmu> motion_emu; static std::shared_ptr<MotionEmu> motion_emu;
#ifdef HAVE_SDL2
static std::unique_ptr<SDL::State> sdl; static std::unique_ptr<SDL::State> sdl;
#endif
static std::unique_ptr<CemuhookUDP::State> udp; static std::unique_ptr<CemuhookUDP::State> udp;
void Init() { void Init() {
@ -29,7 +31,9 @@ void Init() {
motion_emu = std::make_shared<MotionEmu>(); motion_emu = std::make_shared<MotionEmu>();
Input::RegisterFactory<Input::MotionDevice>("motion_emu", motion_emu); Input::RegisterFactory<Input::MotionDevice>("motion_emu", motion_emu);
#ifdef HAVE_SDL2
sdl = SDL::Init(); sdl = SDL::Init();
#endif
udp = CemuhookUDP::Init(); udp = CemuhookUDP::Init();
} }
@ -40,7 +44,9 @@ void Shutdown() {
Input::UnregisterFactory<Input::AnalogDevice>("analog_from_button"); Input::UnregisterFactory<Input::AnalogDevice>("analog_from_button");
Input::UnregisterFactory<Input::MotionDevice>("motion_emu"); Input::UnregisterFactory<Input::MotionDevice>("motion_emu");
motion_emu.reset(); motion_emu.reset();
#ifdef HAVE_SDL2
sdl.reset(); sdl.reset();
#endif
udp.reset(); udp.reset();
} }