1
Description: Use libbz2 from system instead of buildin one
2
Bug: http://code.google.com/p/mupen64plus/issues/detail?id=235
3
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
6
diff --git a/Makefile b/Makefile
7
index 3e468730d4f5a3315ee530f63008b7b80c346fdf..5f7abac0f1a02675ea84373e99c6e0b66c0e3773 100644
10
@@ -110,13 +110,6 @@ OBJ_CORE = \
14
- main/bzip2/bzlib.o \
15
- main/bzip2/crctable.o \
16
- main/bzip2/decompress.o \
17
- main/bzip2/compress.o \
18
- main/bzip2/randtable.o \
19
- main/bzip2/huffman.o \
20
- main/bzip2/blocksort.o \
24
@@ -245,7 +238,7 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
25
# set primary objects and libraries for all outputs
26
ALL = mupen64plus $(PLUGINS)
27
OBJECTS = $(OBJ_CORE) $(OBJ_DYNAREC) $(OBJ_OPENGL)
28
-LIBS = $(SDL_LIBS) $(LIBGL_LIBS)
29
+LIBS = $(SDL_LIBS) $(LIBGL_LIBS) -lbz2
31
# add extra objects and libraries for selected options
33
@@ -342,7 +335,7 @@ endif
35
ifneq ($(OS), WINDOWS)
36
$(RM_F) ./r4300/*.o ./r4300/x86/*.o ./r4300/x86_64/*.o ./memory/*.o ./debugger/*.o ./opengl/*.o
37
- $(RM_F) ./main/*.o ./main/version.h ./main/zip/*.o ./main/bzip2/*.o ./main/lzma/*.o ./main/7zip/*.o ./main/gui_gtk/*.o ./main/gui_gtk/debugger/*.o
38
+ $(RM_F) ./main/*.o ./main/version.h ./main/zip/*.o ./main/lzma/*.o ./main/7zip/*.o ./main/gui_gtk/*.o ./main/gui_gtk/debugger/*.o
39
$(RM_F) mupen64plus mupen64plus.desktop
40
$(RM_F) main/gui_qt4/moc_* main/gui_qt4/ui_*.h main/gui_qt4/*.o main/gui_qt4/*.a main/gui_qt4/Makefile
41
$(RM_F) translations/*.qm
42
diff --git a/main/rom.c b/main/rom.c
43
index 865451793ec78b18854993957ef96ab24b9ad52d..74c9643f861b1c8218baa8a00c9a17ec3106d695 100644
49
#include "zip/unzip.h"
50
-#include "bzip2/bzlib.h"
52
#include "lzma/lzmadec.h"
53
#include "7zip/7zExtract.h"
54
#include "7zip/7zCrc.h"