Skip to content

Commit

Permalink
Multiemu Emulator (#1300)
Browse files Browse the repository at this point in the history 
* multiemu is a mame cut version including pgm2 and fmtowns

Co-authored-by: kelvfimer <calvarro@gmail.com>
  • Loading branch information
@Kelvfimer
Kelvfimer and kelvfimer committed Feb 10, 2024
1 parent 4abc413 commit 54a42b9
Show file tree
Hide file tree
Showing 18 changed files with 2,037 additions and 7 deletions.
2 changes: 1 addition & 1 deletion distributions/EmuELEC/options
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ snes9x2005 \
yabause"

LIBRETRO_S922X_CORES="mesen \
mame \
multiemu \
mesen-s \
quicknes \
virtualjaguar"
Expand Down
27 changes: 22 additions & 5 deletions packages/sx05re/emuelec-emulationstation/config/es_systems.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ This file will be replaced on any new update of EmuELEC-->
<core>fbneo</core>
<core>fbalpha2012</core>
<core>mame2016</core>
<core>mame</core>
</cores>
</emulator>
<emulator name="FBNEOSA">
Expand Down Expand Up @@ -107,7 +106,6 @@ This file will be replaced on any new update of EmuELEC-->
<core>fbneo</core>
<core>fbalpha2012</core>
<core>mame2016</core>
<core>mame</core>
</cores>
</emulator>
<emulator name="FBNEOSA">
Expand All @@ -123,19 +121,38 @@ This file will be replaced on any new update of EmuELEC-->
<manufacturer>Fujitsu</manufacturer>
<release>1989</release>
<hardware>computer</hardware>
<path>/storage/roms/mame/fmtownsux</path>
<path>/storage/roms/fmtownsux</path>
<extension>.cmd</extension>
<command>emuelecRunEmu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers="%CONTROLLERSCONFIG%"</command>
<platform>fmtmarty</platform>
<theme>fmtmarty</theme>
<emulators>
<emulator name="libretro">
<cores>
<core default="true">mame</core>
<core default="true">multiemu</core>
</cores>
</emulator>
</emulators>
</system>
<system>
<name>pgm2</name>
<fullname>PolyGame Master</fullname>
<manufacturer>IGS</manufacturer>
<release>2007</release>
<hardware>arcade</hardware>
<path>/storage/roms/pgm2</path>
<extension>.zip</extension>
<command>emuelecRunEmu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers="%CONTROLLERSCONFIG%"</command>
<platform>pgm2</platform>
<theme>pgm2</theme>
<emulators>
<emulator name="libretro">
<cores>
<core default="true">multiemu</core>
</cores>
</emulator>
</emulators>
</system>
<system>
<name>atari2600</name>
<fullname>Atari 2600</fullname>
Expand Down Expand Up @@ -2322,4 +2339,4 @@ This file will be replaced on any new update of EmuELEC-->
</emulator>
</emulators>
</system>
</systemList>
</systemList>
23 changes: 23 additions & 0 deletions packages/sx05re/emuelec/bin/batocera/batocera-systems
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,29 @@ systems = {
{ "md5": "9bdedde6a4f33555b4a270c8ca53297d", "file": "bios/kick40068.A4000" },
{ "md5": "bb72565701b1b6faece07d68ea5da639", "file": "bios/CD32 Extended-ROM r40.60 (1993)(Commodore)(CD32).rom" } ] },

# ---------- Fujistu FM-Towns ---------- #
# https://github.com/captainys/TOWNSEMU
"fmtowns": { "name": "Fujistu FM-Towns", "biosFiles": [ { "md5": "8fa4e553f28cfc0c30a0a1e589799942", "file": "bios/fmtowns/FMT_DIC.ROM" },
{ "md5": "0585b19930d4a7f4c71bcc8a33746588", "file": "bios/fmtowns/FMT_DOS.ROM" },
{ "md5": "ac0c7021e9bf48ca84b51ab651169a88", "file": "bios/fmtowns/FMT_F20.ROM" },
{ "md5": "b91300e55b70227ce98b59c5f02fa8dd", "file": "bios/fmtowns/FMT_FNT.ROM" },
{ "md5": "86fb6f7280689259f0ca839dd3dd6cde", "file": "bios/fmtowns/FMT_SYS.ROM" },
{ "md5": "", "file": "bios/fmtmarty.zip" },
{ "md5": "6618519b2c104cf9b7e71a48381b44a9", "zippedFile": "mrom.m36", "file": "bios/fmtmarty.zip"},
{ "md5": "75a5c7afb4bc8221bab8cf24db417950", "zippedFile": "mrom.m37", "file": "bios/fmtmarty.zip"},
{ "md5": "", "file": "bios/fmtowns.zip" },
{ "md5": "34847786d7de94b5d1133c956ab1d75d", "zippedFile": "fmt_dic.rom", "file": "bios/fmtowns.zip"},
{ "md5": "0585b19930d4a7f4c71bcc8a33746588", "zippedFile": "fmt_dos.rom", "file": "bios/fmtowns.zip"},
{ "md5": "eb44f2093f51eb7159f03e170b13af76", "zippedFile": "fmt_fnt.rom", "file": "bios/fmtowns.zip"},
{ "md5": "feaf8c5675151e00cfe3ad27673bff29", "zippedFile": "fmt_sys.rom", "file": "bios/fmtowns.zip"},
{ "md5": "", "file": "bios/fmtownsux.zip" },
{ "md5": "8fa4e553f28cfc0c30a0a1e589799942", "zippedFile": "fmt_dic.rom", "file": "bios/fmtownsux.zip"},
{ "md5": "03c8fac9a5f5f5f35fb5de5a5d0d018f", "zippedFile": "fmt_dos_a.rom", "file": "bios/fmtownsux.zip"},
{ "md5": "b91300e55b70227ce98b59c5f02fa8dd", "zippedFile": "fmt_fnt.rom", "file": "bios/fmtownsux.zip"},
{ "md5": "90b5e01d42aaa93e8f4503a5e94e120b", "zippedFile": "fmt_sys_a.rom", "file": "bios/fmtownsux.zip"},
{ "md5": "1a15f6c1b58ec7e5f850118610a787a7", "zippedFile": "mytownsux.rom", "file": "bios/fmtownsux.zip"} ] },


