diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-09-29 08:59:42 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-09-29 11:31:50 +0200 |
| commit | 08e5cd8afe703237dbf54c0b81fab78ea27adb93 (patch) | |
| tree | 384c59ed479df91c2a3046a706dd4d77076a0009 /ios/CustomTarget_iOS.mk | |
| parent | 596c0dd89507479446870e1efda2f9bb5941edd3 (diff) | |
iOS, WIP build static library.
Adjusting differences between default project, and old
iOS project
Change-Id: I2639761bbe909cbd893c7d6b932e11c1e57998df
Diffstat (limited to 'ios/CustomTarget_iOS.mk')
| -rw-r--r-- | ios/CustomTarget_iOS.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk index 6d817c1d5e1f..e28642633223 100644 --- a/ios/CustomTarget_iOS.mk +++ b/ios/CustomTarget_iOS.mk @@ -27,7 +27,7 @@ $(call gb_CustomTarget_get_target,ios/ios): $(IOSGEN)/$(IOSKIT) #- Generate xcconfig files --------------------------------------------------- -$(IOSKITXC) : $(BUILDDIR)/config_host.mk +$(IOSKITXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) @echo "// Xcode configuration properties" > $(IOSKITXC) @echo "// To avoid confusion, the LO-specific ones that aren't as such used" >> $(IOSKITXC) @@ -52,7 +52,7 @@ $(IOSKITXC) : $(BUILDDIR)/config_host.mk "`$(SRCDIR)/bin/lo-all-static-libs`" >> $(IOSKITXC) @echo "SYMROOT = $(WORKDIR)/ios/build\n" >> $(IOSKITXC) -$(IOSAPPXC) : $(BUILDDIR)/config_host.mk +$(IOSAPPXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) @mkdir -p $(IOSGEN); @echo "// Xcode configuration properties" > $(IOSAPPXC) @@ -155,7 +155,7 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj iosCopySetup build \ , $(WORKDIR)/ios/build.log \ ) - cp iOS_LO_kit.a $(IOSGEN)/$(IOSKIT) + cp $(WORKDIR)/ios/build/*/libLibreOfficeKit.a $(IOSGEN)/$(IOSKIT) |