From 64c38401971eba6b7c2eb6dc1af978c8a6110ef8 Mon Sep 17 00:00:00 2001
From: jan Iversen <jani@libreoffice.org>
Date: Sat, 25 Nov 2017 13:10:41 +0100
Subject: iOS, remove app xcconfig

This is now handled directly in the project

Change-Id: I1a57521ff8fe733d56154d186c98f68556128ebd
---
 ios/CustomTarget_iOS_setup.mk | 17 +----------------
 ios/loApp.xcconfig.in         | 27 ---------------------------
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 ios/loApp.xcconfig.in

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index f32e85be3b9f..b6796d5d4721 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -8,7 +8,6 @@
 #- Env ------------------------------------------------------------------------
 IOSGEN := $(SRCDIR)/ios/generated
 IOSRES := $(IOSGEN)/resources
-IOSAPPXC := $(WORKDIR)/ios/loApp.xcconfig
 
 
 #- Top level  -----------------------------------------------------------------
@@ -16,25 +15,11 @@ $(eval $(call gb_CustomTarget_CustomTarget,ios/iOS_setup))
 
 
 
-$(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSAPPXC) $(IOSGEN)/native-code.h
+$(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSGEN)/native-code.h
 
 
 
 #- Generate dynamic files  ---------------------------------------------------
-$(IOSAPPXC): $(SRCDIR)/ios/loApp.xcconfig.in $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS_setup.mk
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
-	@mkdir -p $(WORKDIR)/ios
-	sed -e "s'@BUILDDIR@'$(BUILDDIR)'g" \
-	    -e "s'@INSTDIR@'$(INSTDIR)'g" \
-	    -e "s'@SRCDIR@'$(SRC_ROOT)'g" \
-	    -e "s'@WORKDIR@'$(WORKDIR)'g" \
-	    -e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \
-	    -e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \
-	    -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \
-	    $(SRCDIR)/ios/loApp.xcconfig.in > $(IOSAPPXC)
-
-
-
 $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS_setup.mk
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
 	mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \
diff --git a/ios/loApp.xcconfig.in b/ios/loApp.xcconfig.in
deleted file mode 100644
index 0c0fc98dac79..000000000000
--- a/ios/loApp.xcconfig.in
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// 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/.
-//
-// Xcode configuration properties
-LO_BUILDDIR = @BUILDDIR@
-LO_INSTDIR = @INSTDIR@
-LO_SRCDIR = @SRCDIR@
-LO_WORKDIR = @WORKDIR@
-OTHER_CFLAGS = @CFLAGS@
-OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@
-SYMROOT = @SYMROOT@
-
-//:configuration = Debug
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a -g
-
-//:configuration = Release
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64.a
-
-//:configuration = Simulator
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a -g
-
-//:completeSettings = some
-
-- 
cgit v1.2.3