# Magnavox and Philips
"o2em": { "name": "Odyssey 2", "biosFiles": [ { "md5": "562d5ebf9e030a40d6fabfc2f33139fd", "file": "bios/o2rom.bin" },
{ "md5": "f1071cdb0b6b10dde94d3bc8a6146387", "file": "bios/c52.bin" },
Expand Down
15 changes: 15 additions & 0 deletions packages/sx05re/emuelec/bin/emuelecRunEmu.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,21 @@ fi
RUNTHIS='${RABIN} ${VERBOSE} -L /tmp/cores/${EMU}.so --config ${RACONF} "${ROMNAME}"'
CONTROLLERCONFIG="${arguments#*--controllers=*}"

case ${PLATFORM} in
"fmtmarty")
if [ "$EMU" = "multiemu_libretro" ]; then
set_kill_keys "multiemu_libretro"
RUNTHIS='${TBASH} multiemu.sh && ${RABIN} $VERBOSE -L /tmp/cores/${EMU}.so --config ${RACONF} "${ROMNAME}"'
fi
;;
"pgm2")
if [ "$EMU" = "multiemu_libretro" ]; then
set_kill_keys "multiemu_libretro"
RUNTHIS='${TBASH} multiemu.sh && ${RABIN} $VERBOSE -L /tmp/cores/${EMU}.so --config ${RACONF} "${ROMNAME}"'
fi
;;
esac

if [[ "${arguments}" == *"-state_slot"* ]] && [[ "${arguments}" == *"-autosave"* ]]; then
CONTROLLERCONFIG="${CONTROLLERCONFIG%% -state_slot*}" # until -state is found
SNAPSHOT="${arguments#*-state_slot *}" # -state_slot x -autosave 1
Expand Down
26 changes: 26 additions & 0 deletions packages/sx05re/emuelec/config/retroarch/config/MAME/MAME.opt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
mame_alternate_renderer = "disabled"
mame_altres = "640x480"
mame_auto_save = "disabled"
mame_autoloadfastforward = "disabled"
mame_boot_to_bios = "disabled"
mame_boot_to_osd = "disabled"
mame_buttons_profiles = "disabled"
mame_cheats_enable = "disabled"
mame_cpu_overclock = "default"
mame_joystick_deadzone = "0.15"
mame_joystick_saturation = "0.85"
mame_joystick_threshold = "0.30"
mame_lightgun_mode = "none"
mame_lightgun_offscreen_mode = "free"
mame_mame_4way_enable = "disabled"
mame_mame_paths_enable = "enabled"
mame_media_type = "rom"
mame_mouse_enable = "enabled"
mame_read_config = "enabled"
mame_rotation_mode = "libretro"
mame_saves = "game"
mame_softlists_auto_media = "enabled"
mame_softlists_enable = "enabled"
mame_thread_mode = "enabled"
mame_throttle = "disabled"
mame_write_config = "enabled"
4 changes: 3 additions & 1 deletion packages/sx05re/emuelec/tmpfiles.d/emuelec-dirs.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ d /storage/roms/bios 0777 root root - -
d /storage/roms/bios/dc/textures 0777 root root - -
d /storage/roms/bios/dc/texdump 0777 root root - -
d /storage/roms/bios/dc/data 0777 root root - -
d /storage/roms/bios/mame 0777 root root - -
d /storage/roms/c128 0777 root root - -
d /storage/roms/c16 0777 root root - -
d /storage/roms/c64 0777 root root - -
Expand Down Expand Up @@ -56,6 +57,7 @@ d /storage/roms/fbneo/sgx 0777 root root - -
d /storage/roms/fbneo/sms 0777 root root - -
d /storage/roms/fbneo/tg16 0777 root root - -
d /storage/roms/fds 0777 root root - -
d /storage/roms/fmtownsux 0777 root root - -
d /storage/roms/freej2me 0777 root root - -
d /storage/roms/gameandwatch 0777 root root - -
d /storage/roms/gamegear 0777 root root - -
Expand All @@ -71,7 +73,6 @@ d /storage/roms/genh 0777 root root - -
d /storage/roms/gw 0777 root root - -
d /storage/roms/intellivision 0777 root root - -
d /storage/roms/mame 0777 root root - -
d /storage/roms/mame/fmtownsux 0777 root root - -
d /storage/roms/mastersystem 0777 root root - -
d /storage/roms/megadrive 0777 root root - -
d /storage/roms/megadrive-japan 0777 root root - -
Expand All @@ -96,6 +97,7 @@ d /storage/roms/pc98 0777 root root - -
d /storage/roms/pcengine 0777 root root - -
d /storage/roms/pcenginecd 0777 root root - -
d /storage/roms/pcfx 0777 root root - -
d /storage/roms/pgm2 0777 root root - -
d /storage/roms/pico-8 0777 root root - -
d /storage/roms/pokemini 0777 root root - -
d /storage/roms/ports 0777 root root - -
Expand Down

0 comments on commit 54a42b9

Please sign in to comment.