diff options
| author | jan Iversen <jani@libreoffice.org> | 2018-01-12 18:26:21 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2018-01-13 05:43:42 +0100 |
| commit | dacb12d219fd060504553bf29e8536bdb747c930 (patch) | |
| tree | 23fdd3aace676ee574f9b4789626eab97d8477d7 /ios | |
| parent | iOS, Correct BRAND_* in rc (diff) | |
| download | core-dacb12d219fd060504553bf29e8536bdb747c930.tar.gz core-dacb12d219fd060504553bf29e8536bdb747c930.zip | |
iOS, split .a and .dylib generation
Added new dependency/action
Change-Id: I378bc517e74e1569f81c9c7154be154021f1df3c
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_iOS_prelink.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk index d7834cac50b3..0534264d416c 100644 --- a/ios/CustomTarget_iOS_prelink.mk +++ b/ios/CustomTarget_iOS_prelink.mk @@ -42,7 +42,9 @@ IOSPREBUILD: FORCE -$(IOSKIT).dylib: IOSPREBUILD $(WORKDIR)/ios $(call gb_StaticLibrary_get_target,iOS_kitBridge) $(IOSLIBS) +$(IOSKIT).a: IOSPREBUILD $(WORKDIR)/ios $(call gb_StaticLibrary_get_target,iOS_kitBridge) \ + $(IOSLIBS) + $(call gb_Output_announce,iOS prelink object,$(true),LNK,2) $(IOSLD) -r -ios_version_min $(IOS_DEPLOYMENT_VERSION) \ -syslibroot $(MACOSX_SDK_PATH) \ -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'` \ @@ -51,6 +53,9 @@ $(IOSKIT).dylib: IOSPREBUILD $(WORKDIR)/ios $(call gb_StaticLibrary_get_target,i $(IOSLIBS) $(AR) -r $(IOSKIT).a $(IOSOBJ) + +$(IOSKIT).dylib: $(IOSKIT).a + $(call gb_Output_announce,iOS dylib,$(true),LNK,2) $(IOSCLANG) -dynamiclib -mios-simulator-version-min=$(IOS_DEPLOYMENT_VERSION) \ -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'` \ -isysroot $(MACOSX_SDK_PATH) \ |