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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
Description: Build with system minizip
Author: Stephen Kitt <skitt@debian.org>
Forwarded: not-needed
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -45,12 +45,4 @@
mmx.h \
menu.h \
menudef.h \
-voodoo.h \
-ioapi.h \
-iowin32.h \
-unzip.h \
-zip.h \
-crypt.h \
-mztools.h
-
-
+voodoo.h
--- a/src/misc/Makefile.am
+++ b/src/misc/Makefile.am
@@ -1,4 +1,5 @@
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src "-DRESDIR=\"$(resdir)\""
+AM_CPPFLAGS += -I/usr/include/minizip
resdir = $(datarootdir)/dosbox-x
--- a/src/misc/savestates.cpp
+++ b/src/misc/savestates.cpp
@@ -31,9 +31,9 @@
#include "zip.h"
#include "unzip.h"
#include "ioapi.h"
-#include "vs/zlib/contrib/minizip/zip.c"
-#include "vs/zlib/contrib/minizip/unzip.c"
-#include "vs/zlib/contrib/minizip/ioapi.c"
+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
+#define FTELLO_FUNC(stream) ftello64(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
#include "zipcppstdbuf.h"
#if !defined(HX_DOS)
#include "../libs/tinyfiledialogs/tinyfiledialogs.h"
--- a/configure.ac
+++ b/configure.ac
@@ -1380,6 +1380,7 @@
AM_CONDITIONAL(MACOS_UNIVERSAL, [ test x$enable_universal = xyes ])
LIBS="$LIBS -lopusfile -lspeexdsp"
+LIBS="$LIBS -lminizip"
AC_CONFIG_FILES([
Makefile
--- a/src/dos/Makefile.am
+++ b/src/dos/Makefile.am
@@ -1,5 +1,6 @@
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
AM_CPPFLAGS += -I/usr/include/opus
+AM_CPPFLAGS += -I/usr/include/minizip
noinst_LIBRARIES = libdos.a
EXTRA_DIST = scsidefs.h wnaspi32.h dos_codepages.h dos_keyboard_layout_data.h
|
