summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2008-07-20 15:47:47 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2008-07-20 15:47:47 +0000
commitfd61460c4504da289635c7ece2ce4973311921cf (patch)
tree605e2b1d878db3a0b0d664fd6b0e4124014c55a0 /rbutil
parent903a048ddcf5b95dc85d1c440daf0f397b6d60b0 (diff)
downloadrockbox-fd61460c4504da289635c7ece2ce4973311921cf.tar.gz
rockbox-fd61460c4504da289635c7ece2ce4973311921cf.tar.bz2
rockbox-fd61460c4504da289635c7ece2ce4973311921cf.zip
Extend rbspeex Makefile to allow easier building a universal binary needed for rbutil.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18103 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro15
1 files changed, 3 insertions, 12 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index e9dd5ab10d..f0c95ac5a0 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -15,21 +15,12 @@ RCC_DIR = build/rcc
# add a custom rule for pre-building librbspeex
!mac {
rbspeex.commands = @$(MAKE) -C ../../tools/rbspeex librbspeex.a
-QMAKE_EXTRA_TARGETS += rbspeex
-PRE_TARGETDEPS += rbspeex
}
mac {
-rbspeex0.commands = @$(MAKE) -C ../../tools/rbspeex clean
-rbspeex1.commands = @$(MAKE) -C ../../tools/rbspeex ARCH=ppc librbspeexppc.a
-rbspeex2.commands = @$(MAKE) -C ../../tools/rbspeex clean
-rbspeex3.commands = @$(MAKE) -C ../../tools/rbspeex ARCH=i386 librbspeexi386.a
-rbspeex4.commands = @$(MAKE) -C ../../tools/rbspeex universal
-rbspeex2.depends = rbspeex1
-rbspeex3.depends = rbspeex2
-rbspeex4.depends = rbspeex3
-QMAKE_EXTRA_TARGETS += rbspeex1 rbspeex2 rbspeex3 rbspeex4
-PRE_TARGETDEPS += rbspeex1 rbspeex2 rbspeex4 rbspeex4
+rbspeex.commands = @$(MAKE) -C ../../tools/rbspeex librbspeex-universal
}
+QMAKE_EXTRA_TARGETS += rbspeex
+PRE_TARGETDEPS += rbspeex
# rule for creating ctags file
tags.commands = ctags -R --c++-kinds=+p --fields=+iaS --extra=+q $(SOURCES)