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

[ios] Use Clang only for simulator builds

Browse source
This commit is contained in:
Alex Zolotarev 2012-09-01 21:20:01 +03:00 • committed by Alex Zolotarev
parent 78aa7272ca
commit 580797ec73
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4415,6 +4415,7 @@
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 = "";
@ -4469,6 +4470,7 @@
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;
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "";
@ -4526,6 +4528,7 @@
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 = "";
@ -4627,6 +4630,7 @@
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;
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "";
@ -4684,6 +4688,7 @@
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 = "";
@ -4741,6 +4746,7 @@
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 = "";
@ -4796,6 +4802,7 @@
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 = "";
@ -4852,6 +4859,7 @@
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 = "";

2
tools/autobuild/ios.sh
View file

@ -34,7 +34,7 @@ if [[ $CONFIGURATION == "simulator" ]]; then
MKSPEC="$LOCAL_DIRNAME/../mkspecs/iphonesimulator-clang"
else
SHADOW_DIR="${SHADOW_DIR_BASE}-${CONFIGURATION}"
MKSPEC="$LOCAL_DIRNAME/../mkspecs/iphonedevice-clang"
MKSPEC="$LOCAL_DIRNAME/../mkspecs/iphonedevice-llvm"
fi
if [[ $# > 1 && "$2" == "clean" ]] ; then

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

@ -69,7 +69,7 @@ QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -W
QMAKE_CFLAGS_WARN_OFF += -w
QMAKE_CFLAGS_RELEASE += -O3
QMAKE_CFLAGS_RELEASE += -O4
QMAKE_CFLAGS_DEBUG += -g
QMAKE_CFLAGS_SHLIB +=
QMAKE_CFLAGS_STATIC_LIB +=