From 5dc6b4ee7e81b491d6e4700fd9ba5359c5014618 Mon Sep 17 00:00:00 2001 From: evilynux Date: Sun, 9 Dec 2007 05:58:53 +0000 Subject: [PATCH] Fix build at least for cli and gtk UIs. --- desmume/src/cli/main.c | 4 ++++ desmume/src/gtk-glade/desmume.c | 4 ++++ desmume/src/gtk/desmume.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/desmume/src/cli/main.c b/desmume/src/cli/main.c index 76185be08..2a379c8a2 100644 --- a/desmume/src/cli/main.c +++ b/desmume/src/cli/main.c @@ -610,8 +610,12 @@ int main(int argc, char ** argv) { #ifdef DEBUG LogStart(); #endif +#ifdef GDB_STUB NDS_Init( arm9_memio, &arm9_ctrl_iface, arm7_memio, &arm7_ctrl_iface); +#else + NDS_Init(); +#endif /* Create the dummy firmware */ NDS_CreateDummyFirmware( &fw_config); diff --git a/desmume/src/gtk-glade/desmume.c b/desmume/src/gtk-glade/desmume.c index bbbd3de95..b987a70f4 100755 --- a/desmume/src/gtk-glade/desmume.c +++ b/desmume/src/gtk-glade/desmume.c @@ -44,8 +44,12 @@ void desmume_init( struct armcpu_memory_iface *arm9_mem_if, struct armcpu_memory_iface *arm7_mem_if, struct armcpu_ctrl_iface **arm7_ctrl_iface) { +#ifdef GDB_STUB NDS_Init( arm9_mem_if, arm9_ctrl_iface, arm7_mem_if, arm7_ctrl_iface); +#else + NDS_Init(); +#endif SPU_ChangeSoundCore(SNDCORE_SDL, 735 * 4); execute = FALSE; } diff --git a/desmume/src/gtk/desmume.c b/desmume/src/gtk/desmume.c index 5977652b5..07f709820 100644 --- a/desmume/src/gtk/desmume.c +++ b/desmume/src/gtk/desmume.c @@ -35,8 +35,12 @@ void desmume_init( struct armcpu_memory_iface *arm9_mem_if, struct armcpu_ctrl_iface **arm7_ctrl_iface, int disable_sound) { +#ifdef GDB_STUB NDS_Init( arm9_mem_if, arm9_ctrl_iface, arm7_mem_if, arm7_ctrl_iface); +#else + NDS_Init(); +#endif if ( !disable_sound) { SPU_ChangeSoundCore(SNDCORE_SDL, 735 * 4); }