From 1ddf138860eaa223e02371dcf6f750e15824c3dc Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 9 Jan 2015 18:44:57 +0100
Subject: [PATCH] Move rarch_main_init_wrap to retroarch.c

---
 general.c   | 55 -----------------------------------------------------
 general.h   |  5 -----
 retroarch.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 retroarch.h |  5 +++++
 4 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/general.c b/general.c
index fde0dafee7..d5e59ac494 100644
--- a/general.c
+++ b/general.c
@@ -39,61 +39,6 @@ void rarch_playlist_load_content(content_playlist_t *playlist,
    rarch_main_command(RARCH_CMD_LOAD_CORE);
 }
 
-void rarch_main_init_wrap(const struct rarch_main_wrap *args,
-      int *argc, char **argv)
-{
-   *argc = 0;
-   argv[(*argc)++] = strdup("retroarch");
-
-   if (!args->no_content)
-   {
-      if (args->content_path)
-      {
-         RARCH_LOG("Using content: %s.\n", args->content_path);
-         argv[(*argc)++] = strdup(args->content_path);
-      }
-      else
-      {
-         RARCH_LOG("No content, starting dummy core.\n");
-         argv[(*argc)++] = strdup("--menu");
-      }
-   }
-
-   if (args->sram_path)
-   {
-      argv[(*argc)++] = strdup("-s");
-      argv[(*argc)++] = strdup(args->sram_path);
-   }
-
-   if (args->state_path)
-   {
-      argv[(*argc)++] = strdup("-S");
-      argv[(*argc)++] = strdup(args->state_path);
-   }
-
-   if (args->config_path)
-   {
-      argv[(*argc)++] = strdup("-c");
-      argv[(*argc)++] = strdup(args->config_path);
-   }
-
-#ifdef HAVE_DYNAMIC
-   if (args->libretro_path)
-   {
-      argv[(*argc)++] = strdup("-L");
-      argv[(*argc)++] = strdup(args->libretro_path);
-   }
-#endif
-
-   if (args->verbose)
-      argv[(*argc)++] = strdup("-v");
-
-#ifdef HAVE_FILE_LOGGER
-   for (i = 0; i < *argc; i++)
-      RARCH_LOG("arg #%d: %s\n", i, argv[i]);
-#endif
-}
-
 /* When selection is presented back, returns 0.
  * If it can make a decision right now, returns -1. */
 
diff --git a/general.h b/general.h
index 6ac7b01ef8..32b57f4ad8 100644
--- a/general.h
+++ b/general.h
@@ -841,11 +841,6 @@ int rarch_main(int argc, char *argv[]);
 
 bool rarch_replace_config(const char *path);
 
-void rarch_main_init_wrap(const struct rarch_main_wrap *args,
-      int *argc, char **argv);
-
-int rarch_main_init(int argc, char *argv[]);
-
 void rarch_playlist_load_content(content_playlist_t *playlist,
       unsigned index);
 
diff --git a/retroarch.c b/retroarch.c
index 99ae779be2..aeee1255af 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1996,6 +1996,61 @@ error:
    return 1;
 }
 
+void rarch_main_init_wrap(const struct rarch_main_wrap *args,
+      int *argc, char **argv)
+{
+   *argc = 0;
+   argv[(*argc)++] = strdup("retroarch");
+
+   if (!args->no_content)
+   {
+      if (args->content_path)
+      {
+         RARCH_LOG("Using content: %s.\n", args->content_path);
+         argv[(*argc)++] = strdup(args->content_path);
+      }
+      else
+      {
+         RARCH_LOG("No content, starting dummy core.\n");
+         argv[(*argc)++] = strdup("--menu");
+      }
+   }
+
+   if (args->sram_path)
+   {
+      argv[(*argc)++] = strdup("-s");
+      argv[(*argc)++] = strdup(args->sram_path);
+   }
+
+   if (args->state_path)
+   {
+      argv[(*argc)++] = strdup("-S");
+      argv[(*argc)++] = strdup(args->state_path);
+   }
+
+   if (args->config_path)
+   {
+      argv[(*argc)++] = strdup("-c");
+      argv[(*argc)++] = strdup(args->config_path);
+   }
+
+#ifdef HAVE_DYNAMIC
+   if (args->libretro_path)
+   {
+      argv[(*argc)++] = strdup("-L");
+      argv[(*argc)++] = strdup(args->libretro_path);
+   }
+#endif
+
+   if (args->verbose)
+      argv[(*argc)++] = strdup("-v");
+
+#ifdef HAVE_FILE_LOGGER
+   for (i = 0; i < *argc; i++)
+      RARCH_LOG("arg #%d: %s\n", i, argv[i]);
+#endif
+}
+
 void rarch_main_set_state(unsigned cmd)
 {
    switch (cmd)
diff --git a/retroarch.h b/retroarch.h
index e5a30a7b0e..26ca224bac 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -29,6 +29,11 @@ void rarch_main_set_state(unsigned action);
 
 bool rarch_main_command(unsigned action);
 
+int rarch_main_init(int argc, char *argv[]);
+
+void rarch_main_init_wrap(const struct rarch_main_wrap *args,
+      int *argc, char **argv);
+
 void rarch_main_deinit(void);
 
 void rarch_render_cached_frame(void);