diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-02 13:26:31 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-02 14:40:07 +0100 |
| commit | 4be366de5833c284f21393e99fb7b11199f4b0ff (patch) | |
| tree | 6045389d08b4a5f802c8793ccd838fa6fcbec0a4 /ios | |
| parent | 257d1f4ff3094a42952663d620d7c49e3e7c747f (diff) | |
native code generator: Do not use single_component_map anymore.
Put cui and spl into extended_code and ignore the rest.
Also change DocumentLoader and LibreOffice4Android to use only
extended_core and writer as all the ios apps do, without knowing what is
really needed there.
Change-Id: Ic6a256ea47cc96132c0e7658d6ef2838b295ca71
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_MobileLibreOffice_app.mk | 1 | ||||
| -rw-r--r-- | ios/CustomTarget_TiledLibreOffice_app.mk | 1 | ||||
| -rw-r--r-- | ios/Executable_LibreOffice.mk | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk index cb25385fee52..ec59df0d4f17 100644 --- a/ios/CustomTarget_MobileLibreOffice_app.mk +++ b/ios/CustomTarget_MobileLibreOffice_app.mk @@ -35,7 +35,6 @@ $(call gb_CustomTarget_get_target,ios/MobileLibreOffice): $(call gb_CustomTarget $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2) $(SRCDIR)/solenv/bin/native-code.py \ -g extended_core -g writer \ - -s cui -s spl \ > $(SRCDIR)/ios/shared/ios_sharedlo/cxx/native-code.mm $(call MobileLibreOfficeXcodeBuild, clean build) diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk b/ios/CustomTarget_TiledLibreOffice_app.mk index 5097f0d37458..95e7fbd5f79a 100644 --- a/ios/CustomTarget_TiledLibreOffice_app.mk +++ b/ios/CustomTarget_TiledLibreOffice_app.mk @@ -30,7 +30,6 @@ $(call gb_CustomTarget_get_target,ios/TiledLibreOffice): $(call gb_CustomTarget_ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2) $(SRCDIR)/solenv/bin/native-code.py \ -g extended_core -g writer \ - -s cui -s spl \ > $(SRCDIR)/ios/experimental/TiledLibreOffice/TiledLibreOffice/native-code.mm $(call TiledLibreOfficeXcodeBuild, clean build) diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk index f35b9cb11baa..ccf69c7fb38d 100644 --- a/ios/Executable_LibreOffice.mk +++ b/ios/Executable_LibreOffice.mk @@ -29,7 +29,6 @@ $(call gb_CustomTarget_get_workdir,ios/LibreOffice)/native-code.cxx : mkdir -p `dirname $@` $(SRCDIR)/solenv/bin/native-code.py \ -g extended_core -g writer \ - -s cui -s spl \ > $@ $(eval $(call gb_Executable_add_objcxxobjects,LibreOffice,\ |