From 8c8989407b90891e442997138a6969971440d12c Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 16 Jun 2020 21:08:29 +0100 Subject: [PATCH] Don't build zlib on macos Signed-off-by: falkTX --- bootstrap.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 727e319..2d4fd59 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -48,12 +48,6 @@ build_host_autoconf pkg-config "${PKG_CONFIG_VERSION}" "--enable-indirect-deps - download liblo "${LIBLO_VERSION}" "http://download.sourceforge.net/liblo" build_autoconf liblo "${LIBLO_VERSION}" "--enable-threads --disable-examples --disable-tests --disable-tools" -# --------------------------------------------------------------------------------------------------------------------- -# zlib - -download zlib "${ZLIB_VERSION}" "https://github.com/madler/zlib/archive" -build_conf zlib "${ZLIB_VERSION}" "--static --prefix=${PAWPAW_PREFIX}" - # --------------------------------------------------------------------------------------------------------------------- # libogg @@ -139,3 +133,11 @@ fi build_autoconf fftwf "${FFTW_VERSION}" "${FFTWF_EXTRAFLAGS}" # --------------------------------------------------------------------------------------------------------------------- +# zlib + +if [ "${MACOS}" -eq 0 ]; then + download zlib "${ZLIB_VERSION}" "https://github.com/madler/zlib/archive" + build_conf zlib "${ZLIB_VERSION}" "--static --prefix=${PAWPAW_PREFIX}" +fi + +# ---------------------------------------------------------------------------------------------------------------------