mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify rarch_config_load

Browse Source
This commit is contained in:
twinaphex 2012-10-04 20:09:23 +02:00
parent cd76a2c3b3
commit c6cf258b42
7 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
android/bifrost.c
View File

@ -45,14 +45,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad( JavaVM *vm, void *pvt)
config_set_defaults();
input_null.init();
char tmp_path[PATH_MAX];
snprintf(tmp_path, sizeof(tmp_path), "%s/", default_paths.core_dir);
const char *path_prefix = tmp_path;
const char *extension = default_paths.executable_extension;
const input_driver_t *input = &input_ps3;
char core_exe_path[1024];
snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, extension);
const input_driver_t *input = &input_null;
bool find_libretro_file = false;
@ -62,7 +55,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad( JavaVM *vm, void *pvt)
rarch_settings_set_default();
//rarch_input_set_controls_default(input);
rarch_config_load(default_paths.config_file, path_prefix, extension, find_libretro_file);
rarch_config_load(default_paths.config_file, find_libretro_file);
init_libretro_sym();
input_null.post_init();

1
android/jni/Android.mk
View File

@ -3,6 +3,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
APP_OPTIM := debug
LOCAL_MODULE := retroarch
LOCAL_SRC_FILES = ../../console/griffin/griffin.c ../../console/rzlib/rzlib.c ../bifrost.c

2
console/rarch_console_config.c
View File

@ -21,7 +21,7 @@
#include "rarch_console_config.h"
void rarch_config_load(const char * conf_name, const char * libretro_dir_path, const char * exe_ext, bool upgrade_core_succeeded)
void rarch_config_load(const char *conf_name, bool upgrade_core_succeeded)
{
char libretro_path_tmp[PATH_MAX];

4
console/rarch_console_config.h
View File

@ -24,7 +24,7 @@ enum
INPUT_PRESET_FILE
};
void rarch_config_load(const char * conf_name, const char * libretro_dir_path, const char * exe_ext, bool upgrade_core_succeeded);
void rarch_config_save(const char * conf_name);
void rarch_config_load(const char *conf_name, bool upgrade_core_succeeded);
void rarch_config_save(const char *conf_name);
#endif

2
gx/frontend/main.c
View File

@ -531,7 +531,7 @@ int main(int argc, char *argv[])
rarch_settings_set_default();
rarch_input_set_controls_default(input);
rarch_config_load(default_paths.config_file, path_prefix, extension, find_libretro_file);
rarch_config_load(default_paths.config_file, find_libretro_file);
char core_name[64];
rarch_console_name_from_id(core_name, sizeof(core_name));

2
ps3/frontend/main.c
View File

@ -288,7 +288,7 @@ int main(int argc, char *argv[])
rarch_settings_set_default();
rarch_input_set_controls_default(input);
rarch_config_load(default_paths.config_file, path_prefix, extension, find_libretro_file);
rarch_config_load(default_paths.config_file, find_libretro_file);
init_libretro_sym();
input_ps3.post_init();

2
xdk/frontend/main.c
View File

@ -164,7 +164,7 @@ int main(int argc, char *argv[])
rarch_settings_set_default();
rarch_input_set_controls_default(input);
rarch_config_load(default_paths.config_file, path_prefix, extension, find_libretro_file);
rarch_config_load(default_paths.config_file, find_libretro_file);
init_libretro_sym();
input_xinput.post_init();