From 6bd961d6a5ec628f7b7bed6ff18986a22c88da57 Mon Sep 17 00:00:00 2001 From: Dominik Wenger Date: Wed, 9 Jul 2008 21:41:41 +0000 Subject: [PATCH] rbutil: use rbspeex new Makefile commands to build a universal lib on mac. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18003 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/rbutilqt.pro | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 637fa02ffe..c6f25613ba 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -13,9 +13,22 @@ MOC_DIR = build/moc 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 { +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 ARCH=ppc universal +rbspeex2.depends = rbspeex1 +rbspeex3.depends = rbspeex2 +rbspeex4.depends = rbspeex3 +QMAKE_EXTRA_TARGETS += rbspeex1 rbspeex2 rbspeex3 rbspeex4 +PRE_TARGETDEPS += rbspeex1 rbspeex2 rbspeex4 rbspeex4 +} # rule for creating ctags file tags.commands = ctags -R --c++-kinds=+p --fields=+iaS --extra=+q $(SOURCES)