ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #296 from Polynomial-C/master 

Don't include internal zip library when USE_MINIZIP is defined.
This commit is contained in:
endrift 2016-07-12 14:03:11 -07:00 committed by GitHub
parent 5ca36e9418 9b9de7f2db
commit 6f8b4114fc
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/vfs/vfs-zip.c
View File

@ -34,7 +34,11 @@ enum {
BLOCK_SIZE = 1024 BLOCK_SIZE = 1024
}; };
#else #else
#ifdef USE_MINIZIP
#include <minizip/unzip.h>
#else
#include "third-party/zlib/contrib/minizip/unzip.h" #include "third-party/zlib/contrib/minizip/unzip.h"
#endif
#include "util/memory.h" #include "util/memory.h"
struct VDirEntryZip { struct VDirEntryZip {