diff --git a/Makefile.common b/Makefile.common index c33b4bbe2a..a132ebad74 100644 --- a/Makefile.common +++ b/Makefile.common @@ -976,7 +976,6 @@ ifeq ($(HAVE_ZLIB), 1) DEFINES += -DWANT_ZLIB else LIBS += -lz - HAVE_ZLIB_DEFLATE = 1 endif endif @@ -1027,14 +1026,9 @@ ifeq ($(HAVE_BUILTINZLIB),1) else ifeq ($(HAVE_ZLIB),1) OBJ += $(ZLIB_OBJS) -HAVE_ZLIB_DEFLATE = 1 endif endif -ifeq ($(HAVE_ZLIB_DEFLATE),1) -DEFINES += -DHAVE_ZLIB_DEFLATE -endif - # Video4Linux 2 ifeq ($(HAVE_V4L2),1) diff --git a/Makefile.win b/Makefile.win index c89be5935c..a4663b5976 100644 --- a/Makefile.win +++ b/Makefile.win @@ -15,7 +15,6 @@ HAVE_THREADS = 1 HAVE_RGUI = 1 HAVE_MATERIALUI = 1 HAVE_7ZIP = 1 -HAVE_ZLIB_DEFLATE = 1 HAVE_PYTHON = 0 DYNAMIC = 1 diff --git a/libretro-common/formats/png/rpng_encode.c b/libretro-common/formats/png/rpng_encode.c index afdfa818a7..5ea123795e 100644 --- a/libretro-common/formats/png/rpng_encode.c +++ b/libretro-common/formats/png/rpng_encode.c @@ -36,8 +36,6 @@ goto end; \ } while(0) -#ifdef HAVE_ZLIB_DEFLATE - static void dword_write_be(uint8_t *buf, uint32_t val) { *buf++ = (uint8_t)(val >> 24); @@ -385,5 +383,3 @@ bool rpng_save_image_bgr24(const char *path, const uint8_t *data, return rpng_save_image(path, (const uint8_t*)data, width, height, pitch, 3); } - -#endif diff --git a/libretro-common/formats/png/test/Makefile b/libretro-common/formats/png/test/Makefile index b11516459a..f7d89ed170 100644 --- a/libretro-common/formats/png/test/Makefile +++ b/libretro-common/formats/png/test/Makefile @@ -27,7 +27,7 @@ SOURCES_C := \ OBJS := $(SOURCES_C:.c=.o) -CFLAGS += -Wall -pedantic -std=gnu99 -O0 -g -DHAVE_ZLIB -DHAVE_ZLIB_DEFLATE -DRPNG_TEST -I$(LIBRETRO_COMM_DIR)/include +CFLAGS += -Wall -pedantic -std=gnu99 -O0 -g -DHAVE_ZLIB -DRPNG_TEST -I$(LIBRETRO_COMM_DIR)/include all: $(TARGET) diff --git a/libretro-common/include/formats/rpng.h b/libretro-common/include/formats/rpng.h index 6ac817a4c2..08b1a693d7 100644 --- a/libretro-common/include/formats/rpng.h +++ b/libretro-common/include/formats/rpng.h @@ -51,12 +51,10 @@ int rpng_process_image(rpng_t *rpng, bool rpng_start(rpng_t *rpng); -#ifdef HAVE_ZLIB_DEFLATE bool rpng_save_image_argb(const char *path, const uint32_t *data, unsigned width, unsigned height, unsigned pitch); bool rpng_save_image_bgr24(const char *path, const uint8_t *data, unsigned width, unsigned height, unsigned pitch); -#endif RETRO_END_DECLS diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk index 267a201caa..0ee3ffc305 100644 --- a/pkg/android/phoenix/jni/Android.mk +++ b/pkg/android/phoenix/jni/Android.mk @@ -53,7 +53,7 @@ else GLES_LIB := -lGLESv2 endif -DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_ZLIB_DEFLATE -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER +DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER DEFINES += -DWANT_IFADDRS ifeq ($(HAVE_VULKAN),1) diff --git a/pkg/android/phoenix/jni/Android2.mk b/pkg/android/phoenix/jni/Android2.mk index f513c95f51..5d23218cb9 100644 --- a/pkg/android/phoenix/jni/Android2.mk +++ b/pkg/android/phoenix/jni/Android2.mk @@ -53,7 +53,7 @@ else GLES_LIB := -lGLESv2 endif -DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_LANGEXTRA -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_ZLIB_DEFLATE -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER +DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_LANGEXTRA -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 -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER DEFINES += -DWANT_IFADDRS ifeq ($(HAVE_VULKAN),1) diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c index d17e9518f2..0dbfe70caf 100644 --- a/tasks/task_screenshot.c +++ b/tasks/task_screenshot.c @@ -37,7 +37,7 @@ #include #endif -#if defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG) +#ifdef HAVE_RPNG #include #define IMG_EXT "png" #else @@ -71,7 +71,7 @@ static bool screenshot_dump( char shotname[256] = {0}; bool ret = false; settings_t *settings = config_get_ptr(); -#if defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG) +#if defined(HAVE_RPNG) uint8_t *out_buffer = NULL; struct scaler_ctx scaler = {0}; #endif @@ -95,7 +95,7 @@ static bool screenshot_dump( if (XGWriteSurfaceToFile(surf, filename) == S_OK) ret = true; surf->Release(); -#elif defined(HAVE_ZLIB_DEFLATE) && defined(HAVE_RPNG) +#elif defined(HAVE_RPNG) out_buffer = (uint8_t*)malloc(width * height * 3); if (!out_buffer) return false;