Kaydet (Commit) 8590c8b8 authored tarafından jan Iversen's avatar jan Iversen

iOS, updated init sequence

Updated the init sequence to test for completion
Added a few build switches

Change-Id: I9cb4fc8bc1209afbb49917baf385602f484a6d72
üst bf8193cb
......@@ -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)
if (!kit) {
kit = lok_init_2(path, bufUserPath);
if (!kit)
return 1;
}
return 0;
}
......
......@@ -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";
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment