From de04399afa83f51d16e2ae497f87a8d885282254 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 8 Mar 2016 15:46:20 +0100 Subject: Fixed osdmini building for android and pnacl (nw) --- src/osd/modules/input/input_common.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/osd/modules/input/input_common.cpp') diff --git a/src/osd/modules/input/input_common.cpp b/src/osd/modules/input/input_common.cpp index c3d6367da5f..eea2d52696e 100644 --- a/src/osd/modules/input/input_common.cpp +++ b/src/osd/modules/input/input_common.cpp @@ -33,13 +33,16 @@ #include #define KEY_TRANS_ENTRY0(mame, sdlsc, sdlkey, disc, virtual, ascii, UI) { ITEM_ID_##mame, KEY_ ## disc, virtual, ascii, "ITEM_ID_"#mame, (char *) UI } #define KEY_TRANS_ENTRY1(mame, sdlsc, sdlkey, disc, virtual, ascii) { ITEM_ID_##mame, KEY_ ## disc, virtual, ascii, "ITEM_ID_"#mame, (char*) #mame } -#else +#elseif defined(OSD_SDL) // SDL include #include #define KEY_TRANS_ENTRY0(mame, sdlsc, sdlkey, disc, virtual, ascii, UI) { ITEM_ID_##mame, SDL_SCANCODE_ ## sdlsc, SDLK_ ## sdlkey, ascii, "ITEM_ID_"#mame, (char *) UI } #define KEY_TRANS_ENTRY1(mame, sdlsc, sdlkey, disc, virtual, ascii) { ITEM_ID_##mame, SDL_SCANCODE_ ## sdlsc, SDLK_ ## sdlkey, ascii, "ITEM_ID_"#mame, (char*) #mame } +#else +// osd mini #endif +#if defined(OSD_WINDOWS) || defined(OSD_SDL) key_trans_entry keyboard_trans_table::s_default_table[] = { // MAME key sdl scancode sdl key di scancode virtual key ascii ui @@ -181,7 +184,14 @@ keyboard_trans_table::keyboard_trans_table() m_table = s_default_table; m_table_size = ARRAY_LENGTH(s_default_table); } +#else +keyboard_trans_table::keyboard_trans_table() +{ + m_table = nullptr; + m_table_size = 0; +} +#endif // public constructor to allow creation of non-default instances keyboard_trans_table::keyboard_trans_table(std::unique_ptr entries, unsigned int size) { -- cgit v1.2.3-70-g09d2 From 2d3c0abaefce5456e9bb7600157eba3e0589ebc2 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 8 Mar 2016 16:13:07 +0100 Subject: compile fix (nw) --- src/osd/modules/input/input_common.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/osd/modules/input/input_common.cpp') diff --git a/src/osd/modules/input/input_common.cpp b/src/osd/modules/input/input_common.cpp index eea2d52696e..72a0261c99a 100644 --- a/src/osd/modules/input/input_common.cpp +++ b/src/osd/modules/input/input_common.cpp @@ -33,7 +33,7 @@ #include #define KEY_TRANS_ENTRY0(mame, sdlsc, sdlkey, disc, virtual, ascii, UI) { ITEM_ID_##mame, KEY_ ## disc, virtual, ascii, "ITEM_ID_"#mame, (char *) UI } #define KEY_TRANS_ENTRY1(mame, sdlsc, sdlkey, disc, virtual, ascii) { ITEM_ID_##mame, KEY_ ## disc, virtual, ascii, "ITEM_ID_"#mame, (char*) #mame } -#elseif defined(OSD_SDL) +#elif defined(OSD_SDL) // SDL include #include #define KEY_TRANS_ENTRY0(mame, sdlsc, sdlkey, disc, virtual, ascii, UI) { ITEM_ID_##mame, SDL_SCANCODE_ ## sdlsc, SDLK_ ## sdlkey, ascii, "ITEM_ID_"#mame, (char *) UI } -- cgit v1.2.3-70-g09d2