diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-08-06 20:28:12 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-08-06 20:43:15 +0200 |
commit | 82f98dea2be33f6b4b52eda4a2f92e86c9abfe32 (patch) | |
tree | c2684d5396d37006fa05c32d830a030ff0fdb6b2 | |
parent | d51dfbf2c35a32f0f10615703618c8fb7a748655 (diff) | |
download | rockbox-82f98dea2be33f6b4b52eda4a2f92e86c9abfe32.tar.gz 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
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 8 |
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 \ | |||
90 | # Note: order is important for RBLIBS! The libs are appended to the linker | 90 | # Note: order is important for RBLIBS! The libs are appended to the linker |
91 | # flags in this order, put libucl at the end. | 91 | # flags in this order, put libucl at the end. |
92 | RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \ | 92 | RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \ |
93 | mkmpioboot chinachippatcher mkimxboot mks5lboot bspatch bzip2 ucl | 93 | mkmpioboot chinachippatcher mkimxboot mks5lboot bspatch ucl |
94 | # NOTE: Linking bzip2 causes problems on Windows (Qt seems to export those | ||
95 | # symbols as well, similar to what we have with zlib.) Only link that on | ||
96 | # non-Windows for now. | ||
97 | !win32 { | ||
98 | RBLIBS += bzip2 | ||
99 | } | ||
94 | !win32-msvc* { | 100 | !win32-msvc* { |
95 | QMAKE_EXTRA_TARGETS += extralibs | 101 | QMAKE_EXTRA_TARGETS += extralibs |
96 | PRE_TARGETDEPS += extralibs | 102 | PRE_TARGETDEPS += extralibs |