diff --git a/console/rarch_console.h b/console/rarch_console.h index 974f57962d..15fefd4004 100644 --- a/console/rarch_console.h +++ b/console/rarch_console.h @@ -105,9 +105,7 @@ typedef struct char shader_file[MAXIMUM_PATH]; char shader_dir[MAXIMUM_PATH]; #endif -#ifdef IS_SALAMANDER char salamander_file[MAXIMUM_PATH]; -#endif char sram_dir[MAXIMUM_PATH]; char system_dir[MAXIMUM_PATH]; } default_paths_t; diff --git a/gx/frontend/main.c b/gx/frontend/main.c index 02863df058..9110cafe97 100644 --- a/gx/frontend/main.c +++ b/gx/frontend/main.c @@ -323,6 +323,7 @@ static void get_environment_settings(void) snprintf(default_paths.sram_dir, sizeof(default_paths.sram_dir), "%s/sram", default_paths.port_dir); snprintf(default_paths.input_presets_dir, sizeof(default_paths.input_presets_dir), "%s/input", default_paths.port_dir); strlcpy(default_paths.executable_extension, ".dol", sizeof(default_paths.executable_extension)); + snprintf(default_paths.salamander_file, sizeof(default_paths.salamander_file), "boot.dol"); } #define MAKE_FILE(x) {\ diff --git a/ps3/frontend/main.c b/ps3/frontend/main.c index 2d9f7bee05..7fb81d0035 100644 --- a/ps3/frontend/main.c +++ b/ps3/frontend/main.c @@ -209,6 +209,7 @@ static void get_environment_settings(int argc, char *argv[]) snprintf(default_paths.shader_file, sizeof(default_paths.shader_file), "%s/shaders/stock.cg", default_paths.core_dir); snprintf(default_paths.menu_shader_file, sizeof(default_paths.menu_shader_file), "%s/shaders/Borders/Menu/border-only-rarch.cg", default_paths.core_dir); snprintf(default_paths.config_file, sizeof(default_paths.config_file), "%s/retroarch.cfg", default_paths.port_dir); + snprintf(default_paths.salamander_file, sizeof(default_paths.salamander_file), "EBOOT.BIN"); } g_extern.verbose = false; diff --git a/ps3/salamander/main.c b/ps3/salamander/main.c index 5ffcf83382..4fdb41e40e 100644 --- a/ps3/salamander/main.c +++ b/ps3/salamander/main.c @@ -169,8 +169,8 @@ static void get_environment_settings (void) snprintf(default_paths.input_presets_dir, sizeof(default_paths.input_presets_dir), "%s/input", default_paths.cgp_dir); snprintf(default_paths.border_dir, sizeof(default_paths.border_dir), "%s/borders", default_paths.core_dir); snprintf(default_paths.config_file, sizeof(default_paths.config_file), "%s/retroarch.cfg", default_paths.port_dir); + snprintf(default_paths.salamander_file, sizeof(default_paths.salamander_file), "EBOOT.BIN"); } - snprintf(default_paths.salamander_file, sizeof(default_paths.salamander_file), ""); } //dummy - just to avoid the emitted warnings diff --git a/xdk/frontend/main.c b/xdk/frontend/main.c index 67b4410832..b8b4c39465 100644 --- a/xdk/frontend/main.c +++ b/xdk/frontend/main.c @@ -113,6 +113,7 @@ static void get_environment_settings (void) strlcpy(default_paths.executable_extension, ".xbe", sizeof(default_paths.executable_extension)); strlcpy(default_paths.filebrowser_startup_dir, "D:", sizeof(default_paths.filebrowser_startup_dir)); strlcpy(default_paths.screenshots_dir, "D:\\screenshots", sizeof(default_paths.screenshots_dir)); + snprintf(default_paths.salamander_file, sizeof(default_paths.salamander_file), "default.xbe"); #elif defined(_XBOX360) #ifdef HAVE_HDD_CACHE_PARTITION strlcpy(default_paths.cache_dir, "cache:\\", sizeof(default_paths.cache_dir)); @@ -124,6 +125,7 @@ static void get_environment_settings (void) strlcpy(default_paths.system_dir, "game:\\system\\", sizeof(default_paths.system_dir)); strlcpy(default_paths.executable_extension, ".xex", sizeof(default_paths.executable_extension)); strlcpy(default_paths.filebrowser_startup_dir, "game:", sizeof(default_paths.filebrowser_startup_dir)); + snprintf(default_paths.salamander_file, sizeof(default_paths.salamander_file), "default.xex"); #endif }