diff options
author | Tor Lillqvist <tml@collabora.com> | 2013-10-16 01:35:36 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2013-10-16 01:36:10 +0300 |
commit | de547ccddec1e59879b66f34e5a977dca08cec75 (patch) | |
tree | 1ff1dbb29f932d31c9aac0dfb73a0ed26fe9f4f8 /ios | |
parent | 892ebc079a356a65d8ec5655613ae1653752d136 (diff) |
Use libc++ here, too, as we now do for the LO code
Also quotes added by Xcode around library names that contain
nonalphanumerics.
Change-Id: Ie5b34b2da0ec5600e9ca1aba1e17efd7e3e087de
Diffstat (limited to 'ios')
-rw-r--r-- | ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 16 | ||||
-rw-r--r-- | ios/shared/ios_sharedlo.xcodeproj/project.pbxproj | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj index 018f9abfd518..64aa6dbd3ff7 100644 --- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj +++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj @@ -441,7 +441,7 @@ 68B9A126180BDB7E00FFEA35 /* libexplo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexplo.a; path = lib_link/libexplo.a; sourceTree = "<group>"; }; 68B9A127180BDB7E00FFEA35 /* libexpwraplo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexpwraplo.a; path = lib_link/libexpwraplo.a; sourceTree = "<group>"; }; 68B9A128180BDB7E00FFEA35 /* libexslt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexslt.a; path = lib_link/libexslt.a; sourceTree = "<group>"; }; - 68B9A129180BDB7E00FFEA35 /* libexttextcat-2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libexttextcat-2.0.a; path = lib_link/libexttextcat-2.0.a; sourceTree = "<group>"; }; + 68B9A129180BDB7E00FFEA35 /* libexttextcat-2.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libexttextcat-2.0.a"; path = "lib_link/libexttextcat-2.0.a"; sourceTree = "<group>"; }; 68B9A12A180BDB7E00FFEA35 /* libfastsaxlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfastsaxlo.a; path = lib_link/libfastsaxlo.a; sourceTree = "<group>"; }; 68B9A12B180BDB7E00FFEA35 /* libfileacc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfileacc.a; path = lib_link/libfileacc.a; sourceTree = "<group>"; }; 68B9A12C180BDB7E00FFEA35 /* libfilelo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfilelo.a; path = lib_link/libfilelo.a; sourceTree = "<group>"; }; @@ -464,7 +464,7 @@ 68B9A13D180BDB7E00FFEA35 /* libgraphicfilterlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgraphicfilterlo.a; path = lib_link/libgraphicfilterlo.a; sourceTree = "<group>"; }; 68B9A13E180BDB7E00FFEA35 /* libguesslanglo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libguesslanglo.a; path = lib_link/libguesslanglo.a; sourceTree = "<group>"; }; 68B9A13F180BDB7E00FFEA35 /* libhatchwindowfactorylo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhatchwindowfactorylo.a; path = lib_link/libhatchwindowfactorylo.a; sourceTree = "<group>"; }; - 68B9A140180BDB7E00FFEA35 /* libhunspell-1.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhunspell-1.3.a; path = lib_link/libhunspell-1.3.a; sourceTree = "<group>"; }; + 68B9A140180BDB7E00FFEA35 /* libhunspell-1.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libhunspell-1.3.a"; path = "lib_link/libhunspell-1.3.a"; sourceTree = "<group>"; }; 68B9A141180BDB7E00FFEA35 /* libhwplo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhwplo.a; path = lib_link/libhwplo.a; sourceTree = "<group>"; }; 68B9A142180BDB7E00FFEA35 /* libhyphen.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhyphen.a; path = lib_link/libhyphen.a; sourceTree = "<group>"; }; 68B9A143180BDB7E00FFEA35 /* libhyphenlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhyphenlo.a; path = lib_link/libhyphenlo.a; sourceTree = "<group>"; }; @@ -510,7 +510,7 @@ 68B9A16B180BDB7E00FFEA35 /* libmtfrendererlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmtfrendererlo.a; path = lib_link/libmtfrendererlo.a; sourceTree = "<group>"; }; 68B9A16C180BDB7E00FFEA35 /* libmwaw-0.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libmwaw-0.1.a"; path = "lib_link/libmwaw-0.1.a"; sourceTree = "<group>"; }; 68B9A16D180BDB7E00FFEA35 /* libmysqllo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmysqllo.a; path = lib_link/libmysqllo.a; sourceTree = "<group>"; }; - 68B9A16E180BDB7E00FFEA35 /* libmythes-1.2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmythes-1.2.a; path = lib_link/libmythes-1.2.a; sourceTree = "<group>"; }; + 68B9A16E180BDB7E00FFEA35 /* libmythes-1.2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libmythes-1.2.a"; path = "lib_link/libmythes-1.2.a"; sourceTree = "<group>"; }; 68B9A16F180BDB7E00FFEA35 /* libnamingservicelo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libnamingservicelo.a; path = lib_link/libnamingservicelo.a; sourceTree = "<group>"; }; 68B9A170180BDB7E00FFEA35 /* libodfflatxmllo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libodfflatxmllo.a; path = lib_link/libodfflatxmllo.a; sourceTree = "<group>"; }; 68B9A171180BDB7E00FFEA35 /* libodfgen-0.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libodfgen-0.0.a"; path = "lib_link/libodfgen-0.0.a"; sourceTree = "<group>"; }; @@ -518,7 +518,7 @@ 68B9A173180BDB7E00FFEA35 /* libooopathutils.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libooopathutils.a; path = lib_link/libooopathutils.a; sourceTree = "<group>"; }; 68B9A174180BDB7E00FFEA35 /* libooxlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libooxlo.a; path = lib_link/libooxlo.a; sourceTree = "<group>"; }; 68B9A175180BDB7E00FFEA35 /* liborcus-parser-0.6.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "liborcus-parser-0.6.a"; path = "lib_link/liborcus-parser-0.6.a"; sourceTree = "<group>"; }; - 68B9A176180BDB7E00FFEA35 /* liborcus-0.6.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liborcus-0.6.a; path = lib_link/liborcus-0.6.a; sourceTree = "<group>"; }; + 68B9A176180BDB7E00FFEA35 /* liborcus-0.6.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "liborcus-0.6.a"; path = "lib_link/liborcus-0.6.a"; sourceTree = "<group>"; }; 68B9A177180BDB7E00FFEA35 /* libpackage2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpackage2.a; path = lib_link/libpackage2.a; sourceTree = "<group>"; }; 68B9A178180BDB7E00FFEA35 /* libpasswordcontainerlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpasswordcontainerlo.a; path = lib_link/libpasswordcontainerlo.a; sourceTree = "<group>"; }; 68B9A179180BDB7E00FFEA35 /* libpcrlo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpcrlo.a; path = lib_link/libpcrlo.a; sourceTree = "<group>"; }; @@ -1512,7 +1512,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = armv7; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libstdc++"; + CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -1557,7 +1557,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = armv7; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libstdc++"; + CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -1594,7 +1594,7 @@ 689EBB0E18069FB8002F1CD7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_CXX_LIBRARY = "libstdc++"; + CLANG_CXX_LIBRARY = "libc++"; GCC_DYNAMIC_NO_PIC = NO; GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1616,7 +1616,7 @@ 689EBB0F18069FB8002F1CD7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_CXX_LIBRARY = "libstdc++"; + CLANG_CXX_LIBRARY = "libc++"; GCC_DYNAMIC_NO_PIC = NO; GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj index 2c59fbfe03d0..0ef45242f7bc 100644 --- a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj +++ b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj @@ -459,7 +459,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = armv7; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libstdc++"; + CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -500,7 +500,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = armv7; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libstdc++"; + CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -531,7 +531,7 @@ 68FDBE3918053A140064DD74 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_CXX_LIBRARY = "libstdc++"; + CLANG_CXX_LIBRARY = "libc++"; DSTROOT = /tmp/ios_sharedlo.dst; GCC_DYNAMIC_NO_PIC = NO; GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; @@ -549,7 +549,7 @@ 68FDBE3A18053A140064DD74 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_CXX_LIBRARY = "libstdc++"; + CLANG_CXX_LIBRARY = "libc++"; DSTROOT = /tmp/ios_sharedlo.dst; GCC_DYNAMIC_NO_PIC = NO; GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; |