diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 7f8ec2b60..f50ac6187 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -75,6 +75,7 @@ Emulators\m2emulator\EMULATOR.EXE
Emulators\mame\mame.exe
Emulators\mednafen\mednafen.exe
Emulators\melonDS\melonDS.exe
+Emulators\Mesen\Mesen.exe
Emulators\mGBA\mGBA.exe
Emulators\mupen64plus\mupen64plus-ui-console.exe
Emulators\openMSX\openmsx.exe
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 7dfe82ba5..28ca10273 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -402,6 +402,18 @@
~/.local/share/flatpak/exports/bin/net.kuribo64.melonDS
+
+
+
+ mesen2
+
+
+ ~/Applications/Mesen*.AppImage
+ ~/.local/share/applications/Mesen*.AppImage
+ ~/.local/bin/Mesen*.AppImage
+ ~/bin/Mesen*.AppImage
+
+
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index b3163c107..c6147e6e9 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -531,6 +531,7 @@
%ROMPATH%/famicom
.fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%
%EMULATOR_NESTOPIA-UE% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%
@@ -571,6 +572,7 @@
%ROMPATH%/fds
.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%
%EMULATOR_NESTOPIA-UE% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%
@@ -654,6 +656,7 @@
%EMULATOR_GEARBOY% %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM%
%EMULATOR_MGBA% -f %ROM%
@@ -690,6 +693,7 @@
%EMULATOR_GEARBOY% %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM%
%EMULATOR_MGBA% -f %ROM%
@@ -1169,6 +1173,7 @@
%ROMPATH%/nes
.fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%
%EMULATOR_NESTOPIA-UE% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%
@@ -1280,6 +1285,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM%
%EMULATOR_MEDNAFEN% -force_module pce %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_ARES% --fullscreen --system "PC Engine" %ROM%
pcengine
pcengine
@@ -1292,6 +1298,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM%
%EMULATOR_MEDNAFEN% -force_module pce %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_ARES% --fullscreen --system "PC Engine CD" %ROM%
pcenginecd
pcenginecd
@@ -1446,6 +1453,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%
%EMULATOR_BSNES% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_ARES% --fullscreen --system "Super Famicom" %ROM%
satellaview
satellaview
@@ -1551,6 +1559,7 @@
%EMULATOR_BSNES% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_MEDNAFEN% -force_module snes %ROM%
%EMULATOR_ARES% --fullscreen --system "Super Famicom" %ROM%
snes
@@ -1575,6 +1584,7 @@
%ROMPATH%/sgb
.gb .GB .gbc .GBC .sgb .SGB .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM%
%EMULATOR_MGBA% -f %ROM%
@@ -1595,6 +1605,7 @@
%EMULATOR_BSNES% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_MEDNAFEN% -force_module snes %ROM%
%EMULATOR_ARES% --fullscreen --system "Super Famicom" %ROM%
snes
@@ -1614,6 +1625,7 @@
%EMULATOR_BSNES% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_MEDNAFEN% -force_module snes %ROM%
%EMULATOR_ARES% --fullscreen --system "Super Famicom" %ROM%
snes
@@ -1727,6 +1739,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM%
%EMULATOR_MEDNAFEN% -force_module pce %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_ARES% --fullscreen --system "PC Engine" %ROM%
pcengine
tg16
@@ -1739,6 +1752,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM%
%EMULATOR_MEDNAFEN% -force_module pce %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_ARES% --fullscreen --system "PC Engine CD" %ROM%
pcenginecd
tg-cd
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 7d7d24eda..4fc446959 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -378,6 +378,16 @@
%ESPATH%\..\Emulators\melonDS\melonDS.exe
+
+
+
+ Mesen.exe
+
+
+ %ESPATH%\Emulators\Mesen\Mesen.exe
+ %ESPATH%\..\Emulators\Mesen\Mesen.exe
+
+
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index c0c087826..3aae7c527 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -254,6 +254,13 @@
%ESPATH%\..\Emulators\melonDS\melonDS.exe
+
+
+
+ %ESPATH%\Emulators\Mesen\Mesen.exe
+ %ESPATH%\..\Emulators\Mesen\Mesen.exe
+
+
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 646d9a4fb..6ff205f7a 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -530,6 +530,7 @@
%ROMPATH%\famicom
.fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen_libretro.dll %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\nestopia_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fceumm_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\quicknes_libretro.dll %ROM%
@@ -569,6 +570,7 @@
%ROMPATH%\fds
.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen_libretro.dll %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\nestopia_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fceumm_libretro.dll %ROM%
%EMULATOR_MEDNAFEN% -force_module nes %ROM%
@@ -651,6 +653,7 @@
%EMULATOR_GEARBOY% %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\tgbdual_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen-s_libretro.dll %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bsnes_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mgba_libretro.dll %ROM%
%EMULATOR_MGBA% -f %ROM%
@@ -687,6 +690,7 @@
%EMULATOR_GEARBOY% %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\tgbdual_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen-s_libretro.dll %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bsnes_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mgba_libretro.dll %ROM%
%EMULATOR_MGBA% -f %ROM%
@@ -1166,6 +1170,7 @@
%ROMPATH%\nes
.fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen_libretro.dll %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\nestopia_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fceumm_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\quicknes_libretro.dll %ROM%
@@ -1276,6 +1281,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_fast_libretro.dll %ROM%
%EMULATOR_MEDNAFEN% -force_module pce %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_ARES% --fullscreen --system "PC Engine" %ROM%
pcengine
pcengine
@@ -1288,6 +1294,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_fast_libretro.dll %ROM%
%EMULATOR_MEDNAFEN% -force_module pce %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_ARES% --fullscreen --system "PC Engine CD" %ROM%
pcenginecd
pcenginecd
@@ -1441,6 +1448,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bsnes_mercury_accuracy_libretro.dll %ROM%
%EMULATOR_BSNES% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen-s_libretro.dll %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_ARES% --fullscreen --system "Super Famicom" %ROM%
satellaview
satellaview
@@ -1548,6 +1556,7 @@
%EMULATOR_BSNES% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_supafaust_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen-s_libretro.dll %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_MEDNAFEN% -force_module snes %ROM%
%EMULATOR_ARES% --fullscreen --system "Super Famicom" %ROM%
snes
@@ -1572,6 +1581,7 @@
%ROMPATH%\sgb
.gb .GB .gbc .GBC .sgb .SGB .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen-s_libretro.dll %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\sameboy_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mgba_libretro.dll %ROM%
%EMULATOR_MGBA% -f %ROM%
@@ -1592,6 +1602,7 @@
%EMULATOR_BSNES% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_supafaust_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen-s_libretro.dll %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_MEDNAFEN% -force_module snes %ROM%
%EMULATOR_ARES% --fullscreen --system "Super Famicom" %ROM%
snes
@@ -1611,6 +1622,7 @@
%EMULATOR_BSNES% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_supafaust_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mesen-s_libretro.dll %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_MEDNAFEN% -force_module snes %ROM%
%EMULATOR_ARES% --fullscreen --system "Super Famicom" %ROM%
snes
@@ -1724,6 +1736,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_fast_libretro.dll %ROM%
%EMULATOR_MEDNAFEN% -force_module pce %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_ARES% --fullscreen --system "PC Engine" %ROM%
pcengine
tg16
@@ -1736,6 +1749,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mednafen_pce_fast_libretro.dll %ROM%
%EMULATOR_MEDNAFEN% -force_module pce %ROM%
+ %EMULATOR_MESEN% --fullscreen %ROM%
%EMULATOR_ARES% --fullscreen --system "PC Engine CD" %ROM%
pcenginecd
tg-cd