summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-04-23 14:22:46 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-04-23 14:22:46 +0200
commitff2c95e3bfcc6d249cecba358eb7b416564bae89 (patch)
treedf69ed515d63c4b0d14e338be874c4898bb9dba2
parent64eeebb967e74507b8edb2270b73b1a57295f2f3 (diff)
enabled internal debugger, but this would need to go in time, it is too coupled with UI (nw)
-rw-r--r--scripts/src/osd/modules.lua4
-rw-r--r--src/osd/modules/debugger/debugint.cpp4
-rw-r--r--src/osd/modules/lib/osdobj_common.cpp2
3 files changed, 7 insertions, 3 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index a05e55ee4c6..fef235457fe 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -57,6 +57,7 @@ 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",
@@ -113,6 +114,9 @@ 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",
diff --git a/src/osd/modules/debugger/debugint.cpp b/src/osd/modules/debugger/debugint.cpp
index 03f7998e460..6ac60b81b41 100644
--- a/src/osd/modules/debugger/debugint.cpp
+++ b/src/osd/modules/debugger/debugint.cpp
@@ -9,7 +9,7 @@
*********************************************************************/
#include "emu.h"
-#include "ui/uimain.h"
+#include "ui/ui.h"
#include "ui/menu.h"
#include "rendfont.h"
#include "uiinput.h"
@@ -370,7 +370,7 @@ static void dview_draw_outlined_box(DView *dv, int rtype, int x, int y, int w, i
rectangle r;
dview_get_rect(dv, rtype, r);
- dv->container->manager().machine().ui().draw_outlined_box(dv->container, NX(dv, x + r.min_x), NY(dv, y + r.min_y),
+ mame_machine_manager::instance()->ui().draw_outlined_box(dv->container, NX(dv, x + r.min_x), NY(dv, y + r.min_y),
NX(dv, x + r.min_x + w), NY(dv, y + r.min_y + h), bg);
}
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index 68af56245bf..099c5fefb77 100644
--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
@@ -217,7 +217,7 @@ 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_INTERNAL);
REGISTER_MODULE(m_mod_man, DEBUG_IMGUI);
REGISTER_MODULE(m_mod_man, DEBUG_NONE);
#endif