diff options
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.pro')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 11 |
1 files changed, 5 insertions, 6 deletions
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 \ | |||
93 | RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \ | 93 | RBLIBS = 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 | 100 | RBLIBS += 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 |