diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-11-09 12:49:11 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-11-09 12:52:02 +0200 |
| commit | 0f68e45e2ec6b9fa8c562044e88355d95af0347d (patch) | |
| tree | 338b5f185aab4d7f6e29cee71b5fc2fc26ebea57 /ios | |
| parent | Alignment (whitespace) cleanup (diff) | |
| download | core-0f68e45e2ec6b9fa8c562044e88355d95af0347d.tar.gz core-0f68e45e2ec6b9fa8c562044e88355d95af0347d.zip | |
Do put a BRAND_SHARE_RESOURCE_SUBDIR setting into fundamentalrc for iOS
Not sure wht it was commented out. For now use
$(LIBO_SHARE_RESOURCE_FOLDER) which is the same "program/resource" as
on Unix.
Change-Id: I81b8dd4868e68c3a8c38f9b4f84de7bfc8383d28
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_iOS_setup.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index 390236a29c5d..85fbbad4c727 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -56,6 +56,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \ cp $(INSTDIR)/program/types/oovbaapi.rdb $(IOSRES) cp $(INSTDIR)/program/services/services.rdb $(IOSRES)/services cp $(INSTDIR)/program/services.rdb $(IOSRES) + cp -R $(INSTDIR)/program/resource $(IOSRES)/program mkdir -p $(IOSRES)/share/config cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/share/config cp $(INSTDIR)/share/filter/oox-drawingml-adj-names $(IOSRES)/filter @@ -75,7 +76,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \ && echo 'BRAND_BASE_DIR=file://$$APP_DATA_DIR' \ && echo 'BRAND_INI_DIR=file:://$$APP_DATA_DIR' \ && echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \ - && echo '##BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \ + && echo 'BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \ && echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/registry ' \ 'res:$${BRAND_BASE_DIR}/registry' \ && echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' \ |