Merge dd6bc29e78 into 04f71e5e6d

mingw: fix usage of std::invocable with EnumerateRadios

BuildLinuxAppImage.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Environment variables
+if [ "$(uname -m)" = "x86_64" ];
+then
+    export ARCH=x86_64
+    echo "CPU architecture detected as x86_64."
+
+elif [ "$(uname -m)" = "aarch64" ];
+then
+    export ARCH=aarch64
+    echo "CPU architecture detected as aarch64."
+
+else
+    echo "CPU architecture not supported or detected."
+    exit 1
+fi
+
+export APPIMAGE_EXTRACT_AND_RUN=1
+export QMAKE=$(which qmake6)
+
+# Prepare the AppDir
+DESTDIR=./AppDir ninja install
+mkdir -p ./AppDir/usr/Source/Core
+cp -r ./Source/Core/DolphinQt ./AppDir/usr/Source/Core
+rm -rf ./AppDir/usr/Source/Core/DolphinQt/CMakeFiles
+rm -rf ./AppDir/usr/Source/Core/DolphinQt/dolphin-emu_autogen
+rm ./AppDir/usr/Source/Core/DolphinQt/cmake_install.cmake
+rm ./AppDir/usr/bin/dolphin-emu-nogui
+rm ./AppDir/usr/bin/dolphin-tool
+mv ./AppDir/usr/share/dolphin-emu/sys ./AppDir/usr/bin/Sys
+rm -rf ./AppDir/usr/share/dolphin-emu
+sed -i 's/env QT_QPA_PLATFORM=xcb dolphin-emu/dolphin-emu/g' ./AppDir/usr/share/applications/dolphin-emu.desktop
+
+# Prepare Tools for building the AppImage
+wget -N https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${ARCH}.AppImage
+wget -N https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-${ARCH}.AppImage
+wget -N https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${ARCH}.AppImage
+
+
+chmod a+x linuxdeploy-${ARCH}.AppImage
+chmod a+x linuxdeploy-plugin-qt-${ARCH}.AppImage
+chmod a+x appimagetool-${ARCH}.AppImage
+
+# Build the AppImage
+./linuxdeploy-${ARCH}.AppImage \
+  --appdir AppDir \
+  --plugin qt
+
+echo 'env QT_QPA_PLATFORM=xcb' >> ./AppDir/apprun-hooks/linuxdeploy-plugin-qt-hook.sh
+
+./appimagetool-${ARCH}.AppImage ./AppDir

Source/Core/Core/HW/WiimoteReal/IOWin.cpp

@@ -158,7 +158,7 @@ static std::optional<std::string> GetParentDeviceDescription(const WCHAR* hid_if
   return std::nullopt;
 }
 
-void EnumerateRadios(std::invocable<EnumerationControl(HANDLE)> auto&& enumeration_callback)
+void EnumerateRadios(std::invocable<HANDLE> auto&& enumeration_callback)
 {
   constexpr BLUETOOTH_FIND_RADIO_PARAMS radio_params{
       .dwSize = sizeof(radio_params),