blob: 7f78d385d8eb28ec28090011be07de6ab7572065 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
Use system minizip instead of bundled one
--- a/include/mednafen/compress/Makefile.am.inc
+++ b/include/mednafen/compress/Makefile.am.inc
@@ -1 +1 @@
-mednafen_SOURCES += compress/minilzo.c compress/ioapi.c compress/unzip.c compress/GZFileStream.cpp compress/ZLInflateFilter.cpp
+mednafen_SOURCES += compress/minilzo.c compress/ioapi.c compress/GZFileStream.cpp compress/ZLInflateFilter.cpp
--- a/include/mednafen/file.cpp
+++ b/include/mednafen/file.cpp
@@ -29,7 +29,7 @@
#include <errno.h>
#include <trio/trio.h>
-#include "compress/unzip.h"
+#include <minizip/unzip.h>
#include "file.h"
#include "general.h"
--- a/include/mednafen/Makefile.am
+++ b/include/mednafen/Makefile.am
@@ -6,7 +6,7 @@
bin_PROGRAMS = mednafen
mednafen_SOURCES = debug.cpp error.cpp mempatcher.cpp settings.cpp endian.cpp Time.cpp mednafen.cpp git.cpp file.cpp general.cpp memory.cpp netplay.cpp state.cpp state_rewind.cpp movie.cpp player.cpp PSFLoader.cpp SSFLoader.cpp SNSFLoader.cpp SPCReader.cpp tests.cpp qtrecord.cpp Stream.cpp MemoryStream.cpp FileStream.cpp IPSPatcher.cpp
-mednafen_LDADD = trio/libtrio.a
+mednafen_LDADD = trio/libtrio.a -lminizip
mednafen_DEPENDENCIES = trio/libtrio.a
if HAVE_SDL
|
GitWeb
