mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[iPhone Release] Enabled simultaneous armv6 and armv7 compilation

Browse source
This commit is contained in:
Alex Zolotarev 2011-02-13 01:08:47 +01:00 • committed by Alex Zolotarev
parent 107e292a94
commit 9fd94535bf
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -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";

5
tools/mkspecs/iphonedevice-g++42/qmake.conf
View file

@ -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 =