all repos — mgba @ 9b9de7f2dbcf295becdcbbf16dbb9d74190e9936

mGBA Game Boy Advance Emulator

Don't include internal zip library when USE_MINIZIP is defined.

According to CmakeLists.txt file USE_MINIZIP enables linking against system
minizip library but the code in src/util/vfs/vfs-zip.c doesn't reflect
that.
Lars Wendler polynomial-c@gentoo.org
Tue, 12 Jul 2016 15:46:58 +0200
commit

9b9de7f2dbcf295becdcbbf16dbb9d74190e9936

parent

5ca36e9418101caee8d41a22c817c1bcf7432e41

1 files changed, 4 insertions(+), 0 deletions(-)

jump to
M src/util/vfs/vfs-zip.csrc/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 {