Permalink
Browse files

(RARCH_CONSOLE) Namespaced all files in console/

  • Loading branch information...
1 parent 5c5ab6e commit 714837e8c001dcb0b5db2b2c8ce014828b32d8e3 @twinaphex twinaphex committed Jul 28, 2012
@@ -19,7 +19,7 @@
#include <tchar.h>
#include <xtl.h>
#include "../../console/fileio/file_browser.h"
-#include "../../console/retroarch_console.h"
+#include "../../console/rarch_console.h"
#include "../xdk_d3d9.h"
#include "menu.h"
#include "../../message.h"
View
@@ -21,23 +21,23 @@
/*============================================================
CONSOLE EXTENSIONS
============================================================ */
-#include "../retroarch_rom_ext.c"
-#include "../retroarch_console.c"
+#include "../rarch_console_rom_ext.c"
+#include "../rarch_console.c"
#ifdef HAVE_CONFIGFILE
-#include "../retroarch_config.c"
+#include "../rarch_console_config.c"
#endif
-#include "../retroarch_console_input.c"
+#include "../rarch_console_input.c"
#ifdef HAVE_ZLIB
-#include "../retroarch_rzlib.c"
+#include "../rarch_console_rzlib.c"
#endif
-#include "../console_settings.c"
+#include "../rarch_console_settings.c"
#ifdef HAVE_LIBRETRO_MANAGEMENT
-#include "../libretro_mgmt.c"
+#include "../rarch_console_libretro_mgmt.c"
#endif
/*============================================================
@@ -23,9 +23,10 @@
#include "../libretro.h"
#include "../general.h"
#include "../compat/strl.h"
-#include "retroarch_console.h"
#include "../file.h"
+#include "rarch_console.h"
+
#define MAX_ARGS 32
default_paths_t default_paths;
@@ -18,11 +18,12 @@
#define CONSOLE_EXT_H__
#ifdef HAVE_LIBRETRO_MANAGEMENT
-#include "libretro_mgmt.h"
+#include "rarch_console_libretro_mgmt.h"
#endif
#include "../general.h"
-#include "console_settings.h"
+
+#include "rarch_console_settings.h"
#define IS_TIMER_NOT_EXPIRED(handle) (handle->frame_count < g_console.timer_expiration_frame_count)
#define IS_TIMER_EXPIRED(handle) (!(IS_TIMER_NOT_EXPIRED(handle)))
@@ -16,11 +16,11 @@
#include <stdio.h>
-#include "retroarch_config.h"
-
#include "../conf/config_file.h"
#include "../conf/config_file_macros.h"
+#include "rarch_console_config.h"
+
void rarch_config_create_default(const char * conf_name)
{
FILE * f;
File renamed without changes.
@@ -19,7 +19,8 @@
#include <stddef.h>
#include <string.h>
#include "../boolean.h"
-#include "retroarch_console_input.h"
+
+#include "rarch_console_input.h"
struct platform_bind
{
File renamed without changes.
@@ -16,7 +16,7 @@
#include <stdint.h>
-#include "retroarch_console.h"
+#include "rarch_console.h"
// if a CORE executable exists (full_path), this means we have just installed
// a new libretro port and therefore we need to change it to a more
File renamed without changes.
@@ -24,12 +24,12 @@
#include "../general.h"
#include "../file.h"
-#include "console_settings.h"
-#include "retroarch_console.h"
-#include "retroarch_rom_ext.h"
+#include "rarch_console_settings.h"
+#include "rarch_console.h"
+#include "rarch_console_rom_ext.h"
#ifdef HAVE_ZLIB
-#include "retroarch_rzlib.h"
+#include "rarch_console_rzlib.h"
#endif
static void rarch_console_load_game(const char *path)
File renamed without changes.
@@ -21,10 +21,10 @@
#include "../boolean.h"
#ifdef HAVE_LIBRETRO_MANAGEMENT
-#include "libretro_mgmt.h"
+#include "rarch_console_libretro_mgmt.h"
#endif
-#include "retroarch_rzlib.h"
+#include "rarch_console_rzlib.h"
static int rarch_extract_currentfile_in_zip(unzFile uf, const char *current_dir, char *slash, char *write_filename, size_t write_filename_size)
{
File renamed without changes.
@@ -20,7 +20,7 @@
#include <string.h>
#include "../general.h"
-#include "console_settings.h"
+#include "rarch_console_settings.h"
void rarch_settings_change(unsigned setting)
{
File renamed without changes.
View
@@ -20,7 +20,7 @@
#include <string.h>
#ifdef RARCH_CONSOLE
-#include "console/retroarch_console.h"
+#include "console/rarch_console.h"
#endif
#ifdef HAVE_CONFIG_H
View
@@ -45,9 +45,9 @@
#include "../../gfx/gl_common.h"
-#include "../../console/retroarch_console.h"
-#include "../../console/retroarch_console_input.h"
-#include "../../console/retroarch_config.h"
+#include "../../console/rarch_console.h"
+#include "../../console/rarch_console_input.h"
+#include "../../console/rarch_console_config.h"
#include "../../conf/config_file.h"
#include "../../conf/config_file_macros.h"
#include "../../general.h"
View
@@ -26,13 +26,13 @@
#include "../ps3_input.h"
#include "../../console/fileio/file_browser.h"
-#include "../../console/retroarch_console.h"
-#include "../../console/retroarch_rom_ext.h"
-#include "../../console/retroarch_console_input.h"
-#include "../../console/retroarch_config.h"
+#include "../../console/rarch_console.h"
+#include "../../console/rarch_console_rom_ext.h"
+#include "../../console/rarch_console_input.h"
+#include "../../console/rarch_console_config.h"
#ifdef HAVE_ZLIB
-#include "../../console/retroarch_rzlib.h"
+#include "../../console/rarch_console_rzlib.h"
#endif
#include "../../gfx/gl_common.h"
View
@@ -53,7 +53,6 @@
#include "ps3_input.h"
#include "../driver.h"
-#include "../console/retroarch_console.h"
#include "../libretro.h"
#include "../general.h"
View
@@ -33,10 +33,6 @@
#include "cheats.h"
#include "compat/getopt_rarch.h"
-#ifdef RARCH_CONSOLE
-#include "console/retroarch_console_input.h"
-#endif
-
#if defined(_WIN32) && !defined(_XBOX)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
View
@@ -21,7 +21,8 @@
#include "../../driver.h"
#include "../../general.h"
#include "../../libretro.h"
-#include "../../console/retroarch_console_input.h"
+
+#include "../../console/rarch_console_input.h"
#include <stdlib.h>
#include <stddef.h>
View
@@ -16,7 +16,6 @@
#include "../driver.h"
#include "../general.h"
#include "driver.h"
-#include "../console/retroarch_console.h"
#include <gccore.h>
#include <ogcsys.h>
#include <malloc.h>
@@ -17,7 +17,7 @@
#include "Font.h"
#include "RomList.h"
-#include "../../console/retroarch_console.h"
+#include "../../console/rarch_console.h"
#include "../../general.h"
CMenuMain g_menuMain;
View
@@ -37,8 +37,8 @@
#endif
#endif
-#include "../../console/retroarch_console.h"
-#include "../../console/retroarch_config.h"
+#include "../../console/rarch_console.h"
+#include "../../console/rarch_console_config.h"
#include "../../conf/config_file.h"
#include "../../conf/config_file_macros.h"
#include "../../file.h"

0 comments on commit 714837e

Please sign in to comment.