Fix build at least for cli and gtk UIs.
This commit is contained in:
parent
19830501e2
commit
5dc6b4ee7e
|
@ -610,8 +610,12 @@ int main(int argc, char ** argv) {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
LogStart();
|
LogStart();
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef GDB_STUB
|
||||||
NDS_Init( arm9_memio, &arm9_ctrl_iface,
|
NDS_Init( arm9_memio, &arm9_ctrl_iface,
|
||||||
arm7_memio, &arm7_ctrl_iface);
|
arm7_memio, &arm7_ctrl_iface);
|
||||||
|
#else
|
||||||
|
NDS_Init();
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Create the dummy firmware */
|
/* Create the dummy firmware */
|
||||||
NDS_CreateDummyFirmware( &fw_config);
|
NDS_CreateDummyFirmware( &fw_config);
|
||||||
|
|
|
@ -44,8 +44,12 @@ void desmume_init( struct armcpu_memory_iface *arm9_mem_if,
|
||||||
struct armcpu_memory_iface *arm7_mem_if,
|
struct armcpu_memory_iface *arm7_mem_if,
|
||||||
struct armcpu_ctrl_iface **arm7_ctrl_iface)
|
struct armcpu_ctrl_iface **arm7_ctrl_iface)
|
||||||
{
|
{
|
||||||
|
#ifdef GDB_STUB
|
||||||
NDS_Init( arm9_mem_if, arm9_ctrl_iface,
|
NDS_Init( arm9_mem_if, arm9_ctrl_iface,
|
||||||
arm7_mem_if, arm7_ctrl_iface);
|
arm7_mem_if, arm7_ctrl_iface);
|
||||||
|
#else
|
||||||
|
NDS_Init();
|
||||||
|
#endif
|
||||||
SPU_ChangeSoundCore(SNDCORE_SDL, 735 * 4);
|
SPU_ChangeSoundCore(SNDCORE_SDL, 735 * 4);
|
||||||
execute = FALSE;
|
execute = FALSE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,8 +35,12 @@ void desmume_init( struct armcpu_memory_iface *arm9_mem_if,
|
||||||
struct armcpu_ctrl_iface **arm7_ctrl_iface,
|
struct armcpu_ctrl_iface **arm7_ctrl_iface,
|
||||||
int disable_sound)
|
int disable_sound)
|
||||||
{
|
{
|
||||||
|
#ifdef GDB_STUB
|
||||||
NDS_Init( arm9_mem_if, arm9_ctrl_iface,
|
NDS_Init( arm9_mem_if, arm9_ctrl_iface,
|
||||||
arm7_mem_if, arm7_ctrl_iface);
|
arm7_mem_if, arm7_ctrl_iface);
|
||||||
|
#else
|
||||||
|
NDS_Init();
|
||||||
|
#endif
|
||||||
if ( !disable_sound) {
|
if ( !disable_sound) {
|
||||||
SPU_ChangeSoundCore(SNDCORE_SDL, 735 * 4);
|
SPU_ChangeSoundCore(SNDCORE_SDL, 735 * 4);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue