diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 5868a09186..5e654194b7 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -18,17 +18,17 @@ else DYLIB=-ldl fi -if [ -z "$LIBSNES" ]; then - LIBSNES="-lsnes" +if [ -z "$LIBRETRO" ]; then + LIBRETRO="-lretro" else echo "Explicit libsnes used, disabling dynamic libsnes loading ..." HAVE_DYNAMIC=no fi if [ $HAVE_DYNAMIC != yes ]; then - check_lib_cxx SNES $LIBSNES snes_init $DYLIB - check_critical SNES "Cannot find libsnes." - add_define_make libsnes $LIBSNES + check_lib_cxx RETRO $LIBRETRO retro_init $DYLIB + check_critical RETRO "Cannot find libretro." + add_define_make libretro $LIBRETRO fi check_lib THREADS -lpthread pthread_create diff --git a/qb/config.params.sh b/qb/config.params.sh index eeb551f0a1..3734fdff09 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -8,7 +8,7 @@ PACKAGE_VERSION=0.9.5 # $2: Comment # $3: Default arg. auto implies that HAVE_ALSA will be set according to library checks later on. add_command_line_enable DYNAMIC "Disable dynamic loading of libsnes library" yes -add_command_line_string LIBSNES "libsnes library used" "" +add_command_line_string LIBRETRO "libretro library used" "" add_command_line_enable THREADS "Threading support" auto add_command_line_enable FFMPEG "Enable FFmpeg recording support" auto add_command_line_enable X264RGB "Enable lossless X264 RGB recording" no diff --git a/ssnes.c b/ssnes.c index 8455f54489..4994f2c0cc 100644 --- a/ssnes.c +++ b/ssnes.c @@ -477,7 +477,7 @@ static void print_features(void) _PSUPP(xml, "XML", "bSNES XML pixel shaders"); _PSUPP(sdl_image, "SDL_image", "SDL_image image loading"); _PSUPP(fbo, "FBO", "OpenGL render-to-texture (multi-pass shaders)"); - _PSUPP(dynamic, "Dynamic", "Dynamic run-time loading of libsnes library"); + _PSUPP(dynamic, "Dynamic", "Dynamic run-time loading of libretro library"); _PSUPP(ffmpeg, "FFmpeg", "On-the-fly recording of gameplay with libavcodec"); _PSUPP(x264rgb, "x264 RGB", "x264 lossless RGB recording for FFmpeg"); _PSUPP(configfile, "Config file", "Configuration file support"); @@ -514,7 +514,7 @@ static void print_compiler(FILE *file) static void print_help(void) { puts("==================================================================="); - puts("ssnes: Simple Super Nintendo Emulator (libsnes) -- v" PACKAGE_VERSION " --"); + puts("ssnes: Frontend for libretro -- v" PACKAGE_VERSION " --"); print_compiler(stdout); puts("==================================================================="); puts("Usage: ssnes [rom file] [options...]"); @@ -527,7 +527,7 @@ static void print_help(void) puts("\t-c/--config: Path for config file." SSNES_DEFAULT_CONF_PATH_STR); #endif #ifdef HAVE_DYNAMIC - puts("\t-L/--libsnes: Path to libsnes implementation. Overrides any config setting."); + puts("\t-L/--libretro: Path to libretro implementation. Overrides any config setting."); #endif puts("\t-g/--gameboy: Path to Gameboy ROM. Load SuperGameBoy as the regular rom."); puts("\t-b/--bsx: Path to BSX rom. Load BSX BIOS as the regular rom."); @@ -678,7 +678,7 @@ static void parse_input(int argc, char *argv[]) const struct option opts[] = { #ifdef HAVE_DYNAMIC - { "libsnes", 1, NULL, 'L' }, + { "libretro", 1, NULL, 'L' }, #endif { "help", 0, NULL, 'h' }, { "save", 1, NULL, 's' }, @@ -2293,7 +2293,7 @@ int ssnes_main_init(int argc, char *argv[]) if (*g_extern.basename) psnes_set_cartridge_basename(g_extern.basename); - SSNES_LOG("Version of libsnes API: %u.%u\n", + SSNES_LOG("Version of libretro API: %u.%u\n", psnes_library_revision_major(), psnes_library_revision_minor()); g_extern.use_sram = true;