diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-11-25 09:22:40 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-11-25 12:25:07 +0100 |
| commit | b289dd1bef969185b8219c6c520b194faa2c8b74 (patch) | |
| tree | c79813aeaa5ed4e3644552c31bdef481762a1b8c | |
| parent | b0e37303df56472fdc7782b977326c2391fdab07 (diff) | |
iOS corrected object name
removed "lib" from object name
updated README
Change-Id: I37948aca4d3a1e226e55a84a13e41d0237cbc6fb
| -rw-r--r-- | ios/CustomTarget_iOS_prelink.mk | 4 | ||||
| -rw-r--r-- | ios/README | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk index 76ece5a5023b..2588e72110ca 100644 --- a/ios/CustomTarget_iOS_prelink.mk +++ b/ios/CustomTarget_iOS_prelink.mk @@ -10,9 +10,9 @@ IOSDEV = /Applications/Xcode.app/Contents/Developer/ IOSLD = $(IOSDEV)Toolchains/XcodeDefault.xctoolchain/usr/bin/ld ifeq ($(ENABLE_DEBUG),TRUE) -IOSKIT = $(SRCDIR)/ios/generated/libLibreOfficeKit_$(CPUNAME)_debug.o +IOSKIT = $(SRCDIR)/ios/generated/LibreOfficeKit_$(CPUNAME)_debug.o else -IOSKIT = $(SRCDIR)/ios/generated/libLibreOfficeKit_$(CPUNAME).o +IOSKIT = $(SRCDIR)/ios/generated/LibreOfficeKit_$(CPUNAME).o endif diff --git a/ios/README b/ios/README index 0151d72fd34c..6ad40d2ef8a4 100644 --- a/ios/README +++ b/ios/README @@ -41,7 +41,6 @@ Due to the multiple workdirs a separate work directories are needed as follows: --enable-debug --enable-ios-simulator #--host=arm64-apple-darwin - ./ios-app - workdir for UI, NO autogen.input -- Steps to generate 1) copy ./core/distro-configs/LibreOfficeiOS.conf to autogen.input in @@ -49,14 +48,12 @@ Due to the multiple workdirs a separate work directories are needed as follows: Correct as per above, add your local setup (e.g. location of tarballs) 2) run ../core/autogen.sh in ios-arm64, ios-arm64-debug and ios-simulator 3) run make in ios-arm64, ios-arm64-debug and ios-simulator - this will generate ./*/ios/lo[Kit|App].xcconfig which prepares LO to be compiled + this will generate core/loApp.xcconfig which prepares LO to be compiled and build LOkit is 3 configurations and store the LibreOfficeKit - libraries in ./core/ios/generated as: - LibreOfficeKit-arm64.a - LibreOfficeKit-arm64-debug.a - LibreOfficeKit-simulator.a - *note* run "make build-nocheck" in ios-simulator for the time being -4) run ../core/autogen.sh in ios-app + prelinked object in ./core/ios/generated as: + LibreOfficeKit-arm64.o + LibreOfficeKit-arm64-debug.o + LibreOfficeKit-simulator.o 5) open xcode with LibreOfficeLight add ./ios-app/ios/loApp.xconfig to the project. 6) enjoy |