diff options
| author | Roi Illouz <roi.illouz@cloudon.com> | 2013-10-31 14:19:56 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-31 13:06:02 +0000 |
| commit | aae312db554af9c8de711d67d6d83de44d7c0eed (patch) | |
| tree | 89cf0b3493226605d9cb5d6e9f163120d9f23684 /ios/shared | |
| parent | 8215dcfe7d59f151d30612542c8a1fb4a5f40b95 (diff) | |
Fixe project for Xcode5 iOS7 new solver changes
Change-Id: I13c33cb0806dd16c2255788f5bcf635413644792
Reviewed-on: https://gerrit.libreoffice.org/6514
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'ios/shared')
| -rw-r--r-- | ios/shared/ios_sharedlo.xcodeproj/project.pbxproj | 10 | ||||
| -rw-r--r-- | ios/shared/ios_sharedlo/cxx/mlo.mm | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj index 8f07817460b4..2906cd2b6d2e 100644 --- a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj +++ b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj @@ -449,7 +449,7 @@ 68FDBE2218053A140064DD74 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0460; + LastUpgradeCheck = 0500; ORGANIZATIONNAME = LibreOffice.org; }; buildConfigurationList = 68FDBE2518053A140064DD74 /* Build configuration list for PBXProject "ios_sharedlo" */; @@ -528,8 +528,8 @@ baseConfigurationReference = 689EBADD1806975D002F1CD7 /* lo.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = armv7; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "compiler-default"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -559,7 +559,7 @@ LD_NO_PIE = NO; LINK_WITH_STANDARD_LIBRARIES = NO; LLVM_LTO = NO; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; STRIP_INSTALLED_PRODUCT = NO; }; @@ -570,8 +570,8 @@ baseConfigurationReference = 689EBADD1806975D002F1CD7 /* lo.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = armv7; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "compiler-default"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -643,8 +643,8 @@ baseConfigurationReference = 689EBADD1806975D002F1CD7 /* lo.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = armv7; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "compiler-default"; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; diff --git a/ios/shared/ios_sharedlo/cxx/mlo.mm b/ios/shared/ios_sharedlo/cxx/mlo.mm index 478e012f8cb4..8f551fb88f09 100644 --- a/ios/shared/ios_sharedlo/cxx/mlo.mm +++ b/ios/shared/ios_sharedlo/cxx/mlo.mm @@ -35,7 +35,7 @@ extern "C" { //ADD_LIB(dbaxml); // dbaccess lib ADD_LIB(evtatt); // basic event handling - ADD_LIB(fileacc); // Simple file access func + //ADD_LIB(fileacc); // Simple file access func //ADD_LIB(frm); // form control in documents ADD_LIB(fsstorage); // part of svl required when editing file ADD_LIB(stocservices); @@ -140,7 +140,8 @@ lo_get_libmap(void) //MAP_LIB_LO(xmlfd), MAP_LIB(xmlsecurity), //MAP_LIB_LO(sc), //MAP_LIB_LO(sd), MAP_LIB_LO(svx), MAP_LIB_LO(fwl), MAP_LIB_LO(oox), - MAP_LIB(fileacc), MAP_LIB_LO(svt), MAP_LIB_LO(xof), + //MAP_LIB(fileacc), + MAP_LIB_LO(svt), MAP_LIB_LO(xof), MAP_LIB_LO(evtatt), MAP_LIB_LO(fsstorage), MAP_LIB_LO(lng), MAP_LIB_LO(swd), MAP_LIB_LO(sw), MAP_LIB_LO(lnth), MAP_LIB_LO(unordf), MAP_LIB_LO(unoxml), MAP_LIB_LO(xo), |