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

[iPhone] Revert to not using thumb.

Browse source
This commit is contained in:
Yury Melnichek 2011-03-19 13:11:07 +01:00 • committed by Alex Zolotarev
parent 839151b7cb
commit 73f4321665
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -647,8 +647,7 @@
_DEBUG,
TARGET_OS_IPHONE,
);
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = 4.2;
HEADER_SEARCH_PATHS = (
../../3party/protobuf,
@ -702,8 +701,7 @@
_RELEASE,
TARGET_OS_IPHONE,
);
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
GCC_THUMB_SUPPORT = NO;
GCC_UNROLL_LOOPS = YES;
GCC_VERSION = 4.2;
HEADER_SEARCH_PATHS = (

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

@ -7,14 +7,16 @@
# where gcc an all tools are actually resides
IPHONE_SDK_PATH = /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.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 armv6 -Xarch_armv6 -mno-thumb -arch armv7 -Xarch_armv7 -mthumb
QMAKE_CXX = g++-4.2 -arch armv6 -Xarch_armv6 -mno-thumb -arch armv7 -Xarch_armv7 -mthumb
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 =
@ -63,7 +65,7 @@ QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH
QMAKE_CFLAGS += -isystem $$IPHONE_SDK_PATH/usr/include
QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH
#QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH/System/Library/Frameworks/
QMAKE_CFLAGS += -fmessage-length=0 -marm
QMAKE_CFLAGS += -fmessage-length=0 -mno-thumb -marm
QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0 -dead_strip
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -W