From c6cf258b423608e79571b69b428b03ceb557207a Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Thu, 4 Oct 2012 20:09:23 +0200
Subject: [PATCH] Simplify rarch_config_load

---
 android/bifrost.c              | 11 ++---------
 android/jni/Android.mk         |  1 +
 console/rarch_console_config.c |  2 +-
 console/rarch_console_config.h |  4 ++--
 gx/frontend/main.c             |  2 +-
 ps3/frontend/main.c            |  2 +-
 xdk/frontend/main.c            |  2 +-
 7 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/android/bifrost.c b/android/bifrost.c
index 5d3cb88a29..4dbbe8099e 100644
--- a/android/bifrost.c
+++ b/android/bifrost.c
@@ -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();
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 33c1f2a5a4..b611d31632 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -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
diff --git a/console/rarch_console_config.c b/console/rarch_console_config.c
index 4deb6308b6..2f06c35026 100644
--- a/console/rarch_console_config.c
+++ b/console/rarch_console_config.c
@@ -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];
 
diff --git a/console/rarch_console_config.h b/console/rarch_console_config.h
index 56343382d0..a3237289af 100644
--- a/console/rarch_console_config.h
+++ b/console/rarch_console_config.h
@@ -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
diff --git a/gx/frontend/main.c b/gx/frontend/main.c
index 04748bad58..0e60312ba3 100644
--- a/gx/frontend/main.c
+++ b/gx/frontend/main.c
@@ -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));
diff --git a/ps3/frontend/main.c b/ps3/frontend/main.c
index d84278af9a..8a72ead78a 100644
--- a/ps3/frontend/main.c
+++ b/ps3/frontend/main.c
@@ -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();
diff --git a/xdk/frontend/main.c b/xdk/frontend/main.c
index c75df7dc17..dd739be0af 100644
--- a/xdk/frontend/main.c
+++ b/xdk/frontend/main.c
@@ -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();