1
0
mirror of https://github.com/libretro/RetroArch synced 2025-02-25 12:41:18 +00:00

Merge pull request from orbea/zlib

Makefile.common: Fix the system zlib check.
This commit is contained in:
Twinaphex 2019-07-11 15:48:46 +02:00 committed by GitHub
commit 0c0b0ef8d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1592,12 +1592,10 @@ ifeq ($(HAVE_BUILTINZLIB), 1)
$(DEPS_DIR)/libz/zutil.o
INCLUDE_DIRS += -I$(LIBRETRO_COMM_DIR)/include/compat/zlib
DEFINES += -DWANT_ZLIB
else
ifneq ($(HAVE_ZLIB), 0)
else ifeq ($(HAVE_ZLIB),1)
HAVE_ZLIB_COMMON = 1
LIBS += $(ZLIB_LIBS)
endif
endif
ifeq ($(HAVE_ZLIB_COMMON), 1)
OBJ += $(LIBRETRO_COMM_DIR)/file/archive_file_zlib.o \