mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use retroarch.cfg now

Browse Source
This commit is contained in:
Twinaphex 2012-04-22 01:45:55 +02:00
parent 520f7a823a
commit 4893696e22
7 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
360/main.c
View File

@ -180,7 +180,7 @@ static void init_settings (bool load_libretro_path)
if(!path_file_exists(SYS_CONFIG_FILE)) if(!path_file_exists(SYS_CONFIG_FILE))
{ {
FILE * f; FILE * f;
RARCH_ERR("Config file \"%s\" desn't exist. Creating...\n", "game:\\ssnes.cfg"); RARCH_ERR("Config file \"%s\" desn't exist. Creating...\n", "game:\\retroarch.cfg");
f = fopen(SYS_CONFIG_FILE, "w"); f = fopen(SYS_CONFIG_FILE, "w");
fclose(f); fclose(f);
} }
@ -209,7 +209,7 @@ static void init_settings (bool load_libretro_path)
{ {
fill_pathname_base(fname_tmp, first_xex, sizeof(fname_tmp)); fill_pathname_base(fname_tmp, first_xex, sizeof(fname_tmp));
if(strcmp(fname_tmp, "SSNES-Salamander.xex") == 0) if(strcmp(fname_tmp, "RetroArch-Salamander.xex") == 0)
{ {
RARCH_WARN("First entry is RetroArch Salamander itself, increment entry by one and check if it exists.\n"); RARCH_WARN("First entry is RetroArch Salamander itself, increment entry by one and check if it exists.\n");
first_xex = dir_list[1]; first_xex = dir_list[1];
@ -365,7 +365,7 @@ static void get_environment_settings (void)
} }
strlcpy(DEFAULT_SHADER_FILE, "game:\\media\\shaders\\stock.cg", sizeof(DEFAULT_SHADER_FILE)); strlcpy(DEFAULT_SHADER_FILE, "game:\\media\\shaders\\stock.cg", sizeof(DEFAULT_SHADER_FILE));
strlcpy(SYS_CONFIG_FILE, "game:\\ssnes.cfg", sizeof(SYS_CONFIG_FILE)); strlcpy(SYS_CONFIG_FILE, "game:\\retroarch.cfg", sizeof(SYS_CONFIG_FILE));
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])

2
console/console_ext.h
View File

