diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-11-01 12:31:36 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-26 13:13:27 +0100 |
| commit | 810eee8c773019168c1fcad8262b847009ec149a (patch) | |
| tree | 59ad2adc993d7f04fa95ce35692bcdb011f20c7e /mkspecs/common/ios/arch.conf | |
| parent | 978eb6bdecdc111a96637be0441ae0230fc0a2e6 (diff) | |
iOS: Bump arch and iOS SDK, now that we require GLES 2.x
We now require SDK version 4.3 or above, and armv7.
Change-Id: I4766e277a3a4a32712bf2ec27fede694e8316c95
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'mkspecs/common/ios/arch.conf')
| -rw-r--r-- | mkspecs/common/ios/arch.conf | 55 |
1 files changed, 12 insertions, 43 deletions
diff --git a/mkspecs/common/ios/arch.conf b/mkspecs/common/ios/arch.conf index bf03fe752e..3ac84081af 100644 --- a/mkspecs/common/ios/arch.conf +++ b/mkspecs/common/ios/arch.conf @@ -1,38 +1,16 @@ # # Helper to set CPU architecture flags for iOS configurations # -# Depends on: -# -# QMAKE_IPHONEOS_DEPLOYMENT_TARGET - set in mkspecs/common/ios/versions.conf -# -# Note: -# -# Must be included after load(qt_config) in mkspec for auto-detection based -# on GL/ES version (GL/ES 2.x implies armv7 on iOS). -# -# Target architecture for iOS devices (armv6, armv7 or leave blank for default) -QMAKE_IOS_TARGET_ARCH = +# Target architecture for iOS devices (armv7 or leave blank for default) +QMAKE_IOS_TARGET_ARCH = ########################################################################### # Device? !*simulator* { - # Let mkspec specify archictecture - *armv6*: QMAKE_IOS_TARGET_ARCH = armv6 - else:*armv7*: QMAKE_IOS_TARGET_ARCH = armv7 - - # ARMv7 architecture device (see below) is required for OpenGL/ES 2.x - isEmpty(QMAKE_IOS_TARGET_ARCH):contains(QT_CONFIG, opengles2): QMAKE_IOS_TARGET_ARCH = armv7 - - # No target architecture specified? - isEmpty(QMAKE_IOS_TARGET_ARCH) { - # iOS versions < 4.3 can be armv6 or armv7, so need armv6 for max. compatibility, - # assume that building for OpenGL/ES 1.x is targeting armv6 - lessThan(QMAKE_IPHONEOS_DEPLOYMENT_TARGET, "4.3")|contains(QT_CONFIG, opengles1) { - QMAKE_IOS_TARGET_ARCH = armv6 - } else: QMAKE_IOS_TARGET_ARCH = armv7 - } + # ARMv7 architecture device is required for OpenGL/ES 2.x + isEmpty(QMAKE_IOS_TARGET_ARCH): QMAKE_IOS_TARGET_ARCH = armv7 # Samsung S5PC100, Apple A4, A5, A5X equals(QMAKE_IOS_TARGET_ARCH, "armv7") { @@ -46,38 +24,29 @@ QMAKE_IOS_TARGET_ARCH = # NEON instructions QMAKE_IOS_ARM_ARCH += __ARM_NEON__ } else { - # Samsung S5L8900 - if(equals(QMAKE_IOS_TARGET_ARCH, "armv6")) { - # iOS CPU architecture (armv6) - QMAKE_IOS_ARM_ARCH = __ARM_ARCH_6__ - - # ARM instructions - QMAKE_IOS_ARM_FLAGS = -marm -mcpu=arm1176jzf-s - !*clang*: QMAKE_IOS_ARM_FLAGS += -march=armv6 - } else { - # Unsupported architecture - error("Invalid iOS target $${QMAKE_IOS_TARGET_ARCH}! Edit mkspecs/common/ios/arch.conf to specify target architecture.") - } + # Unsupported architecture + error("Invalid iOS target $${QMAKE_IOS_TARGET_ARCH}!") } # Simulator is i386 only } else: QMAKE_IOS_TARGET_ARCH = i386 # iOS architecture build flags QMAKE_IOS_ARCH_FLAGS = -arch $$QMAKE_IOS_TARGET_ARCH + QMAKE_CFLAGS += $$QMAKE_IOS_ARCH_FLAGS QMAKE_CXXFLAGS += $$QMAKE_IOS_ARCH_FLAGS QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_ARCH_FLAGS QMAKE_LFLAGS += $$QMAKE_IOS_ARCH_FLAGS -QMAKE_IOS_TARGET_ARCH = -QMAKE_IOS_ARCH_FLAGS = # Architecture specific defines/flags !*simulator* { DEFINES += $$QMAKE_IOS_ARM_ARCH - QMAKE_IOS_ARM_ARCH = - QMAKE_CFLAGS += $$QMAKE_IOS_ARM_FLAGS QMAKE_CXXFLAGS += $$QMAKE_IOS_ARM_FLAGS QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_ARM_FLAGS - QMAKE_IOS_ARM_FLAGS = } + +unset(QMAKE_IOS_TARGET_ARCH) +unset(QMAKE_IOS_ARCH_FLAGS) +unset(QMAKE_IOS_ARM_ARCH) +unset(QMAKE_IOS_ARM_FLAGS) |