Makefile.in | 3 +++
ios/StaticLibrary_iOSkit.mk | 5 -----
ios/source/LibreOfficeKit.c | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 73259891a3fa77497b76b8378a795c83944d74e4
Author: jan Iversen <j...@libreoffice.org>
Date: Sun Jan 14 12:02:29 2018 +0100
iOS changed reference to native-code.h
Change-Id: Icadbdc4463ffb9591353e820f66474c65efd12cf
diff --git a/ios/StaticLibrary_iOSkit.mk b/ios/StaticLibrary_iOSkit.mk
index 67f8b086cfcf..f36ef856a8dc 100644
--- a/ios/StaticLibrary_iOSkit.mk
+++ b/ios/StaticLibrary_iOSkit.mk
@@ -19,11 +19,6 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,iOS_kitBridge))
-$(eval $(call gb_StaticLibrary_set_include,iOS_kitBridge,\
- $$(INCLUDE) \
- -I$(SRCDIR)/ios/generated \
-))
-
$(eval $(call gb_StaticLibrary_add_cobjects,iOS_kitBridge,\
ios/source/LibreOfficeKit \
))
diff --git a/ios/source/LibreOfficeKit.c b/ios/source/LibreOfficeKit.c
index b403b356d171..1868ae7b21fa 100644
--- a/ios/source/LibreOfficeKit.c
+++ b/ios/source/LibreOfficeKit.c
@@ -15,7 +15,7 @@
#include <osl/process.h>
// generated by solenv/bin/native-code.py:
-#include "native-code.h"
+#include "../generated/native-code.h"
// pointers to our instance
commit 0ff9e57e0f4ee7a5bf846ae61fc97012434d3be8
Author: jan Iversen <j...@libreoffice.org>
Date: Sun Jan 14 12:01:13 2018 +0100
iOS updated "make clean"
make clean now knows how to clean the iOS special part
Change-Id: If132172d95823754f0983241a8121d143fcc3007
diff --git a/Makefile.in b/Makefile.in
index 006c98c3f41a..1ccb676795fa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -174,6 +174,9 @@ clean-host:
rm -fr $(TESTINSTALLDIR)
rm -fr $(INSTDIR)
rm -fr $(WORKDIR)
+ifeq ($(OS),IOS)
+ rm -fr $(SRCDIR)/ios/generated
+endif
clean-build:
ifneq ($(CROSS_COMPILING),)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
