diff options
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 90949fcc43..b09bd19bab 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
@@ -39,17 +39,15 @@ LIBSPEEX = $$system(pkg-config --silence-errors --libs speex) | |||
39 | } | 39 | } |
40 | # custom rules for rockbox-specific libs | 40 | # custom rules for rockbox-specific libs |
41 | !mac { | 41 | !mac { |
42 | rbspeex.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex librbspeex.a | 42 | RBLIBPOSTFIX = .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 | ||
45 | libmktccboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot libmktccboot.a | ||
46 | } | 43 | } |
47 | mac { | 44 | mac { |
48 | rbspeex.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex librbspeex-universal | 45 | RBLIBPOSTFIX = -universal |
49 | libucl.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src libucl-universal | ||
50 | libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot-universal | ||
51 | libmktccboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot libmktccboot-universal | ||
52 | } | 46 | } |
47 | rbspeex.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex librbspeex$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" | ||
48 | libucl.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src libucl$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" | ||
49 | libmkamsboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mkamsboot libmkamsboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" | ||
50 | libmktccboot.commands = @$(MAKE) TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/rbutil/mktccboot libmktccboot$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" | ||
53 | QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot libmktccboot | 51 | QMAKE_EXTRA_TARGETS += rbspeex libucl libmkamsboot libmktccboot |
54 | PRE_TARGETDEPS += rbspeex libucl libmkamsboot libmktccboot | 52 | PRE_TARGETDEPS += rbspeex libucl libmkamsboot libmktccboot |
55 | 53 | ||
@@ -271,7 +269,7 @@ macx { | |||
271 | QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc | 269 | QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc |
272 | QMAKE_LFLAGS_X86=-mmacosx-version-min=10.4 -arch i386 | 270 | QMAKE_LFLAGS_X86=-mmacosx-version-min=10.4 -arch i386 |
273 | CONFIG+=x86 ppc | 271 | CONFIG+=x86 ppc |
274 | LIBS += -L/usr/local/lib -framework IOKit | 272 | LIBS += -L/usr/local/lib -framework IOKit -lz |
275 | INCLUDEPATH += /usr/local/include | 273 | INCLUDEPATH += /usr/local/include |
276 | QMAKE_INFO_PLIST = Info.plist | 274 | QMAKE_INFO_PLIST = Info.plist |
277 | RC_FILE = icons/rbutilqt.icns | 275 | RC_FILE = icons/rbutilqt.icns |