if want_miniz is 0, zlib is compiled in regardless. Fixes makefile to allow that.

This commit is contained in:
Timo Strunk 2014-09-17 18:44:48 +02:00
parent 95f02d12f4
commit dd892712ad

View File

@ -557,12 +557,14 @@ ifeq ($(WANT_MINIZ),1)
deps/rzlib/ioapi.o \
deps/rzlib/unzip.o
else
ifeq ($(HAVE_ZLIB),1)
ZLIB_OBJS = deps/rzlib/unzip.o deps/rzlib/ioapi.o
OBJ += $(ZLIB_OBJS)
RETROLAUNCH_OBJ += $(ZLIB_OBJS)
JOYCONFIG_OBJ += $(ZLIB_OBJS)
HAVE_ZLIB_DEFLATE = 1
endif
endif
ifeq ($(HAVE_ZLIB_DEFLATE),1)
DEFINES += -DHAVE_ZLIB_DEFLATE