summaryrefslogtreecommitdiff
path: root/ios
diff options
context:
space:
mode:
authorjan Iversen <jani@libreoffice.org>2017-11-25 12:23:58 +0100
committerjan Iversen <jani@libreoffice.org>2017-11-25 12:25:07 +0100
commitff92dc75a7d8c5981503eebac84ceaf33e36845b (patch)
tree3dc7ade5a12b277699892d1e0998088b0ffac384 /ios
parent64c93f3fe939642acd4133ac5bbdeb91975b7662 (diff)
iOS, project update to compile with dummy LOkit
Change-Id: If76f4aaecb853db6b33d671092b7806bbb9b9d2d
Diffstat (limited to 'ios')
-rw-r--r--ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj2
-rw-r--r--ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c14
-rw-r--r--ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h2
3 files changed, 17 insertions, 1 deletions
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index ec9151c4acae..becd7212d156 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -16,6 +16,7 @@
393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 393975771F8BECB0002DC80B /* libiconv.tbd */; };
3939757A1F8BECC1002DC80B /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 393975791F8BECC1002DC80B /* libz.tbd */; };
39503A751F94D44900F19C78 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 39503A741F94D44900F19C78 /* libc++.tbd */; };
+ 396C83371FC989AB008E662A /* dummyLOkit.c in Sources */ = {isa = PBXBuildFile; fileRef = 39284DB01FA5E150006F43E4 /* dummyLOkit.c */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; };
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; };
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift */; };
@@ -267,6 +268,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 396C83371FC989AB008E662A /* dummyLOkit.c in Sources */,
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources */,
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */,
39284DB31FA5F207006F43E4 /* DocumentActions.swift in Sources */,
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c b/ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c
index 5d6effbf9647..309d00506cf3 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c
+++ b/ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c
@@ -48,3 +48,17 @@ int BridgeLOkit_LeaveHipernate()
{
return 0;
}
+
+
+
+int BridgeLOkit_Sizing(const int countXtiles, const int countYtiles,
+ const int pixelsXtile, const int pixelsYtile)
+{
+ (void)countXtiles;
+ (void)countYtiles;
+ (void)pixelsXtile;
+ (void)pixelsYtile;
+ return 0;
+}
+
+
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h b/ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
index 0ddc877b0233..d501ae863444 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
+++ b/ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h
@@ -10,4 +10,4 @@
// LibreOfficeKit is a prelink of all used LO libraries, generated
// as its own xCode project.
-#import "../LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.h"
+#import "../../source/LibreOfficeKit.h"