From 9b70f38442a37950b0369e2bd29d4cbc79b33433 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sun, 3 Jul 2022 14:12:46 +0200
Subject: [PATCH] Added KEmulator standalone as an alternative emulator for the
 j2me system on Windows.

---
 es-app/assets/Windows_Portable_README.txt            |  1 +
 resources/systems/macos/es_systems.xml               |  2 +-
 resources/systems/unix/es_systems.xml                |  2 +-
 resources/systems/windows/es_find_rules.xml          | 11 +++++++++++
 resources/systems/windows/es_find_rules_portable.xml |  8 ++++++++
 resources/systems/windows/es_systems.xml             |  3 ++-
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 9a7acd0a9..b70efa482 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -37,6 +37,7 @@ Emulators\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe
 Emulators\duckstation\duckstation-qt-x64-ReleaseLTCG.exe
 Emulators\flycast\flycast.exe
 Emulators\Hypseus Singe\hypseus.exe
+Emulators\KEmulator\KEmulator.exe
 Emulators\m2emulator\EMULATOR.EXE
 Emulators\mame\mame.exe
 Emulators\melonDS\melonDS.exe
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index c51a89524..c35873150 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -568,7 +568,7 @@
         <fullname>Java 2 Micro Edition (J2ME)</fullname>
         <path>%ROMPATH%/j2me</path>
         <extension>.jar .JAR .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/squirreljme_libretro.dylib %ROM%</command>
+        <command label="SquirrelJME">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/squirreljme_libretro.dylib %ROM%</command>
         <platform>android</platform>
         <theme>j2me</theme>
     </system>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index f61a91c88..742b0cab2 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -574,7 +574,7 @@
         <fullname>Java 2 Micro Edition (J2ME)</fullname>
         <path>%ROMPATH%/j2me</path>
         <extension>.jar .JAR .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/squirreljme_libretro.so %ROM%</command>
+        <command label="SquirrelJME">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/squirreljme_libretro.so %ROM%</command>
         <platform>android</platform>
         <theme>j2me</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index c674b5890..ab0a474d1 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -199,6 +199,17 @@
             <entry>%ESPATH%\..\Hypseus Singe\hypseus.exe</entry>
         </rule>
     </emulator>
+    <emulator name="KEMULATOR">
+        <!-- Java 2 Micro Edition emulator KEmulator -->
+        <rule type="systempath">
+            <entry>KEmulator.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\KEmulator\KEmulator.exe</entry>
+            <entry>%ESPATH%\KEmulator\KEmulator.exe</entry>
+            <entry>%ESPATH%\..\KEmulator\KEmulator.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="M2EMULATOR">
         <!-- Sega Model 2 Emulator -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index d58bba174..c8e955459 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -133,6 +133,14 @@
             <entry>%ESPATH%\..\Hypseus Singe\hypseus.exe</entry>
         </rule>
     </emulator>
+    <emulator name="KEMULATOR">
+        <!-- Java 2 Micro Edition emulator KEmulator -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\KEmulator\KEmulator.exe</entry>
+            <entry>%ESPATH%\KEmulator\KEmulator.exe</entry>
+            <entry>%ESPATH%\..\KEmulator\KEmulator.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="M2EMULATOR">
         <!-- Sega Model 2 Emulator -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 4aa73275d..2814e73bf 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -572,7 +572,8 @@
         <fullname>Java 2 Micro Edition (J2ME)</fullname>
         <path>%ROMPATH%\j2me</path>
         <extension>.jar .JAR .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\squirreljme_libretro.dll %ROM%</command>
+        <command label="SquirrelJME">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\squirreljme_libretro.dll %ROM%</command>
+        <command label="KEmulator (Standalone)">%STARTDIR%=%EMUDIR% %RUNINBACKGROUND% %EMULATOR_KEMULATOR% %ROM%</command>
         <platform>android</platform>
         <theme>j2me</theme>
     </system>