Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-22 22:15:39 +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 2023-12-15 16:13:27 -05:00
parent d504ea42df 866f388e49
commit 99119e984a
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
emu-configs/mame/mame.ini
View file

@ -8,10 +8,10 @@ writeconfig 0
# CORE SEARCH PATH OPTIONS # CORE SEARCH PATH OPTIONS
# #
homepath /var/config/mame homepath /var/config/mame
rompath /home/deck/retrodeck/roms/arcade rompath RETRODECKROMSDIR
hashpath /app/share/mame/hash hashpath /app/share/mame/hash
samplepath /app/share/mame/samples samplepath /app/share/mame/samples
artpath $HOME/retrodeck/downloaded_media/arcade/screenshots/ artpath RETRODECKHOMEDIR/downloaded_media/arcade/screenshots/
ctrlrpath /app/share/mame/ctrlr ctrlrpath /app/share/mame/ctrlr
inipath /var/config/mame inipath /var/config/mame
fontpath /app/bin/ fontpath /app/bin/

4
emu-configs/mame/ui.ini
View file

@ -9,7 +9,7 @@ pcbs_directory pcb
flyers_directory flyers flyers_directory flyers
titles_directory titles titles_directory titles
ends_directory ends ends_directory ends
marquees_directory marquees;$HOME/retrodeck/downloaded_media/arcade/marquees marquees_directory marquees;RETRODECKHOMEDIR/downloaded_media/arcade/marquees
artwork_preview_directory "artwork preview;artpreview" artwork_preview_directory "artwork preview;artpreview"
bosses_directory bosses bosses_directory bosses
logos_directory logo logos_directory logo
@ -19,7 +19,7 @@ gameover_directory gameover
howto_directory howto howto_directory howto
select_directory select select_directory select
icons_directory icons icons_directory icons
covers_directory covers;$HOME/retrodeck/downloaded_media/arcade/covers covers_directory covers;RETRODECKHOMEDIR/downloaded_media/arcade/covers
ui_path ui ui_path ui
# #

3
functions/prepare_emulator.sh
View file

@ -710,6 +710,9 @@ prepare_emulator() {
mkdir -p "/var/config/mame" mkdir -p "/var/config/mame"
cp -fvr "$emuconfigs/mame/**" "/var/config/mame" cp -fvr "$emuconfigs/mame/**" "/var/config/mame"
sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "/var/config/gzdoom/*.ini"
sed -i 's#RETRODECKHOMESDIR#'$rdhome'#g' "/var/config/gzdoom/*.ini"
fi fi
if [[ "$emulator" =~ ^(gzdoom|GZDOOM|all)$ ]]; then if [[ "$emulator" =~ ^(gzdoom|GZDOOM|all)$ ]]; then