copy dependencies in Makefile

SoundScapeRenderer · Jun 17, 2023 · 85745dd · 85745dd
1 parent b4865f0
commit 85745dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git 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
@@ -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