ios/CustomTarget_iOS.mk | 6 -
ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 25 +++++--
ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.mm | 9 --
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 32
+++++-----
ios/LibreOfficeLight/LibreOfficeLight/lokit.mm | 7 --
5 files changed, 41 insertions(+), 38 deletions(-)
New commits:
commit 08e5cd8afe703237dbf54c0b81fab78ea27adb93
Author: jan Iversen <j...@libreoffice.org>
Date: Fri Sep 29 08:59:42 2017 +0200
iOS, WIP build static library.
Adjusting differences between default project, and old
iOS project
Change-Id: I2639761bbe909cbd893c7d6b932e11c1e57998df
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk
index 6d817c1d5e1f..e28642633223 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -27,7 +27,7 @@ $(call gb_CustomTarget_get_target,ios/ios):
$(IOSGEN)/$(IOSKIT)
#- Generate xcconfig files ---------------------------------------------------
-$(IOSKITXC) : $(BUILDDIR)/config_host.mk
+$(IOSKITXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
@echo "// Xcode configuration properties" > $(IOSKITXC)
@echo "// To avoid confusion, the LO-specific ones that aren't as such
used" >> $(IOSKITXC)
@@ -52,7 +52,7 @@ $(IOSKITXC) : $(BUILDDIR)/config_host.mk
"`$(SRCDIR)/bin/lo-all-static-libs`" >> $(IOSKITXC)
@echo "SYMROOT = $(WORKDIR)/ios/build\n" >> $(IOSKITXC)
-$(IOSAPPXC) : $(BUILDDIR)/config_host.mk
+$(IOSAPPXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
@mkdir -p $(IOSGEN);
@echo "// Xcode configuration properties" > $(IOSAPPXC)
@@ -155,7 +155,7 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj
iosCopySetup
build \
, $(WORKDIR)/ios/build.log \
)
- cp iOS_LO_kit.a $(IOSGEN)/$(IOSKIT)
+ cp $(WORKDIR)/ios/build/*/libLibreOfficeKit.a $(IOSGEN)/$(IOSKIT)
diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
index ee698445bd97..0c28349a87eb 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 394699991F7E1CCE0085AD3B /* native-code.mm in Sources */ = {isa
= PBXBuildFile; fileRef = 394699981F7E1CCE0085AD3B /* native-code.mm */; };
39B5D21A1F78130F008FB162 /* LibreOfficeKit.mm in Sources */ =
{isa = PBXBuildFile; fileRef = 39B5D2191F78130F008FB162 /* LibreOfficeKit.mm
*/; };
39B5D21B1F78130F008FB162 /* LibreOfficeKit.h in CopyFiles */ =
{isa = PBXBuildFile; fileRef = 39B5D2181F78130F008FB162 /* LibreOfficeKit.h */;
};
/* End PBXBuildFile section */
@@ -25,9 +26,11 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
+ 394699981F7E1CCE0085AD3B /* native-code.mm */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp;
name = "native-code.mm"; path = "../../generated/native-code.mm"; sourceTree =
"<group>"; };
+ 39AB2EC91F7D6D3D00E6FDA9 /* loKit.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name =
loKit.xcconfig; path =
../../../../../../../Users/jani/lo_ios/ios/loKit.xcconfig; sourceTree =
"<group>"; };
39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */ = {isa =
PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path =
libLibreOfficeKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
39B5D2181F78130F008FB162 /* LibreOfficeKit.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LibreOfficeKit.h;
sourceTree = "<group>"; };
- 39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
LibreOfficeKit.mm; sourceTree = "<group>"; };
+ 39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path =
LibreOfficeKit.mm; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -68,6 +71,8 @@
39B5D2171F78130F008FB162 /* LibreOfficeKit */ = {
isa = PBXGroup;
children = (
+ 394699981F7E1CCE0085AD3B /* native-code.mm */,
+ 39AB2EC91F7D6D3D00E6FDA9 /* loKit.xcconfig */,
39B5D2181F78130F008FB162 /* LibreOfficeKit.h */,
39B5D2191F78130F008FB162 /* LibreOfficeKit.mm
*/,
);
@@ -132,6 +137,7 @@
buildActionMask = 2147483647;
files = (
39B5D21A1F78130F008FB162 /* LibreOfficeKit.mm
in Sources */,
+ 394699991F7E1CCE0085AD3B /* native-code.mm in
Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -140,10 +146,11 @@
/* Begin XCBuildConfiguration section */
39B5D21C1F78130F008FB162 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 39AB2EC91F7D6D3D00E6FDA9
/* loKit.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
- CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION =
YES_AGGRESSIVE;
+ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
@@ -151,7 +158,7 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
@@ -174,6 +181,7 @@
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
@@ -197,16 +205,17 @@
"-lstdc++",
);
SDKROOT = iphoneos;
- VALID_ARCHS = "x86_64 arm64";
+ VALID_ARCHS = "arm64 x86_64";
};
name = Debug;
};
39B5D21D1F78130F008FB162 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 39AB2EC91F7D6D3D00E6FDA9
/* loKit.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
- CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION =
YES_AGGRESSIVE;
+ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
@@ -214,7 +223,7 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
@@ -231,6 +240,7 @@
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
@@ -256,12 +266,12 @@
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "x86_64 arm64";
- "VALID_ARCHS[sdk=*]" = "";
};
name = Release;
};
39B5D21F1F78130F008FB162 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 39AB2EC91F7D6D3D00E6FDA9
/* loKit.xcconfig */;
buildSettings = {
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -271,6 +281,7 @@
};
39B5D2201F78130F008FB162 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 39AB2EC91F7D6D3D00E6FDA9
/* loKit.xcconfig */;
buildSettings = {
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.mm
b/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.mm
index 5c15360ae28b..677386ce196b 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.mm
+++ b/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.mm
@@ -5,8 +5,6 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
//
-#import "LibreOfficeKit.h"
-
#include <stdio.h>
#include <TargetConditionals.h>
#define LOK_USE_UNSTABLE_API
@@ -22,21 +20,19 @@
// Force reference to libreofficekit_hook
-#ifdef LINK_LOKIT
extern "C" __attribute__((used)) void *libreofficekit_hook(const char *);
static __attribute__((used)) void *(*foop)(const char *) = libreofficekit_hook;
// pointers to our instance
static LibreOfficeKit* kit;
static LibreOfficeKitDocument* document;
-#endif
+
// Bridge functions to LibreOfficeKit
extern "C" int BridgeLOkit_Init(const char *path)
{
-#ifdef LINK_LOKIT
char bufUserPath[200];
strcpy(bufUserPath, path);
strcpy(bufUserPath + strlen(path), "/user");
@@ -44,16 +40,13 @@ extern "C" int BridgeLOkit_Init(const char *path)
// Initialize LibreOfficeKit
if (!kit)
kit = lok_init_2(path, bufUserPath);
-#endif
return 0;
}
int LOkit_open(char *file)
{
-#ifdef LINK_LOKIT
document = kit->pClass->documentLoad(kit, file);
document->pClass->initializeForRendering(document, "");
-#endif
return 0;
}
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 70173f60587c..ab7ea842601c 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -22,6 +22,7 @@
3992D85A1E5B762A00BEA987 /* DocumentController.swift in Sources
*/ = {isa = PBXBuildFile; fileRef = 3992D8591E5B762A00BEA987 /*
DocumentController.swift */; };
3992D85D1E5B764A00BEA987 /* SideMenu.swift in Sources */ = {isa
= PBXBuildFile; fileRef = 3992D85B1E5B764A00BEA987 /* SideMenu.swift */; };
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */
= {isa = PBXBuildFile; fileRef = 399648461E5B87DC00E73E83 /*
ViewProperties.swift */; };
+ 39AB2ECB1F7D6D7400E6FDA9 /* loApp.xcconfig in Resources */ =
{isa = PBXBuildFile; fileRef = 39AB2ECA1F7D6D7400E6FDA9 /* loApp.xcconfig */; };
39B08B9D1E5F0BB600682A59 /* fundamentalrc in Resources */ =
{isa = PBXBuildFile; fileRef = 39B084E51E5F0BB400682A59 /* fundamentalrc */; };
39B08B9E1E5F0BB600682A59 /* offapi.rdb in Resources */ = {isa =
PBXBuildFile; fileRef = 39B084E61E5F0BB400682A59 /* offapi.rdb */; };
39B08B9F1E5F0BB600682A59 /* oovbaapi.rdb in Resources */ = {isa
= PBXBuildFile; fileRef = 39B084E71E5F0BB400682A59 /* oovbaapi.rdb */; };
@@ -50,6 +51,7 @@
3992D8591E5B762A00BEA987 /* DocumentController.swift */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift;
name = DocumentController.swift; path =
LibreOfficeLight/DocumentController.swift; sourceTree = SOURCE_ROOT; };
3992D85B1E5B764A00BEA987 /* SideMenu.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name
= SideMenu.swift; path = LibreOfficeLight/SideMenu.swift; sourceTree =
SOURCE_ROOT; };
399648461E5B87DC00E73E83 /* ViewProperties.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name
= ViewProperties.swift; path = LibreOfficeLight/ViewProperties.swift;
sourceTree = SOURCE_ROOT; };
+ 39AB2ECA1F7D6D7400E6FDA9 /* loApp.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name =
loApp.xcconfig; path =
../../../../../../../Users/jani/lo_ios/ios/loApp.xcconfig; sourceTree =
"<group>"; };
39B084E51E5F0BB400682A59 /* fundamentalrc */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name =
fundamentalrc; path = ../generated/resources/fundamentalrc; sourceTree =
SOURCE_ROOT; };
39B084E61E5F0BB400682A59 /* offapi.rdb */ = {isa =
PBXFileReference; lastKnownFileType = file; name = offapi.rdb; path =
../generated/resources/offapi.rdb; sourceTree = SOURCE_ROOT; };
39B084E71E5F0BB400682A59 /* oovbaapi.rdb */ = {isa =
PBXFileReference; lastKnownFileType = file; name = oovbaapi.rdb; path =
../generated/resources/oovbaapi.rdb; sourceTree = SOURCE_ROOT; };
@@ -74,6 +76,7 @@
3911D89F1E5993600050D6BC /* Support files */ = {
isa = PBXGroup;
children = (
+ 39AB2ECA1F7D6D7400E6FDA9 /* loApp.xcconfig */,
39022C221EDC303200100066 /* InfoPlist.strings
*/,
39B092501E5F3DEA00682A59 /*
LibreOfficeLight-Prefix.pch */,
397275391E77D9F1006ACDCC /*
LibreOfficeLight.entitlements */,
@@ -231,6 +234,7 @@
39B091CE1E5F0BB800682A59 /* unorc in Resources
*/,
39022C1F1EDC2AB000100066 /* share in Resources
*/,
397E09031E597BD8001374E0 /* Main.storyboard in
Resources */,
+ 39AB2ECB1F7D6D7400E6FDA9 /* loApp.xcconfig in
Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -284,9 +288,9 @@
/* Begin XCBuildConfiguration section */
397E09231E597BD8001374E0 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 39AB2ECA1F7D6D7400E6FDA9
/* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD)";
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
@@ -295,7 +299,7 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
@@ -330,8 +334,8 @@
"$(LO_SRCDIR)/include",
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
+ "$(LO_SRCDIR)/ios/generated",
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
- "$(LO_WORKDIR)/ios/generated",
);
"HEADER_SEARCH_PATHS[arch=*]" = (
"$(inherited)",
@@ -340,10 +344,10 @@
"$(LO_SRCDIR)/include",
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
+ "$(LO_SRCDIR)/ios/generated",
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
- "$(LO_WORKDIR)/ios/generated",
);
- IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+ IPHONEOS_DEPLOYMENT_TARGET = 10.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
@@ -355,15 +359,14 @@
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "arm64 x86_64";
- "VALID_ARCHS[sdk=*]" = arm64;
};
name = Debug;
};
397E09241E597BD8001374E0 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 39AB2ECA1F7D6D7400E6FDA9
/* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD)";
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
@@ -372,7 +375,7 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
@@ -402,7 +405,7 @@
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
- "$(LO_WORKDIR)/ios/generated",
+ "$(LO_SRCDIR)/ios/generated",
);
"HEADER_SEARCH_PATHS[arch=*]" = (
"$(inherited)",
@@ -412,9 +415,9 @@
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
- "$(LO_WORKDIR)/ios/generated",
+ "$(LO_SRCDIR)/ios/generated",
);
- IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+ IPHONEOS_DEPLOYMENT_TARGET = 10.3;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
@@ -426,12 +429,12 @@
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "arm64 x86_64";
- "VALID_ARCHS[sdk=*]" = arm64;
};
name = Release;
};
397E09261E597BD8001374E0 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 39AB2ECA1F7D6D7400E6FDA9
/* loApp.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -465,12 +468,13 @@
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 2;
- VALID_ARCHS = "$(ARCHS_STANDARD)";
+ VALID_ARCHS = "arm64 x86_64";
};
name = Debug;
};
397E09271E597BD8001374E0 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 39AB2ECA1F7D6D7400E6FDA9
/* loApp.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -493,7 +497,7 @@
SWIFT_OBJC_BRIDGING_HEADER =
"LibreOfficeLight/lokit-Bridging-Header.h";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 2;
- VALID_ARCHS = "$(ARCHS_STANDARD)";
+ VALID_ARCHS = "arm64 x86_64";
};
name = Release;
};
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/lokit.mm
b/ios/LibreOfficeLight/LibreOfficeLight/lokit.mm
index e3455b728fbd..609493076cd4 100755
--- a/ios/LibreOfficeLight/LibreOfficeLight/lokit.mm
+++ b/ios/LibreOfficeLight/LibreOfficeLight/lokit.mm
@@ -20,20 +20,18 @@
// Force reference to libreofficekit_hook
-#ifdef LINK_LOKIT
extern "C" __attribute__((used)) void *libreofficekit_hook(const char *);
static __attribute__((used)) void *(*foop)(const char *) = libreofficekit_hook;
// pointers to our instance
static LibreOfficeKit* kit;
static LibreOfficeKitDocument* document;
-#endif
+
// Bridge functions to LibreOfficeKit
extern "C" int BridgeLOkit_Init(const char *path)
{
-#ifdef LINK_LOKIT
char bufUserPath[200];
strcpy(bufUserPath, path);
strcpy(bufUserPath + strlen(path), "/user");
@@ -41,16 +39,13 @@ extern "C" int BridgeLOkit_Init(const char *path)
// Initialize LibreOfficeKit
if (!kit)
kit = lok_init_2(path, bufUserPath);
-#endif
return 0;
}
int LOkit_open(char *file)
{
-#ifdef LINK_LOKIT
document = kit->pClass->documentLoad(kit, file);
document->pClass->initializeForRendering(document, "");
-#endif
return 0;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
