From 6e594a945164d661d0e1336fcdde784ccd41f5b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 1 Nov 2012 13:18:15 +0100 Subject: iOS: Move device/simulator conditionals out of common mkspecs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead we deal with any differenced by setting variables in the top level makespecs, that are used by the common makespec configs. Change-Id: Iae1fb5fef8c95778511ed400008731989b446f3c Reviewed-by: Morten Johan Sørvig --- mkspecs/common/ios/arch.conf | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'mkspecs/common/ios/arch.conf') diff --git a/mkspecs/common/ios/arch.conf b/mkspecs/common/ios/arch.conf index 3e469fe306..6bd27a6136 100644 --- a/mkspecs/common/ios/arch.conf +++ b/mkspecs/common/ios/arch.conf @@ -3,16 +3,6 @@ # ########################################################################### -# Device? -!*simulator*: \ - # Samsung S5PC100, Apple A4, A5, A5X - QMAKE_IOS_TARGET_ARCH = armv7 -else: \ - # Simulator is i386 only - QMAKE_IOS_TARGET_ARCH = i386 - -# FIXME: Add armv7s support when we need it - QMAKE_IOS_ARCH_FLAGS = -arch $$QMAKE_IOS_TARGET_ARCH QMAKE_CFLAGS += $$QMAKE_IOS_ARCH_FLAGS @@ -20,5 +10,4 @@ QMAKE_CXXFLAGS += $$QMAKE_IOS_ARCH_FLAGS QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_ARCH_FLAGS QMAKE_LFLAGS += $$QMAKE_IOS_ARCH_FLAGS -unset(QMAKE_IOS_TARGET_ARCH) unset(QMAKE_IOS_ARCH_FLAGS) -- cgit v1.2.3