summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-04-08 14:39:30 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-04-09 02:24:49 +0200
commit8d2d6f4ca5ea75c9708f303c8b58aafe4b86de23 (patch)
treecf59d68f5ac17879ac836710d10fcc7c19cc519f /rbutil/rbutilqt
parent5cdfe30e797a012dfad4bd32f5036a01cf704876 (diff)
downloadrockbox-8d2d6f4ca5ea75c9708f303c8b58aafe4b86de23.tar.gz
rockbox-8d2d6f4ca5ea75c9708f303c8b58aafe4b86de23.tar.bz2
rockbox-8d2d6f4ca5ea75c9708f303c8b58aafe4b86de23.zip
rbutil: Add bspatch and libbzip2
This is to enable binary patching of Hiby-based firmware files Note that noting in rbutil uses this yet. Change-Id: I03ac824dd7402d508eb4e857ad78f184eb0d0243
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/Makefile.libs8
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro2
2 files changed, 8 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/Makefile.libs b/rbutil/rbutilqt/Makefile.libs
index fc304fef14..24fe85e269 100644
--- a/rbutil/rbutilqt/Makefile.libs
+++ b/rbutil/rbutilqt/Makefile.libs
@@ -32,7 +32,7 @@ export CC=$(EXTRALIBS_CC)
export CXX=$(EXTRALIBS_CXX)
export AR=$(EXTRALIBS_AR)
-libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot
+libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot libbzip2 libbspatch
# To support cross compiles, we explicitly pass the CC flag below for
# all tools which override CC or CXX in their makefiles. CXX is only
@@ -67,3 +67,9 @@ libmkimxboot:
libmks5lboot:
$(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mks5lboot BUILD_DIR=$(BUILD_DIR)/mks5lboot libmks5lboot.a CC=$(CC)
+
+libbzip2:
+ $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bzip2 BUILD_DIR=$(BUILD_DIR)/bzip2 libbzip2.a CC=$(CC)
+
+libbspatch:
+ $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bspatch BUILD_DIR=$(BUILD_DIR)/bspatch libbspatch.a CC=$(CC)
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index d5caa77b89..fb7b9fcc5f 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -89,7 +89,7 @@ extralibs.commands = $$SILENT \
# Note: order is important for RBLIBS! The libs are appended to the linker
# flags in this order, put libucl at the end.
RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \
- mkmpioboot chinachippatcher mkimxboot mks5lboot ucl
+ mkmpioboot chinachippatcher mkimxboot mks5lboot bspatch bzip2 ucl
!win32-msvc* {
QMAKE_EXTRA_TARGETS += extralibs
PRE_TARGETDEPS += extralibs