From b976584451629087305ce1eff7d142ad3d3c9b21 Mon Sep 17 00:00:00 2001 From: Ingo Saitz Date: Wed, 18 Apr 2018 11:12:43 +0200 Subject: [PATCH 1/2] fix --enable-gdbstub --- desmume/src/frontend/posix/gtk-glade/Makefile.am | 3 --- desmume/src/frontend/posix/gtk-glade/main.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/desmume/src/frontend/posix/gtk-glade/Makefile.am b/desmume/src/frontend/posix/gtk-glade/Makefile.am index 2db0f2494..c0ea195d0 100644 --- a/desmume/src/frontend/posix/gtk-glade/Makefile.am +++ b/desmume/src/frontend/posix/gtk-glade/Makefile.am @@ -35,6 +35,3 @@ desmume_glade_LDADD = ../libdesmume.a \ $(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \ $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \ $(LIBSOUNDTOUCH_LIBS) -if HAVE_GDB_STUB -desmume_glade_LDADD += ../gdbstub/libgdbstub.a -endif diff --git a/desmume/src/frontend/posix/gtk-glade/main.cpp b/desmume/src/frontend/posix/gtk-glade/main.cpp index 11469aaaa..623b1a246 100755 --- a/desmume/src/frontend/posix/gtk-glade/main.cpp +++ b/desmume/src/frontend/posix/gtk-glade/main.cpp @@ -33,7 +33,7 @@ #ifdef GDB_STUB #include "../armcpu.h" -#include "../gdbstub/gdbstub.h" +#include "../gdbstub.h" #endif #ifdef GTKGLEXT_AVAILABLE From 696135d71204691cb9107adf5baaeee33843438a Mon Sep 17 00:00:00 2001 From: Ingo Saitz Date: Mon, 2 Jul 2018 18:04:17 +0200 Subject: [PATCH 2/2] Fix BaseDriver class Commit 7548294333904fba975964fd563980e535f2f160 broke compilation of desmume/src/NDSSystem.cpp if DEVELOPER is defined by --enable-gdb-stub Needs commit c9ad909a75b0ad89d0bd84829ed536c5ae0ffc93 --- desmume/src/driver.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desmume/src/driver.h b/desmume/src/driver.h index 807972c1f..7573a140b 100644 --- a/desmume/src/driver.h +++ b/desmume/src/driver.h @@ -107,7 +107,9 @@ public: virtual bool EMU_HasEmulationStarted() { return true; } virtual bool EMU_IsAtFrameBoundary() { return true; } + virtual void EMU_DebugIdleEnter() {} virtual void EMU_DebugIdleUpdate() {} + virtual void EMU_DebugIdleWakeUp() {} enum eDebug_IOReg {