ios/CustomTarget_iOS.mk
| 2
ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
| 4
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
| 168 ++++++++--
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
| 76 +++-
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-167.png
|binary
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-180.png
|binary
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-20.png
|binary
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-60.png
|binary
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-87.png
|binary
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/LaunchImage.launchimage/Contents.json
| 49 --
ios/LibreOfficeLight/LibreOfficeLight/Info.plist
| 2
ios/loApp.xcconfig.in
| 4
solenv/gbuild/platform/iOS.mk
| 3
13 files changed, 210 insertions(+), 98 deletions(-)
New commits:
commit ede08b49c6336b220ef6e07f65935512537f7dc8
Author: jan Iversen <j...@libreoffice.org>
Date: Wed Nov 22 11:45:12 2017 +0100
iOS, update icons to support new models
Update of icons and start image (xib file not png)
Change-Id: I172c4e6eb0f27d6dd05b9eb28b2e352f29578279
diff --git
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
index c20b7bf1cb1f..b179c2c532c9 100644
---
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
+++
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,10 +1,16 @@
{
"images" : [
{
- "size" : "29x29",
- "idiom" : "ipad",
- "filename" : "LibreOffice-29.png",
- "scale" : "1x"
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "filename" : "LibreOffice-40.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "filename" : "LibreOffice-60.png",
+ "scale" : "3x"
},
{
"size" : "29x29",
@@ -13,33 +19,69 @@
"scale" : "2x"
},
{
+ "idiom" : "iphone",
"size" : "29x29",
- "idiom" : "ipad",
- "filename" : "LibreOffice-58.png",
+ "filename" : "LibreOffice-87.png",
+ "scale" : "3x"
+ },
+ {
+ "size" : "40x40",
+ "idiom" : "iphone",
+ "filename" : "LibreOffice-80.png",
"scale" : "2x"
},
{
+ "idiom" : "iphone",
"size" : "40x40",
+ "filename" : "LibreOffice-120.png",
+ "scale" : "3x"
+ },
+ {
+ "size" : "60x60",
+ "idiom" : "iphone",
+ "filename" : "LibreOffice-120.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "60x60",
+ "filename" : "LibreOffice-180.png",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "20x20",
+ "filename" : "LibreOffice-20.png",
+ "scale" : "1x"
+ },
+ {
"idiom" : "ipad",
+ "size" : "20x20",
"filename" : "LibreOffice-40.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "29x29",
+ "idiom" : "ipad",
+ "filename" : "LibreOffice-29.png",
"scale" : "1x"
},
{
- "size" : "40x40",
+ "size" : "29x29",
"idiom" : "ipad",
- "filename" : "LibreOffice-80.png",
+ "filename" : "LibreOffice-58.png",
"scale" : "2x"
},
{
"size" : "40x40",
- "idiom" : "iphone",
- "filename" : "LibreOffice-80.png",
- "scale" : "2x"
+ "idiom" : "ipad",
+ "filename" : "LibreOffice-40.png",
+ "scale" : "1x"
},
{
- "size" : "60x60",
- "idiom" : "iphone",
- "filename" : "LibreOffice-120.png",
+ "size" : "40x40",
+ "idiom" : "ipad",
+ "filename" : "LibreOffice-80.png",
"scale" : "2x"
},
{
@@ -55,6 +97,12 @@
"scale" : "2x"
},
{
+ "idiom" : "ipad",
+ "size" : "83.5x83.5",
+ "filename" : "LibreOffice-167.png",
+ "scale" : "2x"
+ },
+ {
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "LibreOffice-1024.png",
diff --git
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-167.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-167.png
new file mode 100644
index 000000000000..ef0033f9a8c5
Binary files /dev/null and
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-167.png
differ
diff --git
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-180.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-180.png
new file mode 100644
index 000000000000..2fdcb30dcad7
Binary files /dev/null and
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-180.png
differ
diff --git
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-20.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-20.png
new file mode 100644
index 000000000000..ba82eb87b5e3
Binary files /dev/null and
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-20.png
differ
diff --git
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-60.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-60.png
new file mode 100644
index 000000000000..00774322c381
Binary files /dev/null and
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-60.png
differ
diff --git
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-87.png
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-87.png
new file mode 100644
index 000000000000..679f6abc0816
Binary files /dev/null and
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-87.png
differ
diff --git
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/LaunchImage.launchimage/Contents.json
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/LaunchImage.launchimage/Contents.json
deleted file mode 100644
index 5a2966687aa0..000000000000
---
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- "images" : [
- {
- "orientation" : "portrait",
- "idiom" : "ipad",
- "minimum-system-version" : "7.0",
- "extent" : "full-screen",
- "scale" : "2x"
- },
- {
- "orientation" : "landscape",
- "idiom" : "ipad",
- "minimum-system-version" : "7.0",
- "extent" : "full-screen",
- "scale" : "1x"
- },
- {
- "orientation" : "landscape",
- "idiom" : "ipad",
- "minimum-system-version" : "7.0",
- "extent" : "full-screen",
- "scale" : "2x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "iphone",
- "minimum-system-version" : "7.0",
- "scale" : "2x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "iphone",
- "minimum-system-version" : "7.0",
- "subtype" : "retina4",
- "scale" : "2x"
- },
- {
- "orientation" : "portrait",
- "idiom" : "ipad",
- "minimum-system-version" : "7.0",
- "extent" : "full-screen",
- "scale" : "1x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
b/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
index d059874dfe9b..5168dd42d668 100755
--- a/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
+++ b/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
@@ -397,7 +397,7 @@ file, You can obtain one at
http://mozilla.org/MPL/2.0/.</string>
<key>UIFileSharingEnabled</key>
<true/>
<key>UILaunchStoryboardName</key>
- <string>LaunchScreen</string>
+ <string>LaunchScreen.xib</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
commit 7af059fbbe5c15f093ada6064561f9545ee62aa7
Author: jan Iversen <j...@libreoffice.org>
Date: Wed Nov 22 11:16:42 2017 +0100
iOS, update app project.
Adjustments to cope with schemes.
Change-Id: Ifbe50658299927d66886fc88753db5544e1f93d6
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 0a78faac66ef..2c96313d6c4d 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -15,10 +15,10 @@
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources
*/ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /*
ViewPrintManager.swift */; };
393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */ =
{isa = PBXBuildFile; fileRef = 393975771F8BECB0002DC80B /* libiconv.tbd */; };
3939757A1F8BECC1002DC80B /* libz.tbd in Frameworks */ = {isa =
PBXBuildFile; fileRef = 393975791F8BECC1002DC80B /* libz.tbd */; };
- 39491DFF1FC564190039A265 /* loApp.xcconfig in Resources */ =
{isa = PBXBuildFile; fileRef = 39491DFE1FC564190039A265 /* loApp.xcconfig */; };
39503A751F94D44900F19C78 /* libc++.tbd in Frameworks */ = {isa
= PBXBuildFile; fileRef = 39503A741F94D44900F19C78 /* libc++.tbd */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ =
{isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */;
};
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ =
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */;
};
+ 397A4C3C1FC574A100566B54 /* loApp.xcconfig in Resources */ =
{isa = PBXBuildFile; fileRef = 397A4C3B1FC574A100566B54 /* loApp.xcconfig */; };
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ =
{isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift
*/; };
397E09031E597BD8001374E0 /* Main.storyboard in Resources */ =
{isa = PBXBuildFile; fileRef = 397E09011E597BD8001374E0 /* Main.storyboard */;
};
397E09081E597BD8001374E0 /* Assets.xcassets in Resources */ =
{isa = PBXBuildFile; fileRef = 397E09071E597BD8001374E0 /* Assets.xcassets */;
};
@@ -45,13 +45,13 @@
392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name
= ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift;
sourceTree = SOURCE_ROOT; };
393975771F8BECB0002DC80B /* libiconv.tbd */ = {isa =
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
393975791F8BECC1002DC80B /* libz.tbd */ = {isa =
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
- 39491DFE1FC564190039A265 /* loApp.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name =
loApp.xcconfig; path = ../../../../sim/workdir/ios/loApp.xcconfig; sourceTree =
"<group>"; };
39503A6F1F94C4AC00F19C78 /* lokit-Bridging-Header.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"lokit-Bridging-Header.h"; sourceTree = "<group>"; };
39503A741F94D44900F19C78 /* libc++.tbd */ = {isa =
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa =
PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path =
Settings.bundle; sourceTree = "<group>"; };
397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ =
{isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path =
LibreOfficeLight.entitlements; sourceTree = "<group>"; };
3975A8C91FBD70EE00A87B3A /* LibreOfficeKit.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LibreOfficeKit.h;
path = ../../include/LibreOfficeKit/LibreOfficeKit.h; sourceTree = "<group>"; };
397868D71E59A3EA007F9248 /* en */ = {isa = PBXFileReference;
lastKnownFileType = file.xib; name = en; path = en.lproj/LaunchScreen.xib;
sourceTree = "<group>"; };
+ 397A4C3B1FC574A100566B54 /* loApp.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name =
loApp.xcconfig; path = ../../../../sim/workdir/ios/loApp.xcconfig; sourceTree =
"<group>"; };
397E08FA1E597BD8001374E0 /* LibreOfficeLight.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = LibreOfficeLight.app; sourceTree = BUILT_PRODUCTS_DIR; };
397E08FD1E597BD8001374E0 /* AppDelegate.swift */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.swift; name =
AppDelegate.swift; path = LibreOfficeLight/AppDelegate.swift; sourceTree =
SOURCE_ROOT; };
397E09021E597BD8001374E0 /* en */ = {isa = PBXFileReference;
lastKnownFileType = file.storyboard; name = en; path =
en.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -88,7 +88,7 @@
3911D89F1E5993600050D6BC /* Support files */ = {
isa = PBXGroup;
children = (
- 39491DFE1FC564190039A265 /* loApp.xcconfig */,
+ 397A4C3B1FC574A100566B54 /* loApp.xcconfig */,
39B092501E5F3DEA00682A59 /*
LibreOfficeLight-Prefix.pch */,
397275391E77D9F1006ACDCC /*
LibreOfficeLight.entitlements */,
397E09071E597BD8001374E0 /* Assets.xcassets */,
@@ -179,7 +179,7 @@
/* Begin PBXNativeTarget section */
397E08F91E597BD8001374E0 /* LibreOfficeLight */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 397E08F51E597BD8001374E0 /*
Build configuration list for PBXNativeTarget "LibreOfficeLight" */;
+ buildConfigurationList = 397E09251E597BD8001374E0 /*
Build configuration list for PBXNativeTarget "LibreOfficeLight" */;
buildPhases = (
397E08F61E597BD8001374E0 /* Sources */,
397E08F71E597BD8001374E0 /* Frameworks */,
@@ -223,7 +223,7 @@
};
};
};
- buildConfigurationList = 397E08F51E597BD8001374E0 /*
Build configuration list for PBXNativeTarget "LibreOfficeLight" */;
+ buildConfigurationList = 397E08F51E597BD8001374E0 /*
Build configuration list for PBXProject "LibreOfficeLight" */;
compatibilityVersion = "Xcode 8.0";
developmentRegion = English;
hasScannedForEncodings = 0;
@@ -254,7 +254,7 @@
397868D61E59A3EA007F9248 /* LaunchScreen.xib in
Resources */,
396F92F71E7AE62400A28C82 /* Settings.bundle in
Resources */,
39B08B9F1E5F0BB600682A59 /* oovbaapi.rdb in
Resources */,
- 39491DFF1FC564190039A265 /* loApp.xcconfig in
Resources */,
+ 397A4C3C1FC574A100566B54 /* loApp.xcconfig in
Resources */,
39B08B9D1E5F0BB600682A59 /* fundamentalrc in
Resources */,
39B091CD1E5F0BB800682A59 /* udkapi.rdb in
Resources */,
39B08BD91E5F0BB600682A59 /* services.rdb in
Resources */,
@@ -306,10 +306,9 @@
/* Begin XCBuildConfiguration section */
397E09231E597BD8001374E0 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 397A4C3B1FC574A100566B54
/* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME =
LaunchImage;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
@@ -378,13 +377,11 @@
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
- PRODUCT_BUNDLE_IDENTIFIER =
com.jani.Editors.LibreOfficeLight;
- PRODUCT_NAME = LibreOfficeLight;
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
- SWIFT_OBJC_BRIDGING_HEADER =
"LibreOfficeLight/lokit-Bridging-Header.h";
+ SWIFT_OBJC_BRIDGING_HEADER =
"lokit-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+ SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "arm64 x86_64";
@@ -393,10 +390,9 @@
};
397E09241E597BD8001374E0 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 397A4C3B1FC574A100566B54
/* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME =
LaunchImage;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
@@ -459,12 +455,10 @@
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
- PRODUCT_BUNDLE_IDENTIFIER =
com.jani.Editors.LibreOfficeLight;
- PRODUCT_NAME = LibreOfficeLight;
SDKROOT = iphoneos;
- SWIFT_OBJC_BRIDGING_HEADER =
"LibreOfficeLight/lokit-Bridging-Header.h";
+ SWIFT_OBJC_BRIDGING_HEADER =
"lokit-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
- SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+ SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
@@ -472,12 +466,81 @@
};
name = Release;
};
+ 397E09261E597BD8001374E0 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 397A4C3B1FC574A100566B54
/* loApp.xcconfig */;
+ buildSettings = {
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+ CLANG_WARN_INFINITE_RECURSION = NO;
+ CODE_SIGN_ENTITLEMENTS =
LibreOfficeLight/LibreOfficeLight.entitlements;
+ DEVELOPMENT_TEAM = TM977DU7EF;
+ ENABLE_TESTABILITY = NO;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER =
"LibreOfficeLight/LibreOfficeLight-Prefix.pch";
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ "HEADER_SEARCH_PATHS[arch=*]" = (
+ "$(inherited)",
+
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+ "$(LO_BUILDDIR)/config_host",
+ "$(LO_SRCDIR)/include",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
+
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
+ "$(LO_WORKDIR)/ios/generated",
+ );
+ INFOPLIST_FILE = LibreOfficeLight/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited)
@executable_path/Frameworks";
+ 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_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+ SWIFT_VERSION = 4.0;
+ TARGETED_DEVICE_FAMILY = 2;
+ VALID_ARCHS = "arm64 x86_64";
+ };
+ name = Debug;
+ };
+ 397E09271E597BD8001374E0 /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 397A4C3B1FC574A100566B54
/* loApp.xcconfig */;
+ buildSettings = {
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+ CLANG_WARN_INFINITE_RECURSION = NO;
+ CODE_SIGN_ENTITLEMENTS =
LibreOfficeLight/LibreOfficeLight.entitlements;
+ COPY_PHASE_STRIP = YES;
+ DEVELOPMENT_TEAM = TM977DU7EF;
+ ENABLE_TESTABILITY = NO;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER =
"LibreOfficeLight/LibreOfficeLight-Prefix.pch";
+ INFOPLIST_FILE = LibreOfficeLight/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited)
@executable_path/Frameworks";
+ 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_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_SWIFT3_OBJC_INFERENCE = Off;
+ SWIFT_VERSION = 4.0;
+ TARGETED_DEVICE_FAMILY = 2;
+ VALID_ARCHS = "arm64 x86_64";
+ };
+ name = Release;
+ };
39ACF41A1F8A358000DA7334 /* Simulator */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 397A4C3B1FC574A100566B54
/* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
- ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME =
LaunchImage;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
@@ -546,15 +609,53 @@
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
- PRODUCT_BUNDLE_IDENTIFIER =
com.jani.Editors.LibreOfficeLight;
- PRODUCT_NAME = LibreOfficeLight;
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+ SWIFT_OBJC_BRIDGING_HEADER =
"lokit-Bridging-Header.h";
+ SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+ SWIFT_VERSION = 4.0;
+ TARGETED_DEVICE_FAMILY = "1,2";
+ VALID_ARCHS = "arm64 x86_64";
+ };
+ name = Simulator;
+ };
+ 39ACF41B1F8A358000DA7334 /* Simulator */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 397A4C3B1FC574A100566B54
/* loApp.xcconfig */;
+ buildSettings = {
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+ CLANG_WARN_INFINITE_RECURSION = NO;
+ CODE_SIGN_ENTITLEMENTS =
LibreOfficeLight/LibreOfficeLight.entitlements;
+ DEVELOPMENT_TEAM = TM977DU7EF;
+ ENABLE_TESTABILITY = NO;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER =
"LibreOfficeLight/LibreOfficeLight-Prefix.pch";
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ "HEADER_SEARCH_PATHS[arch=*]" = (
+ "$(inherited)",
+
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+ "$(LO_BUILDDIR)/config_host",
+ "$(LO_SRCDIR)/include",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
+
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
+
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
+ "$(LO_WORKDIR)/ios/generated",
+ );
+ INFOPLIST_FILE = LibreOfficeLight/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+ LD_RUNPATH_SEARCH_PATHS = "$(inherited)
@executable_path/Frameworks";
+ 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_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
- TARGETED_DEVICE_FAMILY = "1,2";
+ TARGETED_DEVICE_FAMILY = 2;
VALID_ARCHS = "arm64 x86_64";
};
name = Simulator;
@@ -562,7 +663,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
- 397E08F51E597BD8001374E0 /* Build configuration list for
PBXNativeTarget "LibreOfficeLight" */ = {
+ 397E08F51E597BD8001374E0 /* Build configuration list for
PBXProject "LibreOfficeLight" */ = {
isa = XCConfigurationList;
buildConfigurations = (
397E09231E597BD8001374E0 /* Debug */,
@@ -572,6 +673,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Simulator;
};
+ 397E09251E597BD8001374E0 /* Build configuration list for
PBXNativeTarget "LibreOfficeLight" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 397E09261E597BD8001374E0 /* Debug */,
+ 39ACF41B1F8A358000DA7334 /* Simulator */,
+ 397E09271E597BD8001374E0 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Simulator;
+ };
/* End XCConfigurationList section */
};
rootObject = 397E08F21E597BD8001374E0 /* Project object */;
commit 965cd360bf6b3e906ed7323d6eee714fd92920c8
Author: jan Iversen <j...@libreoffice.org>
Date: Wed Nov 22 08:57:46 2017 +0100
iOS, update loApp.xcconfig path
Path is now relative to core directory, as documented
Change-Id: Ib731e8c650dd600932516cfda2e9545b04609994
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 1de64a2cb0be..0a78faac66ef 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -15,6 +15,7 @@
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources
*/ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /*
ViewPrintManager.swift */; };
393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */ =
{isa = PBXBuildFile; fileRef = 393975771F8BECB0002DC80B /* libiconv.tbd */; };
3939757A1F8BECC1002DC80B /* libz.tbd in Frameworks */ = {isa =
PBXBuildFile; fileRef = 393975791F8BECC1002DC80B /* libz.tbd */; };
+ 39491DFF1FC564190039A265 /* loApp.xcconfig in Resources */ =
{isa = PBXBuildFile; fileRef = 39491DFE1FC564190039A265 /* loApp.xcconfig */; };
39503A751F94D44900F19C78 /* libc++.tbd in Frameworks */ = {isa
= PBXBuildFile; fileRef = 39503A741F94D44900F19C78 /* libc++.tbd */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ =
{isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */;
};
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ =
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */;
};
@@ -44,6 +45,7 @@
392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name
= ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift;
sourceTree = SOURCE_ROOT; };
393975771F8BECB0002DC80B /* libiconv.tbd */ = {isa =
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
393975791F8BECC1002DC80B /* libz.tbd */ = {isa =
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+ 39491DFE1FC564190039A265 /* loApp.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name =
loApp.xcconfig; path = ../../../../sim/workdir/ios/loApp.xcconfig; sourceTree =
"<group>"; };
39503A6F1F94C4AC00F19C78 /* lokit-Bridging-Header.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
"lokit-Bridging-Header.h"; sourceTree = "<group>"; };
39503A741F94D44900F19C78 /* libc++.tbd */ = {isa =
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa =
PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path =
Settings.bundle; sourceTree = "<group>"; };
@@ -56,7 +58,6 @@
397E09071E597BD8001374E0 /* Assets.xcassets */ = {isa =
PBXFileReference; lastKnownFileType = folder.assetcatalog; name =
Assets.xcassets; path = LibreOfficeLight/Assets.xcassets; sourceTree =
SOURCE_ROOT; };
3992D8591E5B762A00BEA987 /* DocumentController.swift */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift;
name = DocumentController.swift; path =
LibreOfficeLight/DocumentController.swift; sourceTree = SOURCE_ROOT; };
399648461E5B87DC00E73E83 /* ViewProperties.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name
= ViewProperties.swift; path = LibreOfficeLight/ViewProperties.swift;
sourceTree = SOURCE_ROOT; };
- 39ACF4181F8A317600DA7334 /* loApp.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name =
loApp.xcconfig; path =
../../../../../../../Users/jani/lo_ios/workdir/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; };
@@ -87,7 +88,7 @@
3911D89F1E5993600050D6BC /* Support files */ = {
isa = PBXGroup;
children = (
- 39ACF4181F8A317600DA7334 /* loApp.xcconfig */,
+ 39491DFE1FC564190039A265 /* loApp.xcconfig */,
39B092501E5F3DEA00682A59 /*
LibreOfficeLight-Prefix.pch */,
397275391E77D9F1006ACDCC /*
LibreOfficeLight.entitlements */,
397E09071E597BD8001374E0 /* Assets.xcassets */,
@@ -253,6 +254,7 @@
397868D61E59A3EA007F9248 /* LaunchScreen.xib in
Resources */,
396F92F71E7AE62400A28C82 /* Settings.bundle in
Resources */,
39B08B9F1E5F0BB600682A59 /* oovbaapi.rdb in
Resources */,
+ 39491DFF1FC564190039A265 /* loApp.xcconfig in
Resources */,
39B08B9D1E5F0BB600682A59 /* fundamentalrc in
Resources */,
39B091CD1E5F0BB800682A59 /* udkapi.rdb in
Resources */,
39B08BD91E5F0BB600682A59 /* services.rdb in
Resources */,
@@ -304,7 +306,6 @@
/* Begin XCBuildConfiguration section */
397E09231E597BD8001374E0 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 39ACF4181F8A317600DA7334
/* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -392,7 +393,6 @@
};
397E09241E597BD8001374E0 /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 39ACF4181F8A317600DA7334
/* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -474,7 +474,6 @@
};
39ACF41A1F8A358000DA7334 /* Simulator */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 39ACF4181F8A317600DA7334
/* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
commit 0f9dd1c5f2dcf429b2b35ffea90e932587e6d1e1
Author: jan Iversen <j...@libreoffice.org>
Date: Wed Nov 22 08:44:16 2017 +0100
iOS, icudt59.dat => icudt60.dat
Updated copy of icu dat file, due to version change
Change-Id: I12885de019fa00f0816b9c31a30d02e73821be33
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk
index 496070d5d9d2..a9fb058db406 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -68,7 +68,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk
$(SRCDIR)/ios/CustomTarget_i
> $(IOSGEN)/native-code.h
# generate resource files used to start/run LibreOffice
- cp $(WORKDIR)/UnpackedTarball/icu/source/data/in/icudt59l.dat
$(IOSRES)/icudt59l.dat
+ cp $(WORKDIR)/UnpackedTarball/icu/source/data/in/icudt60l.dat
$(IOSRES)/icudt60l.dat
cp $(INSTDIR)/program/types.rdb $(IOSRES)/udkapi.rdb
cp $(INSTDIR)/program/types/offapi.rdb $(IOSRES)
cp $(INSTDIR)/program/types/oovbaapi.rdb $(IOSRES)
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 4ffb19054e5d..1de64a2cb0be 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -10,7 +10,7 @@
39022C1B1EDC2A0E00100066 /* program in Resources */ = {isa =
PBXBuildFile; fileRef = 39022C1A1EDC2A0E00100066 /* program */; };
39022C1D1EDC2A2C00100066 /* services in Resources */ = {isa =
PBXBuildFile; fileRef = 39022C1C1EDC2A2C00100066 /* services */; };
39022C1F1EDC2AB000100066 /* share in Resources */ = {isa =
PBXBuildFile; fileRef = 39022C1E1EDC2AB000100066 /* share */; };
- 39022C211EDC2D0800100066 /* icudt59l.dat in Resources */ = {isa
= PBXBuildFile; fileRef = 39022C201EDC2D0800100066 /* icudt59l.dat */; };
+ 39022C211EDC2D0800100066 /* icudt60l.dat in Resources */ = {isa
= PBXBuildFile; fileRef = 39022C201EDC2D0800100066 /* icudt60l.dat */; };
39284DB31FA5F207006F43E4 /* DocumentActions.swift in Sources */
= {isa = PBXBuildFile; fileRef = 39284DB21FA5F207006F43E4 /*
DocumentActions.swift */; };
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources
*/ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /*
ViewPrintManager.swift */; };
393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */ =
{isa = PBXBuildFile; fileRef = 393975771F8BECB0002DC80B /* libiconv.tbd */; };
@@ -37,7 +37,7 @@
39022C1A1EDC2A0E00100066 /* program */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = program; path =
../generated/resources/program; sourceTree = "<group>"; };
39022C1C1EDC2A2C00100066 /* services */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = services; path =
../generated/resources/services; sourceTree = "<group>"; };
39022C1E1EDC2AB000100066 /* share */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = share; path = ../generated/resources/share;
sourceTree = "<group>"; };
- 39022C201EDC2D0800100066 /* icudt59l.dat */ = {isa =
PBXFileReference; lastKnownFileType = file; name = icudt59l.dat; path =
../generated/resources/icudt59l.dat; sourceTree = "<group>"; };
+ 39022C201EDC2D0800100066 /* icudt60l.dat */ = {isa =
PBXFileReference; lastKnownFileType = file; name = icudt60l.dat; path =
../generated/resources/icudt60l.dat; sourceTree = "<group>"; };
391FE7591FBC89BE00C592BA /* LibreOfficeKit.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
LibreOfficeKit.h; path = ../LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.h;
sourceTree = "<group>"; };
39284DB01FA5E150006F43E4 /* dummyLOkit.c */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.c; path = dummyLOkit.c;
sourceTree = "<group>"; };
39284DB21FA5F207006F43E4 /* DocumentActions.swift */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.swift; path =
DocumentActions.swift; sourceTree = "<group>"; };
@@ -158,7 +158,7 @@
39B084E41E5F0B5200682A59 /* Resources */ = {
isa = PBXGroup;
children = (
- 39022C201EDC2D0800100066 /* icudt59l.dat */,
+ 39022C201EDC2D0800100066 /* icudt60l.dat */,
39022C1E1EDC2AB000100066 /* share */,
39022C1C1EDC2A2C00100066 /* services */,
39022C1A1EDC2A0E00100066 /* program */,
@@ -247,7 +247,7 @@
397E09081E597BD8001374E0 /* Assets.xcassets in
Resources */,
39B08BD71E5F0BB600682A59 /* rc in Resources */,
39B08B9E1E5F0BB600682A59 /* offapi.rdb in
Resources */,
- 39022C211EDC2D0800100066 /* icudt59l.dat in
Resources */,
+ 39022C211EDC2D0800100066 /* icudt60l.dat in
Resources */,
39022C1B1EDC2A0E00100066 /* program in
Resources */,
39022C1D1EDC2A2C00100066 /* services in
Resources */,
397868D61E59A3EA007F9248 /* LaunchScreen.xib in
Resources */,
commit 1b36048a42f8f18667ff45bed9e8c248e7edcc75
Author: jan Iversen <j...@libreoffice.org>
Date: Wed Nov 22 08:32:33 2017 +0100
iOS, changed debugger from to lldb
gdb2 does not work well when using a swift based frontend.
changing to default debugger but only for iOS.
Change-Id: Iae0df85b9db4b3dfaf9fbc0e42848c52f3685a48
diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
index 70821840f233..abd1fe3ec65b 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -205,7 +205,7 @@
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
- PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz
-liconv -ggdb2";
+ PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz
-liconv -g";
SDKROOT = iphoneos;
VALID_ARCHS = "x86_64 arm64";
};
@@ -272,7 +272,7 @@
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
- PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz
-liconv -ggdb2";
+ PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz
-liconv -g";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "x86_64 arm64";
diff --git a/ios/loApp.xcconfig.in b/ios/loApp.xcconfig.in
index 060598e49041..0c0fc98dac79 100644
--- a/ios/loApp.xcconfig.in
+++ b/ios/loApp.xcconfig.in
@@ -15,13 +15,13 @@ OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@
SYMROOT = @SYMROOT@
//:configuration = Debug
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a -ggdb2
+LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a -g
//:configuration = Release
LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64.a
//:configuration = Simulator
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a
-ggdb2
+LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a -g
//:completeSettings = some
diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk
index 6f71fda69b4d..46127c9595bf 100644
--- a/solenv/gbuild/platform/iOS.mk
+++ b/solenv/gbuild/platform/iOS.mk
@@ -28,6 +28,9 @@ gb_COMPILEROPTFLAGS := -Oz
include $(GBUILDDIR)/platform/com_GCC_defs.mk
+# Use standard lldb debugger
+gb_DEBUGINFO_FLAGS=-g
+
# Darwin mktemp -t expects a prefix, not a pattern
gb_MKTEMP := /usr/bin/mktemp -t gbuild.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
