Update/fix up win32 build support files

Author: jlindgren90

win32/Makefile

@@ -10,13 +10,13 @@ gtk: gtk+-2.24.33.tar.xz
 	cd gtk+-2.24.33 && CFLAGS="-O2 -fcommon -Wno-error=implicit-int -Wno-error=incompatible-pointer-types" ./configure --prefix=$(LIB_PREFIX)
 	cd gtk+-2.24.33 && $(MAKE) && $(MAKE) install
 
-ffmpeg-7.1.1.tar.xz:
-	wget https://ffmpeg.org/releases/ffmpeg-7.1.1.tar.xz
+ffmpeg-8.1.1.tar.xz:
+	wget https://ffmpeg.org/releases/ffmpeg-8.1.1.tar.xz
 
-ffmpeg: ffmpeg-7.1.1.tar.xz
-	tar xf ffmpeg-7.1.1.tar.xz
-	cd ffmpeg-7.1.1 && ./configure --prefix=$(LIB_PREFIX) --enable-shared --cpu=x86-64 --disable-vulkan --disable-x86asm
-	cd ffmpeg-7.1.1 && $(MAKE) && $(MAKE) install
+ffmpeg: ffmpeg-8.1.1.tar.xz
+	tar xf ffmpeg-8.1.1.tar.xz
+	cd ffmpeg-8.1.1 && ./configure --prefix=$(LIB_PREFIX) --enable-shared --cpu=x86-64 --disable-vulkan --disable-x86asm
+	cd ffmpeg-8.1.1 && $(MAKE) && $(MAKE) install
 
 libmms-0.6.4.tar.gz:
 	wget https://sourceforge.net/projects/libmms/files/libmms/0.6.4/libmms-0.6.4.tar.gz
@@ -44,11 +44,3 @@ adplug: adplug-2.4.tar.bz2
 	tar xf adplug-2.4.tar.bz2
 	cd adplug-2.4 && ./configure --prefix=$(LIB_PREFIX) --disable-shared
 	cd adplug-2.4 && $(MAKE) && $(MAKE) install
-
-libsidplayfp-2.15.0.tar.gz:
-	wget https://github.com/libsidplayfp/libsidplayfp/releases/download/v2.15.0/libsidplayfp-2.15.0.tar.gz
-
-libsidplayfp: libsidplayfp-2.15.0.tar.gz
-	tar xf libsidplayfp-2.15.0.tar.gz
-	cd libsidplayfp-2.15.0 && ./configure --prefix=$(LIB_PREFIX)
-	cd libsidplayfp-2.15.0 && $(MAKE) && $(MAKE) install

win32/merge.sh

@@ -2,8 +2,12 @@
 
 # Quick-and-dirty script for updating a Windows release folder
 
+set -e
 srcdir=$(dirname "$(readlink -f "$0")")
 
+# this script was written for in-tree build (pre-meson)
+cp -a ${srcdir}/../build/win32/* ${srcdir}/
+
 rm -rf /C/aud-win32/bin/share
 rm -rf /C/aud-win32/share/locale
 

win32/notes.html

@@ -31,7 +31,7 @@ <h3>Set up MSYS2 environment</h3>
 <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 autoconf automake git libtool make patch pkg-config mingw-w64-ucrt-x86_64-meson<br>
 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>
@@ -41,7 +41,7 @@ <h3>Set up MSYS2 environment</h3>
 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>
+pacman -S mingw-w64-ucrt-x86_64-libopenmpt mingw-w64-ucrt-x86_64-json-glib mingw-w64-ucrt-x86_64-libsidplayfp</tt></p></blockquote>
 
 <h3>Install GTK</h3>
 
@@ -61,8 +61,7 @@ <h3>Install additional libraries</h3>
 make -j$(nproc) ffmpeg<br>
 make -j$(nproc) libmms<br>
 make -j$(nproc) libbinio<br>
-make -j$(nproc) adplug<br>
-make -j$(nproc) libsidplayfp</tt></p></blockquote>
+make -j$(nproc) adplug</tt></p></blockquote>
 
 <h3>Install Audacious</h3>
 
@@ -71,9 +70,9 @@ <h3>Install Audacious</h3>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/audacious<br>
-./configure --prefix=/C/aud --enable-gtk2<br>
-make -j$(nproc)<br>
-make install</tt></p></blockquote>
+/ucrt64/bin/meson setup build -Dprefix=/C/aud -Dgtk2=true<br>
+/ucrt64/bin/meson compile -C build<br>
+/ucrt64/bin/meson install -C build</tt></p></blockquote>
 
 <h3>Install Audacious Plugins</h3>
 
@@ -82,9 +81,9 @@ <h3>Install Audacious Plugins</h3>
 
 <p>In the MinGW shell:</p>
 <blockquote><p><tt>cd /C/audacious-plugins<br>
-./configure --prefix=/C/aud --enable-gtk2<br>
-make -j$(nproc)<br>
-make install</tt></p></blockquote>
+/ucrt64/bin/meson setup build -Dprefix=/C/aud -Dgtk2=true<br>
+/ucrt64/bin/meson compile -C build<br>
+/ucrt64/bin/meson install -C build</tt></p></blockquote>
 
 </body>
 </html>