diff --git a/cores/libretro-imageviewer/image_core.c b/cores/libretro-imageviewer/image_core.c index 9ad38033b3..f8e5d96902 100644 --- a/cores/libretro-imageviewer/image_core.c +++ b/cores/libretro-imageviewer/image_core.c @@ -71,46 +71,30 @@ static const char* IMAGE_CORE_PREFIX(valid_extensions) = "jpg|jpeg|png|bmp|psd|t #else #ifdef HAVE_RJPEG -#define RJPEG_ARGS "jpg|jpeg" - -#ifdef HAVE_RPNG -#define RJPEG_SEP "|" -#endif - +#define RJPEG_ARGS "|jpg|jpeg" #else #define RJPEG_ARGS -#define RJPEG_SEP #endif #ifdef HAVE_RPNG -#define RPNG_ARGS "png" - -#ifdef HAVE_RBMP -#define RPNG_SEP "|" -#endif +#define RPNG_ARGS "|png" #else #define RPNG_ARGS -#define RPNG_SEP #endif #ifdef HAVE_RBMP -#define RBMP_ARGS "bmp" - -#ifdef HAVE_RTGA -#define RBMP_SEP "|" -#endif +#define RBMP_ARGS "|bmp" #else #define RBMP_ARGS -#define RBMP_SEP #endif #ifdef HAVE_RTGA -#define RTGA_ARGS "tga" +#define RTGA_ARGS "|tga" #else #define RTGA_ARGS #endif -static const char* IMAGE_CORE_PREFIX(valid_extensions) = RJPEG_ARGS RJPEG_SEP RPNG_ARGS RPNG_SEP RBMP_ARGS RBMP_SEP RTGA_ARGS; +static const char* IMAGE_CORE_PREFIX(valid_extensions) = RJPEG_ARGS RPNG_ARGS RBMP_ARGS RTGA_ARGS + 1; /* +1 to remove the extra | */ #endif void IMAGE_CORE_PREFIX(retro_get_system_info)(struct retro_system_info *info)