diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-05-30 14:15:27 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-06-03 19:33:48 +0200 |
| commit | a318fc479cf7255a7fdf12f578b8c3199eda5367 (patch) | |
| tree | 4498604aac7d2eef6c97ead2eac6e1e5505f7016 /ios | |
| parent | 73e64e295d97d16e6e63e3182a5ad336969f7866 (diff) | |
iOS, prepare for arm architecture
Need arm46, armv7 and i386
Change-Id: Idd72ca070c98974cc31833839e8eaf64ab5ced03
Diffstat (limited to 'ios')
3 files changed, 19 insertions, 7 deletions
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj index 78b070b5ef71..8162ef593d64 100644 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj @@ -442,6 +442,7 @@ baseConfigurationReference = 39B084E21E5F0A9600682A59 /* lo.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -509,6 +510,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Debug; }; @@ -517,6 +519,7 @@ baseConfigurationReference = 39B084E21E5F0A9600682A59 /* lo.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -536,7 +539,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -578,6 +581,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; + VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Release; }; @@ -585,6 +589,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 39B084E21E5F0A9600682A59 /* lo.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = NO; @@ -603,7 +608,7 @@ SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; - VALID_ARCHS = i386; + VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Debug; }; @@ -611,6 +616,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 39B084E21E5F0A9600682A59 /* lo.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = NO; @@ -629,7 +635,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h"; SWIFT_VERSION = 3.0; - VALID_ARCHS = i386; + VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Release; }; diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift b/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift index a1e97161d873..bd9c7cbafe59 100644 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift @@ -19,6 +19,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate // MARK: - AppDelegate functions + func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any] = [:]) -> Bool + { + // called when started from another Application. + return true + } func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool @@ -31,6 +36,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate defaults.set(applicationVersion, forKey: "application_version") defaults.synchronize() + // start LibreOfficeKit + BridgeLOkit_Init(Bundle.main.bundlePath) + // Override point for customization after application launch. return true } @@ -72,8 +80,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate func applicationDidBecomeActive(_ application: UIApplication) { - // start LibreOfficeKit - BridgeLOkit_Init(Bundle.main.bundlePath) } diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist index b65394198954..6975c22c6a08 100755 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist @@ -138,11 +138,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.4.3</string> + <string>0.4.5</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>2</string> + <string>1</string> <key>LSApplicationCategoryType</key> <string>public.app-category.business</string> <key>LSMultipleInstancesProhibited</key> |