diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-10-16 20:44:06 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-10-16 20:44:06 +0000 |
commit | e4af86a834405b91b6c8ed38aa960e754af0eb7d (patch) | |
tree | d8d561a9b2b65d8bbcf2579a8ac6c56148fa4696 /rbutil | |
parent | d7757eb75c7263dd01d10a1b5a6f178b7ebf3ca3 (diff) | |
download | rockbox-e4af86a834405b91b6c8ed38aa960e754af0eb7d.tar.gz rockbox-e4af86a834405b91b6c8ed38aa960e754af0eb7d.zip |
rbutil: build our libraries in the build folder like everything else. Centralize the build rules for them within the project file.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23216 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 45 |
1 files changed, 16 insertions, 29 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 959a10e10d..c1178b8967 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
@@ -9,10 +9,12 @@ unix:!mac:!noccache { | |||
9 | } | 9 | } |
10 | } | 10 | } |
11 | 11 | ||
12 | OBJECTS_DIR = $$OUT_PWD/build/o | 12 | MYBUILDDIR = $$OUT_PWD/build/ |
13 | UI_DIR = $$OUT_PWD/build/ui | 13 | OBJECTS_DIR = $$MYBUILDDIR/o |
14 | MOC_DIR = $$OUT_PWD/build/moc | 14 | UI_DIR = $$MYBUILDDIR/ui |
15 | RCC_DIR = $$OUT_PWD/build/rcc | 15 | MOC_DIR = $$MYBUILDDIR/moc |
16 | RCC_DIR = $$MYBUILDDIR/rcc | ||
17 | |||
16 | 18 | ||
17 | # check version of Qt installation | 19 | # check version of Qt installation |
18 | VER = $$find(QT_VERSION, ^4\.[3-9]+.*) | 20 | VER = $$find(QT_VERSION, ^4\.[3-9]+.*) |
@@ -35,14 +37,19 @@ LIBSPEEX = $$system(pkg-config --silence-errors --libs speex) | |||
35 | LIBSPEEX += $$system(pkg-config --silence-errors --libs speexdsp) | 37 | LIBSPEEX += $$system(pkg-config --silence-errors --libs speexdsp) |
36 | LIBS += $$LIBSPEEX | 38 | LIBS += $$LIBSPEEX |
37 | } | 39 | } |
40 | # custom rules for rockbox-specific libs | ||
38 | !mac { | 41 | !mac { |
39 | rbspeex.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/tools/rbspeex librbspeex.a | 42 | rbspeex.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex librbspeex.a |
43 | libucl.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src libucl.a | ||
44 | libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot.a | ||
40 | } | 45 | } |
41 | mac { | 46 | mac { |
42 | rbspeex.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/tools/rbspeex librbspeex-universal | 47 | rbspeex.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex librbspeex-universal |
48 | libucl.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src libucl-universal | ||
49 | libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot-universal | ||
43 | } | 50 | } |
44 | QMAKE_EXTRA_TARGETS += rbspeex | 51 | QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot |
45 | PRE_TARGETDEPS += rbspeex | 52 | PRE_TARGETDEPS += rbspeex libucl libmkamsboot |
46 | 53 | ||
47 | # rule for creating ctags file | 54 | # rule for creating ctags file |
48 | tags.commands = ctags -R --c++-kinds=+p --fields=+iaS --extra=+q $(SOURCES) | 55 | tags.commands = ctags -R --c++-kinds=+p --fields=+iaS --extra=+q $(SOURCES) |
@@ -56,26 +63,6 @@ QMAKE_EXTRA_TARGETS += lrelease | |||
56 | PRE_TARGETDEPS += lrelease | 63 | PRE_TARGETDEPS += lrelease |
57 | } | 64 | } |
58 | 65 | ||
59 | #custom rules for libucl.a | ||
60 | !mac { | ||
61 | libucl.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/tools/ucl/src libucl.a | ||
62 | } | ||
63 | mac { | ||
64 | libucl.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/tools/ucl/src libucl-universal | ||
65 | } | ||
66 | QMAKE_EXTRA_TARGETS += libucl | ||
67 | PRE_TARGETDEPS += libucl | ||
68 | |||
69 | #custom rules for libmkamsboot.a | ||
70 | !mac { | ||
71 | libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot.a | ||
72 | } | ||
73 | mac { | ||
74 | libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot-universal | ||
75 | } | ||
76 | QMAKE_EXTRA_TARGETS += libmkamsboot | ||
77 | PRE_TARGETDEPS += libmkamsboot | ||
78 | |||
79 | SOURCES += rbutilqt.cpp \ | 66 | SOURCES += rbutilqt.cpp \ |
80 | main.cpp \ | 67 | main.cpp \ |
81 | install.cpp \ | 68 | install.cpp \ |
@@ -192,7 +179,7 @@ INCLUDEPATH += $$RBBASE_DIR/rbutil/ipodpatcher $$RBBASE_DIR/rbutil/sansapatcher | |||
192 | 179 | ||
193 | DEPENDPATH = $$INCLUDEPATH | 180 | DEPENDPATH = $$INCLUDEPATH |
194 | 181 | ||
195 | LIBS += -L$$OUT_PWD -lrbspeex -lmkamsboot -lucl | 182 | LIBS += -L$$OUT_PWD -L$$MYBUILDDIR -lrbspeex -lmkamsboot -lucl |
196 | 183 | ||
197 | TEMPLATE = app | 184 | TEMPLATE = app |
198 | dbg { | 185 | dbg { |