diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-02-11 11:25:38 +0100 |
|---|---|---|
| committer | jan iversen <jani@libreoffice.org> | 2017-02-16 13:01:08 +0000 |
| commit | b7ee370c8e9528f1a3891540165d6d1b49f48fb0 (patch) | |
| tree | df5fe5f1b8b022ed1118a38c82fe0e765c03828e | |
| parent | dd18f8ae55901ca400cf99a804fda46e266588f1 (diff) | |
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@libreoffice.org>
Tested-by: jan iversen <jani@libreoffice.org>
3 files changed, 17 insertions, 1 deletions
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj index 057d4c793f6b..6b4a78d787b2 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 a4645e6b015d..abd908fc986c 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 21fdc15c66db..61477898500a 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 |