From 260f3ac7cebe003cd17d79c64625e2a4ae8e7e29 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Sat, 14 Jan 2012 13:43:15 +0100
Subject: [PATCH] Use a more general SSNES_CONSOLE define.

---
 Makefile.ps3                         | 2 +-
 Makefile.wii                         | 2 +-
 Makefile.xenon                       | 2 +-
 general.h                            | 4 ++--
 msvc-360/SSNES-360/SSNES-360.vcxproj | 4 ++--
 settings.c                           | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.ps3 b/Makefile.ps3
index 301494e9ff..3fecfb7fa4 100644
--- a/Makefile.ps3
+++ b/Makefile.ps3
@@ -47,7 +47,7 @@ OBJ = fifo_buffer.o ps3/cellframework2/fileio/file_browser.o ps3/ps3_audio.o ps3
 
 LIBS = -ldbgfont -lPSGL -lPSGLcgc -lcgc -lgcm_cmd -lgcm_sys_stub -lsnes -lresc_stub -lm -lio_stub -lfs_stub -lsysutil_stub -lsysutil_game_stub -lsysmodule_stub -laudio_stub -lnet_stub -lpthread
 
-DEFINES = -DHAVE_OPENGL=1 -DHAVE_CG=1 -DHAVE_FBO=1 -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"0.9.3\" -Dmain=ssnes_main
+DEFINES = -DSSNES_CONSOLE -DHAVE_OPENGL=1 -DHAVE_CG=1 -DHAVE_FBO=1 -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"0.9.3\" -Dmain=ssnes_main
 
 ifeq ($(DEBUG), 1)
    PPU_OPTIMIZE_LV	:= -O0 -g
diff --git a/Makefile.wii b/Makefile.wii
index f67bfc1f41..481433cd54 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -25,7 +25,7 @@ LIBS := -lfat -lsnes -lwiiuse -logc -lbte -lfreetype
 
 OBJ = wii/main.o fifo_buffer.o ssnes.o driver.o gfx/fonts.o file.o settings.o message.o rewind.o movie.o ups.o bps.o strl.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o wii/audio.o wii/input.o wii/video.o console/sgui.o console/list.o console/font.bmpobj
 
-CFLAGS += -std=gnu99 -DHAVE_CONFIGFILE=1 -DHAVE_GETOPT_LONG -DHAVE_FREETYPE -DPACKAGE_VERSION=\"0.9.3\" -Dmain=ssnes_main -Wno-char-subscripts
+CFLAGS += -std=gnu99 -DSSNES_CONSOLE -DHAVE_CONFIGFILE=1 -DHAVE_GETOPT_LONG -DHAVE_FREETYPE -DPACKAGE_VERSION=\"0.9.3\" -Dmain=ssnes_main -Wno-char-subscripts
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g
diff --git a/Makefile.xenon b/Makefile.xenon
index c4c781f8e2..d8fe8f3c99 100644
--- a/Makefile.xenon
+++ b/Makefile.xenon
@@ -21,7 +21,7 @@ INCDIRS = -I. -I$(DEVKITXENON)/usr/include
 OBJ = fifo_buffer.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o gfx/gfx_common.o ups.o bps.o strl.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o xenon/main.o xenon/xenon360_audio.o xenon/xenon360_input.o xenon/xenon360_video.o
 
 LIBS = -lsnes -lxenon -lm -lc
-DEFINES = -std=gnu99 -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"0.9.3\" -DHAVE_GETOPT_LONG=1 -Dmain=ssnes_main
+DEFINES = -std=gnu99 -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"0.9.3\" -DSSNES_CONSOLE -DHAVE_GETOPT_LONG=1 -Dmain=ssnes_main
 DEFINES += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DXENON $(INCDIRS)
 DEFINES += -u read -u _start -u exc_base
 
diff --git a/general.h b/general.h
index 6d8a4b2683..a7fb4689dc 100644
--- a/general.h
+++ b/general.h
@@ -167,7 +167,7 @@ struct settings
 };
 
 // Settings and/or global state that is specific to a console-style implementation.
-#if defined(__CELLOS_LV2__) || defined(_XBOX) || defined(XENON) || defined(GEKKO)
+#ifdef SSNES_CONSOLE
 struct console_settings
 {
    bool block_config_read;
@@ -360,7 +360,7 @@ void config_set_defaults(void);
 
 extern struct settings g_settings;
 extern struct global g_extern;
-#if defined(__CELLOS_LV2__) || defined(_XBOX) || defined(XENON) || defined(GEKKO)
+#ifdef SSNES_CONSOLE
 extern struct console_settings g_console;
 #endif
 
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj b/msvc-360/SSNES-360/SSNES-360.vcxproj
index e23d544d86..1d72284f34 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj
@@ -129,7 +129,7 @@
       <PREfast>AnalyzeOnly</PREfast>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>_DEBUG;_XBOX;%(PreprocessorDefinitions);PACKAGE_VERSION="0.9.3";_CRT_SECURE_NO_WARNINGS;main=ssnes_main;HAVE_CONFIGFILE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_XBOX;%(PreprocessorDefinitions);PACKAGE_VERSION="0.9.3";_CRT_SECURE_NO_WARNINGS;main=ssnes_main;HAVE_CONFIGFILE;SSNES_CONSOLE</PreprocessorDefinitions>
       <CallAttributedProfiling>Callcap</CallAttributedProfiling>
     </ClCompile>
     <Link>
@@ -304,4 +304,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/settings.c b/settings.c
index 749da3d51d..c7df27deca 100644
--- a/settings.c
+++ b/settings.c
@@ -31,7 +31,7 @@
 
 struct settings g_settings;
 struct global g_extern;
-#if defined(__CELLOS_LV2__) || defined(_XBOX) || defined(XENON) || defined(GEKKO)
+#ifdef SSNES_CONSOLE
 struct console_settings g_console;
 #endif
 
@@ -227,7 +227,7 @@ static void parse_config_file(void);
 
 void parse_config(void)
 {
-#if defined(__CELLOS_LV2__) || defined(_XBOX) || defined(XENON) || defined(GEKKO)
+#ifdef SSNES_CONSOLE
    if (!g_console.block_config_read)
 #endif
    {