blob: cd7e3d0045076e9638ecca6202bceb007946d501 (
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
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
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
diff --git a/utils/rbutilqt/CMakeLists.txt b/utils/rbutilqt/CMakeLists.txt
--- a/utils/rbutilqt/CMakeLists.txt
+++ b/utils/rbutilqt/CMakeLists.txt
@@ -289,8 +289,53 @@
set(QUAZIP_LIBRARY quazip)
endif()
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(MSPACK libmspack)
+if(NOT ${MSPACK_FOUND})
+ add_library(mspack
+ #mspack/cabc.c
+ mspack/cabd.c
+ mspack/cab.h
+ #mspack/chmc.c
+ #mspack/chmd.c
+ #mspack/chm.h
+ mspack/des.h
+ #mspack/hlpc.c
+ #mspack/hlpd.c
+ #mspack/hlp.h
+ #mspack/kwajc.c
+ #mspack/kwajd.c
+ #mspack/kwaj.h
+ #mspack/litc.c
+ #mspack/litd.c
+ #mspack/lit.h
+ #mspack/lzssd.c
+ #mspack/lzss.h
+ mspack/lzxc.c
+ mspack/lzxd.c
+ mspack/lzx.h
+ mspack/mspack.h
+ mspack/mszipc.c
+ mspack/mszipd.c
+ mspack/mszip.h
+ mspack/qtmd.c
+ mspack/qtm.h
+ mspack/readbits.h
+ mspack/readhuff.h
+ mspack/sha.h
+ mspack/system-mspack.c
+ mspack/system-mspack.h
+ #mspack/szddc.c
+ #mspack/szddd.c
+ #mspack/szdd.h
+ )
+
+ target_include_directories(mspack PUBLIC ${CMAKE_CURRENT_LIST_DIR}/mspack)
+ set(MSPACK_LIBRARIES mspack)
+endif()
+
target_link_libraries(rbbase
- cutelogger ${QUAZIP_LIBRARY} mspack bspatch rbspeex
+ cutelogger ${QUAZIP_LIBRARY} ${MSPACK_LIBRARIES} bspatch rbspeex
voicefont sansapatcher ipodpatcher chinachippatcher
mkamsboot mkimxboot mkmpioboot mktccboot mks5lboot
Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network)
@@ -332,47 +377,6 @@ target_link_libraries(cutelogger PUBLIC Qt${QT_VERSION_MAJOR}::Core)
target_compile_definitions(cutelogger PUBLIC CUTELOGGER_STATIC)
set_property(TARGET cutelogger PROPERTY AUTOMOC ON)
-add_library(mspack
- #mspack/cabc.c
- mspack/cabd.c
- mspack/cab.h
- #mspack/chmc.c
- #mspack/chmd.c
- #mspack/chm.h
- mspack/des.h
- #mspack/hlpc.c
- #mspack/hlpd.c
- #mspack/hlp.h
- #mspack/kwajc.c
- #mspack/kwajd.c
- #mspack/kwaj.h
- #mspack/litc.c
- #mspack/litd.c
- #mspack/lit.h
- #mspack/lzssd.c
- #mspack/lzss.h
- mspack/lzxc.c
- mspack/lzxd.c
- mspack/lzx.h
- mspack/mspack.h
- mspack/mszipc.c
- mspack/mszipd.c
- mspack/mszip.h
- mspack/qtmd.c
- mspack/qtm.h
- mspack/readbits.h
- mspack/readhuff.h
- mspack/sha.h
- mspack/system-mspack.c
- mspack/system-mspack.h
- #mspack/szddc.c
- #mspack/szddd.c
- #mspack/szdd.h
- )
-
-target_include_directories(mspack PUBLIC ${CMAKE_CURRENT_LIST_DIR}/mspack)
-
-
# Unit tests
add_executable(test_compareversion
base/utils.cpp
diff --git a/utils/rbutilqt/base/mspackutil.h b/utils/rbutilqt/base/mspackutil.h
--- a/utils/rbutilqt/base/mspackutil.h
+++ b/utils/rbutilqt/base/mspackutil.h
@@ -21,7 +21,7 @@
#include <QtCore>
#include "archiveutil.h"
-#include "mspack/mspack.h"
+#include <mspack.h>
class MsPackUtil : public ArchiveUtil
{
|