@ -97,7 +97,7 @@ bool rarch_manage_libretro_core(const char *full_path, const char *path, const c
#endif #endif
/*============================================================ /*============================================================
SSNES RetroArch
============================================================ */ ============================================================ */
#ifdef HAVE_RARCH_MAIN_WRAP #ifdef HAVE_RARCH_MAIN_WRAP

10
ps3/main.c
View File

@ -69,7 +69,7 @@ char PRESETS_DIR_PATH[MAX_PATH_LENGTH];
char INPUT_PRESETS_DIR_PATH[MAX_PATH_LENGTH]; char INPUT_PRESETS_DIR_PATH[MAX_PATH_LENGTH];
char BORDERS_DIR_PATH[MAX_PATH_LENGTH]; char BORDERS_DIR_PATH[MAX_PATH_LENGTH];
char SHADERS_DIR_PATH[MAX_PATH_LENGTH]; char SHADERS_DIR_PATH[MAX_PATH_LENGTH];
char LIBSNES_DIR_PATH[MAX_PATH_LENGTH]; char LIBRETRO_DIR_PATH[MAX_PATH_LENGTH];
char DEFAULT_SHADER_FILE[MAX_PATH_LENGTH]; char DEFAULT_SHADER_FILE[MAX_PATH_LENGTH];
char DEFAULT_MENU_SHADER_FILE[MAX_PATH_LENGTH]; char DEFAULT_MENU_SHADER_FILE[MAX_PATH_LENGTH];
char SYS_CONFIG_FILE[MAX_PATH_LENGTH]; char SYS_CONFIG_FILE[MAX_PATH_LENGTH];
@ -173,7 +173,7 @@ static void init_settings(bool load_libretro_path)
{ {
//We need to set libretro to the first entry in the cores //We need to set libretro to the first entry in the cores
//directory so that it will be saved to the config file //directory so that it will be saved to the config file
char ** dir_list = dir_list_new(LIBSNES_DIR_PATH, ".SELF"); char ** dir_list = dir_list_new(LIBRETRO_DIR_PATH, ".SELF");
if (!dir_list) if (!dir_list)
{ {
@ -423,12 +423,12 @@ static void get_environment_settings(int argc, char *argv[])
snprintf(DEFAULT_MENU_BORDER_FILE, sizeof(DEFAULT_MENU_BORDER_FILE), "%s/%s/borders/Menu/main-menu.png", usrDirPath, EMULATOR_CORE_DIR); snprintf(DEFAULT_MENU_BORDER_FILE, sizeof(DEFAULT_MENU_BORDER_FILE), "%s/%s/borders/Menu/main-menu.png", usrDirPath, EMULATOR_CORE_DIR);
snprintf(PRESETS_DIR_PATH, sizeof(PRESETS_DIR_PATH), "%s/%s/presets", usrDirPath, EMULATOR_CORE_DIR); snprintf(PRESETS_DIR_PATH, sizeof(PRESETS_DIR_PATH), "%s/%s/presets", usrDirPath, EMULATOR_CORE_DIR);
snprintf(INPUT_PRESETS_DIR_PATH, sizeof(INPUT_PRESETS_DIR_PATH), "%s/input", PRESETS_DIR_PATH); snprintf(INPUT_PRESETS_DIR_PATH, sizeof(INPUT_PRESETS_DIR_PATH), "%s/input", PRESETS_DIR_PATH);
snprintf(LIBSNES_DIR_PATH, sizeof(LIBSNES_DIR_PATH), "%s/%s", usrDirPath, EMULATOR_CORE_DIR); snprintf(LIBRETRO_DIR_PATH, sizeof(LIBRETRO_DIR_PATH), "%s/%s", usrDirPath, EMULATOR_CORE_DIR);
snprintf(BORDERS_DIR_PATH, sizeof(BORDERS_DIR_PATH), "%s/%s/borders", usrDirPath, EMULATOR_CORE_DIR); snprintf(BORDERS_DIR_PATH, sizeof(BORDERS_DIR_PATH), "%s/%s/borders", usrDirPath, EMULATOR_CORE_DIR);
snprintf(SHADERS_DIR_PATH, sizeof(SHADERS_DIR_PATH), "%s/%s/shaders", usrDirPath, EMULATOR_CORE_DIR); snprintf(SHADERS_DIR_PATH, sizeof(SHADERS_DIR_PATH), "%s/%s/shaders", usrDirPath, EMULATOR_CORE_DIR);
snprintf(DEFAULT_SHADER_FILE, sizeof(DEFAULT_SHADER_FILE), "%s/%s/shaders/stock.cg", usrDirPath, EMULATOR_CORE_DIR); snprintf(DEFAULT_SHADER_FILE, sizeof(DEFAULT_SHADER_FILE), "%s/%s/shaders/stock.cg", usrDirPath, EMULATOR_CORE_DIR);
snprintf(DEFAULT_MENU_SHADER_FILE, sizeof(DEFAULT_MENU_SHADER_FILE), "%s/%s/shaders/Borders/Menu/border-only-ssnes.cg", usrDirPath, EMULATOR_CORE_DIR); snprintf(DEFAULT_MENU_SHADER_FILE, sizeof(DEFAULT_MENU_SHADER_FILE), "%s/%s/shaders/Borders/Menu/border-only-rarch.cg", usrDirPath, EMULATOR_CORE_DIR);
snprintf(SYS_CONFIG_FILE, sizeof(SYS_CONFIG_FILE), "%s/ssnes.cfg", usrDirPath); snprintf(SYS_CONFIG_FILE, sizeof(SYS_CONFIG_FILE), "%s/retroarch.cfg", usrDirPath);
} }
g_extern.verbose = false; g_extern.verbose = false;

26
ps3/menu.c
View File

@ -842,7 +842,7 @@ static void select_file(uint32_t menu_id)
strncpy(title, "SHADER PRESETS SELECTION", sizeof(title)); strncpy(title, "SHADER PRESETS SELECTION", sizeof(title));
strncpy(object, "Shader", sizeof(object)); strncpy(object, "Shader", sizeof(object));
strncpy(object, "Shader preset", sizeof(object)); strncpy(object, "Shader preset", sizeof(object));
strncpy(comment, "INFO - Select a shader preset from the menu by pressing the X button. ", sizeof(comment)); strncpy(comment, "INFO - Select a shader preset from the menu by pressing the X button.", sizeof(comment));
break; break;
case INPUT_PRESET_CHOICE: case INPUT_PRESET_CHOICE:
strncpy(dir_path, INPUT_PRESETS_DIR_PATH, sizeof(dir_path)); strncpy(dir_path, INPUT_PRESETS_DIR_PATH, sizeof(dir_path));
@ -850,7 +850,7 @@ static void select_file(uint32_t menu_id)
strncpy(title, "INPUT PRESETS SELECTION", sizeof(title)); strncpy(title, "INPUT PRESETS SELECTION", sizeof(title));
strncpy(object, "Input", sizeof(object)); strncpy(object, "Input", sizeof(object));
strncpy(object, "Input preset", sizeof(object)); strncpy(object, "Input preset", sizeof(object));
strncpy(comment, "INFO - Select an input preset from the menu by pressing the X button. ", sizeof(comment)); strncpy(comment, "INFO - Select an input preset from the menu by pressing the X button.", sizeof(comment));
break; break;
case BORDER_CHOICE: case BORDER_CHOICE:
strncpy(dir_path, BORDERS_DIR_PATH, sizeof(dir_path)); strncpy(dir_path, BORDERS_DIR_PATH, sizeof(dir_path));
@ -858,15 +858,15 @@ static void select_file(uint32_t menu_id)
strncpy(title, "BORDER SELECTION", sizeof(title)); strncpy(title, "BORDER SELECTION", sizeof(title));
strncpy(object, "Border", sizeof(object)); strncpy(object, "Border", sizeof(object));
strncpy(object, "Border image file", sizeof(object)); strncpy(object, "Border image file", sizeof(object));
strncpy(comment, "INFO - Select a border image file from the menu by pressing the X button. ", sizeof(comment)); strncpy(comment, "INFO - Select a border image file from the menu by pressing the X button.", sizeof(comment));
break; break;
case LIBSNES_CHOICE: case LIBRETRO_CHOICE:
strncpy(dir_path, LIBSNES_DIR_PATH, sizeof(dir_path)); strncpy(dir_path, LIBRETRO_DIR_PATH, sizeof(dir_path));
strncpy(extensions, "self|SELF|bin|BIN", sizeof(extensions)); strncpy(extensions, "self|SELF|bin|BIN", sizeof(extensions));
strncpy(title, "LIBSNES CORE SELECTION", sizeof(title)); strncpy(title, "LIBRETRO CORE SELECTION", sizeof(title));
strncpy(object, "Libretro", sizeof(object)); strncpy(object, "Libretro", sizeof(object));
strncpy(object, "Libretro core library", sizeof(object)); strncpy(object, "Libretro core library", sizeof(object));
strncpy(comment, "INFO - Select a Libretro core library from the menu by pressing the X button. ", sizeof(comment)); strncpy(comment, "INFO - Select a Libretro core from the menu by pressing the X button.", sizeof(comment));
break; break;
} }
@ -933,7 +933,7 @@ static void select_file(uint32_t menu_id)
break; break;
case BORDER_CHOICE: case BORDER_CHOICE:
break; break;
case LIBSNES_CHOICE: case LIBRETRO_CHOICE:
strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro)); strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro));
strlcpy(g_console.launch_app_on_exit, path, sizeof(g_console.launch_app_on_exit)); strlcpy(g_console.launch_app_on_exit, path, sizeof(g_console.launch_app_on_exit));
g_console.return_to_launcher = true; g_console.return_to_launcher = true;
@ -1572,7 +1572,7 @@ static void producesettingentry(menu * menu_obj, uint64_t switchvalue)
{ {
menuStackindex++; menuStackindex++;
menuStack[menuStackindex] = menu_filebrowser; menuStack[menuStackindex] = menu_filebrowser;
menuStack[menuStackindex].enum_id = LIBSNES_CHOICE; menuStack[menuStackindex].enum_id = LIBRETRO_CHOICE;
set_initial_dir_tmpbrowser = true; set_initial_dir_tmpbrowser = true;
set_delay = DELAY_LONG; set_delay = DELAY_LONG;
} }
@ -2374,12 +2374,12 @@ static void ingame_menu(uint32_t menu_id)
} }
strcpy(comment, "Press 'CROSS' to return to the ROM Browser menu."); strcpy(comment, "Press 'CROSS' to return to the ROM Browser menu.");
break; break;
case MENU_ITEM_CHANGE_LIBSNES: case MENU_ITEM_CHANGE_LIBRETRO:
if(CTRL_CROSS(state)) if(CTRL_CROSS(state))
{ {
menuStackindex++; menuStackindex++;
menuStack[menuStackindex] = menu_filebrowser; menuStack[menuStackindex] = menu_filebrowser;
menuStack[menuStackindex].enum_id = LIBSNES_CHOICE; menuStack[menuStackindex].enum_id = LIBRETRO_CHOICE;
set_initial_dir_tmpbrowser = true; set_initial_dir_tmpbrowser = true;
set_delay = DELAY_LONG; set_delay = DELAY_LONG;
} }
@ -2482,7 +2482,7 @@ static void ingame_menu(uint32_t menu_id)
cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_RETURN_TO_MENU)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_MENU), "Return to Menu"); cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_RETURN_TO_MENU)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_MENU), "Return to Menu");
cellDbgFontDraw(); cellDbgFontDraw();
cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_CHANGE_LIBSNES)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_CHANGE_LIBSNES), "Change libretro core"); cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_CHANGE_LIBRETRO)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_CHANGE_LIBRETRO), "Change libretro core");
cellDbgFontDraw(); cellDbgFontDraw();
cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_RETURN_TO_MULTIMAN)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_MULTIMAN), "Return to multiMAN"); cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_RETURN_TO_MULTIMAN)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_MULTIMAN), "Return to multiMAN");
@ -2559,7 +2559,7 @@ void menu_loop(void)
case SHADER_CHOICE: case SHADER_CHOICE:
case PRESET_CHOICE: case PRESET_CHOICE:
case BORDER_CHOICE: case BORDER_CHOICE:
case LIBSNES_CHOICE: case LIBRETRO_CHOICE:
case INPUT_PRESET_CHOICE: case INPUT_PRESET_CHOICE:
select_file(menuStack[menuStackindex].enum_id); select_file(menuStack[menuStackindex].enum_id);
break; break;

