From 81bce3b5b3cef318023f2e2034b97307bcbbc7c4 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 5 Sep 2010 09:44:49 +0000 Subject: 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 --- rbutil/rbutilqt/rbutilqt.pro | 15 ++++++++++++--- 1 file 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 -- cgit