mirror of
https://github.com/libretro/RetroArch
synced 2024-07-08 12:15:49 +00:00
Add HAVE_BUILTINZLIB - can now add baked-in zlib
This commit is contained in:
parent
d7214b4a30
commit
1c40598da4
|
@ -964,7 +964,7 @@ ifeq ($(HAVE_ZLIB), 1)
|
||||||
OBJ += $(ZLIB_OBJS)
|
OBJ += $(ZLIB_OBJS)
|
||||||
DEFINES += -DHAVE_ZLIB
|
DEFINES += -DHAVE_ZLIB
|
||||||
HAVE_COMPRESSION = 1
|
HAVE_COMPRESSION = 1
|
||||||
ifeq ($(WANT_ZLIB), 1)
|
ifeq ($(HAVE_BUILTINZLIB), 1)
|
||||||
DEFINES += -DWANT_ZLIB
|
DEFINES += -DWANT_ZLIB
|
||||||
else
|
else
|
||||||
LIBS += -lz
|
LIBS += -lz
|
||||||
|
@ -1001,7 +1001,7 @@ ifdef HAVE_COMPRESSION
|
||||||
DEFINES += -DHAVE_COMPRESSION
|
DEFINES += -DHAVE_COMPRESSION
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(WANT_ZLIB),1)
|
ifeq ($(HAVE_BUILTINZLIB),1)
|
||||||
OBJ += deps/zlib/adler32.o \
|
OBJ += deps/zlib/adler32.o \
|
||||||
deps/zlib/compress.o \
|
deps/zlib/compress.o \
|
||||||
deps/zlib/crc32.o \
|
deps/zlib/crc32.o \
|
||||||
|
|
|
@ -45,6 +45,7 @@ HAVE_EGL=auto # EGL context support
|
||||||
HAVE_VG=auto # OpenVG support
|
HAVE_VG=auto # OpenVG support
|
||||||
HAVE_CG=auto # Cg shader support
|
HAVE_CG=auto # Cg shader support
|
||||||
HAVE_LIBXML2=auto # libxml2 support
|
HAVE_LIBXML2=auto # libxml2 support
|
||||||
|
HAVE_BUILTINZLIB=no # Bake in zlib
|
||||||
HAVE_ZLIB=auto # zlib support (ZIP extract, PNG decoding/encoding)
|
HAVE_ZLIB=auto # zlib support (ZIP extract, PNG decoding/encoding)
|
||||||
HAVE_FBO=auto # render-to-texture (FBO) support
|
HAVE_FBO=auto # render-to-texture (FBO) support
|
||||||
HAVE_ALSA=auto # ALSA support
|
HAVE_ALSA=auto # ALSA support
|
||||||
|
|
Loading…
Reference in New Issue
Block a user