diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2014-03-20 22:20:11 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2014-03-20 22:26:24 +0100 |
commit | c18908d6bd493ea11c37df20dba3bc07d04539c2 (patch) | |
tree | 8943298e84d761a262dcd3dcdc4179573f9e3193 /rbutil/rbutilqt/rbutilqt.pro | |
parent | 06a2e7c3bb652bf0eb6a0c9c57801c5b8a449be1 (diff) | |
download | rockbox-c18908d6bd493ea11c37df20dba3bc07d04539c2.tar.gz rockbox-c18908d6bd493ea11c37df20dba3bc07d04539c2.zip |
OS X: update project file for Qt5 support.
- Qt5 doesn't support PPC anymore, so always build for x86 only.
- Qt5 requires the use of the multimedia module (as Windows).
Change-Id: I7d54faffe9d2fb557f55234ba7b81a508d92a38b
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.pro')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index a0ff344fbb..10ac30d085 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
@@ -140,6 +140,9 @@ contains(QT_MAJOR_VERSION, 5) { | |||
140 | win32 { | 140 | win32 { |
141 | QT += multimedia | 141 | QT += multimedia |
142 | } | 142 | } |
143 | macx { | ||
144 | QT += multimedia | ||
145 | } | ||
143 | } | 146 | } |
144 | 147 | ||
145 | dbg { | 148 | dbg { |
@@ -187,6 +190,12 @@ unix:!macx:static { | |||
187 | } | 190 | } |
188 | 191 | ||
189 | # if -config intel is specified use 10.5 SDK and don't build for PPC | 192 | # if -config intel is specified use 10.5 SDK and don't build for PPC |
193 | contains(QT_MAJOR_VERSION, 5) { | ||
194 | macx { | ||
195 | CONFIG += intel | ||
196 | message("Qt5 doesn't support PPC anymore, building x86 only") | ||
197 | } | ||
198 | } | ||
190 | macx:!intel { | 199 | macx:!intel { |
191 | CONFIG += ppc | 200 | CONFIG += ppc |
192 | QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc | 201 | QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc |
@@ -195,7 +204,12 @@ macx:!intel { | |||
195 | } | 204 | } |
196 | macx:intel { | 205 | macx:intel { |
197 | QMAKE_LFLAGS_X86=-mmacosx-version-min=10.5 -arch i386 | 206 | QMAKE_LFLAGS_X86=-mmacosx-version-min=10.5 -arch i386 |
198 | QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.5.sdk | 207 | contains(QT_MAJOR_VERSION, 5) { |
208 | QMAKE_MAC_SDK=macosx | ||
209 | } | ||
210 | !contains(QT_MAJOR_VERSION, 5) { | ||
211 | QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.5.sdk | ||
212 | } | ||
199 | QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 | 213 | QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 |
200 | } | 214 | } |
201 | macx { | 215 | macx { |