diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-11-22 16:05:03 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-11-22 16:05:43 +0200 |
| commit | c403dd11cc7029082b43ef3935ffc5553dbf5064 (patch) | |
| tree | a980b7ccc70d95ec95fd56973dd7640895b142ee /ios | |
| parent | f543232668af23f798be69303745937a4af17bbd (diff) | |
Use the lo-all-static-libs script
Change-Id: I15605228af82f421ad40465a82661b98c91a3370
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_MobileLibreOffice_app.mk | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk index 404d7978fb71..e517e42637e7 100644 --- a/ios/CustomTarget_MobileLibreOffice_app.mk +++ b/ios/CustomTarget_MobileLibreOffice_app.mk @@ -41,37 +41,16 @@ MobileLibreOffice_setup: #============================================================================== $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) - # Put xcconfig in source dir for Xcode projects + # Libs # + # Create the link flags in the xcconfig for Xcode linkage + all_libs=`$(SRCDIR)/bin/lo-all-static-libs`; \ + sed -i '' -e "s|^\(LINK_LDFLAGS =\).*$$|\1 $$all_libs|" $(LO_XCCONFIG) + + # Copy lo.xcconfig to source dir for Xcode projects if test $(SRCDIR) != $(BUILDDIR); then \ cp $(BUILDDIR)/ios/$(LO_XCCONFIG) $(SRCDIR)/ios; \ fi - # Libs # - # Create the link flags in the xcconfig for Xcode linkage - for path in $(INSTDIR)/program \ - $(WORKDIR)/LinkTarget/StaticLibrary \ - $(WORKDIR)/UnpackedTarball/*/.libs \ - $(WORKDIR)/UnpackedTarball/*/src/.libs \ - $(WORKDIR)/UnpackedTarball/*/src/*/.libs \ - $(WORKDIR)/UnpackedTarball/xslt/libxslt/.libs \ - $(WORKDIR)/UnpackedTarball/icu/source/lib \ - $(WORKDIR)/UnpackedTarball/openssl; do \ - flags=''; \ - for lib in $$path/lib*.a; do \ - if [ ! -r $$lib ]; then \ - continue; \ - fi; \ - base="$${lib##*/lib}"; \ - base=$${base%\.a}; \ - flags+=" -l$${base}"; \ - done; \ - if [ "$$flags" ]; then \ - all_flags+=" -L$$path $$flags"; \ - fi; \ - done; \ - file=$(LO_XCCONFIG); \ - sed -i '' -e "s|^\(LINK_LDFLAGS =\).*$$|\1 $$all_flags|" $$file; - # Resources # rm -rf $(DEST_RESOURCE) 2>/dev/null mkdir -p $(DEST_RESOURCE) |