(svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all

2006-03-31 10:04:18 +00:00
parent 20c29f10df
commit 3b4b577107
3 changed files with 30 additions and 4 deletions
--- a/13
+++ b/13
@@ -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