From 5a04e95a6ae29a4c2076dba3aa8e85138030b107 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 7 Sep 2024 13:36:07 +0200 Subject: [PATCH] Added izapple2 standalone as an alternative emulator for the apple2 system on Linux and Windows --- es-app/assets/Windows_Portable_README.txt | 1 + resources/systems/linux/es_find_rules.xml | 9 +++++++++ resources/systems/linux/es_systems.xml | 1 + resources/systems/unix/es_find_rules.xml | 9 +++++++++ resources/systems/unix/es_systems.xml | 1 + resources/systems/windows/es_find_rules.xml | 10 ++++++++++ resources/systems/windows/es_find_rules_portable.xml | 7 +++++++ resources/systems/windows/es_systems.xml | 1 + 8 files changed, 39 insertions(+) diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt index 319023d5a..35b4c19b0 100644 --- a/es-app/assets/Windows_Portable_README.txt +++ b/es-app/assets/Windows_Portable_README.txt @@ -81,6 +81,7 @@ Emulators\Gearboy\Gearboy.exe Emulators\gopher2600\gopher2600_windows_amd64.exe Emulators\hatari\hatari.exe Emulators\Hypseus Singe\hypseus.exe +Emulators\izapple2\izapple2sdl_windows_amd64.exe Emulators\jgenesis\jgenesis-cli.exe Emulators\KEmulator\KEmulator.exe Emulators\lime3ds\lime3ds.exe diff --git a/resources/systems/linux/es_find_rules.xml b/resources/systems/linux/es_find_rules.xml index 27c24d414..f0ce91936 100644 --- a/resources/systems/linux/es_find_rules.xml +++ b/resources/systems/linux/es_find_rules.xml @@ -469,6 +469,15 @@ ~/bin/hypseus-singe/hypseus.bin + + + + ~/Applications/izapple2/izapple2sdl_linux_amd64 + ~/.local/share/applications/izapple2/izapple2sdl_linux_amd64 + ~/.local/bin/izapple2/izapple2sdl_linux_amd64 + ~/bin/izapple2/izapple2sdl_linux_amd64 + + diff --git a/resources/systems/linux/es_systems.xml b/resources/systems/linux/es_systems.xml index 0b2084b71..6eb98d268 100644 --- a/resources/systems/linux/es_systems.xml +++ b/resources/systems/linux/es_systems.xml @@ -129,6 +129,7 @@ %EMULATOR_MEDNAFEN% -force_module apple2 %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "apple2e -rompath \"%GAMEDIRRAW%;%ROMPATH%/apple2\" -gameio joy -flop1 \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/apple2 apple2e -gameio joy -flop1 %ROM% + %EMULATOR_IZAPPLE2% %ROM% apple2 apple2 diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml index 03e82d574..5cb70b68f 100644 --- a/resources/systems/unix/es_find_rules.xml +++ b/resources/systems/unix/es_find_rules.xml @@ -237,6 +237,15 @@ ~/bin/hypseus-singe/hypseus.bin + + + + ~/Applications/izapple2/izapple2sdl_linux_amd64 + ~/.local/share/applications/izapple2/izapple2sdl_linux_amd64 + ~/.local/bin/izapple2/izapple2sdl_linux_amd64 + ~/bin/izapple2/izapple2sdl_linux_amd64 + + diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml index cdc49f865..23cfd4280 100644 --- a/resources/systems/unix/es_systems.xml +++ b/resources/systems/unix/es_systems.xml @@ -127,6 +127,7 @@ %EMULATOR_MEDNAFEN% -force_module apple2 %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "apple2e -rompath \"%GAMEDIRRAW%;%ROMPATH%/apple2\" -gameio joy -flop1 \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/apple2 apple2e -gameio joy -flop1 %ROM% + %EMULATOR_IZAPPLE2% %ROM% apple2 apple2 diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml index a4330e2f9..315aa56f9 100644 --- a/resources/systems/windows/es_find_rules.xml +++ b/resources/systems/windows/es_find_rules.xml @@ -412,6 +412,16 @@ %ESPATH%\..\Emulators\Hypseus Singe\hypseus.exe + + + + izapple2sdl_windows_amd64.exe + + + %ESPATH%\Emulators\izapple2\izapple2sdl_windows_amd64.exe + %ESPATH%\..\Emulators\izapple2\izapple2sdl_windows_amd64.exe + + diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml index 4bda6b2dd..9a72359bb 100644 --- a/resources/systems/windows/es_find_rules_portable.xml +++ b/resources/systems/windows/es_find_rules_portable.xml @@ -274,6 +274,13 @@ %ESPATH%\..\Emulators\Hypseus Singe\hypseus.exe + + + + %ESPATH%\Emulators\izapple2\izapple2sdl_windows_amd64.exe + %ESPATH%\..\Emulators\izapple2\izapple2sdl_windows_amd64.exe + + diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml index 0bd3e9b6f..fb2c4685a 100644 --- a/resources/systems/windows/es_systems.xml +++ b/resources/systems/windows/es_systems.xml @@ -125,6 +125,7 @@ %EMULATOR_MEDNAFEN% -force_module apple2 %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame_libretro.dll "apple2e -rompath \"%GAMEDIRRAW%;%ROMPATH%\apple2\" -gameio joy -flop1 \"%ROMRAW%\"" %HIDEWINDOW% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\apple2 apple2e -gameio joy -flop1 %ROM% + %EMULATOR_IZAPPLE2% %ROM% apple2 apple2