Remove +1 shenanigans

This commit is contained in:
Alcaro 2016-10-01 19:32:02 +02:00
parent 160444845d
commit 3665e11f83

View File

@ -70,31 +70,53 @@ struct string_list *file_list;
static const char* IMAGE_CORE_PREFIX(valid_extensions) = "jpg|jpeg|png|bmp|psd|tga|gif|hdr|pic|ppm|pgm"; static const char* IMAGE_CORE_PREFIX(valid_extensions) = "jpg|jpeg|png|bmp|psd|tga|gif|hdr|pic|ppm|pgm";
#else #else
static const char* IMAGE_CORE_PREFIX(valid_extensions) =
#undef SEPARATOR
#ifdef HAVE_RJPEG #ifdef HAVE_RJPEG
#define RJPEG_ARGS "|jpg|jpeg" # ifndef SEPARATOR
#else # define SEPARATOR
#define RJPEG_ARGS # else
"|"
# endif
"jpg|jpeg"
#endif #endif
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
#define RPNG_ARGS "|png" # ifndef SEPARATOR
#else # define SEPARATOR
#define RPNG_ARGS # else
"|"
# endif
"png"
#endif #endif
#ifdef HAVE_RBMP #ifdef HAVE_RBMP
#define RBMP_ARGS "|bmp" # ifndef SEPARATOR
#else # define SEPARATOR
#define RBMP_ARGS # else
"|"
# endif
"bmp"
#endif #endif
#ifdef HAVE_RTGA #ifdef HAVE_RTGA
#define RTGA_ARGS "|tga" # ifndef SEPARATOR
#else # define SEPARATOR
#define RTGA_ARGS # else
"|"
# endif
"tga"
#endif #endif
static const char* IMAGE_CORE_PREFIX(valid_extensions) = RJPEG_ARGS RPNG_ARGS RBMP_ARGS RTGA_ARGS + 1; /* +1 to remove the extra | */ #ifndef SEPARATOR
#error "can't build this core with no image formats"
#endif
#undef SEPARATOR
;
#endif #endif
void IMAGE_CORE_PREFIX(retro_get_system_info)(struct retro_system_info *info) void IMAGE_CORE_PREFIX(retro_get_system_info)(struct retro_system_info *info)