diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-11-01 12:31:44 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-26 13:13:28 +0100 |
| commit | 935bb943850d79959188c2f60267b182a8529168 (patch) | |
| tree | b39800b81893a19a2ad48457449a8ffdb0cac2bc /mkspecs/common | |
| parent | 89fbad0827ba25e8936f57ac63a127cf7082255f (diff) | |
iOS: Simplify arch detection/configuration in mkspec
NEON detection is handled by configure's arch test, and THUMB2 is the
default for ARMv7.
Change-Id: I8ec3ce0ec6af9ad8d9509890aa1f8c87e18364d5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/ios/arch.conf | 40 |
1 files changed, 6 insertions, 34 deletions
diff --git a/mkspecs/common/ios/arch.conf b/mkspecs/common/ios/arch.conf index 3ac84081af..3e469fe306 100644 --- a/mkspecs/common/ios/arch.conf +++ b/mkspecs/common/ios/arch.conf @@ -1,36 +1,18 @@ # # Helper to set CPU architecture flags for iOS configurations # - -# Target architecture for iOS devices (armv7 or leave blank for default) -QMAKE_IOS_TARGET_ARCH = - ########################################################################### # Device? -!*simulator* { - # ARMv7 architecture device is required for OpenGL/ES 2.x - isEmpty(QMAKE_IOS_TARGET_ARCH): QMAKE_IOS_TARGET_ARCH = armv7 - +!*simulator*: \ # Samsung S5PC100, Apple A4, A5, A5X - equals(QMAKE_IOS_TARGET_ARCH, "armv7") { - # iOS CPU architecture (armv7) - QMAKE_IOS_ARM_ARCH = __ARM_ARCH_7__ + QMAKE_IOS_TARGET_ARCH = armv7 +else: \ + # Simulator is i386 only + QMAKE_IOS_TARGET_ARCH = i386 - # Thumb2 instructions - QMAKE_IOS_ARM_FLAGS = -mthumb - QMAKE_IOS_ARM_ARCH += __MARM_THUMB__ +# FIXME: Add armv7s support when we need it - # NEON instructions - QMAKE_IOS_ARM_ARCH += __ARM_NEON__ - } else { - # 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 @@ -38,15 +20,5 @@ QMAKE_CXXFLAGS += $$QMAKE_IOS_ARCH_FLAGS QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_ARCH_FLAGS QMAKE_LFLAGS += $$QMAKE_IOS_ARCH_FLAGS -# Architecture specific defines/flags -!*simulator* { - DEFINES += $$QMAKE_IOS_ARM_ARCH - QMAKE_CFLAGS += $$QMAKE_IOS_ARM_FLAGS - QMAKE_CXXFLAGS += $$QMAKE_IOS_ARM_FLAGS - QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_ARM_FLAGS -} - unset(QMAKE_IOS_TARGET_ARCH) unset(QMAKE_IOS_ARCH_FLAGS) -unset(QMAKE_IOS_ARM_ARCH) -unset(QMAKE_IOS_ARM_FLAGS) |