fix build on new devkitppc

This commit is contained in:
Daryl 2020-06-28 15:12:22 -06:00
parent 768c2b3540
commit 92e5513892
4 changed files with 155 additions and 344 deletions

View File

@ -18,11 +18,11 @@ include $(DEVKITPPC)/gamecube_rules
TARGET := fceugx-gc TARGET := fceugx-gc
TARGETDIR := executables TARGETDIR := executables
BUILD := build_gc BUILD := build_gc
SOURCES := source source/images source/sounds source/fonts source/lang \ SOURCES := source source/gui source/utils source/utils/unzip source/utils/sz \
source/gui source/utils source/utils/unzip source/utils/sz \
source/fceultra source/fceultra/boards source/fceultra/input \ source/fceultra source/fceultra/boards source/fceultra/input \
source/fceultra/utils source/fceultra/mbshare source/utils/vm \ source/fceultra/utils source/fceultra/mbshare source/utils/vm \
source/pocketnes source/pocketnes/minilzo source/pocketnes source/pocketnes/minilzo
DATA := source/images source/sounds source/fonts source/lang
INCLUDES := source INCLUDES := source
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
@ -72,10 +72,9 @@ CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
sFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) sFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S))) SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
TTFFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.ttf))) BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.ttf) \
LANGFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.lang))) $(wildcard $(dir)/*.lang) $(wildcard $(dir)/*.png) \
PNGFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.png))) $(wildcard $(dir)/*.pcm)))
PCMFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.pcm)))
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# use CXX for linking C++ projects, CC for standard C # use CXX for linking C++ projects, CC for standard C
@ -86,16 +85,16 @@ else
export LD := $(CXX) export LD := $(CXX)
endif endif
export OFILES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \ export OFILES_BIN := $(addsuffix .o,$(BINFILES))
$(sFILES:.s=.o) $(SFILES:.S=.o) \ export OFILES_SOURCES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(sFILES:.s=.o) $(SFILES:.S=.o)
$(TTFFILES:.ttf=.ttf.o) $(LANGFILES:.lang=.lang.o) \ export OFILES := $(OFILES_BIN) $(OFILES_SOURCES)
$(PNGFILES:.png=.png.o) \
$(PCMFILES:.pcm=.pcm.o) export HFILES := $(addsuffix .h,$(subst .,_,$(BINFILES)))
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# build a list of include paths # build a list of include paths
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ export INCLUDE := $(foreach dir,$(INCLUDES), -iquote $(CURDIR)/$(dir)) \
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-I$(CURDIR)/$(BUILD) \ -I$(CURDIR)/$(BUILD) \
-I$(LIBOGC_INC) -I$(LIBOGC_INC)
@ -103,8 +102,7 @@ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# build a list of library paths # build a list of library paths
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) \ export LIBPATHS := -L$(LIBOGC_LIB) $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
-L$(LIBOGC_LIB)
export OUTPUT := $(CURDIR)/$(TARGETDIR)/$(TARGET) export OUTPUT := $(CURDIR)/$(TARGETDIR)/$(TARGET)
.PHONY: $(BUILD) clean .PHONY: $(BUILD) clean
@ -140,22 +138,24 @@ DEPENDS := $(OFILES:.o=.d)
$(OUTPUT).dol: $(OUTPUT).elf $(OUTPUT).dol: $(OUTPUT).elf
$(OUTPUT).elf: $(OFILES) $(OUTPUT).elf: $(OFILES)
$(OFILES_SOURCES) : $(HFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# This rule links in binary data with these extensions: ttf lang png pcm # This rule links in binary data with these extensions: ttf lang png pcm
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
%.ttf.o : %.ttf %.ttf.o %_ttf.h : %.ttf
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) $(bin2o)
%.lang.o : %.lang %.lang.o %_lang.h : %.lang
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) $(bin2o)
%.png.o : %.png %.png.o %_png.h : %.png
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) $(bin2o)
%.pcm.o : %.pcm %.pcm.o %_pcm.h : %.pcm
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) $(bin2o)

View File

@ -18,11 +18,11 @@ include $(DEVKITPPC)/wii_rules
TARGET := fceugx-wii TARGET := fceugx-wii
TARGETDIR := executables TARGETDIR := executables
BUILD := build_wii BUILD := build_wii
SOURCES := source source/images source/sounds source/fonts source/lang \ SOURCES := source source/gui source/utils source/utils/sz source/utils/unzip \
source/gui source/utils source/utils/sz source/utils/unzip \
source/fceultra source/fceultra/boards source/fceultra/input \ source/fceultra source/fceultra/boards source/fceultra/input \
source/fceultra/utils source/fceultra/mbshare \ source/fceultra/utils source/fceultra/mbshare \
source/pocketnes source/pocketnes/minilzo source/pocketnes source/pocketnes/minilzo
DATA := source/images source/sounds source/fonts source/lang
INCLUDES := source INCLUDES := source
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
@ -73,11 +73,9 @@ CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
sFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) sFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S))) SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
TTFFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.ttf))) BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.ttf) \
LANGFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.lang))) $(wildcard $(dir)/*.lang) $(wildcard $(dir)/*.png) \
PNGFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.png))) $(wildcard $(dir)/*.ogg) $(wildcard $(dir)/*.pcm)))
OGGFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.ogg)))
PCMFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.pcm)))
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# use CXX for linking C++ projects, CC for standard C # use CXX for linking C++ projects, CC for standard C
@ -88,11 +86,12 @@ else
export LD := $(CXX) export LD := $(CXX)
endif endif
export OFILES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \ export OFILES_BIN := $(addsuffix .o,$(BINFILES))
$(sFILES:.s=.o) $(SFILES:.S=.o) \ export OFILES_SOURCES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(sFILES:.s=.o) $(SFILES:.S=.o)
$(TTFFILES:.ttf=.ttf.o) $(LANGFILES:.lang=.lang.o) \ export OFILES := $(OFILES_BIN) $(OFILES_SOURCES)
$(PNGFILES:.png=.png.o) \
$(OGGFILES:.ogg=.ogg.o) $(PCMFILES:.pcm=.pcm.o) export HFILES := $(addsuffix .h,$(subst .,_,$(BINFILES)))
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# build a list of include paths # build a list of include paths
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
@ -104,8 +103,7 @@ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# build a list of library paths # build a list of library paths
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) \ export LIBPATHS := -L$(LIBOGC_LIB) $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
-L$(LIBOGC_LIB)
export OUTPUT := $(CURDIR)/$(TARGETDIR)/$(TARGET) export OUTPUT := $(CURDIR)/$(TARGETDIR)/$(TARGET)
.PHONY: $(BUILD) clean .PHONY: $(BUILD) clean
@ -141,26 +139,28 @@ DEPENDS := $(OFILES:.o=.d)
$(OUTPUT).dol: $(OUTPUT).elf $(OUTPUT).dol: $(OUTPUT).elf
$(OUTPUT).elf: $(OFILES) $(OUTPUT).elf: $(OFILES)
$(OFILES_SOURCES) : $(HFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# This rule links in binary data with these extensions: ttf lang png ogg pcm # This rule links in binary data with these extensions: ttf lang png ogg pcm
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
%.ttf.o : %.ttf %.ttf.o %_ttf.h : %.ttf
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) $(bin2o)
%.lang.o : %.lang %.lang.o %_lang.h : %.lang
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) $(bin2o)
%.png.o : %.png %.png.o %_png.h : %.png
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) $(bin2o)
%.ogg.o : %.ogg %.ogg.o %_ogg.h : %.ogg
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) $(bin2o)
%.pcm.o : %.pcm %.pcm.o %_pcm.h : %.pcm
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) $(bin2o)

View File

@ -16,314 +16,125 @@
#include <gccore.h> #include <gccore.h>
// Fonts // Fonts
extern const u8 font_ttf[]; #include "font_ttf.h"
extern const u32 font_ttf_size;
// Languages // Languages
extern const u8 jp_lang[]; #include "jp_lang.h"
extern const u32 jp_lang_size; #include "en_lang.h"
extern const u8 en_lang[]; #include "de_lang.h"
extern const u32 en_lang_size; #include "fr_lang.h"
extern const u8 de_lang[]; #include "es_lang.h"
extern const u32 de_lang_size; #include "it_lang.h"
extern const u8 fr_lang[]; #include "nl_lang.h"
extern const u32 fr_lang_size; #include "zh_lang.h"
extern const u8 es_lang[]; #include "ko_lang.h"
extern const u32 es_lang_size; #include "pt_lang.h"
extern const u8 it_lang[]; #include "pt_br_lang.h"
extern const u32 it_lang_size; #include "ca_lang.h"
extern const u8 nl_lang[]; #include "tr_lang.h"
extern const u32 nl_lang_size;
extern const u8 zh_lang[];
extern const u32 zh_lang_size;
extern const u8 ko_lang[];
extern const u32 ko_lang_size;
extern const u8 pt_lang[];
extern const u32 pt_lang_size;
extern const u8 pt_br_lang[];
extern const u32 pt_br_lang_size;
extern const u8 ca_lang[];
extern const u32 ca_lang_size;
extern const u8 tr_lang[];
extern const u32 tr_lang_size;
// Sounds // Sounds
#ifdef HW_RVL
extern const u8 bg_music_ogg[]; // background music is Wii-only
extern const u32 bg_music_ogg_size; #include "bg_music_ogg.h"
#include "enter_ogg.h"
extern const u8 enter_ogg[]; #include "exit_ogg.h"
extern const u32 enter_ogg_size; #endif
#include "button_over_pcm.h"
extern const u8 exit_ogg[]; #include "button_click_pcm.h"
extern const u32 exit_ogg_size;
extern const u8 button_over_pcm[];
extern const u32 button_over_pcm_size;
extern const u8 button_click_pcm[];
extern const u32 button_click_pcm_size;
// Graphics // Graphics
#include "logo_png.h"
extern const u8 logo_png[]; #include "logo_over_png.h"
extern const u32 logo_png_size; #include "bg_top_png.h"
#include "bg_bottom_png.h"
extern const u8 logo_over_png[]; #include "icon_settings_png.h"
extern const u32 logo_over_png_size; #include "icon_home_png.h"
#include "icon_game_settings_png.h"
extern const u8 bg_top_png[]; #include "icon_game_cheats_png.h"
extern const u32 bg_top_png_size; #include "icon_game_controllers_png.h"
#include "icon_game_load_png.h"
extern const u8 bg_bottom_png[]; #include "icon_game_save_png.h"
extern const u32 bg_bottom_png_size; #include "icon_game_delete_png.h"
#include "icon_game_reset_png.h"
extern const u8 icon_settings_png[]; #include "icon_settings_wiimote_png.h"
extern const u32 icon_settings_png_size; #include "icon_settings_classic_png.h"
#include "icon_settings_gamecube_png.h"
extern const u8 icon_home_png[]; #include "icon_settings_nunchuk_png.h"
extern const u32 icon_home_png_size; #include "icon_settings_wiiupro_png.h"
#include "icon_settings_drc_png.h"
extern const u8 icon_game_settings_png[]; #include "icon_settings_nescontroller_png.h"
extern const u32 icon_game_settings_png_size; #include "icon_settings_zapper_png.h"
extern const u8 icon_game_cheats_png[]; #include "icon_settings_file_png.h"
extern const u32 icon_game_cheats_png_size; #include "icon_settings_mappings_png.h"
extern const u8 icon_game_controllers_png[]; #include "icon_settings_menu_png.h"
extern const u32 icon_game_controllers_png_size; #include "icon_settings_network_png.h"
extern const u8 icon_game_load_png[]; #include "icon_settings_video_png.h"
extern const u32 icon_game_load_png_size; #include "icon_settings_screenshot_png.h"
extern const u8 icon_game_save_png[]; #include "button_png.h"
extern const u32 icon_game_save_png_size; #include "button_over_png.h"
extern const u8 icon_game_delete_png[]; #include "button_prompt_png.h"
extern const u32 icon_game_delete_png_size; #include "button_prompt_over_png.h"
extern const u8 icon_game_reset_png[]; #include "button_long_png.h"
extern const u32 icon_game_reset_png_size; #include "button_long_over_png.h"
#include "button_short_png.h"
extern const u8 icon_settings_wiimote_png[]; #include "button_short_over_png.h"
extern const u32 icon_settings_wiimote_png_size; #include "button_small_png.h"
extern const u8 icon_settings_classic_png[]; #include "button_small_over_png.h"
extern const u32 icon_settings_classic_png_size; #include "button_large_png.h"
extern const u8 icon_settings_gamecube_png[]; #include "button_large_over_png.h"
extern const u32 icon_settings_gamecube_png_size; #include "button_arrow_left_png.h"
extern const u8 icon_settings_nunchuk_png[]; #include "button_arrow_right_png.h"
extern const u32 icon_settings_nunchuk_png_size; #include "button_arrow_up_png.h"
extern const u8 icon_settings_wiiupro_png[]; #include "button_arrow_down_png.h"
extern const u32 icon_settings_wiiupro_png_size; #include "button_arrow_left_over_png.h"
extern const u8 icon_settings_drc_png[]; #include "button_arrow_right_over_png.h"
extern const u32 icon_settings_drc_png_size; #include "button_arrow_up_over_png.h"
#include "button_arrow_down_over_png.h"
extern const u8 icon_settings_nescontroller_png[]; #include "button_gamesave_png.h"
extern const u32 icon_settings_nescontroller_png_size; #include "button_gamesave_over_png.h"
extern const u8 icon_settings_zapper_png[]; #include "button_gamesave_blank_png.h"
extern const u32 icon_settings_zapper_png_size; #include "screen_position_png.h"
#include "dialogue_box_png.h"
extern const u8 icon_settings_file_png[]; #include "credits_box_png.h"
extern const u32 icon_settings_file_png_size; #include "progressbar_png.h"
extern const u8 icon_settings_mappings_png[]; #include "progressbar_empty_png.h"
extern const u32 icon_settings_mappings_png_size; #include "progressbar_outline_png.h"
extern const u8 icon_settings_menu_png[]; #include "throbber_png.h"
extern const u32 icon_settings_menu_png_size; #include "icon_folder_png.h"
extern const u8 icon_settings_network_png[]; #include "icon_sd_png.h"
extern const u32 icon_settings_network_png_size; #include "icon_usb_png.h"
extern const u8 icon_settings_video_png[]; #include "icon_dvd_png.h"
extern const u32 icon_settings_video_png_size; #include "icon_smb_png.h"
extern const u8 icon_settings_screenshot_png[]; #include "battery_png.h"
extern const u32 icon_settings_screenshot_png_size; #include "battery_red_png.h"
#include "battery_bar_png.h"
#include "bg_options_png.h"
extern const u8 button_png[]; #include "bg_options_entry_png.h"
extern const u32 button_png_size; #include "bg_game_selection_png.h"
#include "bg_game_selection_entry_png.h"
extern const u8 button_over_png[]; #include "bg_preview_png.h"
extern const u32 button_over_png_size; #include "scrollbar_png.h"
#include "scrollbar_arrowup_png.h"
extern const u8 button_prompt_png[]; #include "scrollbar_arrowup_over_png.h"
extern const u32 button_prompt_png_size; #include "scrollbar_arrowdown_png.h"
#include "scrollbar_arrowdown_over_png.h"
extern const u8 button_prompt_over_png[]; #include "scrollbar_box_png.h"
extern const u32 button_prompt_over_png_size; #include "scrollbar_box_over_png.h"
#include "keyboard_textbox_png.h"
extern const u8 button_long_png[]; #include "keyboard_key_png.h"
extern const u32 button_long_png_size; #include "keyboard_key_over_png.h"
#include "keyboard_mediumkey_png.h"
extern const u8 button_long_over_png[]; #include "keyboard_mediumkey_over_png.h"
extern const u32 button_long_over_png_size; #include "keyboard_largekey_png.h"
#include "keyboard_largekey_over_png.h"
extern const u8 button_short_png[]; #include "player1_point_png.h"
extern const u32 button_short_png_size; #include "player2_point_png.h"
#include "player3_point_png.h"
extern const u8 button_short_over_png[]; #include "player4_point_png.h"
extern const u32 button_short_over_png_size; #include "player1_grab_png.h"
#include "player2_grab_png.h"
extern const u8 button_small_png[]; #include "player3_grab_png.h"
extern const u32 button_small_png_size; #include "player4_grab_png.h"
extern const u8 button_small_over_png[];
extern const u32 button_small_over_png_size;
extern const u8 button_large_png[];
extern const u32 button_large_png_size;
extern const u8 button_large_over_png[];
extern const u32 button_large_over_png_size;
extern const u8 button_arrow_left_png[];
extern const u32 button_arrow_left_png_size;
extern const u8 button_arrow_right_png[];
extern const u32 button_arrow_right_png_size;
extern const u8 button_arrow_up_png[];
extern const u32 button_arrow_up_png_size;
extern const u8 button_arrow_down_png[];
extern const u32 button_arrow_down_png_size;
extern const u8 button_arrow_left_over_png[];
extern const u32 button_arrow_left_over_png_size;
extern const u8 button_arrow_right_over_png[];
extern const u32 button_arrow_right_over_png_size;
extern const u8 button_arrow_up_over_png[];
extern const u32 button_arrow_up_over_png_size;
extern const u8 button_arrow_down_over_png[];
extern const u32 button_arrow_down_over_png_size;
extern const u8 button_gamesave_png[];
extern const u32 button_gamesave_png_size;
extern const u8 button_gamesave_over_png[];
extern const u32 button_gamesave_over_png_size;
extern const u8 button_gamesave_blank_png[];
extern const u32 button_gamesave_blank_png_size;
extern const u8 screen_position_png[];
extern const u32 screen_position_png_size;
extern const u8 dialogue_box_png[];
extern const u32 dialogue_box_png_size;
extern const u8 credits_box_png[];
extern const u32 credits_box_png_size;
extern const u8 progressbar_png[];
extern const u32 progressbar_png_size;
extern const u8 progressbar_empty_png[];
extern const u32 progressbar_empty_png_size;
extern const u8 progressbar_outline_png[];
extern const u32 progressbar_outline_png_size;
extern const u8 throbber_png[];
extern const u32 throbber_png_size;
extern const u8 icon_folder_png[];
extern const u32 icon_folder_png_size;
extern const u8 icon_sd_png[];
extern const u32 icon_sd_png_size;
extern const u8 icon_usb_png[];
extern const u32 icon_usb_png_size;
extern const u8 icon_dvd_png[];
extern const u32 icon_dvd_png_size;
extern const u8 icon_smb_png[];
extern const u32 icon_smb_png_size;
extern const u8 battery_png[];
extern const u32 battery_png_size;
extern const u8 battery_red_png[];
extern const u32 battery_red_png_size;
extern const u8 battery_bar_png[];
extern const u32 battery_bar_png_size;
extern const u8 bg_options_png[];
extern const u32 bg_options_png_size;
extern const u8 bg_options_entry_png[];
extern const u32 bg_options_entry_png_size;
extern const u8 bg_game_selection_png[];
extern const u32 bg_game_selection_png_size;
extern const u8 bg_game_selection_entry_png[];
extern const u32 bg_game_selection_entry_png_size;
extern const u8 bg_preview_png[];
extern const u32 bg_preview_png_size;
extern const u8 scrollbar_png[];
extern const u32 scrollbar_png_size;
extern const u8 scrollbar_arrowup_png[];
extern const u32 scrollbar_arrowup_png_size;
extern const u8 scrollbar_arrowup_over_png[];
extern const u32 scrollbar_arrowup_over_png_size;
extern const u8 scrollbar_arrowdown_png[];
extern const u32 scrollbar_arrowdown_png_size;
extern const u8 scrollbar_arrowdown_over_png[];
extern const u32 scrollbar_arrowdown_over_png_size;
extern const u8 scrollbar_box_png[];
extern const u32 scrollbar_box_png_size;
extern const u8 scrollbar_box_over_png[];
extern const u32 scrollbar_box_over_png_size;
extern const u8 keyboard_textbox_png[];
extern const u32 keyboard_textbox_png_size;
extern const u8 keyboard_key_png[];
extern const u32 keyboard_key_png_size;
extern const u8 keyboard_key_over_png[];
extern const u32 keyboard_key_over_png_size;
extern const u8 keyboard_mediumkey_png[];
extern const u32 keyboard_mediumkey_png_size;
extern const u8 keyboard_mediumkey_over_png[];
extern const u32 keyboard_mediumkey_over_png_size;
extern const u8 keyboard_largekey_png[];
extern const u32 keyboard_largekey_png_size;
extern const u8 keyboard_largekey_over_png[];
extern const u32 keyboard_largekey_over_png_size;
extern const u8 player1_point_png[];
extern const u32 player1_point_png_size;
extern const u8 player2_point_png[];
extern const u32 player2_point_png_size;
extern const u8 player3_point_png[];
extern const u32 player3_point_png_size;
extern const u8 player4_point_png[];
extern const u32 player4_point_png_size;
extern const u8 player1_grab_png[];
extern const u32 player1_grab_png_size;
extern const u8 player2_grab_png[];
extern const u32 player2_grab_png_size;
extern const u8 player3_grab_png[];
extern const u32 player3_grab_png_size;
extern const u8 player4_grab_png[];
extern const u32 player4_grab_png_size;
#endif #endif

View File

@ -1864,17 +1864,17 @@ static int MenuGameSaves(int action)
case FILE_RAM: case FILE_RAM:
strncpy(deletepath, filepath, 1024); strncpy(deletepath, filepath, 1024);
deletepath[strlen(deletepath)-4] = 0; deletepath[strlen(deletepath)-4] = 0;
sprintf(deletepath, "%s.sav", deletepath); strcat(deletepath, ".sav");
remove(deletepath); // Delete the *.sav file (Battery save file) remove(deletepath); // Delete the *.sav file (Battery save file)
break; break;
case FILE_STATE: case FILE_STATE:
strncpy(deletepath, filepath, 1024); strncpy(deletepath, filepath, 1024);
deletepath[strlen(deletepath)-4] = 0; deletepath[strlen(deletepath)-4] = 0;
sprintf(deletepath, "%s.png", deletepath); strcat(deletepath, ".png");
remove(deletepath); // Delete the *.png file (Screenshot file) remove(deletepath); // Delete the *.png file (Screenshot file)
strncpy(deletepath, filepath, 1024); strncpy(deletepath, filepath, 1024);
deletepath[strlen(deletepath)-4] = 0; deletepath[strlen(deletepath)-4] = 0;
sprintf(deletepath, "%s.fcs", deletepath); strcat(deletepath, ".fcs");
remove(deletepath); // Delete the *.fcs file (Save State file) remove(deletepath); // Delete the *.fcs file (Save State file)
break; break;
} }