From 58e86996d2eb999c14b3ef1c2fd27c51365fc060 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Thu, 17 Mar 2011 18:31:20 +0000 Subject: [PATCH] [iPhone] Set minimum iOS version to 4.0 --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 16 ++++------------ tools/mkspecs/iphonedevice-g++42/qmake.conf | 2 +- tools/mkspecs/iphonesimulator-g++42/qmake.conf | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 3af30d9110..42ae91e42b 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -550,14 +550,12 @@ ../../3party/boost, ); INFOPLIST_FILE = "MapsWithMe-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; + IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphonesim-build/out/debug\""; - LINK_WITH_STANDARD_LIBRARIES = YES; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; PRODUCT_NAME = MapsWithMe; - RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; STRIP_INSTALLED_PRODUCT = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -595,14 +593,12 @@ ../../3party/boost, ); INFOPLIST_FILE = "MapsWithMe-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; + IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphonesim-build/out/release\""; - LINK_WITH_STANDARD_LIBRARIES = YES; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; PRODUCT_NAME = MapsWithMe; - RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = i386; @@ -650,15 +646,13 @@ ../../3party/boost, ); INFOPLIST_FILE = "MapsWithMe-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; + IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-build/out/debug\""; - LINK_WITH_STANDARD_LIBRARIES = YES; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; PRODUCT_NAME = MapsWithMe; PROVISIONING_PROFILE = ""; - RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; STRIP_INSTALLED_PRODUCT = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -708,15 +702,13 @@ ../../3party/boost, ); INFOPLIST_FILE = "MapsWithMe-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 3.1.3; + IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-build/out/release\""; - LINK_WITH_STANDARD_LIBRARIES = YES; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; PRODUCT_NAME = MapsWithMe; PROVISIONING_PROFILE = ""; - RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; STRIP_INSTALLED_PRODUCT = NO; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/tools/mkspecs/iphonedevice-g++42/qmake.conf b/tools/mkspecs/iphonedevice-g++42/qmake.conf index bea8f8b6a4..ea6d4044c1 100644 --- a/tools/mkspecs/iphonedevice-g++42/qmake.conf +++ b/tools/mkspecs/iphonedevice-g++42/qmake.conf @@ -64,7 +64,7 @@ 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 += -pipe -miphoneos-version-min=3.1 -dead_strip +QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0 -dead_strip QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w diff --git a/tools/mkspecs/iphonesimulator-g++42/qmake.conf b/tools/mkspecs/iphonesimulator-g++42/qmake.conf index dbc2f4fd20..d86bf43a79 100644 --- a/tools/mkspecs/iphonesimulator-g++42/qmake.conf +++ b/tools/mkspecs/iphonesimulator-g++42/qmake.conf @@ -56,7 +56,7 @@ QMAKE_PREFIX_STATICLIB = lib QMAKE_EXTENSION_STATICLIB = a QMAKE_COMPILER_DEFINES += -DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=30100 +DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=40000 QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH -fmessage-length=0 -fpascal-strings -fasm-blocks QMAKE_CFLAGS += -pipe -mmacosx-version-min=10.6 QMAKE_CFLAGS_DEPS += -M