From 84f01716a1942711f1e5bf76785bc51331ee64f5 Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 1 Jun 2009 15:10:36 +0000 Subject: [PATCH] fix linux builds --- desmume/src/MMU.h | 2 -- desmume/src/cli/main.cpp | 2 +- desmume/src/gtk-glade/desmume.cpp | 2 +- desmume/src/gtk/main.cpp | 5 ++--- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/desmume/src/MMU.h b/desmume/src/MMU.h index d005898c3..9e7c0f2c2 100644 --- a/desmume/src/MMU.h +++ b/desmume/src/MMU.h @@ -159,8 +159,6 @@ struct armcpu_memory_iface { }; -void mmu_select_savetype(int type); - void MMU_Init(void); void MMU_DeInit(void); diff --git a/desmume/src/cli/main.cpp b/desmume/src/cli/main.cpp index b92429208..f1c9df0ac 100644 --- a/desmume/src/cli/main.cpp +++ b/desmume/src/cli/main.cpp @@ -703,7 +703,7 @@ int main(int argc, char ** argv) { NDS_3D_ChangeCore(my_config.engine_3d); - mmu_select_savetype(my_config.savetype, &backupmemorytype, &backupmemorysize); + backup_setManualBackupType(my_config.savetype); if (NDS_LoadROM( my_config.nds_file, backupmemorytype, backupmemorysize, my_config.cflash_disk_image_file) < 0) { fprintf(stderr, "error while loading %s\n", my_config.nds_file); diff --git a/desmume/src/gtk-glade/desmume.cpp b/desmume/src/gtk-glade/desmume.cpp index 355561187..93c69ccb1 100755 --- a/desmume/src/gtk-glade/desmume.cpp +++ b/desmume/src/gtk-glade/desmume.cpp @@ -70,7 +70,7 @@ int desmume_open(const char *filename) } void desmume_savetype(int type) { - mmu_select_savetype(type, &savetype, &savesize); + backup_setManualBackupType(type); } diff --git a/desmume/src/gtk/main.cpp b/desmume/src/gtk/main.cpp index ef95e353f..9838637b3 100644 --- a/desmume/src/gtk/main.cpp +++ b/desmume/src/gtk/main.cpp @@ -1515,8 +1515,7 @@ static void desmume_gtk_menu_file_saveload_slot (GtkActionGroup *ag) static void changesavetype(GtkAction *action, GtkRadioAction *current) { - mmu_select_savetype( gtk_radio_action_get_current_value(current), - &backupmemorytype, &backupmemorysize); + backup_setManualBackupType( gtk_radio_action_get_current_value(current)); } static void desmume_gtk_menu_emulation_layers (GtkActionGroup *ag) @@ -1787,7 +1786,7 @@ common_gtk_main( struct configured_features *my_config) "removing 3D support\n"); } - mmu_select_savetype(my_config->savetype, &backupmemorytype, &backupmemorysize); + backup_setManualBackupType(my_config->savetype); /* Command line arg */ if( my_config->nds_file != "") {