summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-08-06 20:28:12 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-08-06 20:43:15 +0200
commit82f98dea2be33f6b4b52eda4a2f92e86c9abfe32 (patch)
treec2684d5396d37006fa05c32d830a030ff0fdb6b2 /rbutil
parentd51dfbf2c35a32f0f10615703618c8fb7a748655 (diff)
downloadrockbox-82f98dea2be33f6b4b52eda4a2f92e86c9abfe32.tar.gz
rockbox-82f98dea2be33f6b4b52eda4a2f92e86c9abfe32.tar.bz2
rockbox-82f98dea2be33f6b4b52eda4a2f92e86c9abfe32.zip
rbutil: Explicitly link bzip2 only on non-Windows.
When building for Windows (at least using mxe) bzip2 clashes with existing symbols. This seems to be a similar issue as with zlib. Don't link it explicitly, so the linker uses the existing symbols. Fixes building for Windows. Change-Id: I7a1e980542961f3e7f8febedd6c0b8f04a6f6ec0
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro8
1 files changed, 7 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index b48e52cefa..5897743199 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -90,7 +90,13 @@ 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 bspatch bzip2 ucl
+ mkmpioboot chinachippatcher mkimxboot mks5lboot bspatch ucl
+# NOTE: Linking bzip2 causes problems on Windows (Qt seems to export those
+# symbols as well, similar to what we have with zlib.) Only link that on
+# non-Windows for now.
+!win32 {
+ RBLIBS += bzip2
+}
!win32-msvc* {
QMAKE_EXTRA_TARGETS += extralibs
PRE_TARGETDEPS += extralibs