Made windows makefile also compile zip decompression support in case of ZLIB presence

This commit is contained in:
Timo Strunk 2014-09-09 15:30:27 +02:00
parent 189af65f71
commit 4796ace114

View File

@ -213,8 +213,9 @@ ifeq ($(HAVE_RSOUND), 1)
endif
ifeq ($(HAVE_ZLIB), 1)
OBJ += gfx/rpng/rpng.o file_extract.o
OBJ += gfx/rpng/rpng.o file_extract.o decompress/zip_support.o
DEFINES += -DHAVE_ZLIB
HAVE_COMPRESSION = 1
ifeq ($(WANT_MINIZ), 1)
OBJ += deps/miniz/miniz.o
DEFINES += -DWANT_MINIZ
@ -292,7 +293,8 @@ ifeq ($(HAVE_7ZIP),1)
CFLAGS += -I./deps/7zip
DEFINES += -D_7ZIP_ST
DEFINES += -DHAVE_7ZIP
DEFINES += -DHAVE_COMPRESSION
HAVE_COMPRESSION = 1
compression = yes
7ZOBJ = deps/7zip/7zIn.o \
deps/7zip/7zAlloc.o \
deps/7zip/Bra86.o \
@ -316,6 +318,10 @@ ifeq ($(HAVE_7ZIP),1)
JOBJ += $(7ZOBJ)
endif
ifdef HAVE_COMPRESSION
DEFINES += -DHAVE_COMPRESSION
endif
ifneq ($(V), 1)
Q := @
endif