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 | |
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')
-rw-r--r-- | ios/CustomTarget_MobileLibreOffice_app.mk | 27 | ||||
-rw-r--r-- | ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 14 | ||||
-rw-r--r-- | ios/shared/ios_sharedlo.xcodeproj/project.pbxproj | 10 | ||||
-rw-r--r-- | ios/shared/ios_sharedlo/cxx/mlo.mm | 5 |
4 files changed, 28 insertions, 28 deletions
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk index e2119a11a72d..64b66a1648cb 100644 --- a/ios/CustomTarget_MobileLibreOffice_app.mk +++ b/ios/CustomTarget_MobileLibreOffice_app.mk @@ -15,9 +15,9 @@ BUILDID :=$(shell cd $(SRCDIR) && git log -1 --format=%H) #- Macros --------------------------------------------------------------------- define MobileLibreOfficeXcodeBuild - CC=;xcodebuild -project shared/ios_sharedlo.xcodeproj -target ios_sharedlo -arch armv7 -configuration $(if $(ENABLE_DEBUG),Debug,Release) $(1) >/dev/null - CC=;xcodebuild -project MobileLibreOffice/MobileLibreOffice.xcodeproj -target MobileLibreOffice -arch armv7 -configuration $(if $(ENABLE_DEBUG),Debug,Release) $(1) >/dev/null + CC=;xcodebuild -project MobileLibreOffice/MobileLibreOffice.xcodeproj -scheme MobileLibreOffice -arch armv7 -configuration $(if $(ENABLE_DEBUG),Debug,Release) $(1) >/dev/null endef + #- Targets -------------------------------------------------------------------- .PHONY: MobileLibreOffice_setup @@ -47,25 +47,30 @@ MobileLibreOffice_setup: # Libs # # Create the link flags in the xcconfig for Xcode linkage - for path in $(OUTDIR)/lib \ - $(INSTDIR)/program \ + for path in $(INSTDIR)/program \ + $(WORKDIR)/Headers/Library \ $(WORKDIR)/LinkTarget/StaticLibrary \ - $(WORKDIR)/UnpackedTarball/*/.libs/ \ + $(WORKDIR)/UnpackedTarball/*/.libs \ $(WORKDIR)/UnpackedTarball/*/src/.libs \ $(WORKDIR)/UnpackedTarball/*/src/*/.libs \ + $(WORKDIR)/UnpackedTarball/xslt/libxslt/.libs \ + $(WORKDIR)/UnpackedTarball/icu/source/lib \ $(WORKDIR)/UnpackedTarball/openssl; do \ - flags+=" -L$$path"; \ + flags=''; \ for lib in $$path/lib*.a; do \ if [ ! -r $$lib ]; then \ continue; \ fi; \ - base=$${lib##*/lib}; \ + base="$${lib##*/lib}"; \ base=$${base%\.a}; \ flags+=" -l$${base}"; \ done; \ + if [ "$$flags" ]; then \ + all_flags+=" -L$$path $$flags"; \ + fi; \ done; \ file=$(LO_XCCONFIG); \ - sed -i '' -e "s|^\(LINK_LDFLAGS =\).*$$|\1 $$flags|" $$file; + sed -i '' -e "s|^\(LINK_LDFLAGS =\).*$$|\1 $$all_flags|" $$file; # Resources # rm -rf $(DEST_RESOURCE) 2>/dev/null @@ -73,9 +78,8 @@ MobileLibreOffice_setup: mkdir -p $(DEST_RESOURCE)/ure # copy rdb files - cp $(OUTDIR)/bin/offapi.rdb $(DEST_RESOURCE) - cp $(OUTDIR)/bin/udkapi.rdb $(DEST_RESOURCE) - cp $(OUTDIR)/bin/oovbaapi.rdb $(DEST_RESOURCE) + cp $(INSTDIR)/program/types/offapi.rdb $(DEST_RESOURCE) + cp $(INSTDIR)/program/types/oovbaapi.rdb $(DEST_RESOURCE) cp $(INSTDIR)/program/services/services.rdb $(DEST_RESOURCE) cp $(INSTDIR)/ure/share/misc/services.rdb $(DEST_RESOURCE)/ure @@ -131,7 +135,6 @@ $(call gb_CustomTarget_get_clean_target,ios/MobileLibreOffice): #============================================================================== $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),APP,2) $(call MobileLibreOfficeXcodeBuild, clean) - rm -f $(LO_XCCONFIG) 2>/dev/null #------------------------------------------------------------------------------ # vim: set noet sw=4 ts=4: diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj index 2f30ea471e89..0700663b73dc 100644 --- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj +++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ 681D78BE180C12D300D52D5E /* rc in Resources */ = {isa = PBXBuildFile; fileRef = 681D78B3180C12D300D52D5E /* rc */; }; 681D78C0180C12D300D52D5E /* services.rdb in Resources */ = {isa = PBXBuildFile; fileRef = 681D78B5180C12D300D52D5E /* services.rdb */; }; 681D78C1180C12D300D52D5E /* share in Resources */ = {isa = PBXBuildFile; fileRef = 681D78B6180C12D300D52D5E /* share */; }; - 681D78C2180C12D300D52D5E /* udkapi.rdb in Resources */ = {isa = PBXBuildFile; fileRef = 681D78B7180C12D300D52D5E /* udkapi.rdb */; }; 681D78C3180C12D300D52D5E /* unorc in Resources */ = {isa = PBXBuildFile; fileRef = 681D78B8180C12D300D52D5E /* unorc */; }; 681D78C6180C136400D52D5E /* ure in Resources */ = {isa = PBXBuildFile; fileRef = 681D78C5180C136400D52D5E /* ure */; }; 688EAB01180D67E9003741B3 /* libios_sharedlo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 688EAAFE180D679F003741B3 /* libios_sharedlo.a */; }; @@ -75,7 +74,6 @@ 681D78B3180C12D300D52D5E /* rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rc; path = resource_link/rc; sourceTree = SOURCE_ROOT; }; 681D78B5180C12D300D52D5E /* services.rdb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = services.rdb; path = resource_link/services.rdb; sourceTree = SOURCE_ROOT; }; 681D78B6180C12D300D52D5E /* share */ = {isa = PBXFileReference; lastKnownFileType = folder; name = share; path = resource_link/share; sourceTree = SOURCE_ROOT; }; - 681D78B7180C12D300D52D5E /* udkapi.rdb */ = {isa = PBXFileReference; lastKnownFileType = file; name = udkapi.rdb; path = resource_link/udkapi.rdb; sourceTree = SOURCE_ROOT; }; 681D78B8180C12D300D52D5E /* unorc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = unorc; path = resource_link/unorc; sourceTree = SOURCE_ROOT; }; 681D78C5180C136400D52D5E /* ure */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ure; path = resource_link/ure; sourceTree = SOURCE_ROOT; }; 688EAAE8180D3130003741B3 /* lo.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = lo.xcconfig; path = ../lo.xcconfig; sourceTree = "<group>"; }; @@ -298,7 +296,6 @@ 681D78B1180C12D300D52D5E /* oovbaapi.rdb */, 681D78B3180C12D300D52D5E /* rc */, 681D78B5180C12D300D52D5E /* services.rdb */, - 681D78B7180C12D300D52D5E /* udkapi.rdb */, 681D78B8180C12D300D52D5E /* unorc */, ); name = linked; @@ -359,7 +356,7 @@ 689EBADF18069FB7002F1CD7 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0460; + LastUpgradeCheck = 0500; ORGANIZATIONNAME = LibreOffice.org; }; buildConfigurationList = 689EBAE218069FB7002F1CD7 /* Build configuration list for PBXProject "MobileLibreOffice" */; @@ -428,7 +425,6 @@ 681D78BE180C12D300D52D5E /* rc in Resources */, 681D78C0180C12D300D52D5E /* services.rdb in Resources */, 681D78C1180C12D300D52D5E /* share in Resources */, - 681D78C2180C12D300D52D5E /* udkapi.rdb in Resources */, 681D78C3180C12D300D52D5E /* unorc in Resources */, 681D78C6180C136400D52D5E /* ure in Resources */, ); @@ -471,8 +467,8 @@ baseConfigurationReference = 688EAAE8180D3130003741B3 /* 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; @@ -502,7 +498,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 6.1; LIBRARY_SEARCH_PATHS = ""; LLVM_LTO = NO; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-ObjC", "$(LINK_LDFLAGS)", @@ -519,8 +515,8 @@ baseConfigurationReference = 688EAAE8180D3130003741B3 /* 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; @@ -597,8 +593,8 @@ baseConfigurationReference = 688EAAE8180D3130003741B3 /* 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.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), |