summaryrefslogtreecommitdiff
path: root/rbutil
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/bspatch/Makefile2
-rw-r--r--rbutil/bzip2/Makefile2
-rw-r--r--rbutil/rbutilqt/Makefile.libs6
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro11
4 files changed, 10 insertions, 11 deletions
diff --git a/rbutil/bspatch/Makefile b/rbutil/bspatch/Makefile
index 5fa2598bce..8f287a5ebb 100644
--- a/rbutil/bspatch/Makefile
+++ b/rbutil/bspatch/Makefile
@@ -12,6 +12,6 @@ LIBSOURCES := bspatch.c
12SOURCES := main.c 12SOURCES := main.c
13 13
14OUTPUT := bspatch 14OUTPUT := bspatch
15EXTRADEPS := libbzip2.a 15EXTRADEPS := libbz2.a
16 16
17include ../libtools.make 17include ../libtools.make
diff --git a/rbutil/bzip2/Makefile b/rbutil/bzip2/Makefile
index 0af1165223..6dc59ed025 100644
--- a/rbutil/bzip2/Makefile
+++ b/rbutil/bzip2/Makefile
@@ -10,6 +10,6 @@
10LIBSOURCES := blocksort.c compress.c decompress.c randtable.c \ 10LIBSOURCES := blocksort.c compress.c decompress.c randtable.c \
11 bzlib.c crctable.c huffman.c 11 bzlib.c crctable.c huffman.c
12 12
13OUTPUT := bzip2 13OUTPUT := bz2
14 14
15include ../libtools.make 15include ../libtools.make
diff --git a/rbutil/rbutilqt/Makefile.libs b/rbutil/rbutilqt/Makefile.libs
index ac4e31a9e4..f95fd52ab9 100644
--- a/rbutil/rbutilqt/Makefile.libs
+++ b/rbutil/rbutilqt/Makefile.libs
@@ -34,7 +34,7 @@ export CXX=$(EXTRALIBS_CXX)
34export AR=$(EXTRALIBS_AR) 34export AR=$(EXTRALIBS_AR)
35export ISYSROOT=$(EXTRALIB_ISYSROOT) 35export ISYSROOT=$(EXTRALIB_ISYSROOT)
36 36
37libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot libbzip2 libbspatch librbtomcrypt 37libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot libbspatch libbz2 librbtomcrypt
38 38
39# To support cross compiles, we explicitly pass the CC flag below for 39# To support cross compiles, we explicitly pass the CC flag below for
40# all tools which override CC or CXX in their makefiles. CXX is only 40# all tools which override CC or CXX in their makefiles. CXX is only
@@ -72,8 +72,8 @@ libmkimxboot:
72libmks5lboot: 72libmks5lboot:
73 $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mks5lboot BUILD_DIR=$(BUILD_DIR)/mks5lboot libmks5lboot.a CC=$(CC) 73 $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mks5lboot BUILD_DIR=$(BUILD_DIR)/mks5lboot libmks5lboot.a CC=$(CC)
74 74
75libbzip2: 75libbz2:
76 $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bzip2 BUILD_DIR=$(BUILD_DIR)/bzip2 libbzip2.a CC=$(CC) 76 $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bzip2 BUILD_DIR=$(BUILD_DIR)/bzip2 libbz2.a CC=$(CC)
77 77
78libbspatch: 78libbspatch:
79 $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bspatch BUILD_DIR=$(BUILD_DIR)/bspatch libbspatch.a CC=$(CC) 79 $(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 b3516f796b..ced22b0628 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -93,12 +93,11 @@ extralibs.commands = $$SILENT \
93RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \ 93RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \
94 mkmpioboot chinachippatcher mkimxboot mks5lboot bspatch ucl \ 94 mkmpioboot chinachippatcher mkimxboot mks5lboot bspatch ucl \
95 rbtomcrypt 95 rbtomcrypt
96# NOTE: Linking bzip2 causes problems on Windows (Qt seems to export those 96# NOTE: Our copy of libbzip2 has to use the name "bz2" to match up with the
97# symbols as well, similar to what we have with zlib.) Only link that on 97# distro name. Otherwise cross compiling would end up linking two copies of
98# non-Windows for now. 98# bzip2 using different names, causing symbol clashes. Using the same name
99!win32 { 99# makes the compiler pick the one he likes.
100 RBLIBS += bzip2 100RBLIBS += bz2
101}
102!win32-msvc* { 101!win32-msvc* {
103 QMAKE_EXTRA_TARGETS += extralibs 102 QMAKE_EXTRA_TARGETS += extralibs
104 PRE_TARGETDEPS += extralibs 103 PRE_TARGETDEPS += extralibs