summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/input
diff options
context:
space:
mode:
author Justin Kerk <dopefishjustin@gmail.com>2018-12-30 21:52:45 +0000
committer Justin Kerk <dopefishjustin@gmail.com>2018-12-30 21:52:45 +0000
commit98d3d350ccbda5b0174a1d8923cad28b0593984c (patch)
tree6023b2c6f7b324ac00aa273178168ba7c33bb186 /src/osd/modules/input
parent56d8eeff86532123e6b8941cc94c975b5ab63172 (diff)
Fix joystick initialization with Emscripten SDL [Justin Kerk]
Diffstat (limited to 'src/osd/modules/input')
-rw-r--r--src/osd/modules/input/input_sdl.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp
index e6d7a1c4553..b904f2c4be3 100644
--- a/src/osd/modules/input/input_sdl.cpp
+++ b/src/osd/modules/input/input_sdl.cpp
@@ -748,7 +748,11 @@ 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;