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

[ios] Switched to C++11

Browse source
This commit is contained in:
Alex Zolotarev 2014-08-06 20:13:45 +03:00 • committed by Alex Zolotarev
parent 49a2a10cc6
commit b70d11daff
5 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common.pri
View file

@ -15,7 +15,7 @@ INCLUDEPATH *= $$ROOT_DIR/3party/boost
# hack for Qt5 qmake to make it faster
CONFIG -= depend_includepath
#CONFIG *= c++11
CONFIG *= c++11
CONFIG(c++11) {
QMAKE_CFLAGS *= -Wno-deprecated-register

2
iphone/Maps/Classes/BottomMenu.mm
View file

@ -178,7 +178,7 @@
NSString * libraryPath = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) firstObject];
NSString * path = [libraryPath stringByAppendingPathComponent:@"bottom_menu_images/"];
if (![[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:nil])
[[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:NO attributes:NO error:nil];
[[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:NO attributes:nil error:nil];
return path;
}

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

@ -4683,7 +4683,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_IDENTIFIER = com.mapswithme.travelguide.simulator;
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
@ -4725,7 +4726,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_IDENTIFIER = com.mapswithme.travelguide;
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
COMPRESS_PNG_FILES = NO;
@ -4796,7 +4798,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_IDENTIFIER = com.mapswithme.travelguide.debug;
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
@ -4863,7 +4866,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_IDENTIFIER = com.mapswithme.travelguide.beta;
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
COMPRESS_PNG_FILES = NO;
@ -4934,7 +4938,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_IDENTIFIER = com.mapswithme.full.simulator;
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
@ -5000,7 +5005,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_IDENTIFIER = com.mapswithme.full.debug;
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
@ -5067,7 +5073,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_IDENTIFIER = com.mapswithme.full.beta;
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
COMPRESS_PNG_FILES = NO;
@ -5138,7 +5145,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_IDENTIFIER = com.mapswithme.full;
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
COMPRESS_PNG_FILES = NO;
@ -5209,7 +5217,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_IDENTIFIER = com.mapswithme.travelguide.release;
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
@ -5279,7 +5288,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_IDENTIFIER = com.mapswithme.full.release;
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
@ -5349,7 +5359,8 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_IDENTIFIER = com.mapswithme.full.simulator.release;
CLANG_CXX_LIBRARY = "libstdc++";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_OBJC_ARC = YES;
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;

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

@ -61,7 +61,7 @@ QMAKE_PREFIX_STATICLIB = lib
QMAKE_EXTENSION_STATICLIB = a
QMAKE_COMPILER_DEFINES += __GNUC__
DEFINES +=
DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=50000
#QMAKE_CFLAGS += -isysroot $$IPHONE_SDK_PATH
#QMAKE_CFLAGS += -I$$IPHONE_SDK_PATH/usr/include
QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH
@ -69,7 +69,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 -mno-thumb
QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.3
QMAKE_CFLAGS += -pipe -miphoneos-version-min=5.0 -Wno-deprecated-register
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -W
QMAKE_CFLAGS_WARN_OFF += -w
@ -86,9 +86,9 @@ QMAKE_CFLAGS_X86 += -arch i386
QMAKE_OBJECTIVE_CFLAGS_X86 += -arch i386
QMAKE_CFLAGS_DWARF2 += -gdwarf-2
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS -fobjc-abi-version=2 -fobjc-legacy-dispatch $$QMAKE_CFLAGS_HIDESYMS
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS -fobjc-abi-version=2 -fobjc-legacy-dispatch $$QMAKE_CFLAGS_HIDESYMS -std=c++11 -stdlib=libc++
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS -stdlib=libstdc++
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS -std=c++11 -stdlib=libc++
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
@ -110,7 +110,7 @@ QMAKE_LINK = $$QMAKE_CXX
QMAKE_LINK_SHLIB = $$QMAKE_CXX
QMAKE_LINK_C = $$QMAKE_CC
QMAKE_LINK_C_SHLIB = $$QMAKE_CC
QMAKE_LFLAGS += -stdlib=libstdc++ -miphoneos-version-min=4.3 -headerpad_max_install_names -Xlinker "-syslibroot $$IPHONE_SDK_PATH"
QMAKE_LFLAGS += -stdlib=libc++ -miphoneos-version-min=5.0 -headerpad_max_install_names -Xlinker "-syslibroot $$IPHONE_SDK_PATH"
QMAKE_LFLAGS_RELEASE += -O3
QMAKE_LFLAGS_DEBUG +=
QMAKE_LFLAGS_APP +=

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

@ -59,9 +59,9 @@ QMAKE_PREFIX_STATICLIB = lib
QMAKE_EXTENSION_STATICLIB = a
QMAKE_COMPILER_DEFINES +=
DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=40300
DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=50000
QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH -fmessage-length=0 -fpascal-strings -fasm-blocks
QMAKE_CFLAGS += -pipe -arch i386
QMAKE_CFLAGS += -pipe -arch i386 -mios-simulator-version-min=5.0 -Wno-deprecated-register
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -W
QMAKE_CFLAGS_WARN_OFF += -w
@ -78,9 +78,9 @@ QMAKE_CFLAGS_X86 += -arch i386
QMAKE_OBJECTIVE_CFLAGS_X86 += -arch i386
QMAKE_CFLAGS_DWARF2 += -gdwarf-2
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS -fobjc-abi-version=2 -fobjc-legacy-dispatch
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS -fobjc-abi-version=2 -fobjc-legacy-dispatch -std=c++11 -stdlib=libc++
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS -std=c++11 -stdlib=libc++
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
@ -102,7 +102,7 @@ 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
QMAKE_LFLAGS += -headerpad_max_install_names -stdlib=libc++ -mios-simulator-version-min=5.0
QMAKE_LFLAGS_RELEASE +=
QMAKE_LFLAGS_DEBUG +=
QMAKE_LFLAGS_APP +=