Need to have native-code.cxx as a separate file for the LibreOffice app
The executable of the LibreOffice app (which as such at the moment doesn't work, since the tiled rendering changes) is built using gbuild, and thus we can't generate the native-code snippet in the CustomTarget that builds the app bundle, but need it already when building the executable. This is one wayt to handle that. Change-Id: Ifdab40c970e93b1f2608cefc637df8a8e5396efe
This commit is contained in:
@@ -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
|
||||
|
@@ -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 \
|
||||
))
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user