Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
with:
msystem: ${{ matrix.variant.sys }}
update: true
install: git make zip wget unzip mingw-w64-${{ matrix.variant.package }}-meson mingw-w64-${{ matrix.variant.package }}-gcc mingw-w64-${{ matrix.variant.package }}-vala mingw-w64-${{ matrix.variant.package }}-libsoup3 mingw-w64-${{ matrix.variant.package }}-libxml2 mingw-w64-${{ matrix.variant.package }}-gtksourceview5 mingw-w64-${{ matrix.variant.package }}-webp-pixbuf-loader mingw-w64-${{ matrix.variant.package }}-libadwaita mingw-w64-${{ matrix.variant.package }}-libgee mingw-w64-${{ matrix.variant.package }}-json-glib mingw-w64-${{ matrix.variant.package }}-libsecret mingw-w64-${{ matrix.variant.package }}-desktop-file-utils mingw-w64-${{ matrix.variant.package }}-imagemagick mingw-w64-${{ matrix.variant.package }}-icu mingw-w64-${{ matrix.variant.package }}-libspelling mingw-w64-${{ matrix.variant.package }}-gstreamer mingw-w64-${{ matrix.variant.package }}-gst-plugins-base mingw-w64-${{ matrix.variant.package }}-gst-plugins-good mingw-w64-${{ matrix.variant.package }}-gexiv2 mingw-w64-x86_64-nsis
install: git make zip wget unzip mingw-w64-${{ matrix.variant.package }}-meson mingw-w64-${{ matrix.variant.package }}-gcc mingw-w64-${{ matrix.variant.package }}-vala mingw-w64-${{ matrix.variant.package }}-libsoup3 mingw-w64-${{ matrix.variant.package }}-libxml2 mingw-w64-${{ matrix.variant.package }}-gtksourceview5 mingw-w64-${{ matrix.variant.package }}-webp-pixbuf-loader mingw-w64-${{ matrix.variant.package }}-libadwaita mingw-w64-${{ matrix.variant.package }}-libgee mingw-w64-${{ matrix.variant.package }}-json-glib mingw-w64-${{ matrix.variant.package }}-libsecret mingw-w64-${{ matrix.variant.package }}-desktop-file-utils mingw-w64-${{ matrix.variant.package }}-imagemagick mingw-w64-${{ matrix.variant.package }}-icu mingw-w64-${{ matrix.variant.package }}-libspelling mingw-w64-${{ matrix.variant.package }}-gstreamer mingw-w64-${{ matrix.variant.package }}-gst-plugins-base mingw-w64-${{ matrix.variant.package }}-gst-plugins-good mingw-w64-${{ matrix.variant.package }}-gexiv2 mingw-w64-${{ matrix.variant.package }}-ntldd mingw-w64-x86_64-nsis
- run: make windows ${{ (inputs.release && 'release=1') || '' }} ${{ (matrix.variant.arch == 'aarch64' && 'msys_sys=clangarm64') || '' }}
- uses: actions/upload-artifact@v4
if: matrix.variant.arch == 'x86_64' # let's not break nightly links
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ endif
./rcedit-x64.exe $(PREFIX)/bin/dev.geopjr.Tuba.exe --set-icon ./builddir/dev.geopjr.Tuba.ico

__windows_copy_deps:
ldd $(PREFIX)/bin/dev.geopjr.Tuba.exe | grep '\/$(msys_sys).*\.dll' -o | xargs -I{} cp "{}" $(PREFIX)/bin
if command -v ntldd >/dev/null 2>&1; then \
ntldd -R $(PREFIX)/bin/dev.geopjr.Tuba.exe | grep -i '\/$(msys_sys).*\.dll' | awk '{print $$3}' | sort -u | xargs -I{} cp "{}" $(PREFIX)/bin; \
else \
ldd $(PREFIX)/bin/dev.geopjr.Tuba.exe | grep '\/$(msys_sys).*\.dll' -o | xargs -I{} cp "{}" $(PREFIX)/bin; \
fi
cp -f /$(msys_sys)/bin/gdbus.exe $(PREFIX)/bin && ldd $(PREFIX)/bin/gdbus.exe | grep '\/$(msys_sys).*\.dll' -o | xargs -I{} cp "{}" $(PREFIX)/bin
cp -f /$(msys_sys)/bin/gspawn-win64-helper.exe $(PREFIX)/bin && ldd $(PREFIX)/bin/gspawn-win64-helper.exe | grep '\/$(msys_sys).*\.dll' -o | xargs -I{} cp "{}" $(PREFIX)/bin
cp -f /$(msys_sys)/bin/libwebp-7.dll /$(msys_sys)/bin/librsvg-2-2.dll /$(msys_sys)/bin/libgnutls-30.dll /$(msys_sys)/bin/libgthread-2.0-0.dll /$(msys_sys)/bin/libgmp-10.dll /$(msys_sys)/bin/libproxy-1.dll ${PREFIX}/bin
Expand Down