ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c | 9 ++++---- ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 11 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-)
New commits: commit 8590c8b8af53df9431639ae92f4169cef17a3660 Author: jan Iversen <[email protected]> Date: Wed Oct 18 20:53:14 2017 +0200 iOS, updated init sequence Updated the init sequence to test for completion Added a few build switches Change-Id: I9cb4fc8bc1209afbb49917baf385602f484a6d72 diff --git a/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c b/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c index b3c41c3a5d4b..d8e41ebf740f 100644 --- a/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c +++ b/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c @@ -29,8 +29,6 @@ static LibreOfficeKit* kit; static LibreOfficeKitDocument* document; - - // Bridge functions to LibreOfficeKit int BridgeLOkit_Init(const char *path) { @@ -39,8 +37,11 @@ int BridgeLOkit_Init(const char *path) strcpy(bufUserPath + strlen(path), "/user"); // Initialize LibreOfficeKit - if (!kit) - kit = lok_init_2(path, bufUserPath); + if (!kit) { + kit = lok_init_2(path, bufUserPath); + if (!kit) + return 1; + } return 0; } diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj index 0eb69658bf5a..d1541cc35d0d 100644 --- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj @@ -441,7 +441,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.3; MACH_O_TYPE = mh_execute; MTL_ENABLE_DEBUG_INFO = NO; - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "$(LINK_LDFLAGS)"; SDKROOT = iphoneos; SWIFT_OBJC_BRIDGING_HEADER = "lokit-Bridging-Header.h"; @@ -480,7 +480,7 @@ INFOPLIST_FILE = LibreOfficeLight/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "$(LINK_LDFLAGS)"; PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -488,6 +488,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; + SWIFT_WHOLE_MODULE_OPTIMIZATION = YES; TARGETED_DEVICE_FAMILY = 2; VALID_ARCHS = "arm64 x86_64"; }; @@ -509,13 +510,14 @@ INFOPLIST_FILE = LibreOfficeLight/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "$(LINK_LDFLAGS)"; PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; + SWIFT_WHOLE_MODULE_OPTIMIZATION = YES; TARGETED_DEVICE_FAMILY = 2; VALID_ARCHS = "arm64 x86_64"; }; @@ -631,7 +633,7 @@ INFOPLIST_FILE = LibreOfficeLight/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "$(LINK_LDFLAGS)"; PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -639,6 +641,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.0; + SWIFT_WHOLE_MODULE_OPTIMIZATION = YES; TARGETED_DEVICE_FAMILY = 2; VALID_ARCHS = "arm64 x86_64"; }; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
