diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-10-16 19:12:38 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-10-16 19:14:26 +0200 |
| commit | 7636558b4549a519694b4263bffee1b1f1cc2672 (patch) | |
| tree | 55a8b246e99b3ec6432af695f9146e18752ca075 /ios | |
| parent | 7e7329873b263917ff963b38dfd804727d0914d0 (diff) | |
iOS, update to make app use prelink
Change-Id: I2af55a199106ae7ccc9ebe748b4295fd9f83e205
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_iOS.mk | 3 | ||||
| -rw-r--r-- | ios/loApp.xcconfig.in | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk index 9f19f279a964..b07c6cbf99e8 100644 --- a/ios/CustomTarget_iOS.mk +++ b/ios/CustomTarget_iOS.mk @@ -29,7 +29,7 @@ $(call gb_CustomTarget_get_target,ios/ios): $(IOSGEN)/$(IOSKIT) #- Generate xcconfig files --------------------------------------------------- -$(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk +$(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) @mkdir -p $(IOSGEN) $(WORKDIR)/ios; sed -e "s'@BUILDDIR@'$(BUILDDIR)'g" \ @@ -48,7 +48,6 @@ $(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i -e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \ -e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \ -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \ - -e "s'@LDLIBS@'`$(SRCDIR)/bin/lo-all-static-libs`'g" \ $(SRCDIR)/ios/loApp.xcconfig.in > $(WORKDIR)/ios/loApp.xcconfig ifeq ("$(wildcard $(IOSRES))","") diff --git a/ios/loApp.xcconfig.in b/ios/loApp.xcconfig.in index 56cb23a9337f..fb3426dd4df8 100644 --- a/ios/loApp.xcconfig.in +++ b/ios/loApp.xcconfig.in @@ -13,16 +13,15 @@ LO_WORKDIR = @WORKDIR@ OTHER_CFLAGS = @CFLAGS@ OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@ SYMROOT = @SYMROOT@ -LINK_LDFLAGS= @LDLIBS@ //:configuration = Debug -//LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a +LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a //:configuration = Release -//LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64.a +LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64.a //:configuration = Simulator -//LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a +LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a //:completeSettings = some |