From a011507fe95501f02a4dc65cf2c3fbf69abb287d Mon Sep 17 00:00:00 2001 From: "B. Scott Michel" Date: Sun, 23 Jun 2024 15:17:50 -0700 Subject: [PATCH] MAKEFILE: Add zlib to macOS deps Zlib is no longer packaged as part of macOS, now needs to be installed by HomeBrew. --- .travis/deps.sh | 2 +- makefile | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis/deps.sh b/.travis/deps.sh index 68a24803..a5d51178 100755 --- a/.travis/deps.sh +++ b/.travis/deps.sh @@ -3,7 +3,7 @@ install_osx() { brew update brew install pkg-config pcre libpng libedit sdl2 freetype2 sdl2_ttf \ - vde cmake gnu-getopt coreutils + vde cmake gnu-getopt coreutils zlib } install_arch_linux() { diff --git a/makefile b/makefile index e1ada281..54b90aa8 100644 --- a/makefile +++ b/makefile @@ -675,13 +675,13 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin) OS_CCDEFS += -DHAVE_LIBPNG OS_LDFLAGS += -lpng $(info using libpng: $(call find_lib,png) $(call find_include,png)) - ifneq (,$(call find_include,zlib)) - ifneq (,$(call find_lib,z)) - OS_CCDEFS += -DHAVE_ZLIB - OS_LDFLAGS += -lz - $(info using zlib: $(call find_lib,z) $(call find_include,zlib)) - endif - endif + endif + endif + ifneq (,$(call find_include,zlib)) + ifneq (,$(call find_lib,z)) + OS_CCDEFS += -DHAVE_ZLIB + OS_LDFLAGS += -lz + $(info using zlib: $(call find_lib,z) $(call find_include,zlib)) endif endif ifneq (,$(call find_include,glob))