From 9fd94535bfa23235946b08f6135473bfb47b07a0 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Sun, 13 Feb 2011 01:08:47 +0100 Subject: [PATCH] [iPhone Release] Enabled simultaneous armv6 and armv7 compilation --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 4 ++-- tools/mkspecs/iphonedevice-g++42/qmake.conf | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 3c278c6a80..d8b3ac7714 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -672,14 +672,14 @@ IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-build/out/release\""; LINK_WITH_STANDARD_LIBRARIES = YES; - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; PREBINDING = NO; PRODUCT_NAME = MapsWithMe; PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; - VALID_ARCHS = armv6; + VALID_ARCHS = "armv6 armv7"; VERSIONING_SYSTEM = "apple-generic"; }; name = "Device Release"; diff --git a/tools/mkspecs/iphonedevice-g++42/qmake.conf b/tools/mkspecs/iphonedevice-g++42/qmake.conf index dbc8f2fee5..70453c8827 100644 --- a/tools/mkspecs/iphonedevice-g++42/qmake.conf +++ b/tools/mkspecs/iphonedevice-g++42/qmake.conf @@ -8,14 +8,15 @@ IPHONE_SDK_PATH = /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk DEVICE_ARCH = armv6 +DEVICE_ARCH2 = armv7 MAKEFILE_GENERATOR = UNIX TEMPLATE = app CONFIG += hide_symbols warn_on dwarf2 app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl QMAKE_INCREMENTAL_STYLE = sublib -QMAKE_CC = gcc-4.2 -std=c99 -arch $$DEVICE_ARCH -QMAKE_CXX = g++-4.2 -arch $$DEVICE_ARCH +QMAKE_CC = gcc-4.2 -std=c99 -arch $$DEVICE_ARCH -arch $$DEVICE_ARCH2 +QMAKE_CXX = g++-4.2 -arch $$DEVICE_ARCH -arch $$DEVICE_ARCH2 QMAKE_RESOURCE =