Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-23 06:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added PS2 emulators and put flatpak Ryujinx removing the former one.

Browse source
This commit is contained in:
XargonWan 2022-03-18 16:14:57 +01:00
parent 19018f7133
commit 8edf3b949b
5 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
emulators/ryujinx.sh Executable file
View file

@ -0,0 +1,3 @@
#!/bin/bash
ARG=${1//[\\]/}
flatpak run org.ryujinx.Ryujinx --fullscreen $ARG

3
emulators/ryujinx/ryujinx.sh
View file

@ -1,3 +0,0 @@
#!/bin/bash
ARG=${1//[\\]/}
./emulators/ryujinx/Ryujinx --fullscreen $ARG

24
es_systems.cfg
View file

@ -1297,6 +1297,30 @@
</emulator> </emulator>
</emulators> </emulators>
</system> </system>
<system>
<name>ps2</name>
<fullname>PlayStation 2</fullname>
<manufacturer>Sony</manufacturer>
<release>2000</release>
<hardware>console</hardware>
<path>~/retrodeck/storage/roms/ps2</path>
<extension>.bin .BIN .cue .CUE .img .IMG .mdf .MDF .pbp .PBP .toc .TOC .cbn .CBN .m3u .M3U .ccd .CCD .chd .CHD .iso .ISO</extension>
<command>~/retrodeck/usr/bin/runemu.py --rom %ROM% --platform %SYSTEM% --emulator %EMULATOR% --core %CORE% --controllers "%CONTROLLERSCONFIG%"</command>
<platform>ps2</platform>
<theme>ps2</theme>
<emulators>
<emulator name="retroarch">
<cores>
<core default="true">pcsx2</core>
</cores>
</emulator>
<emulator name="retroarch">
<cores>
<core>play</core>
</cores>
</emulator>
</emulators>
</system>
<system> <system>
<name>psp</name> <name>psp</name>
<fullname>PlayStation Portable</fullname> <fullname>PlayStation Portable</fullname>

8
install-retrodeck.sh
View file

@ -28,6 +28,7 @@ fi
if [ test ! -d "$INSTALL_DIR/roms" ]; then if [ test ! -d "$INSTALL_DIR/roms" ]; then
ln -s $INSTALL_DIR/storage/roms $INSTALL_DIR/roms ln -s $INSTALL_DIR/storage/roms $INSTALL_DIR/roms
fi fi
mkdir -p $INSTALL_DIR/roms/bios
mkdir -p $INSTALL_DIR/roms/3do mkdir -p $INSTALL_DIR/roms/3do
mkdir -p $INSTALL_DIR/roms/amiga mkdir -p $INSTALL_DIR/roms/amiga
mkdir -p $INSTALL_DIR/roms/amigacd32 mkdir -p $INSTALL_DIR/roms/amigacd32
@ -174,10 +175,7 @@ mv $INSTALL_DIR/emulators/RetroArch-Linux-x86_64/RetroArch-Linux-x86_64.AppImage
flatpak install flathub org.yuzu_emu.yuzu flatpak install flathub org.yuzu_emu.yuzu
# Switch - Ryujinx # Switch - Ryujinx
cd $INSTALL_DIR/emulators flatpak install flathub org.ryujinx.Ryujinx
wget https://github.com/Ryujinx/release-channel-master/releases/download/1.1.76/ryujinx-1.1.76-linux_x64.tar.gz
tar -xvf ryujinx-1.1.76-linux_x64.tar.gz
mv publish ryujinx
# PS3 - RPCS3 # PS3 - RPCS3
# DOS - dosbox-pure is included? # DOS - dosbox-pure is included?
@ -192,7 +190,7 @@ cp $INSTALL_DIR/patches/Splash.h $INSTALL_DIR/emulationstation/es-core/src/Splas
cp $INSTALL_DIR/patches/GuiMenu.cpp $INSTALL_DIR/emulationstation/es-app/src/guis/GuiMenu.cpp cp $INSTALL_DIR/patches/GuiMenu.cpp $INSTALL_DIR/emulationstation/es-app/src/guis/GuiMenu.cpp
# pathes applied # pathes applied
cd emulationstation cd emulationstation
sudo pacman -S base-devel cmake freeimage sdl2_mixer sdl2 rapidjson boost openal # openal is needed for ryujinx sudo pacman -S base-devel cmake freeimage sdl2_mixer sdl2 rapidjson boost
cmake -DENABLE_EMUELEC=1 -DGLES2=0 -DDISABLE_KODI=1 -DENABLE_FILEMANAGER=0 -DCEC=0 -DRG552=1 cmake -DENABLE_EMUELEC=1 -DGLES2=0 -DDISABLE_KODI=1 -DENABLE_FILEMANAGER=0 -DCEC=0 -DRG552=1
make -j$(nproc) make -j$(nproc)
cp $INSTALL_DIR/es_systems.cfg $INSTALL_DIR/emulationstation/ cp $INSTALL_DIR/es_systems.cfg $INSTALL_DIR/emulationstation/

10
usr/bin/runemu.py
View file

@ -133,7 +133,7 @@ standalone_emulators: 'MutableMapping[str, StandaloneEmulator]' = {
'raze': StandaloneEmulator('raze', [INSTALL_DIR + '/usr/bin/raze.sh', '<path>']), 'raze': StandaloneEmulator('raze', [INSTALL_DIR + '/usr/bin/raze.sh', '<path>']),
'solarus': StandaloneEmulator('solarus-run', [INSTALL_DIR + '/usr/bin/solarus.sh', '<path>']), 'solarus': StandaloneEmulator('solarus-run', [INSTALL_DIR + '/usr/bin/solarus.sh', '<path>']),
'yuzu': StandaloneEmulator('yuzu', [INSTALL_DIR + '/emulators/yuzu.sh', '<path>']), 'yuzu': StandaloneEmulator('yuzu', [INSTALL_DIR + '/emulators/yuzu.sh', '<path>']),
'ryujinx': StandaloneEmulator('ryujinx', [INSTALL_DIR + '/emulators/ryujinx/ryujinx.sh', '<path>']), 'ryujinx': StandaloneEmulator('ryujinx', [INSTALL_DIR + '/emulators/ryujinx.sh', '<path>']),
} }
def _load_customized_standalone_emulators(): def _load_customized_standalone_emulators():
@ -219,9 +219,9 @@ class EmuRunner():
log(f'platform: {self.platform}') log(f'platform: {self.platform}')
log(f'core: {self.core}') log(f'core: {self.core}')
retroarch_binary = 'retroarch' retroarch_binary = 'retroarch'
if self.core in {'pcsx_rearmed', 'parallel_n64'}: #if self.core in {'pcsx_rearmed', 'parallel_n64'}:
retroarch_binary = 'retroarch32' # retroarch_binary = 'retroarch32'
self.environment['LD_LIBRARY_PATH'] = '/usr/lib32' # self.environment['LD_LIBRARY_PATH'] = '/usr/lib32'
rom_path: 'Optional[Union[str, Path]]' = self.rom rom_path: 'Optional[Union[str, Path]]' = self.rom
@ -387,7 +387,7 @@ def main():
except subprocess.CalledProcessError as cpe: except subprocess.CalledProcessError as cpe:
log(f'Process exited improperly with return code {cpe.returncode}') log(f'Process exited improperly with return code {cpe.returncode}')
exit_code = 1 exit_code = 1
requires_bios = {'atari5200', 'atari800', 'atari7800', 'atarilynx', 'colecovision', 'amiga', 'amigacd32', 'o2em', 'intellivision', 'pcengine', 'pcenginecd', 'pcfx', 'fds', 'segacd', 'saturn', 'dreamcast', 'naomi', 'atomiswave', 'x68000', 'neogeo', 'neogeocd', 'msx', 'msx2', 'sc-3000'} requires_bios = {'atari5200', 'atari800', 'atari7800', 'atarilynx', 'colecovision', 'amiga', 'amigacd32', 'o2em', 'intellivision', 'pcengine', 'pcenginecd', 'pcfx', 'fds', 'segacd', 'saturn', 'dreamcast', 'naomi', 'atomiswave', 'x68000', 'neogeo', 'neogeocd', 'msx', 'msx2', 'sc-3000', 'pcsx2'}
if platform in requires_bios: if platform in requires_bios:
if platform == 'msx2': if platform == 'msx2':
platform_to_check = 'msx2' platform_to_check = 'msx2'