diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-02-21 19:55:42 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-02-21 19:55:42 +0000 |
commit | 5f540c784cea6ce28e9dece8a4db8582386a617b (patch) | |
tree | aae1890725ff862b56a2e82630bc2c293338e491 /rbutil | |
parent | e744dd43538d457b5c45c9f649c9145aa2da6c75 (diff) | |
download | rockbox-5f540c784cea6ce28e9dece8a4db8582386a617b.tar.gz rockbox-5f540c784cea6ce28e9dece8a4db8582386a617b.zip |
When building a static linux binary link libusb static.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16363 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 5676db810f..b95eee40b9 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
@@ -17,7 +17,7 @@ rbspeex.commands = @$(MAKE) -C ../../tools/rbspeex librbspeex.a | |||
17 | QMAKE_EXTRA_TARGETS += rbspeex | 17 | QMAKE_EXTRA_TARGETS += rbspeex |
18 | PRE_TARGETDEPS += rbspeex | 18 | PRE_TARGETDEPS += rbspeex |
19 | 19 | ||
20 | # add a custom rule for makeing the translations | 20 | # add a custom rule for making the translations |
21 | lrelease.commands = $$[QT_INSTALL_BINS]/lrelease -silent rbutilqt.pro | 21 | lrelease.commands = $$[QT_INSTALL_BINS]/lrelease -silent rbutilqt.pro |
22 | QMAKE_EXTRA_TARGETS += lrelease | 22 | QMAKE_EXTRA_TARGETS += lrelease |
23 | PRE_TARGETDEPS += lrelease | 23 | PRE_TARGETDEPS += lrelease |
@@ -161,8 +161,16 @@ win32 { | |||
161 | unix { | 161 | unix { |
162 | SOURCES += ../ipodpatcher/ipodio-posix.c | 162 | SOURCES += ../ipodpatcher/ipodio-posix.c |
163 | SOURCES += ../sansapatcher/sansaio-posix.c | 163 | SOURCES += ../sansapatcher/sansaio-posix.c |
164 | } | ||
165 | unix:!static { | ||
164 | LIBS += -lusb | 166 | LIBS += -lusb |
165 | } | 167 | } |
168 | unix:static { | ||
169 | # force statically linking of libusb. Use gcc to get its path. | ||
170 | # if you have libusb.a in a non-standard lib path add it to | ||
171 | # the INCLUDEPATH variable above. | ||
172 | LIBS += $$system($$QMAKE_CC $$INCLUDEPATH -print-file-name=libusb.a) | ||
173 | } | ||
166 | 174 | ||
167 | macx { | 175 | macx { |
168 | QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk | 176 | QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk |