[Libreoffice-commits] core.git: ios/experimental ios/lo.xcconfig.in

[jan Iversen]

 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj                        |    2 -
 ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json |   15 ++++++++++
 ios/lo.xcconfig.in                                                                                  |    1 
 3 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit b7ee370c8e9528f1a3891540165d6d1b49f48fb0
Author: jan Iversen <jani at libreoffice.org>
Date:   Sat Feb 11 11:25:38 2017 +0100

    ios BUILDDIR != SRCDIR now works
    
    Added SYMROOT to xcconfig, and change project.pbxproj
    to allow BUILDDIR != SRCDIR
    
    moved part of build output to BUILDDIR
    
    The contents.json change is done by Xcode.
    
    Change-Id: I0594f862781d41b87429f020f059f12e76f7f7f9
    Reviewed-on: https://gerrit.libreoffice.org/34147
    Reviewed-by: jan iversen <jani at libreoffice.org>
    Tested-by: jan iversen <jani at libreoffice.org>

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 057d4c7..6b4a78d 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -39,7 +39,7 @@
 
 /* Begin PBXFileReference section */
 		BE03BF9118F9648F00620DC7 /* udata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = udata.cpp; path = ../../../workdir/UnpackedTarball/icu/source/common/udata.cpp; sourceTree = "<group>"; };
-		BE03BF9218F9A7CC00620DC7 /* icudt58l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt58l.dat; path = ../../../../workdir/UnpackedTarball/icu/source/data/in/icudt58l.dat; sourceTree = "<group>"; };
+		BE03BF9218F9A7CC00620DC7 /* icudt58l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt58l.dat; path = ../../../workdir/UnpackedTarball/icu/source/data/in/icudt58l.dat; sourceTree = BUILT_PRODUCTS_DIR; };
 		BE03BF9518FC1A1C00620DC7 /* xdictionary.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xdictionary.cxx; path = ../../../i18npool/source/breakiterator/xdictionary.cxx; sourceTree = "<group>"; };
 		BE0898E81860D42B0021A679 /* brand.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = brand.cxx; path = ../../../vcl/source/app/brand.cxx; sourceTree = "<group>"; };
 		BE0898E91860D42B0021A679 /* dbggui.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbggui.cxx; path = ../../../vcl/source/app/dbggui.cxx; sourceTree = "<group>"; };
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json
index a4645e6..abd908f 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -2,6 +2,16 @@
   "images" : [
     {
       "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
       "size" : "29x29",
       "scale" : "1x"
     },
@@ -29,6 +39,11 @@
       "idiom" : "ipad",
       "size" : "76x76",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
     }
   ],
   "info" : {
diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
index 21fdc15..6147789 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -29,3 +29,4 @@ DEBUG_INFORMATION_FORMAT=@XCODE_DEBUG_INFORMATION_FORMAT@
 LINK_LDFLAGS =
 OTHER_CFLAGS =
 OTHER_CPLUSPLUSFLAGS =
+SYMROOT = @BUILDDIR@/ios/TiledLibreOffice