Makefile
changeset 3389 56f72f7838cc
parent 3380 2d02cfdf6d14
child 3406 ee3af0f1932b
--- a/Makefile	Fri Mar 31 09:09:26 2006 +0000
+++ b/Makefile	Fri Mar 31 10:04:18 2006 +0000
@@ -416,8 +416,17 @@
 
 # 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