Skip to content

Commit 4e5bf65

Browse files
inactive123inactive123
committed
Create HAVE_RPNG define
1 parent 31de846 commit 4e5bf65

File tree

15 files changed

+67
-19
lines changed

15 files changed

+67
-19
lines changed

‎Makefile.common

+13-5
Original file line numberDiff line numberDiff line change
@@ -643,13 +643,10 @@ endif
643643

644644
ifeq ($(HAVE_ZLIB), 1)
645645
ZLIB_OBJS = decompress/zip_support.o
646-
OBJ += libretro-common/formats/png/rpng_nbio.o \
647-
libretro-common/formats/png/rpng_fbio.o \
648-
libretro-common/formats/png/rpng_decode.o \
649-
libretro-common/formats/png/rpng_encode.o \
650-
libretro-common/file/file_extract.o
646+
OBJ += libretro-common/file/file_extract.o
651647
OBJ += $(ZLIB_OBJS)
652648
DEFINES += -DHAVE_ZLIB
649+
#HAVE_RPNG = 1
653650
HAVE_COMPRESSION = 1
654651
ifeq ($(WANT_ZLIB), 1)
655652
DEFINES += -DWANT_ZLIB
@@ -659,6 +656,17 @@ ifeq ($(HAVE_ZLIB), 1)
659656
endif
660657
endif
661658

659+
ifdef HAVE_RPNG
660+
DEFINES += -DHAVE_RPNG
661+
endif
662+
663+
ifeq ($(HAVE_RPNG), 1)
664+
OBJ += libretro-common/formats/png/rpng_nbio.o \
665+
libretro-common/formats/png/rpng_fbio.o \
666+
libretro-common/formats/png/rpng_decode.o \
667+
libretro-common/formats/png/rpng_encode.o
668+
endif
669+
662670
ifdef HAVE_COMPRESSION
663671
DEFINES += -DHAVE_COMPRESSION
664672
endif

‎Makefile.ctr

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ CFLAGS += -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include
3939

4040
CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE -DSINC_LOWEST_QUALITY
4141
CFLAGS += -DHAVE_GRIFFIN=1 -DHAVE_FILTERS_BUILTIN -DHAVE_MENU -DHAVE_RGUI
42-
CFLAGS += -DHAVE_ZLIB -DWANT_ZLIB -DHAVE_BUILTIN_AUTOCONFIG
42+
CFLAGS += -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_BUILTIN_AUTOCONFIG
4343
#-DHAVE_LIBRETRO_MANAGEMENT -DWANT_RPNG -DHAVE_7ZIP
4444

4545

‎Makefile.griffin

+6
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ endif
7676
HAVE_FILTERS_BUILTIN := 1
7777
HAVE_THREADS := 1
7878
HAVE_ZLIB := 1
79+
HAVE_RPNG := 1
7980
HAVE_7ZIP := 1
8081
HAVE_RPNG := 1
8182
HAVE_OVERLAY := 1
@@ -119,6 +120,7 @@ HAVE_7ZIP := 1
119120
HAVE_LIBRETRO_MANAGEMENT := 1
120121
HAVE_ZLIB := 1
121122
HAVE_RPNG := 1
123+
HAVE_RPNG := 1
122124
HAVE_OVERLAY := 1
123125
HAVE_LIBSICKSAXIS := 0
124126
HAVE_BUILTIN_AUTOCONFIG := 1
@@ -172,6 +174,10 @@ ifeq ($(HAVE_ZLIB), 1)
172174
CFLAGS += -DHAVE_ZLIB -DWANT_ZLIB
173175
endif
174176

177+
ifeq ($(HAVE_RPNG), 1)
178+
CFLAGS += -DHAVE_RPNG
179+
endif
180+
175181
ifeq ($(HAVE_7ZIP), 1)
176182
CFLAGS += -DHAVE_7ZIP
177183
endif

‎Makefile.ps3

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ PPU_LDLIBS = $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l
106106

107107
PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe
108108

109-
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
109+
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
110110

111111
ifeq ($(DEBUG), 1)
112112
PPU_OPTIMIZE_LV := -O0 -g

‎Makefile.ps3.cobra

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ PPU_LDLIBS = $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l
106106

107107
PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe
108108

