Fix compilation with EXPERIMENTAL_GBASLOT defined.
This commit is contained in:
parent
af53b8e106
commit
e9ebd7df18
|
@ -732,6 +732,7 @@ int main(int argc, char ** argv) {
|
|||
SDL_TimerID limiter_timer = NULL;
|
||||
int sdl_quit = 0;
|
||||
int boost = 0;
|
||||
int error;
|
||||
|
||||
#ifdef DISPLAY_FPS
|
||||
u32 fps_timing = 0;
|
||||
|
@ -806,7 +807,12 @@ int main(int argc, char ** argv) {
|
|||
|
||||
backup_setManualBackupType(my_config.savetype);
|
||||
|
||||
if (NDS_LoadROM( my_config.nds_file, my_config.cflash_disk_image_file) < 0) {
|
||||
#ifdef EXPERIMENTAL_GBASLOT
|
||||
error = NDS_LoadROM( my_config.nds_file );
|
||||
#else
|
||||
error = NDS_LoadROM( my_config.nds_file, my_config.cflash_disk_image_file );
|
||||
#endif
|
||||
if (error < 0) {
|
||||
fprintf(stderr, "error while loading %s\n", my_config.nds_file);
|
||||
exit(-1);
|
||||
}
|
||||
|
|
|
@ -63,7 +63,11 @@ int desmume_open(const char *filename)
|
|||
int i;
|
||||
noticed_3D=FALSE;
|
||||
clear_savestates();
|
||||
#ifdef EXPERIMENTAL_GBASLOT
|
||||
i = NDS_LoadROM(filename);
|
||||
#else
|
||||
i = NDS_LoadROM(filename, NULL);
|
||||
#endif
|
||||
return i;
|
||||
}
|
||||
|
||||
|
|
|
@ -577,7 +577,11 @@ static void ToggleStatusbarVisible(GtkToggleAction *action)
|
|||
static int Open(const char *filename, const char *cflash_disk_image)
|
||||
{
|
||||
int res;
|
||||
#ifdef EXPERIMENTAL_GBASLOT
|
||||
res = NDS_LoadROM( filename );
|
||||
#else
|
||||
res = NDS_LoadROM( filename, cflash_disk_image );
|
||||
#endif
|
||||
if(res > 0)
|
||||
gtk_action_set_sensitive(gtk_action_group_get_action(action_group, "cheatlist"), TRUE);
|
||||
return res;
|
||||
|
|
Loading…
Reference in New Issue