blob: 9ed3d7a0b2566c87813d247cb977e99da018c7fd (
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
31
32
33
34
35
|
use minizip from system zlib
https://bugs.gentoo.org/383845
--- a/Makefile
+++ b/Makefile
@@ -101,8 +101,6 @@
main/plugin.o \
main/rom.o \
main/savestates.o \
- main/zip/ioapi.o \
- main/zip/unzip.o \
main/7zip/7zAlloc.o \
main/7zip/7zBuffer.o \
main/7zip/7zCrc.o \
@@ -229,7 +227,7 @@
# set primary objects and libraries for all outputs
ALL = mupen64plus $(PLUGINS)
OBJECTS = $(OBJ_CORE) $(OBJ_DYNAREC) $(OBJ_OPENGL)
-LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) -lbz2
+LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) -lbz2 -lminizip
STATIC_LIBS =
CFLAGS+= $(LZMA_FLAGS)
--- a/main/rom.c
+++ b/main/rom.c
@@ -27,7 +27,7 @@
#include <limits.h>
#include <zlib.h>
-#include "zip/unzip.h"
+#include "minizip/unzip.h"
#include <bzlib.h>
#include <lzma.h>
#include "7zip/7zExtract.h"
|
GitWeb
