diff options
Diffstat (limited to 'ios')
-rw-r--r-- | ios/CustomTarget_LibreOffice_app.mk | 4 | ||||
-rw-r--r-- | ios/Executable_LibreOffice.mk | 11 | ||||
-rw-r--r-- | ios/experimental/LibreOffice/LibreOffice/lo.mm | 3 |
3 files changed, 11 insertions, 7 deletions
diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index f9101148dc91..719ff0905bb7 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -137,10 +137,6 @@ else # Copy the Xcode project to BUILDDIR if SRCDIR!=BUILDDIR, so that one # can then open it from there in Xcode. $(call gb_CustomTarget_get_target,ios/LibreOffice_app) : $(gb_Helper_PHONY) - $(SRCDIR)/solenv/bin/native-code.py \ - -g extended_core -g writer \ - -s cui -s spl -s uui \ - > $(SRCDIR)/ios/experimental/LibreOffice/LibreOffice/native-code.mm if test $(SRCDIR) != $(BUILDDIR); then \ (cd $(SRCDIR) && tar cf - ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj) | (cd $(BUILDDIR) && tar xf -); \ fi diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk index 7327d3817a20..6f63c28af973 100644 --- a/ios/Executable_LibreOffice.mk +++ b/ios/Executable_LibreOffice.mk @@ -21,6 +21,17 @@ $(eval $(call gb_Executable_use_system_darwin_frameworks,LibreOffice,\ UIKit \ )) +$(eval $(call gb_Executable_add_generated_cxxobjects,LibreOffice,\ + CustomTarget/ios/LibreOffice/native-code \ +)) + +$(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 -s uui \ + > $@ + $(eval $(call gb_Executable_add_objcxxobjects,LibreOffice,\ ios/experimental/LibreOffice/LibreOffice/lo \ )) diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm index 3e69eb74c803..ca01ce0f06e6 100644 --- a/ios/experimental/LibreOffice/LibreOffice/lo.mm +++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm @@ -15,9 +15,6 @@ #include <osl/process.h> #include <touch/touch.h> -// generated by solenv/bin/native-code.py: -#include "native-code.mm" - extern "C" void lo_initialize(void) |