diff options
| author | jan Iversen <jani@libreoffice.org> | 2018-01-08 11:53:31 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2018-01-08 13:18:36 +0100 |
| commit | b9bfda051a4248a0e209fa9fa59a4bfe8a48b853 (patch) | |
| tree | ca31df2eefa96c656cf44214888973cc21d94e6d /ios | |
| parent | ee4b074ce26029092d0e5f27c22a358abe101312 (diff) | |
iOS, forgot make dependency.
and also added -Objc to allow use of NS functions.
Change-Id: I236cefa53f54531d035881768d2f99749dd00cea
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_iOS_prelink.mk | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk index a50a1209630b..affd32e5bf59 100644 --- a/ios/CustomTarget_iOS_prelink.mk +++ b/ios/CustomTarget_iOS_prelink.mk @@ -7,6 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. #- Env ------------------------------------------------------------------------ IOSLD = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld +IOSCLANG = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o ifeq ($(ENABLE_DEBUG),TRUE) @@ -31,7 +32,7 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): $(IOSKIT) FORCE: -$(IOSKIT): +$(IOSKIT): $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o $(IOSLD) -r -ios_version_min 11.2 \ -syslibroot $(MACOSX_SDK_PATH) \ -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'` \ @@ -40,28 +41,33 @@ $(IOSKIT): `$(SRCDIR)/bin/lo-all-static-libs` $(AR) -r $(IOSKIT2) $(IOSOBJ) - $(IOSLD) -dylib -ios_version_min $(IOS_DEPLOYMENT_VERSION) \ - -syslibroot $(MACOSX_SDK_PATH) \ + $(IOSCLANG) -dynamiclib -mios-simulator-version-min=$(IOS_DEPLOYMENT_VERSION) \ -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'` \ + -isysroot $(MACOSX_SDK_PATH) \ + -Xlinker -rpath -Xlinker @executable_path/Frameworks \ + -Xlinker -rpath -Xlinker @loader_path/Frameworks \ + -dead_strip \ + -Xlinker -export_dynamic \ + -Xlinker -no_deduplicate \ + -Xlinker -objc_abi_version -Xlinker 2 \ + -fobjc-link-runtime \ -framework CoreFoundation \ -framework CoreGraphics \ -framework CoreText \ + -liconv \ -lc++ \ - -lobjc \ -lz \ - -liconv \ -lpthread \ - -objc_abi_version 2 \ - -rpath @executable_path/Frameworks \ - -rpath @loader_path/Frameworks \ - -export_dynamic \ - -no_deduplicate \ + -single_module \ + -compatibility_version 1 \ + -current_version 1 \ $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \ `$(SRCDIR)/bin/lo-all-static-libs` \ -o $(IOSKIT) + #- clean ios ----------------------------------------------------------------- $(call gb_CustomTarget_get_clean_target,ios/iOS_prelink): rm -f $(IOSKIT) $(IOSKIT2) |