Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-19 15:11:37 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

no deps between osd and frontend, internal debugger removed (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-05-06 14:01:27 +02:00
parent 1f3d4e650a
commit e3ff63cdda
8 changed files with 11 additions and 1879 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/src/osd/modules.lua
View File

@ -57,7 +57,6 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/diagnostics/none.cpp",
MAME_DIR .. "src/osd/modules/diagnostics/diagnostics_win32.cpp",
MAME_DIR .. "src/osd/modules/debugger/none.cpp",
MAME_DIR .. "src/osd/modules/debugger/debugint.cpp",
MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp",
MAME_DIR .. "src/osd/modules/debugger/debugimgui.cpp",
MAME_DIR .. "src/osd/modules/font/font_sdl.cpp",
@ -114,9 +113,6 @@ function osdmodulesbuild()
ext_includedir("uv"),
}
includedirs {
MAME_DIR .. "src/frontend/mame", -- for internal debugger
}
if _OPTIONS["targetos"]=="windows" then
includedirs {
MAME_DIR .. "3rdparty/winpcap/Include",

2
src/emu/ui/uimain.h
View File

@ -89,6 +89,8 @@ public:
virtual void image_display(const device_type &type, device_image_interface *image) { }
virtual void menu_reset() { }
template <typename Format, typename... Params> void popup_time(int seconds, Format &&fmt, Params &&... args);
protected:

5
src/frontend/mame/ui/ui.cpp
View File

@ -2812,3 +2812,8 @@ void mame_ui_manager::save_main_option()
}
popup_time(3, "%s", _("\n Configuration saved \n\n"));
}
void mame_ui_manager::menu_reset()
{
ui_menu::stack_reset(machine());
}

2
src/frontend/mame/ui/ui.h
View File

@ -171,6 +171,8 @@ public:
virtual void popup_time_string(int seconds, std::string message) override;
virtual void image_display(const device_type &type, device_image_interface *image) override;
virtual void menu_reset() override;
private:
// instance variables
render_font * m_font;

1869
src/osd/modules/debugger/debugint.cpp
View File

File diff suppressed because it is too large Load Diff

1
src/osd/modules/lib/osdobj_common.cpp
View File

@ -217,7 +217,6 @@ void osd_common_t::register_options()
#ifndef OSD_MINI
REGISTER_MODULE(m_mod_man, DEBUG_WINDOWS);
REGISTER_MODULE(m_mod_man, DEBUG_QT);
REGISTER_MODULE(m_mod_man, DEBUG_INTERNAL);
REGISTER_MODULE(m_mod_man, DEBUG_IMGUI);
REGISTER_MODULE(m_mod_man, DEBUG_NONE);
#endif

4
src/osd/sdl/window.cpp
View File

@ -29,8 +29,6 @@
#include "emu.h"
#include "emuopts.h"
#include "ui/uimain.h"
#include "ui/menu.h"
// OSD headers
@ -286,7 +284,7 @@ void sdl_window_info::toggle_full_screen()
}
// reset UI to main menu
ui_menu::stack_reset(machine());
machine().ui().menu_reset();
// kill off the drawers
renderer_reset();
set_platform_window(nullptr);

3
src/osd/windows/window.cpp
View File

@ -22,7 +22,6 @@
// MAME headers
#include "emu.h"
#include "uiinput.h"
#include "ui/menu.h"
// MAMEOS headers
#include "winmain.h"
@ -1918,7 +1917,7 @@ void win_window_info::set_fullscreen(int fullscreen)
m_fullscreen = fullscreen;
// reset UI to main menu
ui_menu::stack_reset(machine());
machine().ui().menu_reset();
// kill off the drawers
renderer_reset();