summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/Makefile.libs4
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro6
2 files changed, 5 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/Makefile.libs b/rbutil/rbutilqt/Makefile.libs
index 6d5c8c5354..938426f124 100644
--- a/rbutil/rbutilqt/Makefile.libs
+++ b/rbutil/rbutilqt/Makefile.libs
@@ -33,12 +33,14 @@ export CC=$(EXTRALIBS_CC)
33export CXX=$(EXTRALIBS_CXX) 33export CXX=$(EXTRALIBS_CXX)
34export AR=$(EXTRALIBS_AR) 34export AR=$(EXTRALIBS_AR)
35 35
36libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot libbzip2 libbspatch 36libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot libbzip2 libbspatch librbtomcrypt
37 37
38# To support cross compiles, we explicitly pass the CC flag below for 38# To support cross compiles, we explicitly pass the CC flag below for
39# all tools which override CC or CXX in their makefiles. CXX is only 39# all tools which override CC or CXX in their makefiles. CXX is only
40# used by mkimxboot. 40# used by mkimxboot.
41 41
42librbtomcrypt:
43 $(SILENT) $(MAKE) -C $(RBBASE_DIR)/utils/tomcrypt BUILD_DIR=$(BUILD_DIR)/tomcrypt librbtomcrypt.a
42librbspeex: 44librbspeex:
43 $(SILENT) $(MAKE) -C $(RBBASE_DIR)/tools/rbspeex BUILD_DIR=$(BUILD_DIR)/libspeex librbspeex.a 45 $(SILENT) $(MAKE) -C $(RBBASE_DIR)/tools/rbspeex BUILD_DIR=$(BUILD_DIR)/libspeex librbspeex.a
44 46
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index d07c1e01bc..9d7da92dbf 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -85,7 +85,8 @@ extralibs.commands = $$SILENT \
85# Note: order is important for RBLIBS! The libs are appended to the linker 85# Note: order is important for RBLIBS! The libs are appended to the linker
86# flags in this order, put libucl at the end. 86# flags in this order, put libucl at the end.
87RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \ 87RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \
88 mkmpioboot chinachippatcher mkimxboot mks5lboot bspatch ucl 88 mkmpioboot chinachippatcher mkimxboot mks5lboot bspatch ucl \
89 rbtomcrypt
89# NOTE: Linking bzip2 causes problems on Windows (Qt seems to export those 90# NOTE: Linking bzip2 causes problems on Windows (Qt seems to export those
90# symbols as well, similar to what we have with zlib.) Only link that on 91# symbols as well, similar to what we have with zlib.) Only link that on
91# non-Windows for now. 92# non-Windows for now.
@@ -139,9 +140,6 @@ for(rblib, RBLIBS) {
139 LIBS += -l$$rblib 140 LIBS += -l$$rblib
140} 141}
141 142
142# We need libcrypto++
143LIBS += -lcryptopp
144
145# on win32 libz is linked implicitly. 143# on win32 libz is linked implicitly.
146!win32 { 144!win32 {
147 LIBS += -lz 145 LIBS += -lz