strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iOS, remove app xcconfig

Browse source 
This is now handled directly in the project

Change-Id: I1a57521ff8fe733d56154d186c98f68556128ebd
This commit is contained in:
jan Iversen 2017-11-25 13:10:41 +01:00
parent d7b4408886
commit 64c3840197
2 changed files with 1 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ios/CustomTarget_iOS_setup.mk
View file

@ -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 \

27
ios/loApp.xcconfig.in
View file

@ -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