ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154 from Salz/pullreq/gdb-stub 

Pullreq/gdb stub
This commit is contained in:
zeromus 2018-07-06 13:54:23 -04:00 committed by GitHub
parent 9f7ed1aeeb 696135d712
commit a17bafa652
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/driver.h
View File

@ -107,7 +107,9 @@ public:
virtual bool EMU_HasEmulationStarted() { return true; } virtual bool EMU_HasEmulationStarted() { return true; }
virtual bool EMU_IsAtFrameBoundary() { return true; } virtual bool EMU_IsAtFrameBoundary() { return true; }
virtual void EMU_DebugIdleEnter() {}
virtual void EMU_DebugIdleUpdate() {} virtual void EMU_DebugIdleUpdate() {}
virtual void EMU_DebugIdleWakeUp() {}
enum eDebug_IOReg enum eDebug_IOReg
{ {

3
desmume/src/frontend/posix/gtk-glade/Makefile.am
View File

@ -35,6 +35,3 @@ desmume_glade_LDADD = ../libdesmume.a \
$(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \ $(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \
$(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \ $(GTHREAD_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) \
$(LIBSOUNDTOUCH_LIBS) $(LIBSOUNDTOUCH_LIBS)
if HAVE_GDB_STUB
desmume_glade_LDADD += ../gdbstub/libgdbstub.a
endif

2
desmume/src/frontend/posix/gtk-glade/main.cpp
View File

@ -33,7 +33,7 @@
#ifdef GDB_STUB #ifdef GDB_STUB
#include "../armcpu.h" #include "../armcpu.h"
#include "../gdbstub/gdbstub.h" #include "../gdbstub.h"
#endif #endif
#ifdef GTKGLEXT_AVAILABLE #ifdef GTKGLEXT_AVAILABLE