mirror of
https://github.com/libretro/RetroArch
synced 2024-07-03 00:38:44 +00:00
Create HAVE_RPNG define
This commit is contained in:
parent
31de846279
commit
4e5bf65e23
|
@ -643,13 +643,10 @@ endif
|
|||
|
||||
ifeq ($(HAVE_ZLIB), 1)
|
||||
ZLIB_OBJS = decompress/zip_support.o
|
||||
OBJ += libretro-common/formats/png/rpng_nbio.o \
|
||||
libretro-common/formats/png/rpng_fbio.o \
|
||||
libretro-common/formats/png/rpng_decode.o \
|
||||
libretro-common/formats/png/rpng_encode.o \
|
||||
libretro-common/file/file_extract.o
|
||||
OBJ += libretro-common/file/file_extract.o
|
||||
OBJ += $(ZLIB_OBJS)
|
||||
DEFINES += -DHAVE_ZLIB
|
||||
#HAVE_RPNG = 1
|
||||
HAVE_COMPRESSION = 1
|
||||
ifeq ($(WANT_ZLIB), 1)
|
||||
DEFINES += -DWANT_ZLIB
|
||||
|
@ -659,6 +656,17 @@ ifeq ($(HAVE_ZLIB), 1)
|
|||
endif
|
||||
endif
|
||||
|
||||
ifdef HAVE_RPNG
|
||||
DEFINES += -DHAVE_RPNG
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_RPNG), 1)
|
||||
OBJ += libretro-common/formats/png/rpng_nbio.o \
|
||||
libretro-common/formats/png/rpng_fbio.o \
|
||||
libretro-common/formats/png/rpng_decode.o \
|
||||
libretro-common/formats/png/rpng_encode.o
|
||||
endif
|
||||
|
||||
ifdef HAVE_COMPRESSION
|
||||
DEFINES += -DHAVE_COMPRESSION
|
||||
endif
|
||||
|
|
|
@ -39,7 +39,7 @@ CFLAGS += -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include
|
|||
|
||||
CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE -DSINC_LOWEST_QUALITY
|
||||
CFLAGS += -DHAVE_GRIFFIN=1 -DHAVE_FILTERS_BUILTIN -DHAVE_MENU -DHAVE_RGUI
|
||||
CFLAGS += -DHAVE_ZLIB -DWANT_ZLIB -DHAVE_BUILTIN_AUTOCONFIG
|
||||
CFLAGS += -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_BUILTIN_AUTOCONFIG
|
||||
#-DHAVE_LIBRETRO_MANAGEMENT -DWANT_RPNG -DHAVE_7ZIP
|
||||
|
||||
|
||||
|
|
|
@ -76,6 +76,7 @@ endif
|
|||
HAVE_FILTERS_BUILTIN := 1
|
||||
HAVE_THREADS := 1
|
||||
HAVE_ZLIB := 1
|
||||
HAVE_RPNG := 1
|
||||
HAVE_7ZIP := 1
|
||||
HAVE_RPNG := 1
|
||||
HAVE_OVERLAY := 1
|
||||
|
@ -119,6 +120,7 @@ HAVE_7ZIP := 1
|
|||
HAVE_LIBRETRO_MANAGEMENT := 1
|
||||
HAVE_ZLIB := 1
|
||||
HAVE_RPNG := 1
|
||||
HAVE_RPNG := 1
|
||||
HAVE_OVERLAY := 1
|
||||
HAVE_LIBSICKSAXIS := 0
|
||||
HAVE_BUILTIN_AUTOCONFIG := 1
|
||||
|
@ -172,6 +174,10 @@ ifeq ($(HAVE_ZLIB), 1)
|
|||
CFLAGS += -DHAVE_ZLIB -DWANT_ZLIB
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_RPNG), 1)
|
||||
CFLAGS += -DHAVE_RPNG
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_7ZIP), 1)
|
||||
CFLAGS += -DHAVE_7ZIP
|
||||
endif
|
||||
|
|
|
@ -106,7 +106,7 @@ PPU_LDLIBS = $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l
|
|||
|
||||
PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe
|
||||
|
||||
DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_7Z -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_BUILTIN_AUTOCONFIG
|
||||
DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_7Z -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_BUILTIN_AUTOCONFIG
|
||||
|
||||
ifeq ($(DEBUG), 1)
|
||||
PPU_OPTIMIZE_LV := -O0 -g
|
||||
|
|
|
@ -106,7 +106,7 @@ PPU_LDLIBS = $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l
|
|||
|
||||
PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe
|
||||
|
||||
DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
|
||||
DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
|
||||
|
||||
ifeq ($(DEBUG), 1)
|
||||
PPU_OPTIMIZE_LV := -O0 -g
|
||||
|
|
|
@ -90,7 +90,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
|
|||
CFLAGS += -DHAVE_FILE_LOGGER
|
||||
endif
|
||||
|
||||
SHARED_FLAGS := -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE -DHAVE_ZLIB -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts
|
||||
SHARED_FLAGS := -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts
|
||||
CFLAGS += -std=gnu99 $(SHARED_FLAGS)
|
||||
CXXFLAGS += $(SHARED_FLAGS)
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ INCDIR = deps/zlib deps/7zip libretro-common/include
|
|||
CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
|
||||
ASFLAGS = $(CFLAGS)
|
||||
|
||||
RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_ZLIB -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DWANT_RPNG -DSINC_LOWEST_QUALITY -DHAVE_BUILTIN_AUTOCONFIG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP
|
||||
RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DWANT_RPNG -DSINC_LOWEST_QUALITY -DHAVE_BUILTIN_AUTOCONFIG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP
|
||||
|
||||
LIBDIR =
|
||||
LDFLAGS =
|
||||
|
|
|
@ -58,7 +58,7 @@ else
|
|||
endif
|
||||
|
||||
|
||||
LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_GLUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB
|
||||
LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_GLUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB
|
||||
LOCAL_CFLAGS += -DHAVE_7ZIP
|
||||
|
||||
ifeq ($(NDK_DEBUG),1)
|
||||
|
|
|
@ -298,6 +298,7 @@
|
|||
"-DHAVE_DYNAMIC",
|
||||
"-DHAVE_OVERLAY",
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOA",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
|
@ -361,6 +362,7 @@
|
|||
"-DHAVE_DYNAMIC",
|
||||
"-DHAVE_OVERLAY",
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOA",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
|
|
|
@ -341,6 +341,7 @@
|
|||
"-DHAVE_DYNAMIC",
|
||||
"-DHAVE_OVERLAY",
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOA",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
|
@ -397,6 +398,7 @@
|
|||
"-DHAVE_DYNAMIC",
|
||||
"-DHAVE_OVERLAY",
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOA",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
|
|
|
@ -513,6 +513,7 @@
|
|||
"-DHAVE_DYNAMIC",
|
||||
"-DHAVE_OVERLAY",
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
|
@ -577,6 +578,7 @@
|
|||
"-DHAVE_DYNAMIC",
|
||||
"-DHAVE_OVERLAY",
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
|
@ -615,6 +617,7 @@
|
|||
"-DRARCH_INTERNAL",
|
||||
"-DHAVE_OVERLAY",
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
|
@ -685,6 +688,7 @@
|
|||
"-DHAVE_FBO",
|
||||
"-DHAVE_OVERLAY",
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
|
@ -744,6 +748,7 @@
|
|||
"-DHAVE_FBO",
|
||||
"-DHAVE_OVERLAY",
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
|
@ -802,6 +807,7 @@
|
|||
"-DHAVE_DYNAMIC",
|
||||
"-DHAVE_OVERLAY",
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
|
@ -867,6 +873,7 @@
|
|||
"-DHAVE_DYNAMIC",
|
||||
"-DHAVE_OVERLAY",
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
|
@ -906,6 +913,7 @@
|
|||
"-DRARCH_INTERNAL",
|
||||
"-DHAVE_OVERLAY",
|
||||
"-DHAVE_ZLIB",
|
||||
"-DHAVE_RPNG",
|
||||
"-DHAVE_COCOATOUCH",
|
||||
"-DWANT_ZLIB",
|
||||
"-DSINC_LOWER_QUALITY",
|
||||
|
|
|
@ -19,7 +19,9 @@
|
|||
#endif
|
||||
|
||||
#include <formats/image.h>
|
||||
#ifdef HAVE_RPNG
|
||||
#include <formats/rpng.h>
|
||||
#endif
|
||||
#include <formats/tga.h>
|
||||
#ifdef _XBOX1
|
||||
#include "../d3d/d3d_wrapper.h"
|
||||
|
@ -46,7 +48,7 @@
|
|||
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_ZLIB
|
||||
#ifdef HAVE_RPNG
|
||||
static bool rpng_image_load_argb_shift(const char *path,
|
||||
struct texture_image *out_img,
|
||||
unsigned a_shift, unsigned r_shift,
|
||||
|
@ -397,13 +399,12 @@ bool texture_image_load(struct texture_image *out_img, const char *path)
|
|||
if (buf)
|
||||
free(buf);
|
||||
}
|
||||
#ifdef HAVE_ZLIB
|
||||
#ifdef HAVE_RPNG
|
||||
else if (strstr(path, ".png"))
|
||||
{
|
||||
ret = rpng_image_load_argb_shift(path, out_img,
|
||||
a_shift, r_shift, g_shift, b_shift);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef GEKKO
|
||||
if (ret)
|
||||
|
@ -416,6 +417,9 @@ bool texture_image_load(struct texture_image *out_img, const char *path)
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -173,10 +173,13 @@ VIDEO IMAGE
|
|||
#include "../gfx/video_texture.c"
|
||||
|
||||
#include "../libretro-common/formats/tga/tga_decode.c"
|
||||
|
||||
#ifdef HAVE_RPNG
|
||||
#include "../libretro-common/formats/png/rpng_fbio.c"
|
||||
#include "../libretro-common/formats/png/rpng_nbio.c"
|
||||
#include "../libretro-common/formats/png/rpng_decode.c"
|
||||
#include "../libretro-common/formats/png/rpng_encode.c"
|
||||
#endif
|
||||
|
||||
/*============================================================
|
||||
VIDEO DRIVER
|
||||
|
|
|
@ -59,7 +59,9 @@ typedef struct nbio_image_handle
|
|||
bool is_blocking_on_processing;
|
||||
bool is_finished;
|
||||
transfer_cb_t cb;
|
||||
#ifdef HAVE_RPNG
|
||||
struct rpng_t *handle;
|
||||
#endif
|
||||
unsigned processing_pos_increment;
|
||||
unsigned pos_increment;
|
||||
uint64_t frame_count;
|
||||
|
@ -301,6 +303,8 @@ static int rarch_main_data_http_iterate_poll(http_handle_t *http)
|
|||
#endif
|
||||
|
||||
#ifdef HAVE_MENU
|
||||
|
||||
#ifdef HAVE_RPNG
|
||||
static int cb_image_menu_wallpaper_upload(void *data, size_t len)
|
||||
{
|
||||
nbio_handle_t *nbio = (nbio_handle_t*)data;
|
||||
|
@ -395,7 +399,6 @@ static int cb_nbio_image_menu_wallpaper(void *data, size_t len)
|
|||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int rarch_main_data_image_iterate_poll(nbio_handle_t *nbio)
|
||||
{
|
||||
|
@ -511,6 +514,9 @@ static int rarch_main_data_image_iterate_transfer_parse(nbio_handle_t *nbio)
|
|||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
static int cb_nbio_default(void *data, size_t len)
|
||||
{
|
||||
|
@ -569,7 +575,7 @@ static int rarch_main_data_nbio_iterate_poll(nbio_handle_t *nbio)
|
|||
|
||||
if (elem1[0] != '\0')
|
||||
{
|
||||
#ifdef HAVE_MENU
|
||||
#if defined(HAVE_MENU) && defined(HAVE_RPNG)
|
||||
if (!strcmp(elem1, "cb_menu_wallpaper"))
|
||||
nbio->cb = &cb_nbio_image_menu_wallpaper;
|
||||
#endif
|
||||
|
@ -648,6 +654,7 @@ static int rarch_main_data_nbio_iterate_parse(nbio_handle_t *nbio)
|
|||
|
||||
#ifdef HAVE_LIBRETRODB
|
||||
#ifdef HAVE_MENU
|
||||
|
||||
static void rarch_main_data_db_iterate(bool is_thread,
|
||||
data_runloop_t *runloop)
|
||||
{
|
||||
|
@ -670,10 +677,12 @@ static void rarch_main_data_db_iterate(bool is_thread,
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef HAVE_RPNG
|
||||
static void rarch_main_data_nbio_image_iterate(bool is_thread,
|
||||
data_runloop_t *runloop)
|
||||
{
|
||||
|
@ -708,6 +717,7 @@ static void rarch_main_data_nbio_image_iterate(bool is_thread,
|
|||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void rarch_main_data_nbio_iterate(bool is_thread, data_runloop_t *runloop)
|
||||
{
|
||||
|
@ -893,7 +903,9 @@ void rarch_main_data_free(void)
|
|||
static void data_runloop_iterate(bool is_thread, data_runloop_t *runloop)
|
||||
{
|
||||
rarch_main_data_nbio_iterate (is_thread, runloop);
|
||||
#ifdef HAVE_RPNG
|
||||
rarch_main_data_nbio_image_iterate (is_thread, runloop);
|
||||
#endif
|
||||
#ifdef HAVE_OVERLAY
|
||||
rarch_main_data_overlay_iterate (is_thread, runloop);
|
||||
#endif
|
||||
|
@ -970,6 +982,7 @@ error:
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_RPNG
|
||||
static void rarch_main_data_nbio_image_upload_iterate(bool is_thread,
|
||||
data_runloop_t *runloop)
|
||||
{
|
||||
|
@ -994,6 +1007,7 @@ static void rarch_main_data_nbio_image_upload_iterate(bool is_thread,
|
|||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void rarch_main_data_iterate(void)
|
||||
{
|
||||
|
@ -1019,7 +1033,9 @@ void rarch_main_data_iterate(void)
|
|||
#ifdef HAVE_OVERLAY
|
||||
rarch_main_data_overlay_image_upload_iterate(false, runloop);
|
||||
#endif
|
||||
#ifdef HAVE_RPNG
|
||||
rarch_main_data_nbio_image_upload_iterate(false, runloop);
|
||||
#endif
|
||||
|
||||
if (data_runloop_msg[0] != '\0')
|
||||
{
|
||||
|
|
|
@ -41,8 +41,7 @@
|
|||
#include <xgraphics.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_ZLIB_DEFLATE
|
||||
|
||||
#if defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG)
|
||||
#include <formats/rpng.h>
|
||||
#define IMG_EXT "png"
|
||||
|
||||
|
@ -379,7 +378,7 @@ bool screenshot_dump(const char *folder, const void *frame,
|
|||
}
|
||||
|
||||
ret = false;
|
||||
#elif defined(HAVE_ZLIB_DEFLATE)
|
||||
#elif defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG)
|
||||
out_buffer = (uint8_t*)malloc(width * height * 3);
|
||||
if (!out_buffer)
|
||||
return false;
|
||||
|
|
Loading…
Reference in New Issue
Block a user