Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Switch from MINGW64 to UCRT64. Closes: #1421 #1448

Merged
merged 2 commits into from
Aug 14, 2024
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
16 changes: 8 additions & 8 deletions .github/actions/install-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ runs:
- uses: msys2/setup-msys2@v2
if: startsWith(inputs.os, 'windows')
with:
msystem: MINGW64
msystem: UCRT64
update: true
install: >-
mingw-w64-x86_64-autotools
mingw-w64-x86_64-gcc
mingw-w64-x86_64-gtk2
mingw-w64-x86_64-meson
mingw-w64-x86_64-pkg-config
mingw-w64-x86_64-qt6-base
mingw-w64-x86_64-qt6-svg
mingw-w64-ucrt-x86_64-autotools
mingw-w64-ucrt-x86_64-gcc
mingw-w64-ucrt-x86_64-gtk2
mingw-w64-ucrt-x86_64-meson
mingw-w64-ucrt-x86_64-pkg-config
mingw-w64-ucrt-x86_64-qt6-base
mingw-w64-ucrt-x86_64-qt6-svg
24 changes: 12 additions & 12 deletions win32/notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<h2>Notes for Building Audacious on Windows</h2>

<p><em>John Lindgren<br>
February 09, 2023</em></p>
August 14, 2024</em></p>

<p>A Makefile and several patch files should accompany this document.</p>

Expand All @@ -28,20 +28,20 @@ <h3>Set up MSYS2 environment</h3>
export CPLUS_INCLUDE_PATH=/C/libs/include<br>
export LIBRARY_PATH=/C/libs/lib</tt></p></blockquote>

<p>In the MinGW shell (MSYS2 MinGW 64-bit, <b>not</b> MSYS2 MSYS):</p>
<p>In the MinGW shell (MSYS2 UCRT64, <b>not</b> MSYS2 MSYS):</p>

<blockquote><p><tt>pacman -Syu<br>
pacman -S autoconf automake git libtool make patch pkg-config<br>
pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2<br>
pacman -S mingw-w64-x86_64-atk mingw-w64-x86_64-cairo mingw-w64-x86_64-pango<br>
pacman -S mingw-w64-x86_64-gdk-pixbuf2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-qt6-base<br>
pacman -S mingw-w64-x86_64-qt6-imageformats mingw-w64-x86_64-qt6-svg mingw-w64-x86_64-qt6-translations<br>
pacman -S mingw-w64-x86_64-flac mingw-w64-x86_64-libvorbis mingw-w64-x86_64-libcdio-paranoia<br>
pacman -S mingw-w64-x86_64-fluidsynth mingw-w64-x86_64-mpg123 mingw-w64-x86_64-faad2<br>
pacman -S mingw-w64-x86_64-wavpack mingw-w64-x86_64-libmodplug mingw-w64-x86_64-libbs2b<br>
pacman -S mingw-w64-x86_64-libsamplerate mingw-w64-x86_64-libsoxr mingw-w64-x86_64-neon<br>
pacman -S mingw-w64-x86_64-libcue mingw-w64-x86_64-lame mingw-w64-x86_64-opusfile<br>
pacman -S mingw-w64-x86_64-libopenmpt mingw-w64-x86_64-json-glib</tt></p></blockquote>
pacman -S mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-gettext mingw-w64-ucrt-x86_64-libxml2<br>
pacman -S mingw-w64-ucrt-x86_64-atk mingw-w64-ucrt-x86_64-cairo mingw-w64-ucrt-x86_64-pango<br>
pacman -S mingw-w64-ucrt-x86_64-gdk-pixbuf2 mingw-w64-ucrt-x86_64-librsvg mingw-w64-ucrt-x86_64-qt6-base<br>
pacman -S mingw-w64-ucrt-x86_64-qt6-imageformats mingw-w64-ucrt-x86_64-qt6-svg mingw-w64-ucrt-x86_64-qt6-translations<br>
pacman -S mingw-w64-ucrt-x86_64-flac mingw-w64-ucrt-x86_64-libvorbis mingw-w64-ucrt-x86_64-libcdio-paranoia<br>
pacman -S mingw-w64-ucrt-x86_64-fluidsynth mingw-w64-ucrt-x86_64-mpg123 mingw-w64-ucrt-x86_64-faad2<br>
pacman -S mingw-w64-ucrt-x86_64-wavpack mingw-w64-ucrt-x86_64-libmodplug mingw-w64-ucrt-x86_64-libbs2b<br>
pacman -S mingw-w64-ucrt-x86_64-libsamplerate mingw-w64-ucrt-x86_64-libsoxr mingw-w64-ucrt-x86_64-neon<br>
pacman -S mingw-w64-ucrt-x86_64-libcue mingw-w64-ucrt-x86_64-lame mingw-w64-ucrt-x86_64-opusfile<br>
pacman -S mingw-w64-ucrt-x86_64-libopenmpt mingw-w64-ucrt-x86_64-json-glib</tt></p></blockquote>

<h3>Install GTK</h3>

Expand Down