summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-02-02 08:57:39 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-02-02 08:57:39 +0000
commitaa16ee779d83c827b3c0b2c848b42321266fdffc (patch)
treef70c01e60e1b0ca9eb78d733f528568556448144 /src/osd
parent2df389a77d21a027c3c3cbddceb4a225003fdf04 (diff)
Changed debugger-related code to be based off a new makefile define (DEBUGGER) which sets
a new compile-time define (ENABLE_DEBUGGER). This means that MAME_DEBUG no longer means "enable debugger", it simply enables debugging features such as assertions and debug code in drivers. Also removed the various levels of opbase protection in memory.h and always just turned on full bounds checking. Fixed build break due to missing ampoker.lay -> ampoker2.lay renaming.
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/windows/video.c6
-rw-r--r--src/osd/windows/window.c4
-rw-r--r--src/osd/windows/windows.mak2
-rw-r--r--src/osd/windows/winmain.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/osd/windows/video.c b/src/osd/windows/video.c
index 36d053dbf14..6928db82142 100644
--- a/src/osd/windows/video.c
+++ b/src/osd/windows/video.c
@@ -111,7 +111,7 @@ void winvideo_init(running_machine *machine)
SetForegroundWindow(win_window_list->hwnd);
// possibly create the debug window, but don't show it yet
-#ifdef MAME_DEBUG
+#ifdef ENABLE_DEBUGGER
if (options_get_bool(mame_options(), OPTION_DEBUG))
debugwin_init_windows();
#endif
@@ -130,7 +130,7 @@ static void video_exit(running_machine *machine)
effect_bitmap = NULL;
// possibly kill the debug window
-#ifdef MAME_DEBUG
+#ifdef ENABLE_DEBUGGER
if (options_get_bool(mame_options(), OPTION_DEBUG))
debugwin_destroy_windows();
#endif
@@ -384,7 +384,7 @@ static void extract_video_config(void)
video_config.prescale = options_get_int(mame_options(), WINOPTION_PRESCALE);
video_config.keepaspect = options_get_bool(mame_options(), WINOPTION_KEEPASPECT);
video_config.numscreens = options_get_int(mame_options(), WINOPTION_NUMSCREENS);
-#ifdef MAME_DEBUG
+#ifdef ENABLE_DEBUGGER
// if we are in debug mode, never go full screen
if (options_get_bool(mame_options(), OPTION_DEBUG))
video_config.windowed = TRUE;
diff --git a/src/osd/windows/window.c b/src/osd/windows/window.c
index 673da9c5d33..1fbf842a241 100644
--- a/src/osd/windows/window.c
+++ b/src/osd/windows/window.c
@@ -353,7 +353,7 @@ void winwindow_process_events(int ingame)
assert(GetCurrentThreadId() == main_threadid);
// if we're running, disable some parts of the debugger
-#if defined(MAME_DEBUG)
+#ifdef ENABLE_DEBUGGER
if (ingame)
debugwin_update_during_game();
#endif
@@ -495,7 +495,7 @@ void winwindow_toggle_full_screen(void)
assert(GetCurrentThreadId() == main_threadid);
-#ifdef MAME_DEBUG
+#ifdef ENABLE_DEBUGGER
// if we are in debug mode, never go full screen
if (options_get_bool(mame_options(), OPTION_DEBUG))
return;
diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak
index b108c6479e1..837519c9d3f 100644
--- a/src/osd/windows/windows.mak
+++ b/src/osd/windows/windows.mak
@@ -249,7 +249,7 @@ $(WINOBJ)/drawdd.o : $(SRC)/emu/rendersw.c
$(WINOBJ)/drawgdi.o : $(SRC)/emu/rendersw.c
# add debug-specific files
-ifdef DEBUG
+ifdef DEBUGGER
OSDOBJS += \
$(WINOBJ)/debugwin.o
endif
diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c
index 74b593a0a99..ae95b62bfc0 100644
--- a/src/osd/windows/winmain.c
+++ b/src/osd/windows/winmain.c
@@ -408,7 +408,7 @@ static LONG CALLBACK exception_filter(struct _EXCEPTION_POINTERS *info)
ExitProcess(100);
already_hit = 1;
-#ifdef MAME_DEBUG
+#ifdef ENABLE_DEBUGGER
{
extern void debug_flush_traces(void);
debug_flush_traces();