diff options
author | 2015-06-24 23:33:18 +0200 | |
---|---|---|
committer | 2015-06-24 23:33:18 +0200 | |
commit | 7a07ecba2a16abf918cc87dc23367f9a97cea3a6 (patch) | |
tree | 1c70358b79b3e9c38e6848657f609f6a3842bd68 /src/osd/sdl/sdlmain.c | |
parent | 3035213d045bc0edc31194fa5309c60ade5919ff (diff) | |
parent | cda316ccfea6017740fbbf8d76a732eff54047ff (diff) |
Merge pull request #3 from mamedev/master
merge with base
Diffstat (limited to 'src/osd/sdl/sdlmain.c')
-rw-r--r-- | src/osd/sdl/sdlmain.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/osd/sdl/sdlmain.c b/src/osd/sdl/sdlmain.c index e022c9d59b4..14ff93ecaf5 100644 --- a/src/osd/sdl/sdlmain.c +++ b/src/osd/sdl/sdlmain.c @@ -117,11 +117,6 @@ const options_entry sdl_options::s_option_entries[] = { NULL, NULL, OPTION_HEADER, "SDL KEYBOARD MAPPING" }, { SDLOPTION_KEYMAP, "0", OPTION_BOOLEAN, "enable keymap" }, { SDLOPTION_KEYMAP_FILE, "keymap.dat", OPTION_STRING, "keymap filename" }, -#ifdef SDLMAME_MACOSX - { SDLOPTION_UIMODEKEY, "DEL", OPTION_STRING, "Key to toggle keyboard mode" }, -#else - { SDLOPTION_UIMODEKEY, "SCRLOCK", OPTION_STRING, "Key to toggle keyboard mode" }, -#endif // SDLMAME_MACOSX // joystick mapping { NULL, NULL, OPTION_HEADER, "SDL JOYSTICK MAPPING" }, |