changeset 3389 | f26c7fc263a5 |
parent 3380 | f473785f812c |
child 3406 | 514eef372355 |
--- 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