2
ps3/menu.h
View File

@ -69,7 +69,7 @@ enum
SHADER_CHOICE, SHADER_CHOICE,
PRESET_CHOICE, PRESET_CHOICE,
BORDER_CHOICE, BORDER_CHOICE,
LIBSNES_CHOICE, LIBRETRO_CHOICE,
PATH_SAVESTATES_DIR_CHOICE, PATH_SAVESTATES_DIR_CHOICE,
PATH_DEFAULT_ROM_DIR_CHOICE, PATH_DEFAULT_ROM_DIR_CHOICE,
PATH_CHEATS_DIR_CHOICE, PATH_CHEATS_DIR_CHOICE,

4
ps3/shared.h
View File

@ -66,7 +66,7 @@ enum {
MENU_ITEM_RESET, MENU_ITEM_RESET,
MENU_ITEM_RETURN_TO_GAME, MENU_ITEM_RETURN_TO_GAME,
MENU_ITEM_RETURN_TO_MENU, MENU_ITEM_RETURN_TO_MENU,
MENU_ITEM_CHANGE_LIBSNES, MENU_ITEM_CHANGE_LIBRETRO,
MENU_ITEM_RETURN_TO_MULTIMAN, MENU_ITEM_RETURN_TO_MULTIMAN,
MENU_ITEM_RETURN_TO_XMB MENU_ITEM_RETURN_TO_XMB
}; };
@ -87,7 +87,7 @@ extern char BORDERS_DIR_PATH[MAX_PATH_LENGTH];
extern char SHADERS_DIR_PATH[MAX_PATH_LENGTH]; extern char SHADERS_DIR_PATH[MAX_PATH_LENGTH];
extern char DEFAULT_SHADER_FILE[MAX_PATH_LENGTH]; extern char DEFAULT_SHADER_FILE[MAX_PATH_LENGTH];
extern char DEFAULT_MENU_SHADER_FILE[MAX_PATH_LENGTH]; extern char DEFAULT_MENU_SHADER_FILE[MAX_PATH_LENGTH];
extern char LIBSNES_DIR_PATH[MAX_PATH_LENGTH]; extern char LIBRETRO_DIR_PATH[MAX_PATH_LENGTH];
extern char SYS_CONFIG_FILE[MAX_PATH_LENGTH]; extern char SYS_CONFIG_FILE[MAX_PATH_LENGTH];
extern char MULTIMAN_EXECUTABLE[MAX_PATH_LENGTH]; extern char MULTIMAN_EXECUTABLE[MAX_PATH_LENGTH];

