diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-10-06 09:20:22 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-10-06 09:34:59 +0200 |
| commit | eed96773b4adf7fdec74502ee89bca63b9018a80 (patch) | |
| tree | 8696b0ea6918bdbcc4d1679de2fbb03b23bda052 /ios | |
| parent | 60e7480535147bbfb1b000528510e66303c032fb (diff) | |
iOS, fixes for release build
removed coinmp (needed to update lo-all-static-libs)
convert CPUNAME to lowercase (needed by xcodebuild)
Change-Id: I13ccfbd6a6fd139db2745c1536192710afe094bb
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_iOS.mk | 2 | ||||
| -rw-r--r-- | ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk index 55375687ff0e..f3e834f5084f 100644 --- a/ios/CustomTarget_iOS.mk +++ b/ios/CustomTarget_iOS.mk @@ -116,7 +116,7 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj $(IOSKITXC) $(IOSAPPXC) -project $(IOSKITPRJ) \ -target LibreOfficeKit \ -sdk $(IOS_SDK) \ - -arch $(CPU_NAME) \ + -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'`\ -configuration $(if $(ENABLE_DEBUG),Debug,Release) \ build \ , $(WORKDIR)/ios/build.log \ diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj index 407b57cb37d5..ca9a90549414 100644 --- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj +++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 3908315E1F8395EB003F2A29 /* loKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = loKit.xcconfig; path = ../../../../../../../Users/jani/lo_ios/workdir/ios/loKit.xcconfig; sourceTree = "<group>"; }; 39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libLibreOfficeKit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 39B5D2181F78130F008FB162 /* LibreOfficeKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LibreOfficeKit.h; sourceTree = "<group>"; }; 39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LibreOfficeKit.mm; sourceTree = "<group>"; }; @@ -69,7 +68,6 @@ 39B5D2171F78130F008FB162 /* LibreOfficeKit */ = { isa = PBXGroup; children = ( - 3908315E1F8395EB003F2A29 /* loKit.xcconfig */, 39B5D2181F78130F008FB162 /* LibreOfficeKit.h */, 39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */, ); |