109-
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)
109+
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)
110110

111111
ifeq ($(DEBUG), 1)
112112
PPU_OPTIMIZE_LV := -O0 -g

‎Makefile.psl1ght

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
9090
CFLAGS += -DHAVE_FILE_LOGGER
9191
endif
9292

93-
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
93+
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
9494
CFLAGS += -std=gnu99 $(SHARED_FLAGS)
9595
CXXFLAGS += $(SHARED_FLAGS)
9696

‎Makefile.psp1

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ INCDIR = deps/zlib deps/7zip libretro-common/include
2323
CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
2424
ASFLAGS = $(CFLAGS)
2525

26-
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
26+
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
2727

2828
LIBDIR =
2929
LDFLAGS =

‎android/phoenix/jni/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ else
5858
endif
5959

6060

61-
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
61+
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
6262
LOCAL_CFLAGS += -DHAVE_7ZIP
6363

6464
ifeq ($(NDK_DEBUG),1)

‎apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj

+2
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@
298298
"-DHAVE_DYNAMIC",
299299
"-DHAVE_OVERLAY",
300300
"-DHAVE_ZLIB",
301+
"-DHAVE_RPNG",
301302
"-DHAVE_COCOA",
302303
"-DWANT_ZLIB",
303304
"-DSINC_LOWER_QUALITY",
@@ -361,6 +362,7 @@
361362
"-DHAVE_DYNAMIC",
362363
"-DHAVE_OVERLAY",
363364
"-DHAVE_ZLIB",
365+
"-DHAVE_RPNG",
364366
"-DHAVE_COCOA",
365367
"-DWANT_ZLIB",
366368
"-DSINC_LOWER_QUALITY",

‎apple/RetroArch_OSX.xcodeproj/project.pbxproj

+2
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@
341341
"-DHAVE_DYNAMIC",
342342
"-DHAVE_OVERLAY",
343343
"-DHAVE_ZLIB",
344+
"-DHAVE_RPNG",
344345
"-DHAVE_COCOA",
345346
"-DWANT_ZLIB",
346347
"-DSINC_LOWER_QUALITY",
@@ -397,6 +398,7 @@
397398
"-DHAVE_DYNAMIC",
398399
"-DHAVE_OVERLAY",
399400
"-DHAVE_ZLIB",
401+
"-DHAVE_RPNG",
400402
"-DHAVE_COCOA",
401403
"-DWANT_ZLIB",
402404
"-DSINC_LOWER_QUALITY",

‎apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj

+8
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,7 @@
513513
"-DHAVE_DYNAMIC",
514514
"-DHAVE_OVERLAY",
515515
"-DHAVE_ZLIB",
516+
"-DHAVE_RPNG",
516517
"-DHAVE_COCOATOUCH",
517518
"-DWANT_ZLIB",
518519
"-DSINC_LOWER_QUALITY",
@@ -577,6 +578,7 @@
577578
"-DHAVE_DYNAMIC",
578579
"-DHAVE_OVERLAY",
579580
"-DHAVE_ZLIB",
581+
"-DHAVE_RPNG",
580582
"-DHAVE_COCOATOUCH",
581583
"-DWANT_ZLIB",
582584
"-DSINC_LOWER_QUALITY",
@@ -615,6 +617,7 @@
615617
"-DRARCH_INTERNAL",
616618
"-DHAVE_OVERLAY",
617619
"-DHAVE_ZLIB",
620+
"-DHAVE_RPNG",
618621
"-DHAVE_COCOATOUCH",
619622
"-DWANT_ZLIB",
620623
"-DSINC_LOWER_QUALITY",
@@ -685,6 +688,7 @@
685688
"-DHAVE_FBO",
686689
"-DHAVE_OVERLAY",
687690
"-DHAVE_ZLIB",
691+
"-DHAVE_RPNG",
688692
"-DHAVE_COCOATOUCH",
689693
"-DWANT_ZLIB",
690694
"-DSINC_LOWER_QUALITY",
@@ -744,6 +748,7 @@
744748
"-DHAVE_FBO",
745749
"-DHAVE_OVERLAY",
746750
"-DHAVE_ZLIB",
751+
"-DHAVE_RPNG",
747752
"-DHAVE_COCOATOUCH",
748753
"-DWANT_ZLIB",
749754
"-DSINC_LOWER_QUALITY",
@@ -802,6 +807,7 @@
802807
"-DHAVE_DYNAMIC",
803808
"-DHAVE_OVERLAY",
804809
"-DHAVE_ZLIB",
810+
"-DHAVE_RPNG",
805811
"-DHAVE_COCOATOUCH",
806812
"-DWANT_ZLIB",
807813
"-DSINC_LOWER_QUALITY",
@@ -867,6 +873,7 @@
867873
"-DHAVE_DYNAMIC",
868874
"-DHAVE_OVERLAY",
869875
"-DHAVE_ZLIB",
876+
"-DHAVE_RPNG",
870877
"-DHAVE_COCOATOUCH",
871878
"-DWANT_ZLIB",
872879
"-DSINC_LOWER_QUALITY",
@@ -906,6 +913,7 @@
906913
"-DRARCH_INTERNAL",
907914
"-DHAVE_OVERLAY",
908915
"-DHAVE_ZLIB",
916+
"-DHAVE_RPNG",
909917
"-DHAVE_COCOATOUCH",
910918
"-DWANT_ZLIB",
911919
"-DSINC_LOWER_QUALITY",

