Revert "(Android) Set up rarch_main_init_wrap so that it can load dynamic" - revisit

later

This reverts commit 42f2d068a7da28122c1eae5b6626985abff6e324.

console/rarch_console.h

@@ -106,8 +106,6 @@ typedef struct
    char shader_file[MAXIMUM_PATH];
    char shader_dir[MAXIMUM_PATH];
 #endif
-   char libretro_path[MAXIMUM_PATH]; /* set this to NULL if libretro cores
-					cannot be loaded dynamically. */
    char salamander_file[MAXIMUM_PATH];
    char sram_dir[MAXIMUM_PATH];
    char system_dir[MAXIMUM_PATH];

console/rarch_console_main_wrap.c

@@ -49,12 +49,6 @@ static int rarch_main_init_wrap(const struct rarch_main_wrap *args)
       argv[argc++] = strdup(args->config_path);
    }
 
-   if (args->libretro_path)
-   {
-      argv[argc++] = strdup("-L");
-      argv[argc++] = strdup(args->libretro_path);
-   }
-
    if (args->verbose)
       argv[argc++] = strdup("-v");
 
@@ -77,7 +71,7 @@ static int rarch_main_init_wrap(const struct rarch_main_wrap *args)
    return ret;
 }
 
-bool rarch_startup (const char * config_path, const char * libretro_path)
+bool rarch_startup (const char * config_path)
 {
    bool retval = false;
 
@@ -90,7 +84,6 @@ bool rarch_startup (const char * config_path, const char * libretro_path)
 
       args.verbose = g_extern.verbose;
       args.config_path = config_path;
-      args.libretro_path = libretro_path;
       args.sram_path = g_console.default_sram_dir_enable ? g_console.default_sram_dir : NULL,
       args.state_path = g_console.default_savestate_dir_enable ? g_console.default_savestate_dir : NULL,
       args.rom_path = g_console.rom_path;

console/rarch_console_main_wrap.h

@@ -23,10 +23,9 @@ struct rarch_main_wrap
    const char *sram_path;
    const char *state_path;
    const char *config_path;
-   const char *libretro_path;
    bool verbose;
 };
 
-bool rarch_startup (const char *config_path, const char *libretro_path);
+bool rarch_startup (const char * config_path);
 
 #endif

gx/frontend/main.c

@@ -433,7 +433,6 @@ static void get_environment_settings(void)
    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));
    strlcpy(default_paths.salamander_file, "boot.dol", sizeof(default_paths.salamander_file));
-   default_paths.libretro_path = NULL:
 }
 
 #define MAKE_FILE(x) {\
@@ -559,7 +558,7 @@ int main(int argc, char *argv[])
       rarch_render_cached_frame();
       gx->menu_render = false;
 
-      rarch_startup(default_paths.config_file, default_paths.libretro_path);
+      rarch_startup(default_paths.config_file);
    }
    else
    {
@@ -588,7 +587,7 @@ begin_loop:
       menu_loop();
 
       if (g_console.mode_switch != MODE_EXIT)
-         rarch_startup(default_paths.config_file, default_paths.libretro_path);
+         rarch_startup(default_paths.config_file);
    }
    else
       goto begin_shutdown;

ps3/frontend/main.c

@@ -225,7 +225,6 @@ static void get_environment_settings(int argc, char *argv[])
 #endif
       snprintf(default_paths.config_file, sizeof(default_paths.config_file), "%s/retroarch.cfg", default_paths.port_dir);
       snprintf(default_paths.salamander_file, sizeof(default_paths.salamander_file), "EBOOT.BIN");
-      default_paths.libretro_path = NULL:
    }
 
    g_extern.verbose = false;
@@ -331,7 +330,7 @@ int main(int argc, char *argv[])
 	 RARCH_LOG("Started from multiMAN, will auto-start game.\n");
 	 strlcpy(g_console.rom_path, argv[1], sizeof(g_console.rom_path));
          rarch_settings_change(S_START_RARCH);
-	 rarch_startup(default_paths.config_file, default_paths.libretro_path);
+	 rarch_startup(default_paths.config_file);
 	 break;
 #endif
       default:
@@ -356,7 +355,7 @@ begin_loop:
       menu_loop();
 
       if (g_console.mode_switch != MODE_EXIT)
-	 rarch_startup(default_paths.config_file, default_paths.libretro_path);
+         rarch_startup(default_paths.config_file);
    }
    else
       goto begin_shutdown;

xdk/frontend/main.c

@@ -127,7 +127,6 @@ static void get_environment_settings (void)
    strlcpy(default_paths.filebrowser_startup_dir, "game:", sizeof(default_paths.filebrowser_startup_dir));
    snprintf(default_paths.salamander_file, sizeof(default_paths.salamander_file), "default.xex");
 #endif
-   default_paths.libretro_path = NULL;
 }
 
 static void system_init(void)
@@ -202,7 +201,7 @@ begin_loop:
       menu_loop();
 
       if (g_console.mode_switch != MODE_EXIT)
-         rarch_startup(default_paths.config_file, default_paths.libretro_path);
+         rarch_startup(default_paths.config_file);
    }
    else
       goto begin_shutdown;