folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MAKEFILE: Add zlib to macOS deps

Browse source 
Zlib is no longer packaged as part of macOS, now needs to be installed
by HomeBrew.
This commit is contained in:
B. Scott Michel 2024-06-23 15:17:50 -07:00 • committed by Paul Koning
parent a944a4bc6d
commit a011507fe9
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis/deps.sh
View file

@ -3,7 +3,7 @@
install_osx() { install_osx() {
brew update brew update
brew install pkg-config pcre libpng libedit sdl2 freetype2 sdl2_ttf \ 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() { install_arch_linux() {

14
makefile
View file

@ -675,13 +675,13 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin)
OS_CCDEFS += -DHAVE_LIBPNG OS_CCDEFS += -DHAVE_LIBPNG
OS_LDFLAGS += -lpng OS_LDFLAGS += -lpng
$(info using libpng: $(call find_lib,png) $(call find_include,png)) $(info using libpng: $(call find_lib,png) $(call find_include,png))
ifneq (,$(call find_include,zlib)) endif
ifneq (,$(call find_lib,z)) endif
OS_CCDEFS += -DHAVE_ZLIB ifneq (,$(call find_include,zlib))
OS_LDFLAGS += -lz ifneq (,$(call find_lib,z))
$(info using zlib: $(call find_lib,z) $(call find_include,zlib)) OS_CCDEFS += -DHAVE_ZLIB
endif OS_LDFLAGS += -lz
endif $(info using zlib: $(call find_lib,z) $(call find_include,zlib))
endif endif
endif endif
ifneq (,$(call find_include,glob)) ifneq (,$(call find_include,glob))