‎gfx/image/image.c

+7-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
#endif
2020

2121
#include <formats/image.h>
22+
#ifdef HAVE_RPNG
2223
#include <formats/rpng.h>
24+
#endif
2325
#include <formats/tga.h>
2426
#ifdef _XBOX1
2527
#include "../d3d/d3d_wrapper.h"
@@ -46,7 +48,7 @@
4648

4749
#endif
4850

49-
#ifdef HAVE_ZLIB
51+
#ifdef HAVE_RPNG
5052
static bool rpng_image_load_argb_shift(const char *path,
5153
struct texture_image *out_img,
5254
unsigned a_shift, unsigned r_shift,
@@ -397,13 +399,12 @@ bool texture_image_load(struct texture_image *out_img, const char *path)
397399
if (buf)
398400
free(buf);
399401
}
400-
#ifdef HAVE_ZLIB
402+
#ifdef HAVE_RPNG
401403
else if (strstr(path, ".png"))
402404
{
403405
ret = rpng_image_load_argb_shift(path, out_img,
404406
a_shift, r_shift, g_shift, b_shift);
405407
}
406-
#endif
407408

408409
#ifdef GEKKO
409410
if (ret)
@@ -416,6 +417,9 @@ bool texture_image_load(struct texture_image *out_img, const char *path)
416417
}
417418
#endif
418419

420+
#endif
421+
422+
419423
return ret;
420424
}
421425
#endif

‎griffin/griffin.c

+3
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,13 @@ VIDEO IMAGE
173173
#include "../gfx/video_texture.c"
174174

175175
#include "../libretro-common/formats/tga/tga_decode.c"
176+
177+
#ifdef HAVE_RPNG
176178
#include "../libretro-common/formats/png/rpng_fbio.c"
177179
#include "../libretro-common/formats/png/rpng_nbio.c"
178180
#include "../libretro-common/formats/png/rpng_decode.c"
179181
#include "../libretro-common/formats/png/rpng_encode.c"
182+
#endif
180183

