diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 1b7492c1760..8043384a5a2 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -38,6 +38,18 @@ if _OPTIONS["with-bundled-lua"] then } end +if (_OPTIONS["targetos"] == "windows") then + defines { + "UI_WINDOWS", + } +end + +if (_OPTIONS["osd"] == "sdl") then + defines { + "UI_SDL", + } +end + files { MAME_DIR .. "src/emu/emu.h", MAME_DIR .. "src/emu/gamedrv.h", diff --git a/src/emu/ui/custui.cpp b/src/emu/ui/custui.cpp index 47d983d5ef4..70176cf4708 100644 --- a/src/emu/ui/custui.cpp +++ b/src/emu/ui/custui.cpp @@ -141,7 +141,7 @@ void ui_menu_custom_ui::custom_render(void *selectedref, float top, float bottom ui_menu_font_ui::ui_menu_font_ui(running_machine &machine, render_container *container) : ui_menu(machine, container) { emu_options &moptions = machine.options(); -#ifdef OSD_WINDOWS +#ifdef UI_WINDOWS std::string name(moptions.ui_font()); list(); @@ -180,7 +180,7 @@ ui_menu_font_ui::ui_menu_font_ui(running_machine &machine, render_container *con } -#ifdef OSD_WINDOWS +#ifdef UI_WINDOWS //------------------------------------------------- // fonts enumerator CALLBACK //------------------------------------------------- @@ -227,7 +227,7 @@ ui_menu_font_ui::~ui_menu_font_ui() std::string error_string; emu_options &moptions = machine().options(); -#ifdef OSD_WINDOWS +#ifdef UI_WINDOWS std::string name(m_fonts[m_actual]); if (m_fonts[m_actual] != "default") { @@ -273,7 +273,7 @@ void ui_menu_font_ui::handle() } break; -#ifdef OSD_WINDOWS +#ifdef UI_WINDOWS case MUI_FNT: if (m_event->iptkey == IPT_UI_LEFT || m_event->iptkey == IPT_UI_RIGHT) @@ -313,7 +313,7 @@ void ui_menu_font_ui::populate() UINT32 arrow_flags; std::string tmptxt; -#ifdef OSD_WINDOWS +#ifdef UI_WINDOWS // add fonts option arrow_flags = get_arrow_flags(0, m_fonts.size() - 1, m_actual); std::string name(m_fonts[m_actual]); diff --git a/src/emu/ui/custui.h b/src/emu/ui/custui.h index 0c453340c18..79f45cc3a6e 100644 --- a/src/emu/ui/custui.h +++ b/src/emu/ui/custui.h @@ -13,7 +13,7 @@ #ifndef __UI_CUSTUI_H__ #define __UI_CUSTUI_H__ -#ifdef OSD_WINDOWS +#ifdef UI_WINDOWS #define WIN32_LEAN_AND_MEAN #include #endif @@ -64,7 +64,7 @@ private: MUI_ITALIC }; -#ifdef OSD_WINDOWS +#ifdef UI_WINDOWS UINT16 m_actual; std::vector m_fonts; bool m_bold, m_italic; diff --git a/src/emu/ui/dsplmenu.cpp b/src/emu/ui/dsplmenu.cpp index 88edd6466e7..a1907b89d51 100644 --- a/src/emu/ui/dsplmenu.cpp +++ b/src/emu/ui/dsplmenu.cpp @@ -15,7 +15,7 @@ #include "ui/selector.h" #include "ui/utils.h" -#if defined(OSD_WINDOWS) && !defined(OSD_SDL) +#if defined(UI_WINDOWS) && !defined(UI_SDL) #include "../osd/windows/winmain.h" #else #include "../osd/modules/lib/osdobj_common.h" @@ -24,7 +24,7 @@ ui_menu_display_options::video_modes ui_menu_display_options::m_video[] = { { "auto", "Auto" }, { "opengl", "OpenGL" }, -#if defined(OSD_WINDOWS) && !defined(OSD_SDL) +#if defined(UI_WINDOWS) && !defined(UI_SDL) { "d3d", "Direct3D" }, { "gdi", "GDI" }, { "ddraw", "DirectDraw" } @@ -37,7 +37,7 @@ ui_menu_display_options::video_modes ui_menu_display_options::m_video[] = { ui_menu_display_options::dspl_option ui_menu_display_options::m_options[] = { { 0, nullptr, nullptr }, { 0, "Video Mode", OSDOPTION_VIDEO }, -#if defined(OSD_WINDOWS) && !defined(OSD_SDL) +#if defined(UI_WINDOWS) && !defined(UI_SDL) { 0, "Hardware Stretch", WINOPTION_HWSTRETCH }, { 0, "Triple Buffering", WINOPTION_TRIPLEBUFFER }, { 0, "HLSL", WINOPTION_HLSL_ENABLE }, @@ -60,7 +60,7 @@ ui_menu_display_options::dspl_option ui_menu_display_options::m_options[] = { ui_menu_display_options::ui_menu_display_options(running_machine &machine, render_container *container) : ui_menu(machine, container) { -#if defined(OSD_WINDOWS) && !defined(OSD_SDL) +#if defined(UI_WINDOWS) && !defined(UI_SDL) windows_options &options = downcast(machine.options()); #else osd_options &options = downcast(machine.options());