diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-16 16:12:54 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-16 16:39:49 +0300 |
| commit | 795dcf9da430c55f2702793b80ce031bf11933db (patch) | |
| tree | 98798cbee2339794283699f181eb65ff906cc04f /ios/MobileLibreOffice/MobileLibreOffice.xcodeproj | |
| parent | canvas is null under Xdmx so createBitmap fails (diff) | |
| download | core-795dcf9da430c55f2702793b80ce031bf11933db.tar.gz core-795dcf9da430c55f2702793b80ce031bf11933db.zip | |
Make libc++ optional for iOS and use the right library in the Xcode projects
It seems that using libc++ when building with Xcode 4 (and iOS SDK 6)
you get linking errors. Stick to libstdc++ for now then with that.
Propagate the choice to the iOS Xcode projects through the lo.xcconfig
file.
Change-Id: Ic61dd2336066a77c4219c532106e3e50e85d0689
Diffstat (limited to 'ios/MobileLibreOffice/MobileLibreOffice.xcodeproj')
| -rw-r--r-- | ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj index f1a3b42028bf..220ce0099697 100644 --- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj +++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj @@ -1510,7 +1510,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = armv7; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -1555,7 +1554,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = armv7; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -1592,7 +1590,6 @@ 689EBB0E18069FB8002F1CD7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_CXX_LIBRARY = "libc++"; GCC_DYNAMIC_NO_PIC = NO; GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1614,7 +1611,6 @@ 689EBB0F18069FB8002F1CD7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_CXX_LIBRARY = "libc++"; GCC_DYNAMIC_NO_PIC = NO; GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp; GCC_PRECOMPILE_PREFIX_HEADER = YES; |