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

[ios] - Added new Xcode support

Browse source 
- Speed up compilation in Release and Debug (only one arch armv7 is built)
- Switched to clang by default to publish release
- Removed iPhone 3G support (armv6 arch and iOS < 4.3)
This commit is contained in:
Alex Zolotarev 2012-09-19 13:23:21 +03:00 • committed by Alex Zolotarev
parent 1b8258729c
commit 67ade4cb49
7 changed files with 171 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4350,6 +4350,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = i386;
BUNDLE_IDENTIFIER = com.mapswithme.travelguide.simulator;
CLANG_CXX_LIBRARY = "libstdc++";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2;
@ -4364,14 +4365,16 @@
_DEBUG,
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_UNINITIALIZED_AUTOS = NO;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphonesim-debug/out/debug\"";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-debug-i386/out/debug\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CFLAGS = (
"-Wall",
"-mno-thumb",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_NAME = "MWM Dbg Lite";
SDKROOT = iphoneos;
@ -4386,12 +4389,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
armv6,
armv7,
);
BUNDLE_IDENTIFIER = com.mapswithme.travelguide;
CODE_SIGN_IDENTITY = "iPhone Distribution: Yury Melnichek";
CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_IDENTITY = "iPhone Distribution";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 2.2;
@ -4406,26 +4406,28 @@
_RELEASE,
NDEBUG,
TARGET_OS_IPHONE,
"NS_BLOCK_ASSERTIONS=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
GCC_UNROLL_LOOPS = YES;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/production\"";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
"LIBRARY_SEARCH_PATHS[arch=armv7]" = "\"$(SRCROOT)/../../../omim-iphone-production-armv7/out/production\"";
"LIBRARY_SEARCH_PATHS[arch=armv7s]" = "\"$(SRCROOT)/../../../omim-iphone-production-armv7s/out/production\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CFLAGS = (
"-Wall",
"-mno-thumb",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_NAME = MapsWithMe;
PROVISIONING_PROFILE = "6F57AA0F-13F9-49C8-A4C6-AD6438C87533";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "armv6 armv7";
VALID_ARCHS = "armv7s armv7";
VERSIONING_SYSTEM = "apple-generic";
};
name = "Production Lite";
@ -4441,11 +4443,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
armv6,
armv7,
);
BUNDLE_IDENTIFIER = com.mapswithme.travelguide.debug;
CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_IDENTITY = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
@ -4461,23 +4460,24 @@
TARGET_OS_IPHONE,
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_UNINITIALIZED_AUTOS = NO;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-debug/out/debug\"";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
"LIBRARY_SEARCH_PATHS[arch=armv7]" = "\"$(SRCROOT)/../../../omim-iphone-debug-armv7/out/debug\"";
"LIBRARY_SEARCH_PATHS[arch=armv7s]" = "\"$(SRCROOT)/../../../omim-iphone-debug-armv7s/out/debug\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CFLAGS = (
"-Wall",
"-mno-thumb",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_NAME = "MWM Dbg Lite";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "armv6 armv7";
VALID_ARCHS = armv7;
VERSIONING_SYSTEM = "apple-generic";
};
name = "Debug Lite";
@ -4493,11 +4493,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
armv6,
armv7,
);
BUNDLE_IDENTIFIER = com.mapswithme.travelguide.beta;
CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_IDENTITY = "iPhone Distribution";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = YES;
@ -4513,26 +4510,28 @@
RELEASE,
_RELEASE,
TARGET_OS_IPHONE,
"NS_BLOCK_ASSERTIONS=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
GCC_UNROLL_LOOPS = YES;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/production\"";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
"LIBRARY_SEARCH_PATHS[arch=armv7]" = "\"$(SRCROOT)/../../../omim-iphone-production-armv7/out/production\"";
"LIBRARY_SEARCH_PATHS[arch=armv7s]" = "\"$(SRCROOT)/../../../omim-iphone-production-armv7s/out/production\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CFLAGS = (
"-Wall",
"-mno-thumb",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_NAME = "MWM Beta Lite";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "armv6 armv7";
VALID_ARCHS = "armv7s armv7";
VERSIONING_SYSTEM = "apple-generic";
};
name = "AdHoc Lite";
@ -4550,6 +4549,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = i386;
BUNDLE_IDENTIFIER = com.mapswithme.full.simulator;
CLANG_CXX_LIBRARY = "libstdc++";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2;
@ -4564,14 +4564,16 @@
_DEBUG,
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_UNINITIALIZED_AUTOS = NO;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphonesim-debug/out/debug\"";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-debug-i386/out/debug\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CFLAGS = (
"-Wall",
"-mno-thumb",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_NAME = "MWM Dbg";
SDKROOT = iphoneos;
@ -4593,11 +4595,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
armv6,
armv7,
);
BUNDLE_IDENTIFIER = com.mapswithme.full.debug;
CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_IDENTITY = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
@ -4613,23 +4612,24 @@
TARGET_OS_IPHONE,
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_UNINITIALIZED_AUTOS = NO;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-debug/out/debug\"";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
"LIBRARY_SEARCH_PATHS[arch=armv7]" = "\"$(SRCROOT)/../../../omim-iphone-debug-armv7/out/debug\"";
"LIBRARY_SEARCH_PATHS[arch=armv7s]" = "\"$(SRCROOT)/../../../omim-iphone-debug-armv7s/out/debug\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CFLAGS = (
"-Wall",
"-mno-thumb",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_NAME = "MWM Dbg";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "armv6 armv7";
VALID_ARCHS = armv7;
VERSIONING_SYSTEM = "apple-generic";
};
name = "Debug Full";
@ -4645,11 +4645,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
armv6,
armv7,
);
BUNDLE_IDENTIFIER = com.mapswithme.full.beta;
CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_IDENTITY = "iPhone Distribution";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = YES;
@ -4665,26 +4662,28 @@
RELEASE,
_RELEASE,
TARGET_OS_IPHONE,
"NS_BLOCK_ASSERTIONS=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
GCC_UNROLL_LOOPS = YES;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/production\"";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
"LIBRARY_SEARCH_PATHS[arch=armv7]" = "\"$(SRCROOT)/../../../omim-iphone-production-armv7/out/production\"";
"LIBRARY_SEARCH_PATHS[arch=armv7s]" = "\"$(SRCROOT)/../../../omim-iphone-production-armv7s/out/production\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CFLAGS = (
"-Wall",
"-mno-thumb",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_NAME = "MWM Beta";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "armv6 armv7";
VALID_ARCHS = "armv7s armv7";
VERSIONING_SYSTEM = "apple-generic";
};
name = "AdHoc Full";
@ -4700,12 +4699,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
armv6,
armv7,
);
BUNDLE_IDENTIFIER = com.mapswithme.full;
CODE_SIGN_IDENTITY = "iPhone Distribution: Yury Melnichek";
CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_IDENTITY = "iPhone Distribution";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 2.2;
@ -4720,25 +4716,28 @@
_RELEASE,
NDEBUG,
TARGET_OS_IPHONE,
"NS_BLOCK_ASSERTIONS=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
GCC_UNROLL_LOOPS = YES;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/production\"";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
"LIBRARY_SEARCH_PATHS[arch=armv7]" = "\"$(SRCROOT)/../../../omim-iphone-production-armv7/out/production\"";
"LIBRARY_SEARCH_PATHS[arch=armv7s]" = "\"$(SRCROOT)/../../../omim-iphone-production-armv7s/out/production\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CFLAGS = (
"-Wall",
"-mno-thumb",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_NAME = MapsWithMe;
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "armv6 armv7";
VALID_ARCHS = "armv7s armv7";
VERSIONING_SYSTEM = "apple-generic";
};
name = "Production Full";
@ -4754,11 +4753,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
armv6,
armv7,
);
BUNDLE_IDENTIFIER = com.mapswithme.travelguide.release;
CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_IDENTITY = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
@ -4773,26 +4769,28 @@
RELEASE,
_RELEASE,
TARGET_OS_IPHONE,
"NS_BLOCK_ASSERTIONS=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
GCC_UNROLL_LOOPS = YES;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-release/out/release\"";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
"LIBRARY_SEARCH_PATHS[arch=armv7]" = "\"$(SRCROOT)/../../../omim-iphone-release-armv7/out/release\"";
"LIBRARY_SEARCH_PATHS[arch=armv7s]" = "\"$(SRCROOT)/../../../omim-iphone-release-armv7s/out/release\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CFLAGS = (
"-Wall",
"-mno-thumb",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_NAME = "MWM Rel Lite";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "armv6 armv7";
VALID_ARCHS = armv7;
VERSIONING_SYSTEM = "apple-generic";
};
name = "Release Lite";
@ -4808,11 +4806,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
armv6,
armv7,
);
BUNDLE_IDENTIFIER = com.mapswithme.full.release;
CLANG_CXX_LIBRARY = "libstdc++";
CODE_SIGN_IDENTITY = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
@ -4827,26 +4822,28 @@
RELEASE,
_RELEASE,
TARGET_OS_IPHONE,
"NS_BLOCK_ASSERTIONS=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv7]" = YES;
GCC_UNROLL_LOOPS = YES;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-release/out/release\"";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
"LIBRARY_SEARCH_PATHS[arch=armv7]" = "\"$(SRCROOT)/../../../omim-iphone-release-armv7/out/release\"";
"LIBRARY_SEARCH_PATHS[arch=armv7s]" = "\"$(SRCROOT)/../../../omim-iphone-release-armv7s/out/release\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CFLAGS = (
"-Wall",
"-mno-thumb",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_NAME = "MWM Rel";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "armv6 armv7";
VALID_ARCHS = armv7;
VERSIONING_SYSTEM = "apple-generic";
};
name = "Release Full";
@ -4864,6 +4861,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = i386;
BUNDLE_IDENTIFIER = com.mapswithme.full.simulator.release;
CLANG_CXX_LIBRARY = "libstdc++";
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 2.2;
@ -4877,17 +4875,20 @@
NDEBUG,
RELEASE,
_RELEASE,
"NS_BLOCK_ASSERTIONS=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_UNROLL_LOOPS = YES;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphonesim-release/out/release\"";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-release-i386/out/release\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CFLAGS = (
"-Wall",
"-mno-thumb",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_NAME = "MWM Rel";
SDKROOT = iphoneos;

6
tools/autobuild/detect_xcode.sh
View file

@ -1,12 +1,14 @@
# Add your paths into these arrays
KNOWN_IOS_SDK_PATHS=( \
/Applications/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.1.sdk \
/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk/
/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk \
/Applications/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.0.sdk
)
KNOWN_IOS_SDK_SIMULATOR_PATHS=( \
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.1.sdk \
/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk
/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk \
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator6.0.sdk
)

50
tools/autobuild/ios.sh
View file

@ -22,30 +22,42 @@ if [[ $? -ne 0 ]]; then
fi
export SDK_ROOT
QMAKE_PARAMS="CONFIG+=${CONFIGURATION}"
if [[ $CONFIGURATION == "production" ]] ; then
QMAKE_PARAMS="$QMAKE_PARAMS CONFIG+=release"
fi
SHADOW_DIR="$LOCAL_DIRNAME/../../../omim-iphone"
SHADOW_DIR_BASE="$LOCAL_DIRNAME/../../../omim-iphone"
if [[ $CONFIGURATION == *production* ]]; then
QMAKE_PARAMS="CONFIG+=production CONFIG+=release"
SHADOW_DIR="${SHADOW_DIR}-production"
elif [[ $CONFIGURATION == *release* ]]; then
QMAKE_PARAMS="CONFIG+=release"
SHADOW_DIR="${SHADOW_DIR}-release"
elif [[ $CONFIGURATION == *debug* || $CONFIGURATION == "simulator" ]]; then
QMAKE_PARAMS="CONFIG+=debug"
SHADOW_DIR="${SHADOW_DIR}-debug"
else
echo "Unrecognized configuration passed to the script: $CONFIGURATION"
exit 1
fi
if [[ $CONFIGURATION == *simulator* ]]; then
if [[ $CONFIGURATION == "simulator-release" ]]; then
SHADOW_DIR="${SHADOW_DIR_BASE}sim-release"
QMAKE_PARAMS="CONFIG+=release"
else
SHADOW_DIR="${SHADOW_DIR_BASE}sim-debug"
QMAKE_PARAMS="CONFIG+=debug"
fi
MKSPEC="$LOCAL_DIRNAME/../mkspecs/iphonesimulator-llvm"
MKSPEC="$LOCAL_DIRNAME/../mkspecs/iphonesimulator"
else
SHADOW_DIR="${SHADOW_DIR_BASE}-${CONFIGURATION}"
MKSPEC="$LOCAL_DIRNAME/../mkspecs/iphonedevice-llvm"
MKSPEC="$LOCAL_DIRNAME/../mkspecs/iphonedevice"
fi
if [[ $# > 1 && "$2" == "clean" ]] ; then
echo "Cleaning $CONFIGURATION configuration..."
rm -rf "$SHADOW_DIR"
if [[ $GCC_VERSION == *clang* ]]; then
MKSPEC="${MKSPEC}-clang"
else
BuildQt "$SHADOW_DIR" "$MKSPEC" "$QMAKE_PARAMS" || ( echo "ERROR while building $CONFIGURATION config"; exit 1 )
MKSPEC="${MKSPEC}-llvm"
fi
# Build libs for each architecture in separate folders
for ARCH in $VALID_ARCHS; do
if [[ $# > 1 && "$2" == "clean" ]] ; then
echo "Cleaning $CONFIGURATION configuration..."
rm -rf "$SHADOW_DIR-$ARCH"
else
# pass build architecture to qmake as an environment variable, see mkspecs/iphone*/qmake.conf
export BUILD_ARCHITECTURE="$ARCH"
BuildQt "$SHADOW_DIR-$ARCH" "$MKSPEC" "$QMAKE_PARAMS" || ( echo "ERROR while building $CONFIGURATION config"; exit 1 )
fi
done

19
tools/mkspecs/iphonedevice-clang/qmake.conf
View file

@ -6,16 +6,19 @@
# to include /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin
# where gcc an all tools are actually resides
IPHONE_SDK_PATH = $$(SDK_ROOT)
IPHONE_SDK_PATH = $$(SDK_ROOT)
isEmpty( IPHONE_SDK_PATH ) : error(Please set SDK_ROOT environment variable)
BUILD_ARCH = $$(BUILD_ARCHITECTURE)
isEmpty( BUILD_ARCH ) : error(Please check that BUILD_ARCHITECTURE environment variable is set)
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 = clang -arch armv6 -arch armv7
QMAKE_CXX = clang++ -arch armv6 -arch armv7
QMAKE_CC = clang -arch $$BUILD_ARCH
QMAKE_CXX = clang++ -arch $$BUILD_ARCH
QMAKE_RESOURCE =
@ -64,12 +67,12 @@ 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
QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0
QMAKE_CFLAGS += -fmessage-length=0 -mno-thumb
QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.3
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -W
QMAKE_CFLAGS_WARN_OFF += -w
QMAKE_CFLAGS_RELEASE += -O3 -funroll-loops
QMAKE_CFLAGS_RELEASE += -O3 -funroll-loops -DNS_BLOCK_ASSERTIONS=1
QMAKE_CFLAGS_DEBUG += -g
QMAKE_CFLAGS_SHLIB +=
QMAKE_CFLAGS_STATIC_LIB +=
@ -106,8 +109,8 @@ QMAKE_LINK = $$QMAKE_CXX
QMAKE_LINK_SHLIB = $$QMAKE_CXX
QMAKE_LINK_C = $$QMAKE_CC
QMAKE_LINK_C_SHLIB = $$QMAKE_CC
QMAKE_LFLAGS += -miphoneos-version-min=4.0 -headerpad_max_install_names -Xlinker "-syslibroot $$IPHONE_SDK_PATH"
QMAKE_LFLAGS_RELEASE +=
QMAKE_LFLAGS += -stdlib=libstdc++ -miphoneos-version-min=4.3 -headerpad_max_install_names -Xlinker "-syslibroot $$IPHONE_SDK_PATH"
QMAKE_LFLAGS_RELEASE += -O3
QMAKE_LFLAGS_DEBUG +=
QMAKE_LFLAGS_APP +=
QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib

19
tools/mkspecs/iphonedevice-llvm/qmake.conf
View file

@ -9,15 +9,18 @@
IPHONE_SDK_PATH = $$(SDK_ROOT)
isEmpty( IPHONE_SDK_PATH ) : error(Please set SDK_ROOT environment variable)
BUILD_ARCH = $$(BUILD_ARCHITECTURE)
isEmpty( BUILD_ARCH ) : error(Please check that BUILD_ARCHITECTURE environment variable is set)
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 = $$IPHONE_SDK_PATH/../../usr/bin/llvm-gcc -arch armv6 -mno-thumb -arch armv7 -mthumb
QMAKE_CXX = $$IPHONE_SDK_PATH/../../usr/bin/llvm-g++ -arch armv6 -mno-thumb -arch armv7 -mthumb
QMAKE_CC = $$IPHONE_SDK_PATH/../../usr/bin/llvm-gcc -arch $$BUILD_ARCH
QMAKE_CXX = $$IPHONE_SDK_PATH/../../usr/bin/llvm-g++ -arch $$BUILD_ARCH
QMAKE_RESOURCE =
QMAKE_RESOURCE =
QMAKE_EXTENSION_SHLIB = dylib
@ -64,12 +67,12 @@ 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
QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0 -dead_strip
QMAKE_CFLAGS += -fmessage-length=0 -mno-thumb
QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.3
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -W
QMAKE_CFLAGS_WARN_OFF += -w
QMAKE_CFLAGS_RELEASE += -O3 -funroll-loops
QMAKE_CFLAGS_RELEASE += -O3 -flto -funroll-loops -DNS_BLOCK_ASSERTIONS=1
QMAKE_CFLAGS_DEBUG += -g
QMAKE_CFLAGS_SHLIB +=
QMAKE_CFLAGS_STATIC_LIB +=
@ -106,8 +109,8 @@ QMAKE_LINK = $$QMAKE_CXX
QMAKE_LINK_SHLIB = $$QMAKE_CXX
QMAKE_LINK_C = $$QMAKE_CC
QMAKE_LINK_C_SHLIB = $$QMAKE_CC
QMAKE_LFLAGS += -headerpad_max_install_names -stdlib=libc++
QMAKE_LFLAGS_RELEASE +=
QMAKE_LFLAGS += -stdlib=libstdc++ -miphoneos-version-min=4.3 -headerpad_max_install_names
QMAKE_LFLAGS_RELEASE += -O3 -flto
QMAKE_LFLAGS_DEBUG +=
QMAKE_LFLAGS_APP +=
QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib

6
tools/mkspecs/iphonesimulator-clang/qmake.conf
View file

@ -58,9 +58,9 @@ QMAKE_PREFIX_STATICLIB = lib
QMAKE_EXTENSION_STATICLIB = a
QMAKE_COMPILER_DEFINES +=
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
DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=40300
QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH -fmessage-length=0 -fpascal-strings -fasm-blocks
QMAKE_CFLAGS += -pipe
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -W
QMAKE_CFLAGS_WARN_OFF += -w

6
tools/mkspecs/iphonesimulator-llvm/qmake.conf
View file

@ -58,9 +58,9 @@ QMAKE_PREFIX_STATICLIB = lib
QMAKE_EXTENSION_STATICLIB = a
QMAKE_COMPILER_DEFINES +=
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
DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=40300
QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH -fmessage-length=0 -fpascal-strings -fasm-blocks
QMAKE_CFLAGS += -pipe
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -W
QMAKE_CFLAGS_WARN_OFF += -w