mirror of
https://github.com/libretro/RetroArch.git
synced 2024-11-23 07:59:42 +00:00
Jdgleaver improvements
This commit is contained in:
parent
9ee1e33e09
commit
3ac75c043e
@ -89,38 +89,8 @@ static void get_first_valid_core(char* path_return, size_t len)
|
||||
closedir(dir);
|
||||
}
|
||||
}
|
||||
#else
|
||||
static void ctr_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
static void frontend_ctr_get_environment_settings(int* argc, char* argv[],
|
||||
void* args, void* params_data)
|
||||
{
|
||||
@ -157,8 +127,9 @@ static void frontend_ctr_get_environment_settings(int* argc, char* argv[],
|
||||
"logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
|
||||
fill_pathname_join(g_defaults.path_config, g_defaults.dirs[DEFAULT_DIR_PORT],
|
||||
FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
ctr_dir_check_defaults();
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -67,6 +67,7 @@
|
||||
#include "../../verbosity.h"
|
||||
#include "../../msg_hash.h"
|
||||
#include "../../ui/ui_companion_driver.h"
|
||||
#include "../../paths.h"
|
||||
|
||||
#if 1
|
||||
#define RELEASE_BUILD
|
||||
@ -332,37 +333,6 @@ static void frontend_darwin_get_os(char *s, size_t len, int *major, int *minor)
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
static void darwin_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
|
||||
void *args, void *params_data)
|
||||
{
|
||||
@ -531,8 +501,9 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
|
||||
|
||||
CFRelease(bundle_path);
|
||||
CFRelease(bundle_url);
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
darwin_dir_check_defaults();
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -22,6 +22,7 @@
|
||||
|
||||
#include "../frontend_driver.h"
|
||||
#include "../../defaults.h"
|
||||
#include "../../paths.h"
|
||||
|
||||
static enum frontend_fork dos_fork_mode = FRONTEND_FORK_NONE;
|
||||
|
||||
@ -45,37 +46,6 @@ enum frontend_architecture frontend_dos_get_architecture(void)
|
||||
return FRONTEND_ARCH_X86;
|
||||
}
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
static void dos_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void frontend_dos_get_env_settings(int *argc, char *argv[],
|
||||
void *data, void *params_data)
|
||||
{
|
||||
@ -137,7 +107,7 @@ static void frontend_dos_get_env_settings(int *argc, char *argv[],
|
||||
"logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
dos_dir_check_defaults();
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -45,6 +45,7 @@
|
||||
#include "../../command.h"
|
||||
#include "../../tasks/tasks_internal.h"
|
||||
#include "../../file_path_special.h"
|
||||
#include "../../paths.h"
|
||||
|
||||
void dummyErrnoCodes(void);
|
||||
void emscripten_mainloop(void);
|
||||
@ -69,35 +70,6 @@ void cmd_take_screenshot(void)
|
||||
command_event(CMD_EVENT_TAKE_SCREENSHOT, NULL);
|
||||
}
|
||||
|
||||
static void emscripten_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
|
||||
static void frontend_emscripten_get_env(int *argc, char *argv[],
|
||||
void *args, void *params_data)
|
||||
{
|
||||
@ -179,8 +151,9 @@ static void frontend_emscripten_get_env(int *argc, char *argv[],
|
||||
user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
|
||||
fill_pathname_join(g_defaults.path_config, user_path,
|
||||
FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
emscripten_dir_check_defaults();
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -154,35 +154,6 @@ static void gx_devthread(void *a)
|
||||
|
||||
#ifdef IS_SALAMANDER
|
||||
extern char gx_rom_path[PATH_MAX_LENGTH];
|
||||
#else
|
||||
static void gx_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void frontend_gx_get_environment_settings(
|
||||
@ -312,7 +283,7 @@ static void frontend_gx_get_environment_settings(
|
||||
}
|
||||
}
|
||||
#endif
|
||||
gx_dir_check_defaults();
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -95,35 +95,6 @@ int main(int argc, char *argv[])
|
||||
return rarch_main(argc, argv, NULL);
|
||||
}
|
||||
|
||||
static void orbis_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "host0:app/custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
|
||||
static void frontend_orbis_get_environment_settings(int *argc, char *argv[],
|
||||
void *args, void *params_data)
|
||||
{
|
||||
@ -239,7 +210,8 @@ static void frontend_orbis_get_environment_settings(int *argc, char *argv[],
|
||||
RARCH_LOG("Auto-start game %s.\n", argv[2]);
|
||||
}
|
||||
}
|
||||
orbis_dir_check_defaults();
|
||||
|
||||
dir_check_defaults("host0:app/custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -33,6 +33,7 @@
|
||||
#include "../../defaults.h"
|
||||
#include "../../file_path_special.h"
|
||||
#include "../../verbosity.h"
|
||||
#include "../../paths.h"
|
||||
#include <elf-loader.h>
|
||||
|
||||
|
||||
@ -107,37 +108,6 @@ static void reset_IOP()
|
||||
sbv_patch_disable_prefix_check();
|
||||
}
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
static void ps2_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void frontend_ps2_get_environment_settings(int *argc, char *argv[],
|
||||
void *args, void *params_data)
|
||||
{
|
||||
@ -171,8 +141,9 @@ static void frontend_ps2_get_environment_settings(int *argc, char *argv[],
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
ps2_dir_check_defaults();
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -49,6 +49,7 @@
|
||||
#include "../../defines/ps3_defines.h"
|
||||
#include "../../defaults.h"
|
||||
#include "../../verbosity.h"
|
||||
#include "../../paths.h"
|
||||
|
||||
#ifdef __PSL1GHT__
|
||||
#define EMULATOR_CONTENT_DIR "SSNE10001"
|
||||
@ -176,37 +177,6 @@ static void use_app_path(char *content_info_path)
|
||||
"USRDIR", sizeof(g_defaults.dirs[DEFAULT_DIR_PORT]));
|
||||
}
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
static void dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __PSL1GHT__
|
||||
static void frontend_ps3_get_environment_settings(int *argc, char *argv[],
|
||||
void *args, void *params_data)
|
||||
@ -237,7 +207,8 @@ static void frontend_ps3_get_environment_settings(int *argc, char *argv[],
|
||||
verbosity_enable();
|
||||
else
|
||||
verbosity_disable();
|
||||
ps3_dir_check_defaults();
|
||||
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -80,37 +80,6 @@ char user_path[512];
|
||||
|
||||
static enum frontend_fork psp_fork_mode = FRONTEND_FORK_NONE;
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
static void psp_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void frontend_psp_get_environment_settings(int *argc, char *argv[],
|
||||
void *args, void *params_data)
|
||||
{
|
||||
@ -248,7 +217,8 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
|
||||
RARCH_LOG("Auto-start game %s.\n", argv[1]);
|
||||
}
|
||||
}
|
||||
psp_dir_check_defaults();
|
||||
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -30,6 +30,7 @@
|
||||
#include "../../defaults.h"
|
||||
#include "../../dynamic.h"
|
||||
#include "../../verbosity.h"
|
||||
#include "../../paths.h"
|
||||
|
||||
static void frontend_qnx_init(void *data)
|
||||
{
|
||||
@ -51,37 +52,6 @@ static int frontend_qnx_get_rating(void)
|
||||
return -1;
|
||||
}
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
static void qnx_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void frontend_qnx_get_environment_settings(int *argc, char *argv[],
|
||||
void *data, void *params_data)
|
||||
{
|
||||
@ -195,8 +165,9 @@ static void frontend_qnx_get_environment_settings(int *argc, char *argv[],
|
||||
|
||||
/* set GLUI as default menu */
|
||||
snprintf(g_defaults.settings_menu, sizeof(g_defaults.settings_menu), "glui");
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
qnx_dir_check_defaults();
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -175,35 +175,6 @@ static void get_first_valid_core(char *path_return, size_t len)
|
||||
closedir(dir);
|
||||
}
|
||||
}
|
||||
#else
|
||||
static void switch_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void frontend_switch_get_environment_settings(
|
||||
@ -305,8 +276,9 @@ static void frontend_switch_get_environment_settings(
|
||||
g_defaults.dirs[DEFAULT_DIR_PORT],
|
||||
FILE_PATH_MAIN_CONFIG,
|
||||
sizeof(g_defaults.path_config));
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
switch_dir_check_defaults();
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -1327,41 +1327,6 @@ static void frontend_unix_get_lakka_version(char *s,
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
static void unix_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
#if defined(ANDROID)
|
||||
strcpy_literal(path, "host0:app/custom.ini");
|
||||
#else
|
||||
strcpy_literal(path, "custom.ini");
|
||||
#endif
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void frontend_unix_get_env(int *argc,
|
||||
char *argv[], void *data, void *params_data)
|
||||
{
|
||||
@ -1889,7 +1854,11 @@ static void frontend_unix_get_env(int *argc,
|
||||
#endif
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
unix_dir_check_defaults();
|
||||
#if defined(ANDROID)
|
||||
dir_check_defaults("host0:app/custom.ini");
|
||||
#else
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -42,6 +42,7 @@
|
||||
#include "../../retroarch.h"
|
||||
#include "../../verbosity.h"
|
||||
#include "../../ui/drivers/ui_win32.h"
|
||||
#include "../../paths.h"
|
||||
|
||||
#include "../../uwp/uwp_func.h"
|
||||
|
||||
@ -323,37 +324,6 @@ static int frontend_uwp_parse_drive_list(void *data, bool load_content)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
static void uwp_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
fill_pathname_expand_special(path, "~\\custom.ini", MAX_PATH);
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void frontend_uwp_environment_get(int *argc, char *argv[],
|
||||
void *args, void *params_data)
|
||||
{
|
||||
@ -421,8 +391,14 @@ static void frontend_uwp_environment_get(int *argc, char *argv[],
|
||||
strcpy_literal(g_defaults.settings_menu, "glui");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
uwp_dir_check_defaults();
|
||||
{
|
||||
char custom_ini_path[PATH_MAX_LENGTH];
|
||||
fill_pathname_expand_special(custom_ini_path,
|
||||
"~\\custom.ini", sizeof(custom_ini_path));
|
||||
dir_check_defaults(custom_ini_path);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -96,37 +96,6 @@ static void fix_asset_directory(void)
|
||||
rename(src_path_buf, dst_path_buf);
|
||||
}
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
static void wiiu_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void frontend_wiiu_get_environment_settings(int *argc, char *argv[],
|
||||
void *args, void *params_data)
|
||||
{
|
||||
@ -168,7 +137,7 @@ static void frontend_wiiu_get_environment_settings(int *argc, char *argv[],
|
||||
FILE_PATH_MAIN_CONFIG, sizeof(g_defaults.path_config));
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
wiiu_dir_check_defaults();
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -565,37 +565,6 @@ static int frontend_win32_parse_drive_list(void *data, bool load_content)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
static void win32_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void frontend_win32_environment_get(int *argc, char *argv[],
|
||||
void *args, void *params_data)
|
||||
{
|
||||
@ -660,7 +629,7 @@ static void frontend_win32_environment_get(int *argc, char *argv[],
|
||||
":\\logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
win32_dir_check_defaults();
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -50,37 +50,6 @@
|
||||
|
||||
static enum frontend_fork xdk_fork_mode = FRONTEND_FORK_NONE;
|
||||
|
||||
#ifndef IS_SALAMANDER
|
||||
static void xdk_dir_check_defaults(void)
|
||||
{
|
||||
unsigned i;
|
||||
char path[PATH_MAX_LENGTH];
|
||||
|
||||
/* early return for people with a custom folder setup
|
||||
so it doesn't create unnecessary directories
|
||||
*/
|
||||
strcpy_literal(path, "custom.ini");
|
||||
if (path_is_valid(path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void frontend_xdk_get_environment_settings(int *argc, char *argv[],
|
||||
void *args, void *params_data)
|
||||
{
|
||||
@ -258,7 +227,8 @@ exit:
|
||||
else
|
||||
verbosity_disable();
|
||||
#endif
|
||||
xdk_dir_check_defaults();
|
||||
|
||||
dir_check_defaults("custom.ini");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -33,6 +33,7 @@
|
||||
#include <boolean.h>
|
||||
|
||||
#include "../../dynamic.h"
|
||||
#include "../../paths.h"
|
||||
|
||||
static void frontend_xenon_init(void *data)
|
||||
{
|
||||
|
@ -123,8 +123,10 @@ static void salamander_init(char *s, size_t len)
|
||||
const char *rarch_config_path = g_defaults.path_config;
|
||||
bool config_valid = false;
|
||||
char config_path[PATH_MAX_LENGTH];
|
||||
char config_dir[PATH_MAX_LENGTH];
|
||||
|
||||
config_path[0] = '\0';
|
||||
config_dir[0] = '\0';
|
||||
|
||||
/* Get salamander config file path */
|
||||
if (!string_is_empty(rarch_config_path))
|
||||
@ -135,6 +137,12 @@ static void salamander_init(char *s, size_t len)
|
||||
else
|
||||
strcpy_literal(config_path, FILE_PATH_SALAMANDER_CONFIG);
|
||||
|
||||
/* Ensure that config directory exists */
|
||||
fill_pathname_parent_dir(config_dir, config_path, sizeof(config_dir));
|
||||
if (!string_is_empty(config_dir) &&
|
||||
!path_is_directory(config_dir))
|
||||
path_mkdir(config_dir);
|
||||
|
||||
/* Attempt to open config file */
|
||||
config = config_file_new_from_path_to_string(config_path);
|
||||
|
||||
|
2
paths.h
2
paths.h
@ -65,6 +65,8 @@ char *dir_get_ptr(enum rarch_dir_type type);
|
||||
|
||||
void dir_set(enum rarch_dir_type type, const char *path);
|
||||
|
||||
void dir_check_defaults(const char *custom_ini_path);
|
||||
|
||||
void path_deinit_savefile(void);
|
||||
|
||||
bool path_set(enum rarch_path_type type, const char *path);
|
||||
|
27
retroarch.c
27
retroarch.c
@ -9424,6 +9424,33 @@ void dir_set(enum rarch_dir_type type, const char *path)
|
||||
}
|
||||
}
|
||||
|
||||
void dir_check_defaults(const char *custom_ini_path)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
/* Early return for people with a custom folder setup
|
||||
* so it doesn't create unnecessary directories */
|
||||
if (!string_is_empty(custom_ini_path) &&
|
||||
path_is_valid(custom_ini_path))
|
||||
return;
|
||||
|
||||
for (i = 0; i < DEFAULT_DIR_LAST; i++)
|
||||
{
|
||||
const char *dir_path = g_defaults.dirs[i];
|
||||
char new_path[PATH_MAX_LENGTH];
|
||||
|
||||
if (string_is_empty(dir_path))
|
||||
continue;
|
||||
|
||||
new_path[0] = '\0';
|
||||
fill_pathname_expand_special(new_path,
|
||||
dir_path, sizeof(new_path));
|
||||
|
||||
if (!path_is_directory(new_path))
|
||||
path_mkdir(new_path);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef HAVE_ACCESSIBILITY
|
||||
static bool is_accessibility_enabled(struct rarch_state *p_rarch)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user