Kaydet (Commit) 6b77a740 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 99c59c59
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
#- Env ------------------------------------------------------------------------ #- Env ------------------------------------------------------------------------
IOSGEN = $(SRCDIR)/ios/generated IOSGEN = $(BUILDDIR)/workdir/CustomTarget/ios
IOSLIBS := $(shell \ IOSLIBS := $(shell \
(export INSTDIR=$(INSTDIR);export OS=$(OS); \ (export INSTDIR=$(INSTDIR);export OS=$(OS); \
export WORKDIR=$(WORKDIR);export LIBO_LIB_FOLDER=$(LIBO_LIB_FOLDER); \ export WORKDIR=$(WORKDIR);export LIBO_LIB_FOLDER=$(LIBO_LIB_FOLDER); \
$(SRCDIR)/bin/lo-all-static-libs)) $(SRCDIR)/bin/lo-all-static-libs))
IOSOBJ = $(WORKDIR)/ios/Kit.o IOSOBJ = $(IOSGEN)/Kit.o
IOSSRC = $(SRCDIR)/ios/source/LibreOfficeKit.c IOSSRC = $(SRCDIR)/ios/source/LibreOfficeKit.c
ifeq ($(ENABLE_DEBUG),TRUE) ifeq ($(ENABLE_DEBUG),TRUE)
......
...@@ -1792,19 +1792,19 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.</string> ...@@ -1792,19 +1792,19 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.</string>
<string>public.composite-content</string> <string>public.composite-content</string>
</array> </array>
<key>UTTypeDescription</key> <key>UTTypeDescription</key>
<string>Apple PDF pasteboard type PDF data</string> <string>Apple PDF pasteboard type PDF data</string>
<key>UTTypeIdentifier</key> <key>UTTypeIdentifier</key>
<string>com.adobe.pdf</string> <string>com.adobe.pdf</string>
<key>UTTypeTagSpecification</key> <key>UTTypeTagSpecification</key>
<dict> <dict>
<key>public.filename-extension</key> <key>public.filename-extension</key>
<array> <array>
<string>pdf</string> <string>pdf</string>
</array> </array>
<key>public.mime-type</key> <key>public.mime-type</key>
<array> <array>
<string>application/pdf</string> <string>application/pdf</string>
</array> </array>
</dict> </dict>
</dict> </dict>
</array> </array>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment