From 4ba68cf450eeb3da04cf7cb95ade55f2624cf80b Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sat, 7 Jul 2012 16:28:01 +0200 Subject: [PATCH] Snes-isms changed --- console/libretro_mgmt.c | 2 +- dynamic.c | 8 ++++---- tools/retroarch-joyconfig.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/console/libretro_mgmt.c b/console/libretro_mgmt.c index fd611b99d0..45aca72c18 100644 --- a/console/libretro_mgmt.c +++ b/console/libretro_mgmt.c @@ -51,7 +51,7 @@ static bool rarch_manage_libretro_install(char *libretro_core_installed, size_t if (ret == 0) { - RARCH_LOG("Libsnes core [%s] renamed to: [%s].\n", full_path, tmp_pathnewfile); + RARCH_LOG("libretro core [%s] renamed to: [%s].\n", full_path, tmp_pathnewfile); strlcpy(libretro_core_installed, tmp_pathnewfile, sizeof_libretro_core); ret = 1; } diff --git a/dynamic.c b/dynamic.c index 20c9f74996..0eaa7b8d92 100644 --- a/dynamic.c +++ b/dynamic.c @@ -93,7 +93,7 @@ static void set_environment_defaults(void); static void load_symbols(void) { #ifdef HAVE_DYNAMIC - RARCH_LOG("Loading dynamic libsnes from: \"%s\"\n", g_settings.libretro); + RARCH_LOG("Loading dynamic libretro from: \"%s\"\n", g_settings.libretro); lib_handle = dylib_load(g_settings.libretro); if (!lib_handle) { @@ -144,13 +144,13 @@ void init_libretro_sym(void) rarch_assert(sizeof(void*) == sizeof(void (*)(void))); #ifdef HAVE_DYNAMIC - // Try to verify that -lsnes was not linked in from other modules + // Try to verify that -lretro was not linked in from other modules // since loading it dynamically and with -l will fail hard. function_t sym = dylib_proc(NULL, "retro_init"); if (sym) { - RARCH_ERR("Serious problem. RetroArch wants to load libsnes dyamically, but it is already linked.\n"); - RARCH_ERR("This could happen if other modules RetroArch depends on link against libsnes directly.\n"); + RARCH_ERR("Serious problem. RetroArch wants to load libretro dyamically, but it is already linked.\n"); + RARCH_ERR("This could happen if other modules RetroArch depends on link against libretro directly.\n"); RARCH_ERR("Proceeding could cause a crash. Aborting ...\n"); rarch_fail(1, "init_libretro_sym()"); } diff --git a/tools/retroarch-joyconfig.c b/tools/retroarch-joyconfig.c index 0754933dc3..3c1bcd6473 100644 --- a/tools/retroarch-joyconfig.c +++ b/tools/retroarch-joyconfig.c @@ -41,7 +41,7 @@ static void print_help(void) puts("=================="); puts("retroarch-joyconfig"); puts("=================="); - puts("Usage: ssnes-joyconfig [ -p/--player <1-5> | -j/--joypad | -i/--input | -o/--output | -h/--help ]"); + puts("Usage: retroarch-joyconfig [ -p/--player <1-5> | -j/--joypad | -i/--input | -o/--output | -h/--help ]"); puts(""); puts("-p/--player: Which player to configure for (1 up to and including 5)."); puts("-j/--joypad: Which joypad to use when configuring (first joypad is 0).");