diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2016-03-08 15:46:20 +0100 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2016-03-08 15:46:20 +0100 |
commit | de04399afa83f51d16e2ae497f87a8d885282254 (patch) | |
tree | 4eae2a05781f6deda0a2f361a1ea83bb7faddacb | |
parent | e8546abde9953f5f36227525c09bc4a3a2db4687 (diff) |
Fixed osdmini building for android and pnacl (nw)
-rw-r--r-- | scripts/src/emu.lua | 2 | ||||
-rw-r--r-- | scripts/src/osd/osdmini.lua | 1 | ||||
-rw-r--r-- | src/osd/modules/input/input_common.cpp | 12 |
3 files changed, 13 insertions, 2 deletions
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index ac6ed9359aa..e71103a26b6 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -40,7 +40,7 @@ if _OPTIONS["with-bundled-lua"] then } end -if (_OPTIONS["targetos"] == "windows") then +if (_OPTIONS["targetos"] == "windows" and _OPTIONS["osd"] ~= "osdmini") then defines { "UI_WINDOWS", } diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua index cc794ae88df..52a28147c32 100644 --- a/scripts/src/osd/osdmini.lua +++ b/scripts/src/osd/osdmini.lua @@ -65,6 +65,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/lib/osdobj_common.h", MAME_DIR .. "src/osd/modules/font/font_sdl.cpp", MAME_DIR .. "src/osd/modules/font/font_windows.cpp", + MAME_DIR .. "src/osd/modules/font/font_dwrite.cpp", MAME_DIR .. "src/osd/modules/font/font_osx.cpp", MAME_DIR .. "src/osd/modules/font/font_none.cpp", MAME_DIR .. "src/osd/modules/netdev/taptun.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 <windows.h> #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 <sdlinc.h> #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<key_trans_entry[]> entries, unsigned int size) { |