From dd892712ad259024762c64f815e436395b328cf2 Mon Sep 17 00:00:00 2001 From: Timo Strunk Date: Wed, 17 Sep 2014 18:44:48 +0200 Subject: [PATCH] if want_miniz is 0, zlib is compiled in regardless. Fixes makefile to allow that. --- Makefile.common | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.common b/Makefile.common index d11d06c4ce..e8567377ab 100644 --- a/Makefile.common +++ b/Makefile.common @@ -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