Kaydet (Commit) c1f46c54 authored tarafından jan Iversen's avatar jan Iversen Kaydeden (comit) jan iversen

ios LibreOfficeLight LOkit integration

Integrated LibreOfficeLight into gbuild.
added lo.xcconfig and Resources (needed to link with LO and run LO)
added swift --> C interface for LOkit
add known commands from JS client

added C++ condition in LibreOfficekitInit.h (inline no good in a C file)

Change-Id: I19ebe8912546408bf701c96c0c63541d6e37cad8
Reviewed-on: https://gerrit.libreoffice.org/35430Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarjan iversen <jani@libreoffice.org>
üst 7a2f07c4
...@@ -43,7 +43,9 @@ extern "C" ...@@ -43,7 +43,9 @@ extern "C"
#define SEPARATOR '/' #define SEPARATOR '/'
#ifndef __OBJC__ #ifndef __OBJC__
#ifdef __cplusplus
inline inline
#endif
#endif #endif
void *lok_loadlib(const char *pFN) void *lok_loadlib(const char *pFN)
{ {
...@@ -55,7 +57,9 @@ extern "C" ...@@ -55,7 +57,9 @@ extern "C"
} }
#ifndef __OBJC__ #ifndef __OBJC__
#ifdef __cplusplus
inline inline
#endif
#endif #endif
char *lok_dlerror(void) char *lok_dlerror(void)
{ {
...@@ -63,7 +67,9 @@ extern "C" ...@@ -63,7 +67,9 @@ extern "C"
} }
#ifndef __OBJC__ #ifndef __OBJC__
#ifdef __cplusplus
inline inline
#endif
#endif #endif
void *lok_dlsym(void *Hnd, const char *pName) void *lok_dlsym(void *Hnd, const char *pName)
{ {
...@@ -71,7 +77,9 @@ extern "C" ...@@ -71,7 +77,9 @@ extern "C"
} }
#ifndef __OBJC__ #ifndef __OBJC__
#ifdef __cplusplus
inline inline
#endif
#endif #endif
int lok_dlclose(void *Hnd) int lok_dlclose(void *Hnd)
{ {
...@@ -79,7 +87,9 @@ extern "C" ...@@ -79,7 +87,9 @@ extern "C"
} }
#ifndef __OBJC__ #ifndef __OBJC__
#ifdef __cplusplus
inline inline
#endif
#endif #endif
void extendUnoPath(const char *pPath) void extendUnoPath(const char *pPath)
{ {
......
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#- Env ------------------------------------------------------------------------
BUILDID :=$(shell cd $(SRCDIR) && git log -1 --format=%H)
#- Targets --------------------------------------------------------------------
.PHONY: LibreOfficeLight_setup
# Register target
$(eval $(call gb_CustomTarget_CustomTarget,ios/LibreOfficeLight))
# Build
# Depend on the custom target that sets up lo.xcconfig
$(call gb_CustomTarget_get_target,ios/LibreOfficeLight): $(call gb_CustomTarget_get_target,ios/Lo_Xcconfig)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
$(call IOSbuild,LibreOfficeLight, clean build)
# Clean
$(call gb_CustomTarget_get_clean_target,ios/LibreOfficeLight):
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),APP,2)
$(call IOSbuild,LibreOfficeLight, clean)
# vim: set noet sw=4 ts=4:
...@@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,ios,\ ...@@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,ios,\
CustomTarget_Lo_Xcconfig \ CustomTarget_Lo_Xcconfig \
CustomTarget_TiledLibreOffice_app \ CustomTarget_TiledLibreOffice_app \
CustomTarget_Prototype_app \ CustomTarget_Prototype_app \
CustomTarget_LibreOfficeLight_app \
)) ))
endif endif
......
...@@ -16,7 +16,7 @@ class LOkit ...@@ -16,7 +16,7 @@ class LOkit
{ {
init() init()
{ {
LOkit_Init()
} }
......
// -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
//
// This file is part of the LibreOffice project.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#import <Availability.h>
#ifndef __IPHONE_5_0
#warning "This project uses features only available in iOS SDK 5.0 and later."
#endif
#ifdef __OBJC__
#include <premac.h>
#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h>
#include <postmac.h>
#endif
// vim:set shiftwidth=4 softtabstop=4 expandtab:
//
// This file is part of the LibreOffice project.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
//
// Bridge functions to LibreOfficeKit
int LOkit_Init();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment