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 @@ - + SOFTWARE\PCSX2\Install_Dir|\pcsx2.exe @@ -253,6 +253,28 @@ %ESPATH%\..\PCSX2\pcsx2.exe + + + + pcsx2-qtx64.exe + + + %ESPATH%\Emulators\PCSX2-Qt\pcsx2-qtx64.exe + %ESPATH%\PCSX2-Qt\pcsx2-qtx64.exe + %ESPATH%\..\PCSX2-Qt\pcsx2-qtx64.exe + + + + + + pcsx2x64.exe + + + %ESPATH%\Emulators\PCSX2-wxWidgets\pcsx2x64.exe + %ESPATH%\PCSX2-wxWidgets\pcsx2x64.exe + %ESPATH%\..\PCSX2-wxWidgets\pcsx2x64.exe + + 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 @@ - + %ESPATH%\Emulators\PCSX2\pcsx2.exe %ESPATH%\PCSX2\pcsx2.exe %ESPATH%\..\PCSX2\pcsx2.exe + + + + %ESPATH%\Emulators\PCSX2-Qt\pcsx2-qtx64.exe + %ESPATH%\PCSX2-Qt\pcsx2-qtx64.exe + %ESPATH%\..\PCSX2-Qt\pcsx2-qtx64.exe + + + + + + %ESPATH%\Emulators\PCSX2-wxWidgets\pcsx2x64.exe + %ESPATH%\PCSX2-wxWidgets\pcsx2x64.exe + %ESPATH%\..\PCSX2-wxWidgets\pcsx2x64.exe + + 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 @@ .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 %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\pcsx2_libretro.dll %ROM% %EMULATOR_PCSX2% --nogui %ROM% + %EMULATOR_PCSX2-QT% -batch %ROM% + %EMULATOR_PCSX2-WXWIDGETS% --nogui %ROM% %EMULATOR_PLAY!% --disc %ROM% ps2 ps2