Add HAVE_RJPEG ifdefs

This commit is contained in:
twinaphex 2016-05-11 21:27:17 +02:00
parent 4100bf95b4
commit 28dd2c2545
4 changed files with 22 additions and 2 deletions

View File

@ -904,8 +904,13 @@ ifeq ($(HAVE_RPNG), 1)
OBJ += libretro-common/formats/png/rpng.o \
libretro-common/formats/png/rpng_encode.o
endif
OBJ += libretro-common/formats/jpeg/rjpeg.o \
libretro-common/formats/bmp/rbmp_encode.o \
ifeq ($(HAVE_RJPEG), 1)
DEFINES += -DHAVE_RJPEG
OBJ += libretro-common/formats/jpeg/rjpeg.o
endif
OBJ += libretro-common/formats/bmp/rbmp_encode.o \
libretro-common/formats/tga/rtga.o \
libretro-common/formats/json/jsonsax.o

View File

@ -232,7 +232,9 @@ VIDEO IMAGE
#include "../libretro-common/formats/png/rpng.c"
#include "../libretro-common/formats/png/rpng_encode.c"
#endif
#ifdef HAVE_RJPEG
#include "../libretro-common/formats/jpeg/rjpeg.c"
#endif
#include "../libretro-common/formats/bmp/rbmp_encode.c"
/*============================================================

View File

@ -78,3 +78,4 @@ HAVE_CHEEVOS=yes # Retro Achievements
HAVE_VULKAN=auto # Vulkan support
C89_VULKAN=no
HAVE_RPNG=yes # RPNG support
HAVE_RJPEG=yes # RJPEG support

View File

@ -117,6 +117,8 @@ static int rarch_main_data_image_process(
#endif
break;
case IMAGE_TYPE_JPEG:
#ifdef HAVE_RJPEG
#endif
break;
}
@ -207,6 +209,8 @@ static int rarch_main_data_image_iterate_transfer(nbio_handle_t *nbio)
#endif
break;
case IMAGE_TYPE_JPEG:
#ifdef HAVE_RJPEG
#endif
break;
}
}
@ -232,6 +236,8 @@ static void rarch_task_image_load_free_internal(nbio_handle_t *nbio)
#endif
break;
case IMAGE_TYPE_JPEG:
#ifdef HAVE_RJPEG
#endif
break;
}
@ -260,6 +266,8 @@ static int cb_nbio_generic(nbio_handle_t *nbio, size_t *len)
#endif
break;
case IMAGE_TYPE_JPEG:
#ifdef HAVE_RJPEG
#endif
break;
}
@ -275,6 +283,8 @@ static int cb_nbio_generic(nbio_handle_t *nbio, size_t *len)
#endif
break;
case IMAGE_TYPE_JPEG:
#ifdef HAVE_RJPEG
#endif
break;
}
@ -304,6 +314,8 @@ static int cb_nbio_image_menu_thumbnail(void *data, size_t len)
#endif
break;
case IMAGE_TYPE_JPEG:
#ifdef HAVE_RJPEG
#endif
break;
}