[Libreoffice-commits] core.git: 2 commits - ios/CustomTarget_LibreOffice_app.mk ios/experimental

[Tor Lillqvist]

 ios/CustomTarget_LibreOffice_app.mk            |    5 ++++-
 ios/experimental/LibreOffice/LibreOffice/lo.mm |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 0aa9ced531b8d85ad067c1d156a9708eea628d78
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Nov 6 00:43:06 2013 +0200

    It's types.rdb now, not udkapi.rdb any more
    
    Change-Id: If6e8c4862ec628eb4c052e0fd237f5aef89db8eb

diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index eec4c43..429bb1a 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -168,7 +168,7 @@ lo_initialize(void)
     uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"oovbaapi.rdb"]];
 
     uno_types = [uno_types stringByAppendingString: @" file://"];
-    uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"udkapi.rdb"]];
+    uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"types.rdb"]];
 
     assert(strcmp(argv[2], "placeholder-uno-types") == 0);
     argv[2] = [uno_types UTF8String];
commit fdeb3e618667bc7b556dc6be9b93c451a91fa8ba
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Nov 6 00:29:11 2013 +0200

    Recognize also arm64
    
    Change-Id: Ia66dc4bfa5ea32c6099a135d7182bac2418fb731

diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk
index 7ec5034..719ff09 100644
--- a/ios/CustomTarget_LibreOffice_app.mk
+++ b/ios/CustomTarget_LibreOffice_app.mk
@@ -12,7 +12,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,ios/LibreOffice_app))
 # looking for the "iarmv7" or "i386" in the -arch option that is part
 # of $(CC)
 
-ifneq ($(filter i386,$(CC)),)
+ifneq ($(filter arm64,$(CC)),)
+xcode_sdk=iphoneos
+xcode_arch=arm64
+else ifneq ($(filter i386,$(CC)),)
 xcode_sdk=iphonesimulator
 xcode_arch=i386
 else