diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-09-26 12:54:40 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-09-26 18:22:03 +0200 |
| commit | 11f001f1a05684c87615e74a1edab300409bf6c6 (patch) | |
| tree | 3707b57c907cb50be63c82561dc600143eed6c18 /ios/CustomTarget_Lo_Xcconfig.mk | |
| parent | Call pyuno.private_initTestEnvironment() only once (diff) | |
| download | core-11f001f1a05684c87615e74a1edab300409bf6c6.tar.gz core-11f001f1a05684c87615e74a1edab300409bf6c6.zip | |
iOS, build instructions.
Added README with instruction on how to build for
the different platforms, updated iOS files corresponding
Change-Id: I8a85f808841d682bc09f1e3b039192e342ecc484
Diffstat (limited to 'ios/CustomTarget_Lo_Xcconfig.mk')
| -rw-r--r-- | ios/CustomTarget_Lo_Xcconfig.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ios/CustomTarget_Lo_Xcconfig.mk b/ios/CustomTarget_Lo_Xcconfig.mk index a4bbbc577e82..6aea394fab2f 100644 --- a/ios/CustomTarget_Lo_Xcconfig.mk +++ b/ios/CustomTarget_Lo_Xcconfig.mk @@ -11,7 +11,6 @@ IOSWORK := $(BUILDDIR)/workdir IOSDIR := $(IOSWORK)/ios IOSRESOURCE := $(IOSDIR)/resources IOSGENERATED := $(IOSDIR)/generated -IOSLINK := $(SRCDIR)/ios/ioswork LO_XCCONFIG = $(IOSGENERATED)/lo.xcconfig @@ -20,7 +19,8 @@ define IOSbuild CC=; \ $(call gb_Helper_print_on_error, \ xcodebuild \ - -project $(SRCDIR)/ios/experimental/$(1)/$(1).xcodeproj \ + -xcconfig $(BUILDDIR)/ios/$1/lo_kit.xconfig \ + -project $(SRCDIR)/ios/$(1)/$(1).xcodeproj \ -target $(1) \ -sdk $(XCODEBUILD_SDK) \ -arch $(XCODE_ARCHS) \ @@ -42,9 +42,8 @@ $(LO_XCCONFIG) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) # prepare work directories for all ios builds - rm -rf $(IOSRESOURCE) $(IOSLINK) 2>/dev/null; + rm -rf $(IOSRESOURCE) 2>/dev/null; mkdir -p $(IOSDIR) $(IOSGENERATED) $(IOSRESOURCE) $(IOSRESOURCE)/services; - ln -s $(IOSWORK) $(IOSLINK) # generate file with call declarations $(SRCDIR)/solenv/bin/native-code.py \ @@ -127,7 +126,6 @@ $(LO_XCCONFIG) : $(call gb_CustomTarget_get_clean_target,ios/Lo_Xcconfig): $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),ENV,2) rm -rf $(IOSDIR) - rm -f $(IOSLINK) rm -f $(WORKDIR)/CustomTarget/ios/Lo_Xcconfig.done |