devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

rbutil: Explicitly link bzip2 only on non-Windows.

Browse source 
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
This commit is contained in:
Dominik Riebeling 2020-08-06 20:28:12 +02:00
parent d51dfbf2c3
commit 82f98dea2b
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rbutil/rbutilqt/rbutilqt.pro
View file

@ -90,7 +90,13 @@ extralibs.commands = $$SILENT \
# Note: order is important for RBLIBS! The libs are appended to the linker # Note: order is important for RBLIBS! The libs are appended to the linker
# flags in this order, put libucl at the end. # flags in this order, put libucl at the end.
RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \ 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* { !win32-msvc* {
QMAKE_EXTRA_TARGETS += extralibs QMAKE_EXTRA_TARGETS += extralibs
PRE_TARGETDEPS += extralibs PRE_TARGETDEPS += extralibs