6
retroarch.c
View File

@ -421,11 +421,11 @@ static int16_t input_state(unsigned port, unsigned device, unsigned index, unsig
} }
#ifdef _WIN32 #ifdef _WIN32
#define RARCH_DEFAULT_CONF_PATH_STR "\n\t\tDefaults to ssnes.cfg in same directory as ssnes.exe." #define RARCH_DEFAULT_CONF_PATH_STR "\n\t\tDefaults to retroarch.cfg in same directory as ssnes.exe."
#elif defined(__APPLE__) #elif defined(__APPLE__)
#define RARCH_DEFAULT_CONF_PATH_STR " Defaults to $HOME/.ssnes.cfg." #define RARCH_DEFAULT_CONF_PATH_STR " Defaults to $HOME/.retroarch.cfg."
#else #else
#define RARCH_DEFAULT_CONF_PATH_STR " Defaults to $XDG_CONFIG_HOME/ssnes/ssnes.cfg,\n\t\tor $HOME/.ssnes.cfg, if $XDG_CONFIG_HOME is not defined." #define RARCH_DEFAULT_CONF_PATH_STR " Defaults to $XDG_CONFIG_HOME/ssnes/retroarch.cfg,\n\t\tor $HOME/.retroarch.cfg, if $XDG_CONFIG_HOME is not defined."
#endif #endif
#include "config.features.h" #include "config.features.h"