summaryrefslogtreecommitdiffstats
path: root/rbutil
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 /rbutil
parent839f777aaa06d56638d12bf9cb3ac264515b9211 (diff)
downloadrockbox-81bce3b5b3cef318023f2e2034b97307bcbbc7c4.tar.gz
rockbox-81bce3b5b3cef318023f2e2034b97307bcbbc7c4.tar.bz2
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
Diffstat (limited to 'rbutil')
-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 {
LIBS += -Wl,-Bstatic -lusb -Wl,-Bdynamic
}
-macx {
- QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+# if -config intel is specified use 10.5 SDK and don't build for PPC
+macx:!intel {
+ CONFIG += ppc
QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc
QMAKE_LFLAGS_X86=-mmacosx-version-min=10.4 -arch i386
- CONFIG+=x86 ppc
+ QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+}
+macx:intel {
+ QMAKE_LFLAGS_X86=-mmacosx-version-min=10.5 -arch i386
+ QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.5.sdk
+ QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
+}
+macx {
+ CONFIG += x86
LIBS += -L/usr/local/lib -lz \
-framework IOKit -framework CoreFoundation -framework Carbon \
-framework SystemConfiguration -framework CoreServices