diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-02-02 17:28:42 +0000 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-02-02 17:28:42 +0000 |
| commit | 51f6fb56f143107fce78fb98b0328ded59bc4710 (patch) | |
| tree | 113f056d45759dc96157f9d84cbcbcb1bf266fd7 | |
| parent | dce2ef805c17a124548c95c52237af6cc4726a86 (diff) | |
| download | rockbox-51f6fb56f143107fce78fb98b0328ded59bc4710.zip rockbox-51f6fb56f143107fce78fb98b0328ded59bc4710.tar.gz rockbox-51f6fb56f143107fce78fb98b0328ded59bc4710.tar.bz2 rockbox-51f6fb56f143107fce78fb98b0328ded59bc4710.tar.xz | |
Don't overwrite the build pretarget libspeex with lrelease. Make sure to use the lrelease binary from the current installation to prevent clashes on systems with Qt3 and Qt4 installed in parallel.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16201 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index d64edb1..5676db8 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -14,13 +14,13 @@ RCC_DIR = build/rcc # add a custom rule for pre-building librbspeex rbspeex.commands = @$(MAKE) -C ../../tools/rbspeex librbspeex.a -QMAKE_EXTRA_TARGETS = rbspeex -PRE_TARGETDEPS = rbspeex +QMAKE_EXTRA_TARGETS += rbspeex +PRE_TARGETDEPS += rbspeex # add a custom rule for makeing the translations -lrelease.commands = lrelease rbutilqt.pro +lrelease.commands = $$[QT_INSTALL_BINS]/lrelease -silent rbutilqt.pro QMAKE_EXTRA_TARGETS += lrelease -PRE_TARGETDEPS = lrelease +PRE_TARGETDEPS += lrelease SOURCES += rbutilqt.cpp \ |