summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2010-09-05 09:44:49 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2010-09-05 09:44:49 +0000
commit81bce3b5b3cef318023f2e2034b97307bcbbc7c4 (patch)
treece88cc04c232f023e09971ae086be3c7c51d02e4
parent839f777aaa06d56638d12bf9cb3ac264515b9211 (diff)
downloadrockbox-81bce3b5b3cef318023f2e2034b97307bcbbc7c4.tar.gz
rockbox-81bce3b5b3cef318023f2e2034b97307bcbbc7c4.zip
Add -config intel option to allow building for Intel targets only on Mac.
This doesn't change building of the used libraries, so librbspeex etc. are still built as universal libraries. Building for Intel also targets 10.5 and up instead of 10.4 and up which is targeted by default. Addresses FS#10938. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27997 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro15
1 files changed, 12 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index f868156e3b..16d7144729 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -141,11 +141,20 @@ unix:static {
141 LIBS += -Wl,-Bstatic -lusb -Wl,-Bdynamic 141 LIBS += -Wl,-Bstatic -lusb -Wl,-Bdynamic
142} 142}
143 143
144macx { 144# if -config intel is specified use 10.5 SDK and don't build for PPC
145 QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk 145macx:!intel {
146 CONFIG += ppc
146 QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc 147 QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc
147 QMAKE_LFLAGS_X86=-mmacosx-version-min=10.4 -arch i386 148 QMAKE_LFLAGS_X86=-mmacosx-version-min=10.4 -arch i386
148 CONFIG+=x86 ppc 149 QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
150}
151macx:intel {
152 QMAKE_LFLAGS_X86=-mmacosx-version-min=10.5 -arch i386
153 QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.5.sdk
154 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
155}
156macx {
157 CONFIG += x86
149 LIBS += -L/usr/local/lib -lz \ 158 LIBS += -L/usr/local/lib -lz \
150 -framework IOKit -framework CoreFoundation -framework Carbon \ 159 -framework IOKit -framework CoreFoundation -framework Carbon \
151 -framework SystemConfiguration -framework CoreServices 160 -framework SystemConfiguration -framework CoreServices