Merge pull request #296 from Polynomial-C/master Don't include internal zip library when USE_MINIZIP is defined.
endrift jeffrey@endrift.com
Tue, 12 Jul 2016 14:03:11 -0700
1 files changed,
4 insertions(+),
0 deletions(-)
jump to
M
src/util/vfs/vfs-zip.c
→
src/util/vfs/vfs-zip.c
@@ -34,7 +34,11 @@ enum {
BLOCK_SIZE = 1024 }; #else +#ifdef USE_MINIZIP +#include <minizip/unzip.h> +#else #include "third-party/zlib/contrib/minizip/unzip.h" +#endif #include "util/memory.h" struct VDirEntryZip {