ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj | 14 +++++++ solenv/gbuild/platform/IOS_ARM_GCC.mk | 5 ++ vcl/inc/ios/iosvcltypes.h | 20 ---------- 3 files changed, 18 insertions(+), 21 deletions(-)
New commits: commit b7e5ab6f65eb682bfa200459d745d3bc4056e42a Author: Tor Lillqvist <t...@collabora.com> Date: Fri Oct 25 00:47:22 2013 +0300 No libs in solver now any more Change-Id: I6f0f91c5fdb467fea2c706b4d426a973277c5230 diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index aac083b..96cfb5d 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -117,13 +117,13 @@ define gb_LinkTarget__command_dynamiclink $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ $(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \ - $(wildcard $(OUTDIR)/lib/*.a) \ $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \ $(HUNSPELL_LIBS) \ $(HYPHEN_LIB) \ $(MYTHES_LIBS) \ $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/lcms2/src/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libmspub/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libmwaw/src/lib/.libs/*.a) \ @@ -132,6 +132,9 @@ define gb_LinkTarget__command_dynamiclink $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/raptor/src/.libs/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/rasqal/src/.libs/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/redland/src/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/xml2/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/xslt/libxslt/.libs/*.a) \ $(T_LIBS) \ commit a9759f706b0abd202e704004bdfa7b69fe93bbd0 Author: Tor Lillqvist <t...@collabora.com> Date: Thu Oct 24 23:34:26 2013 +0300 Add a few sources from vcl Change-Id: Iaddbfb48a071baaf84ee7bde38f40449f342dce8 diff --git a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj index 89e04be..4a4dce7 100644 --- a/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj @@ -78,6 +78,13 @@ BE9086FF16FF02B3004400A1 /* svptext.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svptext.cxx; path = ../../../../vcl/headless/svptext.cxx; sourceTree = "<group>"; }; BE90870016FF02B3004400A1 /* svpvd.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svpvd.cxx; path = ../../../../vcl/headless/svpvd.cxx; sourceTree = "<group>"; }; BE954A2E1704F9500040D517 /* iosinst.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = iosinst.cxx; path = ../../../../vcl/ios/iosinst.cxx; sourceTree = "<group>"; }; + BE96AEB118196DCE00BD1AC4 /* svpbmp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpbmp.cxx; path = ../../../../vcl/headless/svpbmp.cxx; sourceTree = "<group>"; }; + BE96AEB218196DCE00BD1AC4 /* svpdata.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpdata.cxx; path = ../../../../vcl/headless/svpdata.cxx; sourceTree = "<group>"; }; + BE96AEB318196DCE00BD1AC4 /* svpframe.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpframe.cxx; path = ../../../../vcl/headless/svpframe.cxx; sourceTree = "<group>"; }; + BE96AEB418196DCE00BD1AC4 /* svpgdi.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpgdi.cxx; path = ../../../../vcl/headless/svpgdi.cxx; sourceTree = "<group>"; }; + BE96AEB518196DCE00BD1AC4 /* svpvd.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpvd.cxx; path = ../../../../vcl/headless/svpvd.cxx; sourceTree = "<group>"; }; + BE96AEB6181971AF00BD1AC4 /* svpinst.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svpinst.cxx; path = ../../../../vcl/headless/svpinst.cxx; sourceTree = "<group>"; }; + BE96AEB7181973DA00BD1AC4 /* salbmp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salbmp.cxx; path = ../../../../vcl/quartz/salbmp.cxx; sourceTree = "<group>"; }; BE9B03C8181671C000E1B0CF /* edws.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = edws.cxx; path = ../../../../sw/source/core/edit/edws.cxx; sourceTree = "<group>"; }; BEB752BD180C90D0005B5696 /* outmap.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = outmap.cxx; path = ../../../../vcl/source/gdi/outmap.cxx; sourceTree = "<group>"; }; BEBF3E3A17002D0200C454AC /* svapp.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svapp.cxx; path = ../../../../vcl/source/app/svapp.cxx; sourceTree = "<group>"; }; @@ -135,8 +142,15 @@ children = ( BE954A2E1704F9500040D517 /* iosinst.cxx */, BEB752BD180C90D0005B5696 /* outmap.cxx */, + BE96AEB7181973DA00BD1AC4 /* salbmp.cxx */, BEBF3E3A17002D0200C454AC /* svapp.cxx */, BEBF3E3B17002D0200C454AC /* svmain.cxx */, + BE96AEB118196DCE00BD1AC4 /* svpbmp.cxx */, + BE96AEB218196DCE00BD1AC4 /* svpdata.cxx */, + BE96AEB318196DCE00BD1AC4 /* svpframe.cxx */, + BE96AEB418196DCE00BD1AC4 /* svpgdi.cxx */, + BE96AEB6181971AF00BD1AC4 /* svpinst.cxx */, + BE96AEB518196DCE00BD1AC4 /* svpvd.cxx */, BE4EEE9A16FF80B100D475B2 /* virdev.cxx */, BEBF3E3D17002D6900C454AC /* window.cxx */, BE2CB9601808247600953CB4 /* winproc.cxx */, commit 097f76d473a54290fd54cdaafb211167994c8f56 Author: Tor Lillqvist <t...@collabora.com> Date: Thu Oct 24 17:44:05 2013 +0300 Remove unused file Change-Id: I78023074a31cf1cc3703a8fbeeb7f6a44a5c70d3 diff --git a/vcl/inc/ios/iosvcltypes.h b/vcl/inc/ios/iosvcltypes.h deleted file mode 100644 index 1c7da58..0000000 --- a/vcl/inc/ios/iosvcltypes.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -*- Mode: C++; 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/. - */ - -#ifndef _IOSVCLTYPES_H -#define _IOSVCLTYPES_H - -#include "premac.h" -#import <CoreText/CoreText.h> -#import <UIKit/UIKit.h> -#include "postmac.h" - -#endif /* _IOSVCLTYPES_H */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits