summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/input
diff options
context:
space:
mode:
author Justin Kerk <dopefishjustin@gmail.com>2018-12-31 00:50:11 +0000
committer Justin Kerk <dopefishjustin@gmail.com>2018-12-31 00:50:11 +0000
commit65d0a8477ecbdb73ae5b9a76da4a307be90740a2 (patch)
treed52f557b88e11f020dba79bea575795174982506 /src/osd/modules/input
parentf8efff0afe11c3e9157823618613d89a5398f86f (diff)
Better Emscripten SDL fix (nw)
Diffstat (limited to 'src/osd/modules/input')
-rw-r--r--src/osd/modules/input/input_sdl.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp
index b904f2c4be3..0da4701b2c9 100644
--- a/src/osd/modules/input/input_sdl.cpp
+++ b/src/osd/modules/input/input_sdl.cpp
@@ -748,16 +748,17 @@ public:
{
SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
-#ifdef SDLMAME_EMSCRIPTEN
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK))
-#else
- if (SDL_InitSubSystem(SDL_INIT_JOYSTICK|SDL_INIT_HAPTIC))
-#endif
{
osd_printf_error("Could not initialize SDL Joystick: %s.\n", SDL_GetError());
return;
}
+ if (SDL_InitSubSystem(SDL_INIT_HAPTIC))
+ {
+ osd_printf_verbose("Could not initialize SDL Haptic subsystem: %s.\n", SDL_GetError());
+ }
+
sdl_input_module::input_init(machine);
char tempname[512];