equal
deleted
inserted
replaced
414 endif |
414 endif |
415 endif |
415 endif |
416 |
416 |
417 # zlib config |
417 # zlib config |
418 ifdef WITH_ZLIB |
418 ifdef WITH_ZLIB |
419 CDEFS += -DWITH_ZLIB |
419 CDEFS += -DWITH_ZLIB |
420 LIBS += -lz |
420 ifdef STATIC |
|
421 ifdef OSX |
|
422 # OSX links dynamically to zlib, even in static builds since it's always present in the system |
|
423 LIBS += -lz |
|
424 else |
|
425 LIBS += $(STATIC_ZLIB_PATH) |
|
426 endif |
|
427 else |
|
428 LIBS += -lz |
|
429 endif |
421 endif |
430 endif |
422 |
431 |
423 # libpng config |
432 # libpng config |
424 ifdef WITH_PNG |
433 ifdef WITH_PNG |
425 CDEFS += -DWITH_PNG |
434 CDEFS += -DWITH_PNG |