Include zlib and libpng in build