[Libreoffice-commits] core.git: 3 commits - ios/CustomTarget_MobileLibreOffice_app.mk ios/MobileLibreOffice ios/Module_ios.mk

[Tor Lillqvist]

 ios/CustomTarget_MobileLibreOffice_app.mk |    3 ++-
 ios/MobileLibreOffice/.gitignore          |    1 -
 ios/Module_ios.mk                         |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 48c29ef3f8214b21833a88adf02c1e1998f27b68
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 22 15:08:30 2013 +0200

    Now we can re-add CustomTarget_MobileLibreOffice_app
    
    Change-Id: Iefb00e72f2700503ea33a28c9f7e2150f0d1e06e

diff --git a/ios/Module_ios.mk b/ios/Module_ios.mk
index d70e277..671e9f3 100644
--- a/ios/Module_ios.mk
+++ b/ios/Module_ios.mk
@@ -13,6 +13,7 @@ ifeq ($(OS),IOS)
 $(eval $(call gb_Module_add_targets,ios,\
 	Executable_LibreOffice \
 	CustomTarget_LibreOffice_app \
+	CustomTarget_MobileLibreOffice_app \
 ))
 
 endif
commit 542dee77d483e10fcd540abc04cee9fa727b6c63
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 22 15:01:51 2013 +0200

    Schemes don't exist in a clean tree, so use targets
    
    The intent hopefully is that the MobileLibreOffice project should be
    buildable in a freshly cloned or otherwise clean tree, where Xcode has
    not been used interactively (which automatically creates a scheme for
    each target, it seems).
    
    Change-Id: I690513ecf54bb824dd3c3b0ef1735cc5cdff6d60

diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk
index 76b3e75..404d797 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -15,7 +15,8 @@ BUILDID			:=$(shell cd $(SRCDIR) && git log -1 --format=%H)
 #- Macros ---------------------------------------------------------------------
 
 define MobileLibreOfficeXcodeBuild 
-	CC=;xcodebuild -project MobileLibreOffice/MobileLibreOffice.xcodeproj -scheme MobileLibreOffice -arch armv7 -configuration $(if $(ENABLE_DEBUG),Debug,Release) $(1) $(if $(verbose)$(VERBOSE),,>/dev/null)
+	CC=;xcodebuild -project shared/ios_sharedlo.xcodeproj -target ios_sharedlo -arch armv7 -configuration $(if $(ENABLE_DEBUG),Debug,Release) $(1) $(if $(verbose)$(VERBOSE),,>/dev/null)
+	CC=;xcodebuild -project MobileLibreOffice/MobileLibreOffice.xcodeproj -target MobileLibreOffice -arch armv7 -configuration $(if $(ENABLE_DEBUG),Debug,Release) $(1) $(if $(verbose)$(VERBOSE),,>/dev/null)
 endef
 
 #- Targets --------------------------------------------------------------------
commit 86c12faeb68b1e952118436c00f55a19b33866fc
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 22 13:45:29 2013 +0200

    No lib_link directory is used any more
    
    Change-Id: Ic21750744794b4721c28f4e2b23e5e5ca5d74db5

diff --git a/ios/MobileLibreOffice/.gitignore b/ios/MobileLibreOffice/.gitignore
index 85f0b5d..289939e 100644
--- a/ios/MobileLibreOffice/.gitignore
+++ b/ios/MobileLibreOffice/.gitignore
@@ -1,2 +1 @@
-/lib_link
 /resource_link