From 7baec8a1f335e5c00acca5e6b970222e8f9b5e27 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Fri, 27 May 2022 12:03:38 +0200
Subject: [PATCH] Added experimental support for PCSX2 Qt and PCSX2 wxWidgets
 for the ps2 system on Windows.

---
 es-app/assets/Windows_Portable_README.txt     |  2 ++
 resources/systems/windows/es_find_rules.xml   | 24 ++++++++++++++++++-
 .../windows/es_find_rules_portable.xml        | 18 +++++++++++++-
 resources/systems/windows/es_systems.xml      |  2 ++
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 6b7c78b51..7a035141e 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -41,6 +41,8 @@ Emulators\mGBA\mGBA.exe
 Emulators\Model2\EMULATOR.EXE
 Emulators\mupen64plus\mupen64plus-ui-console.exe
 Emulators\PCSX2\pcsx2.exe
+Emulators\PCSX2-Qt\pcsx2-qtx64.exe
+Emulators\PCSX2-wxWidgets\pcsx2x64.exe
 Emulators\Play\Play.exe
 Emulators\PPSSPP\PPSSPPWindows64.exe
 Emulators\redream\redream.exe
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 4ad8db67e..cafaf2e72 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -238,7 +238,7 @@
         </rule>
     </emulator>
     <emulator name="PCSX2">
-        <!-- Sony PlayStation 2 emulator PCSX2 -->
+        <!-- Sony PlayStation 2 emulator PCSX2 (legacy) -->
         <rule type="winregistryvalue">
             <entry>SOFTWARE\PCSX2\Install_Dir|\pcsx2.exe</entry>
         </rule>
@@ -253,6 +253,28 @@
             <entry>%ESPATH%\..\PCSX2\pcsx2.exe</entry>
         </rule>
     </emulator>
+    <emulator name="PCSX2-QT">
+        <!-- Sony PlayStation 2 emulator PCSX2 (Qt) -->
+        <rule type="systempath">
+            <entry>pcsx2-qtx64.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\PCSX2-Qt\pcsx2-qtx64.exe</entry>
+            <entry>%ESPATH%\PCSX2-Qt\pcsx2-qtx64.exe</entry>
+            <entry>%ESPATH%\..\PCSX2-Qt\pcsx2-qtx64.exe</entry>
+        </rule>
+    </emulator>
+    <emulator name="PCSX2-WXWIDGETS">
+        <!-- Sony PlayStation 2 emulator PCSX2 (wxWidgets) -->
+        <rule type="systempath">
+            <entry>pcsx2x64.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\PCSX2-wxWidgets\pcsx2x64.exe</entry>
+            <entry>%ESPATH%\PCSX2-wxWidgets\pcsx2x64.exe</entry>
+            <entry>%ESPATH%\..\PCSX2-wxWidgets\pcsx2x64.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="PLAY!">
         <!-- Sony PlayStation 2 emulator Play! -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 771bd9e04..d6d4f77cd 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -158,13 +158,29 @@
         </rule>
     </emulator>
     <emulator name="PCSX2">
-        <!-- Sony PlayStation 2 emulator PCSX2 -->
+        <!-- Sony PlayStation 2 emulator PCSX2 (legacy) -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\PCSX2\pcsx2.exe</entry>
             <entry>%ESPATH%\PCSX2\pcsx2.exe</entry>
             <entry>%ESPATH%\..\PCSX2\pcsx2.exe</entry>
         </rule>
     </emulator>
+    <emulator name="PCSX2-QT">
+        <!-- Sony PlayStation 2 emulator PCSX2 (Qt) -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\PCSX2-Qt\pcsx2-qtx64.exe</entry>
+            <entry>%ESPATH%\PCSX2-Qt\pcsx2-qtx64.exe</entry>
+            <entry>%ESPATH%\..\PCSX2-Qt\pcsx2-qtx64.exe</entry>
+        </rule>
+    </emulator>
+    <emulator name="PCSX2-WXWIDGETS">
+        <!-- Sony PlayStation 2 emulator PCSX2 (wxWidgets) -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\PCSX2-wxWidgets\pcsx2x64.exe</entry>
+            <entry>%ESPATH%\PCSX2-wxWidgets\pcsx2x64.exe</entry>
+            <entry>%ESPATH%\..\PCSX2-wxWidgets\pcsx2x64.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="PLAY!">
         <!-- Sony PlayStation 2 emulator Play! -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 4a162f15c..77feddd4f 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -985,6 +985,8 @@
         <extension>.bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG</extension>
         <command label="PCSX2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\pcsx2_libretro.dll %ROM%</command>
         <command label="PCSX2 (Standalone)">%EMULATOR_PCSX2% --nogui %ROM%</command>
+        <command label="PCSX2 Qt (Standalone)">%EMULATOR_PCSX2-QT% -batch %ROM%</command>
+        <command label="PCSX2 wxWidgets (Standalone)">%EMULATOR_PCSX2-WXWIDGETS% --nogui %ROM%</command>
         <command label="Play! (Standalone)">%EMULATOR_PLAY!% --disc %ROM%</command>
         <platform>ps2</platform>
         <theme>ps2</theme>