From 85745dd23243b95a2e413c37fd9db5cf9b573e2f Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Sat, 17 Jun 2023 17:27:31 +0200 Subject: [PATCH] copy dependencies in Makefile --- .github/workflows/windows-msys2.yml | 9 --------- data/nsis/Makefile.am | 4 ++++ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml index fc448a98..e7b76020 100644 --- a/.github/workflows/windows-msys2.yml +++ b/.github/workflows/windows-msys2.yml @@ -87,15 +87,6 @@ jobs: working-directory: ssr run: | make - - name: make install-strip - working-directory: ssr - run: | - make install-strip - - name: copy dependencies - working-directory: ssr/windows-installer - # See https://github.com/msys2/MINGW-packages/issues/5204#issuecomment-1013818547 - run: | - ldd bin/*.exe | grep -iv system32 | grep -v :$ | cut -f2 -d\> | cut -f1 -d\( | while read a; do ! [ -e "bin/`basename $a`" ] && cp -v "$a" bin/ || true; done - name: make nsis working-directory: ssr run: | diff --git a/data/nsis/Makefile.am b/data/nsis/Makefile.am index ad7348c9..1ce6f5fc 100644 --- a/data/nsis/Makefile.am +++ b/data/nsis/Makefile.am @@ -10,9 +10,13 @@ if ENABLE_WINDOWS_INSTALLER # this is done after installing the executables install-exec-hook: +## the line starting with "ldd" was adapted from +## https://github.com/msys2/MINGW-packages/issues/5204#issuecomment-1013818547 for exec in $(SSR_executables); do \ windeployqt --no-compiler-runtime $(DESTDIR)$(bindir)/$$exec ; \ + ldd $(DESTDIR)$(bindir)/$$exec | grep -iv system32 | cut -f2 -d\> | cut -f1 -d\( | while read a; do ! [ -e "$(DESTDIR)$(bindir)/`basename $$a`" ] && cp -v "$$a" $(DESTDIR)$(bindir)/ || true; done \ done +## those are copied by windeployqt, but they are not needed: $(RM) -r $(DESTDIR)$(bindir)/styles $(RM) -r $(DESTDIR)$(bindir)/imageformats