mirror of
https://github.com/CTCaer/RetroArch.git
synced 2024-12-16 15:27:41 +00:00
rarch_console.h - cut down on executable_extension variable as well
and move it to config.def.h
This commit is contained in:
parent
ce42e7fb65
commit
370fca304d
@ -201,15 +201,20 @@ enum
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBRETRO_MANAGEMENT
|
||||
#if defined(HAVE_LIBRETRO_MANAGEMENT) || defined(IS_SALAMANDER)
|
||||
#ifdef GEKKO
|
||||
#define SALAMANDER_FILE "boot.dol"
|
||||
#define DEFAULT_EXE_EXT ".dol"
|
||||
#elif defined(__CELLOS_LV2__)
|
||||
#define SALAMANDER_FILE "EBOOT.BIN"
|
||||
#define DEFAULT_EXE_EXT ".SELF"
|
||||
#elif defined(_XBOX1)
|
||||
#define SALAMANDER_FILE "default.xbe"
|
||||
#define DEFAULT_EXE_EXT ".xbe"
|
||||
#elif defined(_XBOX360)
|
||||
#define SALAMANDER_FILE "default.xex"
|
||||
#define DEFAULT_EXE_EXT ".xex"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
////////////////
|
||||
|
@ -44,7 +44,6 @@ typedef struct
|
||||
char core_dir[MAXIMUM_PATH];
|
||||
char config_path[MAXIMUM_PATH];
|
||||
char libretro_path[MAXIMUM_PATH];
|
||||
char executable_extension[MAXIMUM_PATH];
|
||||
char filebrowser_startup_dir[MAXIMUM_PATH];
|
||||
char filesystem_root_dir[MAXIMUM_PATH];
|
||||
char input_presets_dir[MAXIMUM_PATH];
|
||||
|
@ -19,6 +19,7 @@
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "../config.def.h"
|
||||
#include "frontend_console.h"
|
||||
#include "menu/rmenu.h"
|
||||
#include "menu/menu_settings.h"
|
||||
@ -238,7 +239,7 @@ int rarch_main(int argc, char *argv[])
|
||||
#ifdef HAVE_LIBRETRO_MANAGEMENT
|
||||
char core_exe_path[PATH_MAX];
|
||||
char path_prefix[PATH_MAX];
|
||||
const char *extension = default_paths.executable_extension;
|
||||
const char *extension = DEFAULT_EXE_EXT;
|
||||
char slash;
|
||||
#if defined(_WIN32)
|
||||
slash = '\\';
|
||||
|
@ -273,7 +273,6 @@ static void get_environment_settings(int argc, char *argv[])
|
||||
snprintf(default_paths.filebrowser_startup_dir, sizeof(default_paths.filebrowser_startup_dir), default_paths.filesystem_root_dir);
|
||||
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));
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
MAKE_DIR(default_paths.port_dir);
|
||||
|
@ -283,7 +283,6 @@ static void get_environment_settings(int argc, char *argv[])
|
||||
}
|
||||
|
||||
snprintf(default_paths.core_dir, sizeof(default_paths.core_dir), "%s/cores", default_paths.port_dir);
|
||||
snprintf(default_paths.executable_extension, sizeof(default_paths.executable_extension), ".SELF");
|
||||
snprintf(default_paths.savestate_dir, sizeof(default_paths.savestate_dir), "%s/savestates", default_paths.core_dir);
|
||||
snprintf(default_paths.filesystem_root_dir, sizeof(default_paths.filesystem_root_dir), "/");
|
||||
snprintf(default_paths.filebrowser_startup_dir, sizeof(default_paths.filebrowser_startup_dir), default_paths.filesystem_root_dir);
|
||||
|
@ -55,7 +55,6 @@ static void get_environment_settings(int argc, char *argv[])
|
||||
RARCH_LOG("port dir: [%s]\n", default_paths.port_dir);
|
||||
|
||||
snprintf(default_paths.core_dir, sizeof(default_paths.core_dir), "%s/cores", default_paths.port_dir);
|
||||
snprintf(default_paths.executable_extension, sizeof(default_paths.executable_extension), ".SELF");
|
||||
snprintf(default_paths.savestate_dir, sizeof(default_paths.savestate_dir), "%s/savestates", default_paths.core_dir);
|
||||
snprintf(default_paths.filesystem_root_dir, sizeof(default_paths.filesystem_root_dir), "/");
|
||||
snprintf(default_paths.filebrowser_startup_dir, sizeof(default_paths.filebrowser_startup_dir), default_paths.filesystem_root_dir);
|
||||
|
@ -306,7 +306,6 @@ static void get_environment_settings(int argc, char *argv[])
|
||||
strlcpy(default_paths.sram_dir, "D:\\sram", sizeof(default_paths.sram_dir));
|
||||
strlcpy(default_paths.system_dir, "D:\\system", sizeof(default_paths.system_dir));
|
||||
strlcpy(default_paths.filesystem_root_dir, "D:", sizeof(default_paths.filesystem_root_dir));
|
||||
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));
|
||||
#elif defined(_XBOX360)
|
||||
@ -322,7 +321,6 @@ static void get_environment_settings(int argc, char *argv[])
|
||||
strlcpy(default_paths.savestate_dir, "game:\\savestates", sizeof(default_paths.savestate_dir));
|
||||
strlcpy(default_paths.sram_dir, "game:\\sram", sizeof(default_paths.sram_dir));
|
||||
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));
|
||||
#endif
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user