181184
/*============================================================
182185
VIDEO DRIVER

‎runloop_data.c

+18-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ typedef struct nbio_image_handle
5959
bool is_blocking_on_processing;
6060
bool is_finished;
6161
transfer_cb_t cb;
62+
#ifdef HAVE_RPNG
6263
struct rpng_t *handle;
64+
#endif
6365
unsigned processing_pos_increment;
6466
unsigned pos_increment;
6567
uint64_t frame_count;
@@ -301,6 +303,8 @@ static int rarch_main_data_http_iterate_poll(http_handle_t *http)
301303
#endif
302304

303305
#ifdef HAVE_MENU
306+
307+
#ifdef HAVE_RPNG
304308
static int cb_image_menu_wallpaper_upload(void *data, size_t len)
305309
{
306310
nbio_handle_t *nbio = (nbio_handle_t*)data;
@@ -395,7 +399,6 @@ static int cb_nbio_image_menu_wallpaper(void *data, size_t len)
395399

396400
return 0;
397401
}
398-
#endif
399402

400403
static int rarch_main_data_image_iterate_poll(nbio_handle_t *nbio)
401404
{
@@ -511,6 +514,9 @@ static int rarch_main_data_image_iterate_transfer_parse(nbio_handle_t *nbio)
511514

512515
return 0;
513516
}
517+
#endif
518+
519+
#endif
514520

515521
static int cb_nbio_default(void *data, size_t len)
516522
{
@@ -569,7 +575,7 @@ static int rarch_main_data_nbio_iterate_poll(nbio_handle_t *nbio)
569575

570576
if (elem1[0] != '\0')
571577
{
572-
#ifdef HAVE_MENU
578+
#if defined(HAVE_MENU) && defined(HAVE_RPNG)
573579
if (!strcmp(elem1, "cb_menu_wallpaper"))
574580
nbio->cb = &cb_nbio_image_menu_wallpaper;
575581
#endif
@@ -648,6 +654,7 @@ static int rarch_main_data_nbio_iterate_parse(nbio_handle_t *nbio)
648654

649655
#ifdef HAVE_LIBRETRODB
650656
#ifdef HAVE_MENU
657+
651658
static void rarch_main_data_db_iterate(bool is_thread,
652659
data_runloop_t *runloop)
653660
{
@@ -670,10 +677,12 @@ static void rarch_main_data_db_iterate(bool is_thread,
670677
break;
671678
}
672679
}
680+
673681
#endif
674682
#endif
675683

676684

685+
#ifdef HAVE_RPNG
677686
static void rarch_main_data_nbio_image_iterate(bool is_thread,
678687
data_runloop_t *runloop)
679688
{
@@ -708,6 +717,7 @@ static void rarch_main_data_nbio_image_iterate(bool is_thread,
708717
break;
709718
}
710719
}
720+
#endif
711721

712722
static void rarch_main_data_nbio_iterate(bool is_thread, data_runloop_t *runloop)
713723
{
@@ -893,7 +903,9 @@ void rarch_main_data_free(void)
893903
static void data_runloop_iterate(bool is_thread, data_runloop_t *runloop)
894904
{
895905
rarch_main_data_nbio_iterate (is_thread, runloop);
906+
#ifdef HAVE_RPNG
896907
rarch_main_data_nbio_image_iterate (is_thread, runloop);
908+
#endif
897909
#ifdef HAVE_OVERLAY
898910
rarch_main_data_overlay_iterate (is_thread, runloop);
899911
#endif
@@ -970,6 +982,7 @@ static void rarch_main_data_thread_init(void)
970982
}
971983
#endif
972984

985+
#ifdef HAVE_RPNG
973986
static void rarch_main_data_nbio_image_upload_iterate(bool is_thread,
974987
data_runloop_t *runloop)
975988
{
@@ -994,6 +1007,7 @@ static void rarch_main_data_nbio_image_upload_iterate(bool is_thread,
9941007
break;
9951008
}
9961009
}
1010+
#endif
9971011

9981012
void rarch_main_data_iterate(void)
9991013
{
@@ -1019,7 +1033,9 @@ void rarch_main_data_iterate(void)
10191033
#ifdef HAVE_OVERLAY
10201034
rarch_main_data_overlay_image_upload_iterate(false, runloop);
10211035
#endif
1036+
#ifdef HAVE_RPNG
10221037
rarch_main_data_nbio_image_upload_iterate(false, runloop);
1038+
#endif
10231039

10241040
if (data_runloop_msg[0] != '\0')
10251041
{

‎screenshot.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
#include <xgraphics.h>
4242
#endif
4343

44-
#ifdef HAVE_ZLIB_DEFLATE
45-
44+
#if defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG)
4645
#include <formats/rpng.h>
4746
#define IMG_EXT "png"
4847

@@ -379,7 +378,7 @@ bool screenshot_dump(const char *folder, const void *frame,
379378
}
380379

381380
ret = false;
382-
#elif defined(HAVE_ZLIB_DEFLATE)
381+
#elif defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG)
383382
out_buffer = (uint8_t*)malloc(width * height * 3);
384383
if (!out_buffer)
385384
return false;

0 commit comments

Comments
 (0)