diff options
author | Tor Lillqvist <tml@collabora.com> | 2018-10-10 12:22:52 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2018-10-10 12:29:18 +0300 |
commit | 6b77a740e580ffbd4a99e15ad321f160916646f7 (patch) | |
tree | 16fc2bb0976b39a4c4ceeb089be899feebfbc9b0 /ios/CustomTarget_iOS_link.mk | |
parent | 99c59c594ff6747abef4529fbb2251751737eb7e (diff) |
Make LibreOfficeLight build again
(And it actually works now again, as far as I see, after the recent
fix to LibreOfficeKit's iOS code.)
Adapt to earlier changes: The generated files are now in workdir, not
in the ios source directory.
Use org.libreoffice.ios.LibreOfficeLight for the
PRODUCT_BUNDLE_IDENTIFIER instead of janI's own.
(Additionally the DEVELOPMENT_TEAM was reset to the one I use;
apparently there is no way to make sure that developer-specific
setting is in a file not in version control?)
Change-Id: I575561583f584b5ac3c759d115b1c9c6dc97ef94
Diffstat (limited to 'ios/CustomTarget_iOS_link.mk')
-rw-r--r-- | ios/CustomTarget_iOS_link.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ios/CustomTarget_iOS_link.mk b/ios/CustomTarget_iOS_link.mk index 9d868ca181cd..8bcf6f550826 100644 --- a/ios/CustomTarget_iOS_link.mk +++ b/ios/CustomTarget_iOS_link.mk @@ -8,12 +8,12 @@ #- Env ------------------------------------------------------------------------ -IOSGEN = $(SRCDIR)/ios/generated +IOSGEN = $(BUILDDIR)/workdir/CustomTarget/ios IOSLIBS := $(shell \ (export INSTDIR=$(INSTDIR);export OS=$(OS); \ export WORKDIR=$(WORKDIR);export LIBO_LIB_FOLDER=$(LIBO_LIB_FOLDER); \ $(SRCDIR)/bin/lo-all-static-libs)) -IOSOBJ = $(WORKDIR)/ios/Kit.o +IOSOBJ = $(IOSGEN)/Kit.o IOSSRC = $(SRCDIR)/ios/source/LibreOfficeKit.c ifeq ($(ENABLE_DEBUG),TRUE) |