diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-13 18:35:29 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-13 20:42:30 +0100 |
| commit | 979433eddb5a8f2180aba134befb08b222718bc8 (patch) | |
| tree | a307962a9105152514b6ab37f98818b6d4431204 /platform | |
| parent | e9805b60ee77fcb91dcaac89c09290d185d072bd (diff) | |
| download | qtlocation-mapboxgl-979433eddb5a8f2180aba134befb08b222718bc8.tar.gz | |
[build] update Boost to 1.69 and remove RTTI
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/build.gradle | 2 | ||||
| -rw-r--r-- | platform/ios/ios.xcodeproj/project.pbxproj | 3 | ||||
| -rw-r--r-- | platform/macos/macos.xcodeproj/project.pbxproj | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 257da91b6b..89937448e9 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -76,7 +76,7 @@ android { cmake { arguments "-DANDROID_TOOLCHAIN=clang" arguments "-DANDROID_STL=" + stl - arguments "-DANDROID_CPP_FEATURES=rtti;exceptions" + arguments "-DANDROID_CPP_FEATURES=exceptions" arguments "-DMBGL_PLATFORM=android" arguments "-DMASON_PLATFORM=android" arguments "-DNodeJS_EXECUTABLE=" + node diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index bfbdcf53da..51e9ba19b0 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -3804,6 +3804,7 @@ ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_ENABLE_CPP_RTTI = NO; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ""; "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = ""; @@ -4064,6 +4065,7 @@ ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_CPP_RTTI = NO; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -4130,6 +4132,7 @@ ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_ENABLE_CPP_RTTI = NO; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ""; "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = ""; diff --git a/platform/macos/macos.xcodeproj/project.pbxproj b/platform/macos/macos.xcodeproj/project.pbxproj index d70971ae66..739a388e6e 100644 --- a/platform/macos/macos.xcodeproj/project.pbxproj +++ b/platform/macos/macos.xcodeproj/project.pbxproj @@ -1933,6 +1933,7 @@ ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_CPP_RTTI = NO; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1997,6 +1998,7 @@ ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_ENABLE_CPP_RTTI = NO; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; |