From 3b4b5771073555b14a47400bf1d7522fd394e8a2 Mon Sep 17 00:00:00 2001
From: bjarni <bjarni@openttd.org>
Date: Fri, 31 Mar 2006 10:04:18 +0000
Subject: (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it
 turned out that it's used after all

---
 Makefile | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'Makefile')

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
-- 
cgit v1.2.3-54-g00ecf