diff options
| author | jan Iversen <jani@libreoffice.org> | 2018-01-07 17:19:27 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2018-01-07 18:16:57 +0100 |
| commit | 2d28107c294e72e69fa0ce4fc20bad9e11ef1118 (patch) | |
| tree | 1e1a59a6bb9bcf50c017f506b4b725f8099809e8 /ios | |
| parent | 89289fd5df60e73aa5c96c72b94d5b0bef302ef2 (diff) | |
iOS, create both static and dylib.
for now the dylib is experimental.
Change-Id: Id32e90a61b9695c0a73554db80b072a98234a9f5
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_iOS_prelink.mk | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk index 4ced2da31977..a50a1209630b 100644 --- a/ios/CustomTarget_iOS_prelink.mk +++ b/ios/CustomTarget_iOS_prelink.mk @@ -11,8 +11,10 @@ IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o ifeq ($(ENABLE_DEBUG),TRUE) IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.dylib +IOSKIT2 = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.a else -IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME).a +IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME).dylib +IOSKIT2 = $(SRCDIR)/ios/generated/libKit_$(CPUNAME).a endif @@ -29,9 +31,15 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): $(IOSKIT) FORCE: -$(IOSKIT): $(IOSOBJ) - $(SRCDIR)/bin/lo-all-static-libs > $(SRCDIR)/ios/generated/lib.list -ifeq ($(ENABLE_DEBUG),TRUE) +$(IOSKIT): + $(IOSLD) -r -ios_version_min 11.2 \ + -syslibroot $(MACOSX_SDK_PATH) \ + -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'` \ + -o $(IOSOBJ) \ + $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \ + `$(SRCDIR)/bin/lo-all-static-libs` + $(AR) -r $(IOSKIT2) $(IOSOBJ) + $(IOSLD) -dylib -ios_version_min $(IOS_DEPLOYMENT_VERSION) \ -syslibroot $(MACOSX_SDK_PATH) \ -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'` \ @@ -51,21 +59,12 @@ ifeq ($(ENABLE_DEBUG),TRUE) $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \ `$(SRCDIR)/bin/lo-all-static-libs` \ -o $(IOSKIT) -else - $(IOSLD) -r -ios_version_min 11.2 \ - -syslibroot $(MACOSX_SDK_PATH) \ - -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'` \ - -o $(IOSOBJ) \ - $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \ - `$(SRCDIR)/bin/lo-all-static-libs` - $(AR) -r $(IOSKIT) $(IOSOBJ) -endif #- clean ios ----------------------------------------------------------------- $(call gb_CustomTarget_get_clean_target,ios/iOS_prelink): - rm $(IOSKIT) + rm -f $(IOSKIT) $(IOSKIT2) |