Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2025-03-06 14:27:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/cooker-0.8.0b' into cooker-0.8.0b-icenine451

Browse source
This commit is contained in:
icenine451 2024-02-27 11:55:33 -05:00
parent 099bf7f642 e44e860ca1
commit 6028f7269b
3 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
emu-configs/mame/default.cfg
View file

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<!-- This file is autogenerated; comments and unknown tags will be stripped -->
<mameconfig version="10">
<system name="default">
@ -8,9 +8,14 @@
JOYCODE_1_HAT1UP
</newseq>
</port>
<port type="P1_START">
<newseq type="standard">
JOYCODE_1_BUTTON8
</newseq>
</port>
<port type="P1_SELECT">
<newseq type="standard">
JOYCODE_1_SELECT
KEYCODE_5 OR JOYCODE_1_BUTTON7
</newseq>
</port>
<port type="MEMORY_RESET">
@ -43,6 +48,16 @@
KEYCODE_DEL
</newseq>
</port>
<port type="UI_PAGE_UP">
<newseq type="standard">
KEYCODE_PGUP OR JOYCODE_1_ZAXIS_POS_SWITCH
</newseq>
</port>
<port type="UI_PAGE_DOWN">
<newseq type="standard">
KEYCODE_PGDN OR JOYCODE_1_RZAXIS_POS_SWITCH
</newseq>
</port>
<port type="UI_PREV_GROUP">
<newseq type="standard">
NONE
@ -95,12 +110,12 @@
</port>
<port type="UI_RESET_MACHINE">
<newseq type="standard">
KEYCODE_LCONTROL KEYCODE_R
NONE
</newseq>
</port>
<port type="UI_SOFT_RESET">
<newseq type="standard">
KEYCODE_LCONTROL KEYCODE_N
KEYCODE_LCONTROL KEYCODE_R
</newseq>
</port>
<port type="UI_SHOW_GFX">
@ -125,7 +140,7 @@
</port>
<port type="UI_FAST_FORWARD">
<newseq type="standard">
KEYCODE_LCONTROL KEYCODE_MINUS
KEYCODE_LCONTROL KEYCODE_PLUS
</newseq>
</port>
<port type="UI_SHOW_FPS">
@ -205,12 +220,12 @@
</port>
<port type="UI_FOCUS_NEXT">
<newseq type="standard">
NONE
KEYCODE_TAB OR JOYCODE_1_RZAXIS_POS_SWITCH
</newseq>
</port>
<port type="UI_FOCUS_PREV">
<newseq type="standard">
NONE
KEYCODE_LSHIFT KEYCODE_TAB OR JOYCODE_1_ZAXIS_POS_SWITCH
</newseq>
</port>
<port type="UI_DATS">
@ -220,7 +235,7 @@
</port>
<port type="UI_FAVORITES">
<newseq type="standard">
NONE
JOYCODE_1_BUTTON4
</newseq>
</port>
<port type="UI_EXPORT">

5
functions/global.sh
View file

@ -112,6 +112,11 @@ rpcs3vfsconf="/var/config/rpcs3/vfs.yml"
vita3kconf="/var/data/Vita3K/config.yml"
vita3kusrconfdir="$bios_folder/Vita3K/Vita3K"
# MAME-SA config files
mameconf="/var/config/mame/mame.ini"
mameuiconf="$bios_folder/Vita3K/ui.ini"
# We moved the lockfile in /var/config/retrodeck in order to solve issue #53 - Remove in a few versions
if [[ -f "$HOME/retrodeck/.lock" ]]; then
mv "$HOME/retrodeck/.lock" $lockfile

13
functions/prepare_component.sh
View file

@ -761,15 +761,12 @@ prepare_component() {
cp -fvr "$emuconfigs/mame/ui.ini" "/var/config/mame/cfg"
cp -fvr "$emuconfigs/mame/default.cfg" "/var/config/mame/cfg"
sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "/var/config/mame/cfg/mame.ini"
sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "/var/config/mame/cfg/mame.ini"
sed -i 's#RETRODECKSAVESDIR#'$saves_folder'#g' "/var/config/mame/cfg/mame.ini"
sed -i 's#RETRODECKSTATESDIR#'$states_folder'#g' "/var/config/mame/cfg/mame.ini"
sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "$mameconf" # one-off as roms folders are a lot
set_setting_value "$mameconf" "nvram_directory" "$saves_folder/mame-sa/nvram" "mame"
set_setting_value "$mameconf" "state_directory" "$states_folder/mame-sa" "mame"
set_setting_value "$mameconf" "snapshot_directory" "$screenshots_folder/mame-sa" "mame"
set_setting_value "$mameconf" "diff_directory" "$saves_folder/mame-sa/diff" "mame"
sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "/var/config/mame/cfg/ui.ini"
sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "/var/config/mame/cfg/ui.ini"
sed -i 's#RETRODECKSAVESDIR#'$saves_folder'#g' "/var/config/mame/cfg/ui.ini"
sed -i 's#RETRODECKSTATESDIR#'$states_folder'#g' "/var/config/mame/cfg/ui.ini"
fi
if [[ "$component" =~ ^(gzdoom|GZDOOM|all)$ ]]; then