diff options
author | 2016-02-29 21:59:56 -0500 | |
---|---|---|
committer | 2016-02-29 21:59:56 -0500 | |
commit | 3b0d8b1efb51663a55140d0b743f9d1b19c86d7b (patch) | |
tree | 471ad8b0e9dd36ff3205aa6981441a19769f4f69 /src/osd/modules/lib/osdobj_common.cpp | |
parent | 6436c3f8c4b89bd2c818d7c3150acda3558a6ccd (diff) | |
parent | 5cc9973a0aec22600ba118eb60a1603c7d471ee4 (diff) |
Merge branch 'xinput_local_temp1' of E:\mame\bradhugh.mame\mame
Diffstat (limited to 'src/osd/modules/lib/osdobj_common.cpp')
-rw-r--r-- | src/osd/modules/lib/osdobj_common.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp index 277dc4ef692..be9590087c9 100644 --- a/src/osd/modules/lib/osdobj_common.cpp +++ b/src/osd/modules/lib/osdobj_common.cpp @@ -235,6 +235,7 @@ void osd_common_t::register_options() REGISTER_MODULE(m_mod_man, JOYSTICKINPUT_SDL); REGISTER_MODULE(m_mod_man, JOYSTICKINPUT_DINPUT); + REGISTER_MODULE(m_mod_man, JOYSTICKINPUT_XINPUT); REGISTER_MODULE(m_mod_man, JOYSTICK_NONE); // after initialization we know which modules are supported |