diff --git a/360/xaudio-c/xaudio.h b/360/xaudio-c/xaudio.h index 496dd1fc16..7476cb832a 100644 --- a/360/xaudio-c/xaudio.h +++ b/360/xaudio-c/xaudio.h @@ -3,7 +3,7 @@ authors: OV2, Themaister */ -// Kinda stripped down. Only contains the bare essentials used in SSNES. +// Kinda stripped down. Only contains the bare essentials used in RetroArch. #ifndef XAUDIO2_XDK360_H #define XAUDIO2_XDK360_H diff --git a/360/xdk360_video.cpp b/360/xdk360_video.cpp index b1e5a54ed2..987cba27d0 100644 --- a/360/xdk360_video.cpp +++ b/360/xdk360_video.cpp @@ -614,7 +614,7 @@ void xdk360_video_set_vsync(bool vsync) xdk360_gfx_set_nonblock_state(g_d3d, vsync); } -// 360 needs a working graphics stack before SSNESeven starts. +// 360 needs a working graphics stack before RetroArch even starts. // To deal with this main.c, // the top level module owns the instance, and is created beforehand. // When RetroArch gets around to init it, it is already allocated. diff --git a/360/xdk360_video_resources.h b/360/xdk360_video_resources.h index 3769b47c02..4196e3cb1f 100644 --- a/360/xdk360_video_resources.h +++ b/360/xdk360_video_resources.h @@ -16,8 +16,8 @@ #pragma once -#ifndef SSNES360_RESOURCES_H -#define SSNES360_RESOURCES_H +#ifndef RARCH_360_RESOURCES_H +#define RARCH_360_RESOURCES_H //-------------------------------------------------------------------------------------- // Name tag for resources. An app may initialize this structure, and pass @@ -32,7 +32,6 @@ struct RESOURCE char * strName; }; - // Resource types enum { diff --git a/config.def.h b/config.def.h index 480603f35b..3860e673a9 100644 --- a/config.def.h +++ b/config.def.h @@ -13,7 +13,7 @@ * If not, see . */ -/// Config header for SSNES +/// Config header for RetroArch // // diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index bb8c9406d5..8869d423c2 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -161,7 +161,7 @@ MAIN #endif /*============================================================ -SSNES +RETROARCH ============================================================ */ #include "../../retroarch.c" diff --git a/console/szlib/szlib.c b/console/szlib/szlib.c index a55b2ab6f8..217aa02fb6 100644 --- a/console/szlib/szlib.c +++ b/console/szlib/szlib.c @@ -3,8 +3,8 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* This source as presented is a modified version of original zlib for use with SSNES, - * and must not be confused with the original software. */ +/* This source as presented is a modified version of original zlib for use + * with RetroArch, and must not be confused with the original software. */ #include #include diff --git a/console/szlib/zconf.h b/console/szlib/zconf.h index 89295415f8..b2060b97a7 100644 --- a/console/szlib/zconf.h +++ b/console/szlib/zconf.h @@ -3,8 +3,8 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* This source as presented is a modified version of original zlib for use with SSNES, - * and must not be confused with the original software. */ +/* This source as presented is a modified version of original zlib for use with + * RetroArch, and must not be confused with the original software. */ #ifndef _ZCONF_H diff --git a/console/szlib/zlib.h b/console/szlib/zlib.h index da6b044bf9..20a4a48e6f 100644 --- a/console/szlib/zlib.h +++ b/console/szlib/zlib.h @@ -3,8 +3,8 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* This source as presented is a modified version of original zlib for use with SSNES, - * and must not be confused with the original software. */ +/* This source as presented is a modified version of original zlib for use with + * RetroArch, and must not be confused with the original software. */ #ifndef _SZLIB_H #define _SZLIB_H @@ -682,4 +682,4 @@ extern int unzSetOffset (unzFile file, unsigned long pos); } #endif -#endif /* _SZLIB_H */ \ No newline at end of file +#endif /* _SZLIB_H */ diff --git a/msvc-360/SSNES-Salamander/SSNES-Salamander.vcxproj b/msvc-360/SSNES-Salamander/SSNES-Salamander.vcxproj index b5492306cd..ca9107eccf 100644 --- a/msvc-360/SSNES-Salamander/SSNES-Salamander.vcxproj +++ b/msvc-360/SSNES-Salamander/SSNES-Salamander.vcxproj @@ -113,7 +113,7 @@ true false MultiThreadedDebug - _DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_CONFIGFILE;_CRT_SECURE_NO_WARNINGS;SSNES_CONSOLE=1 + _DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_CONFIGFILE;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1 Callcap @@ -136,7 +136,7 @@ AnalyzeOnly false MultiThreadedDebug - _DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_CONFIGFILE;_CRT_SECURE_NO_WARNINGS;SSNES_CONSOLE=1 + _DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_CONFIGFILE;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1 Callcap @@ -160,7 +160,7 @@ Size false MultiThreaded - NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);HAVE_CONFIGFILE;_CRT_SECURE_NO_WARNINGS;SSNES_CONSOLE=1 + NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);HAVE_CONFIGFILE;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1 Callcap @@ -189,7 +189,7 @@ Size false MultiThreaded - NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);HAVE_CONFIGFILE;_CRT_SECURE_NO_WARNINGS;SSNES_CONSOLE=1 + NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);HAVE_CONFIGFILE;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1 true @@ -215,7 +215,7 @@ false false MultiThreaded - NDEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_CONFIGFILE;_CRT_SECURE_NO_WARNINGS;SSNES_CONSOLE=1 + NDEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_CONFIGFILE;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1 true @@ -241,7 +241,7 @@ false false MultiThreaded - NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);HAVE_CONFIGFILE;_CRT_SECURE_NO_WARNINGS;SSNES_CONSOLE=1 + NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);HAVE_CONFIGFILE;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE=1 true @@ -278,4 +278,4 @@ - \ No newline at end of file + diff --git a/patch.h b/patch.h index 08c87b8f11..ef5761b143 100644 --- a/patch.h +++ b/patch.h @@ -20,7 +20,7 @@ #include // BPS/UPS/IPS implementation from bSNES (nall::). -// Modified for SSNES. +// Modified for RetroArch. typedef enum { diff --git a/ps3/ps3py/pkg.py b/ps3/ps3py/pkg.py index 17cc1aeada..219608bb0d 100644 --- a/ps3/ps3py/pkg.py +++ b/ps3/ps3py/pkg.py @@ -517,9 +517,9 @@ try: import pkgcrypt except: print "" - print "-----------------" - print "SSNES BUILD ERROR" - print "-----------------" + print "---------------------" + print "RETROARCH BUILD ERROR" + print "---------------------" print "Couldn't make PKG file. Go into the ps3py directory, and type the following:" print "" print "python2 setup.py build" diff --git a/retroarch.cfg b/retroarch.cfg index 2aa582fc63..70a5e7431d 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -1,4 +1,4 @@ -## Skeleton config file for SSNES +## Skeleton config file for RetroArch # Save all save files (*.srm) to this directory. This includes related files like .bsv, .rtc, .psrm, etc ... # This will be overridden by explicit command line options. @@ -11,7 +11,7 @@ # If enabled, load libretro from a dynamic location. # libretro_path = "/path/to/libretro.so" -# Environment variables internally in SSNES. +# Environment variables internally in RetroArch. # Implementations can tap into this user-specificed information to enable functionality # that is deemed too obscure to expose directly. # Some variables might be "standardized" at a later time if needed. @@ -25,7 +25,7 @@ # Video driver to use. "gl", "xvideo", "sdl" or "ext" (external API driver) # video_driver = "gl" -# Path to external video driver using the SSNES driver API. +# Path to external video driver using the RetroArch driver API. # video_external_driver = # Windowed xscale and yscale @@ -143,7 +143,7 @@ # Audio driver backend. Depending on configuration possible candidates are: alsa, pulse, oss, jack, rsound, roar, openal, sdl, xaudio and ext (external driver). # audio_driver = -# Path to external audio driver using the SSNES audio driver API. +# Path to external audio driver using the RetroArch audio driver API. # audio_external_driver = # Override the default audio device the audio_driver uses. This is driver dependant. E.g. ALSA wants a PCM device, OSS wants a path (e.g. /dev/dsp), Jack wants portnames (e.g. system:playback1,system:playback_2), and so on ... @@ -201,7 +201,7 @@ # input_player8_joypad_index = 7 # Joypad buttons. -# Figure these out by using SSNES-Phoenix or ssnes-joyconfig. +# Figure these out by using RetroArch-Phoenix or ssnes-joyconfig. # You can use joypad hats with hnxx, where n is the hat, and xx is a string representing direction. # E.g. "h0up" # input_player1_a_btn = diff --git a/thread.h b/thread.h index 270c4c9352..003492f066 100644 --- a/thread.h +++ b/thread.h @@ -18,7 +18,7 @@ #include "boolean.h" -// Implements the bare minimum needed for SSNES. :) +// Implements the bare minimum needed for RetroArch. :) typedef struct sthread sthread_t;