summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 11 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f48ad707a..04f0b67b5 100644
--- a/Makefile
+++ b/Makefile
@@ -416,8 +416,17 @@ endif
# zlib config
ifdef WITH_ZLIB
- CDEFS += -DWITH_ZLIB
- LIBS += -lz
+ CDEFS += -DWITH_ZLIB
+ ifdef STATIC
+ ifdef OSX
+ # OSX links dynamically to zlib, even in static builds since it's always present in the system
+ LIBS += -lz
+ else
+ LIBS += $(STATIC_ZLIB_PATH)
+ endif
+ else
+ LIBS += -lz
+ endif
endif
# libpng config