1
0
mirror of https://github.com/libretro/RetroArch synced 2024-07-05 09:48:42 +00:00

Add HAVE_BUILTINZLIB - can now add baked-in zlib

This commit is contained in:
twinaphex 2016-07-21 09:15:51 +02:00
parent d7214b4a30
commit 1c40598da4
2 changed files with 3 additions and 2 deletions

View File

@ -964,7 +964,7 @@ ifeq ($(HAVE_ZLIB), 1)
OBJ += $(ZLIB_OBJS)
DEFINES += -DHAVE_ZLIB
HAVE_COMPRESSION = 1
ifeq ($(WANT_ZLIB), 1)
ifeq ($(HAVE_BUILTINZLIB), 1)
DEFINES += -DWANT_ZLIB
else
LIBS += -lz
@ -1001,7 +1001,7 @@ ifdef HAVE_COMPRESSION
DEFINES += -DHAVE_COMPRESSION
endif
ifeq ($(WANT_ZLIB),1)
ifeq ($(HAVE_BUILTINZLIB),1)
OBJ += deps/zlib/adler32.o \
deps/zlib/compress.o \
deps/zlib/crc32.o \

View File

@ -45,6 +45,7 @@ HAVE_EGL=auto # EGL context support
HAVE_VG=auto # OpenVG support
HAVE_CG=auto # Cg shader support
HAVE_LIBXML2=auto # libxml2 support
HAVE_BUILTINZLIB=no # Bake in zlib
HAVE_ZLIB=auto # zlib support (ZIP extract, PNG decoding/encoding)
HAVE_FBO=auto # render-to-texture (FBO) support
HAVE_ALSA=auto # ALSA support