ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Snes-isms changed

This commit is contained in:
Twinaphex 2012-07-07 16:28:01 +02:00
parent d2dfe38170
commit 4ba68cf450
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console/libretro_mgmt.c
View File

@ -51,7 +51,7 @@ static bool rarch_manage_libretro_install(char *libretro_core_installed, size_t
if (ret == 0) 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); strlcpy(libretro_core_installed, tmp_pathnewfile, sizeof_libretro_core);
ret = 1; ret = 1;
} }

8
dynamic.c
View File

@ -93,7 +93,7 @@ static void set_environment_defaults(void);
static void load_symbols(void) static void load_symbols(void)
{ {
#ifdef HAVE_DYNAMIC #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); lib_handle = dylib_load(g_settings.libretro);
if (!lib_handle) if (!lib_handle)
{ {
@ -144,13 +144,13 @@ void init_libretro_sym(void)
rarch_assert(sizeof(void*) == sizeof(void (*)(void))); rarch_assert(sizeof(void*) == sizeof(void (*)(void)));
#ifdef HAVE_DYNAMIC #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. // since loading it dynamically and with -l will fail hard.
function_t sym = dylib_proc(NULL, "retro_init"); function_t sym = dylib_proc(NULL, "retro_init");
if (sym) if (sym)
{ {
RARCH_ERR("Serious problem. RetroArch wants to load libsnes dyamically, but it is already linked.\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 libsnes directly.\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_ERR("Proceeding could cause a crash. Aborting ...\n");
rarch_fail(1, "init_libretro_sym()"); rarch_fail(1, "init_libretro_sym()");
} }

2
tools/retroarch-joyconfig.c
View File

@ -41,7 +41,7 @@ static void print_help(void)
puts("=================="); puts("==================");
puts("retroarch-joyconfig"); puts("retroarch-joyconfig");
puts("=================="); puts("==================");
puts("Usage: ssnes-joyconfig [ -p/--player <1-5> | -j/--joypad <num> | -i/--input <file> | -o/--output <file> | -h/--help ]"); puts("Usage: retroarch-joyconfig [ -p/--player <1-5> | -j/--joypad <num> | -i/--input <file> | -o/--output <file> | -h/--help ]");
puts(""); puts("");
puts("-p/--player: Which player to configure for (1 up to and including 5)."); 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)."); puts("-j/--joypad: Which joypad to use when configuring (first joypad is 0).");