Merge pull request #1752 from fewtarius/dev

Fix Amiberry across devices, update docs.
This commit is contained in:
fewtarius 2023-07-17 17:19:49 -04:00 committed by GitHub
commit 7875c91db3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 35 additions and 83 deletions

View file

@ -7,4 +7,4 @@ SYSTEM_EXTENSION=".xci .XCI .nsp .NSP .nca .NCA .nso .NSO .nro .NRO"
SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
SYSTEM_PLATFORM="switch"
SYSTEM_THEME="switch"
SYSTEM_FULLNAME="switch"
SYSTEM_FULLNAME="Switch"

View file

@ -80,7 +80,7 @@ This document describes all available systems emulators and cores available for
|Nintendo|Super Famicom (sfc)|1990|`sfc`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)<br>**retroarch:** snes9x2010<br>**retroarch:** snes9x2002<br>**retroarch:** snes9x2005_plus<br>**retroarch:** beetle_supafaust<br>**retroarch:** bsnes<br>**retroarch:** bsnes_mercury_performance<br>**retroarch:** bsnes_hd_beta<br>|
|Nintendo|Super Nintendo (Hacks) (snesh)|1991|`snesh`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)<br>**retroarch:** snes9x2010<br>**retroarch:** snes9x2002<br>**retroarch:** snes9x2005_plus<br>**retroarch:** beetle_supafaust<br>**retroarch:** bsnes<br>**retroarch:** bsnes_mercury_performance<br>**retroarch:** bsnes_hd_beta<br>|
|Nintendo|Super Nintendo (snes)|1991|`snes`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)<br>**retroarch:** snes9x2010<br>**retroarch:** snes9x2002<br>**retroarch:** snes9x2005_plus<br>**retroarch:** beetle_supafaust<br>**retroarch:** bsnes<br>**retroarch:** bsnes_mercury_performance<br>**retroarch:** bsnes_hd_beta<br>|
|Nintendo|switch (switch)|2017|`switch`|.xci .XCI .nsp .NSP .nca .NCA .nso .NSO .nro .NRO|**yuzu:** yuzu-sa (default)<br>**ryujinx:** ryujinx-sa<br>|
|Nintendo|Switch (switch)|2017|`switch`|.xci .XCI .nsp .NSP .nca .NCA .nso .NSO .nro .NRO|**yuzu:** yuzu-sa (default)<br>**ryujinx:** ryujinx-sa<br>|
|Nintendo|Virtual Boy (virtualboy)|1995|`virtualboy`|.vb .VB .zip .ZIP .7z .7Z|**retroarch:** beetle_vb (default)<br>|
|Nintendo|Wii (wii)|2006|`wii`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL .wad .WAD|**dolphin:** dolphin-sa-wii (default)<br>**primehack:** primehack<br>**retroarch:** dolphin<br>|
|Nintendo|Wii U (wiiu)|2012|`wiiu`|.wud .WUD .wux .WUX .wua .WUA|**cemu:** cemu-sa (default)<br>|

View file

@ -26,7 +26,7 @@ This document describes all available systems emulators and cores available for
|Capcom|PlaySystem 2 (cps2)|1993|`cps2`|.zip .ZIP .7z .7Z|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** mame2010<br>**retroarch:** fbalpha2012<br>**retroarch:** mba_mini<br>**AdvanceMame:** AdvanceMame<br>|
|Capcom|PlaySystem 3 (cps3)|1996|`cps3`|.zip .ZIP .7z .7Z|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** mame2010<br>**retroarch:** fbalpha2012<br>**retroarch:** mba_mini<br>**AdvanceMame:** AdvanceMame<br>|
|Coleco|ColecoVision (colecovision)|1982|`coleco`|.bin .BIN .col .COL .rom .ROM .zip .ZIP .7z .7Z|**retroarch:** bluemsx (default)<br>**retroarch:** gearcoleco<br>**retroarch:** smsplus<br>|
|Commodore|Amiga (amiga)|1985|`amiga`|.zip .ZIP .adf .ADF .uae .UAE .ipf .IPF .dms .DMS .adz .ADZ .lha .LHA .m3u .M3U .hdf .HDF .hdz .HDZ|**retroarch:** puae (default)<br>**retroarch:** uae4arm<br>|
|Commodore|Amiga (amiga)|1985|`amiga`|.zip .ZIP .adf .ADF .uae .UAE .ipf .IPF .dms .DMS .adz .ADZ .lha .LHA .m3u .M3U .hdf .HDF .hdz .HDZ|**retroarch:** puae (default)<br>**amiberry:** amiberry<br>**retroarch:** uae4arm<br>|
|Commodore|Amiga CD32 (amigacd32)|1994|`amigacd32`|.iso .ISO .cue .CUE .lha .LHA .chd .CHD|**retroarch:** puae (default)<br>**retroarch:** uae4arm<br>|
|Commodore|C128 (c128)|1985|`c128`|.d64 .D64 .d71 .D71 .d80 .D80 .d81 .D81 .d82 .D82 .g64 .G64 .g41 .G41 .x64 .X64 .t64 .T64 .tap .TAP .prg .PRG .p00 .P00 .crt .CRT .bin .BIN .d6z .D6Z .d7z .D7Z .d8z .D8Z .g6z .G6Z .g4z .G4Z .x6z .X6Z .cmd .CMD .m3u .M3U .vsf .VSF .nib .NIB .nbz .NBZ .zip .ZIP|**retroarch:** vice_x128 (default)<br>**vicesa:** x128<br>|
|Commodore|C16 (c16)|1984|`c16`|.d64 .D64 .d71 .D71 .d80 .D80 .d81 .D81 .d82 .D82 .g64 .G64 .g41 .G41 .x64 .X64 .t64 .T64 .tap .TAP .prg .PRG .p00 .P00 .crt .CRT .bin .BIN .d6z .D6Z .d7z .D7Z .d8z .D8Z .g6z .G6Z .g4z .G4Z .x6z .X6Z .cmd .CMD .m3u .M3U .vsf .VSF .nib .NIB .nbz .NBZ .zip .ZIP|**retroarch:** vice_xplus4 (default)<br>**vicesa:** xplus4<br>|

View file

@ -26,7 +26,7 @@ This document describes all available systems emulators and cores available for
|Capcom|PlaySystem 2 (cps2)|1993|`cps2`|.zip .ZIP .7z .7Z|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** mame2010<br>**retroarch:** fbalpha2012<br>**retroarch:** mba_mini<br>**AdvanceMame:** AdvanceMame<br>|
|Capcom|PlaySystem 3 (cps3)|1996|`cps3`|.zip .ZIP .7z .7Z|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** mame2010<br>**retroarch:** fbalpha2012<br>**retroarch:** mba_mini<br>**AdvanceMame:** AdvanceMame<br>|
|Coleco|ColecoVision (colecovision)|1982|`coleco`|.bin .BIN .col .COL .rom .ROM .zip .ZIP .7z .7Z|**retroarch:** bluemsx (default)<br>**retroarch:** gearcoleco<br>**retroarch:** smsplus<br>|
|Commodore|Amiga (amiga)|1985|`amiga`|.zip .ZIP .adf .ADF .uae .UAE .ipf .IPF .dms .DMS .adz .ADZ .lha .LHA .m3u .M3U .hdf .HDF .hdz .HDZ|**retroarch:** puae (default)<br>**retroarch:** uae4arm<br>|
|Commodore|Amiga (amiga)|1985|`amiga`|.zip .ZIP .adf .ADF .uae .UAE .ipf .IPF .dms .DMS .adz .ADZ .lha .LHA .m3u .M3U .hdf .HDF .hdz .HDZ|**retroarch:** puae (default)<br>**amiberry:** amiberry<br>**retroarch:** uae4arm<br>|
|Commodore|Amiga CD32 (amigacd32)|1994|`amigacd32`|.iso .ISO .cue .CUE .lha .LHA .chd .CHD|**retroarch:** puae (default)<br>**retroarch:** uae4arm<br>|
|Commodore|C128 (c128)|1985|`c128`|.d64 .D64 .d71 .D71 .d80 .D80 .d81 .D81 .d82 .D82 .g64 .G64 .g41 .G41 .x64 .X64 .t64 .T64 .tap .TAP .prg .PRG .p00 .P00 .crt .CRT .bin .BIN .d6z .D6Z .d7z .D7Z .d8z .D8Z .g6z .G6Z .g4z .G4Z .x6z .X6Z .cmd .CMD .m3u .M3U .vsf .VSF .nib .NIB .nbz .NBZ .zip .ZIP|**retroarch:** vice_x128 (default)<br>**vicesa:** x128<br>|
|Commodore|C16 (c16)|1984|`c16`|.d64 .D64 .d71 .D71 .d80 .D80 .d81 .D81 .d82 .D82 .g64 .G64 .g41 .G41 .x64 .X64 .t64 .T64 .tap .TAP .prg .PRG .p00 .P00 .crt .CRT .bin .BIN .d6z .D6Z .d7z .D7Z .d8z .D8Z .g6z .G6Z .g4z .G4Z .x6z .X6Z .cmd .CMD .m3u .M3U .vsf .VSF .nib .NIB .nbz .NBZ .zip .ZIP|**retroarch:** vice_xplus4 (default)<br>**vicesa:** xplus4<br>|

View file

@ -26,7 +26,7 @@ This document describes all available systems emulators and cores available for
|Capcom|PlaySystem 2 (cps2)|1993|`cps2`|.zip .ZIP .7z .7Z|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** mame2010<br>**retroarch:** fbalpha2012<br>**retroarch:** mba_mini<br>**AdvanceMame:** AdvanceMame<br>|
|Capcom|PlaySystem 3 (cps3)|1996|`cps3`|.zip .ZIP .7z .7Z|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** mame2010<br>**retroarch:** fbalpha2012<br>**retroarch:** mba_mini<br>**AdvanceMame:** AdvanceMame<br>|
|Coleco|ColecoVision (colecovision)|1982|`coleco`|.bin .BIN .col .COL .rom .ROM .zip .ZIP .7z .7Z|**retroarch:** bluemsx (default)<br>**retroarch:** gearcoleco<br>**retroarch:** smsplus<br>|
|Commodore|Amiga (amiga)|1985|`amiga`|.zip .ZIP .adf .ADF .uae .UAE .ipf .IPF .dms .DMS .adz .ADZ .lha .LHA .m3u .M3U .hdf .HDF .hdz .HDZ|**retroarch:** puae (default)<br>**retroarch:** uae4arm<br>|
|Commodore|Amiga (amiga)|1985|`amiga`|.zip .ZIP .adf .ADF .uae .UAE .ipf .IPF .dms .DMS .adz .ADZ .lha .LHA .m3u .M3U .hdf .HDF .hdz .HDZ|**retroarch:** puae (default)<br>**amiberry:** amiberry<br>**retroarch:** uae4arm<br>|
|Commodore|Amiga CD32 (amigacd32)|1994|`amigacd32`|.iso .ISO .cue .CUE .lha .LHA .chd .CHD|**retroarch:** puae (default)<br>**retroarch:** uae4arm<br>|
|Commodore|C128 (c128)|1985|`c128`|.d64 .D64 .d71 .D71 .d80 .D80 .d81 .D81 .d82 .D82 .g64 .G64 .g41 .G41 .x64 .X64 .t64 .T64 .tap .TAP .prg .PRG .p00 .P00 .crt .CRT .bin .BIN .d6z .D6Z .d7z .D7Z .d8z .D8Z .g6z .G6Z .g4z .G4Z .x6z .X6Z .cmd .CMD .m3u .M3U .vsf .VSF .nib .NIB .nbz .NBZ .zip .ZIP|**retroarch:** vice_x128 (default)<br>**vicesa:** x128<br>|
|Commodore|C16 (c16)|1984|`c16`|.d64 .D64 .d71 .D71 .d80 .D80 .d81 .D81 .d82 .D82 .g64 .G64 .g41 .G41 .x64 .X64 .t64 .T64 .tap .TAP .prg .PRG .p00 .P00 .crt .CRT .bin .BIN .d6z .D6Z .d7z .D7Z .d8z .D8Z .g6z .G6Z .g4z .G4Z .x6z .X6Z .cmd .CMD .m3u .M3U .vsf .VSF .nib .NIB .nbz .NBZ .zip .ZIP|**retroarch:** vice_xplus4 (default)<br>**vicesa:** xplus4<br>|

View file

@ -26,7 +26,7 @@ This document describes all available systems emulators and cores available for
|Capcom|PlaySystem 2 (cps2)|1993|`cps2`|.zip .ZIP .7z .7Z|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** mame2010<br>**retroarch:** fbalpha2012<br>**retroarch:** mba_mini<br>**AdvanceMame:** AdvanceMame<br>|
|Capcom|PlaySystem 3 (cps3)|1996|`cps3`|.zip .ZIP .7z .7Z|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** mame2010<br>**retroarch:** fbalpha2012<br>**retroarch:** mba_mini<br>**AdvanceMame:** AdvanceMame<br>|
|Coleco|ColecoVision (colecovision)|1982|`coleco`|.bin .BIN .col .COL .rom .ROM .zip .ZIP .7z .7Z|**retroarch:** bluemsx (default)<br>**retroarch:** gearcoleco<br>**retroarch:** smsplus<br>|
|Commodore|Amiga (amiga)|1985|`amiga`|.zip .ZIP .adf .ADF .uae .UAE .ipf .IPF .dms .DMS .adz .ADZ .lha .LHA .m3u .M3U .hdf .HDF .hdz .HDZ|**retroarch:** puae (default)<br>**retroarch:** uae4arm<br>|
|Commodore|Amiga (amiga)|1985|`amiga`|.zip .ZIP .adf .ADF .uae .UAE .ipf .IPF .dms .DMS .adz .ADZ .lha .LHA .m3u .M3U .hdf .HDF .hdz .HDZ|**retroarch:** puae (default)<br>**amiberry:** amiberry<br>**retroarch:** uae4arm<br>|
|Commodore|Amiga CD32 (amigacd32)|1994|`amigacd32`|.iso .ISO .cue .CUE .lha .LHA .chd .CHD|**retroarch:** puae (default)<br>**retroarch:** uae4arm<br>|
|Commodore|C128 (c128)|1985|`c128`|.d64 .D64 .d71 .D71 .d80 .D80 .d81 .D81 .d82 .D82 .g64 .G64 .g41 .G41 .x64 .X64 .t64 .T64 .tap .TAP .prg .PRG .p00 .P00 .crt .CRT .bin .BIN .d6z .D6Z .d7z .D7Z .d8z .D8Z .g6z .G6Z .g4z .G4Z .x6z .X6Z .cmd .CMD .m3u .M3U .vsf .VSF .nib .NIB .nbz .NBZ .zip .ZIP|**retroarch:** vice_x128 (default)<br>**vicesa:** x128<br>|
|Commodore|C16 (c16)|1984|`c16`|.d64 .D64 .d71 .D71 .d80 .D80 .d81 .D81 .d82 .D82 .g64 .G64 .g41 .G41 .x64 .X64 .t64 .T64 .tap .TAP .prg .PRG .p00 .P00 .crt .CRT .bin .BIN .d6z .D6Z .d7z .D7Z .d8z .D8Z .g6z .G6Z .g4z .G4Z .x6z .X6Z .cmd .CMD .m3u .M3U .vsf .VSF .nib .NIB .nbz .NBZ .zip .ZIP|**retroarch:** vice_xplus4 (default)<br>**vicesa:** xplus4<br>|

View file

@ -14,28 +14,17 @@ PKG_TOOLCHAIN="make"
PKG_GIT_CLONE_BRANCH="master"
PKG_PATCH_DIRS+=" ${DEVICE}"
### Note: OpenGL does not work.
# if [ ! "${OPENGL}" = "no" ]; then
# PKG_PATCH_DIRS+=" opengl"
# fi
# if [ "${VULKAN_SUPPORT}" = "yes" ]
# then
# PKG_PATCH_DIRS+=" vulkan"
# fi
if [ ! "${OPENGL}" = "no" ]; then
PKG_PATCH_DIRS+=" opengl"
fi
pre_configure_target() {
cd ${PKG_BUILD}
export SYSROOT_PREFIX=${SYSROOT_PREFIX}
AMIBERRY_PLATFORM="PLATFORM=${DEVICE}"
### Note: OpenGL does not work.
# if [ ! "${OPENGL}" = "no" ]; then
# PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
# SET_OPENGL="USE_OPENGL=1"
# fi
sed -i "s|AS = as|AS \?= as|" Makefile
PKG_MAKE_OPTS_TARGET+="${AMIBERRY_PLATFORM} ${SET_OPENGL} all SDL_CONFIG=${SYSROOT_PREFIX}/usr/bin/sdl2-config"
PKG_MAKE_OPTS_TARGET+="${AMIBERRY_PLATFORM} all SDL_CONFIG=${SYSROOT_PREFIX}/usr/bin/sdl2-config"
}
makeinstall_target() {

View file

@ -1,13 +1,20 @@
diff --git a/src/osdep/vkbd/vkbd.cpp b/src/osdep/vkbd/vkbd.cpp
index bcf25636..f7b56242 100644
--- a/src/osdep/vkbd/vkbd.cpp
+++ b/src/osdep/vkbd/vkbd.cpp
@@ -21,6 +21,8 @@ using VkbdRect = struct
int key;
};
+SDL_Renderer* sdl_renderer;
diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp
index 13237df9..95e6b04e 100644
--- a/src/osdep/amiberry.cpp
+++ b/src/osdep/amiberry.cpp
@@ -3691,12 +3691,9 @@ int main(int argc, char* argv[])
write_log("SDL could not initialize! SDL_Error: %s\n", SDL_GetError());
abort();
}
-#ifdef USE_OPENGL
- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
- //SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
-#endif
+
// Configurable options
static bool vkbdHires = true;
static VkbdLanguage vkbdLanguage = VKBD_LANGUAGE_US;
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+
atexit(SDL_Quit);
write_log(_T("Sorting devices and modes...\n"));
sortdisplays();

View file

@ -1,39 +0,0 @@
diff --git a/src/osdep/amiberry_gfx.cpp b/src/osdep/amiberry_gfx.cpp
index 73cd03eb..9d85fc0d 100644
--- a/src/osdep/amiberry_gfx.cpp
+++ b/src/osdep/amiberry_gfx.cpp
@@ -2077,7 +2077,7 @@ int graphics_init(bool mousecapture)
// Set Window allow high DPI by default
sdl_window_mode |= SDL_WINDOW_ALLOW_HIGHDPI;
#ifdef USE_OPENGL
- sdl_window_mode |= SDL_WINDOW_OPENGL;
+ sdl_window_mode |= SDL_WINDOW_VULKAN;
#endif
}
else
diff --git a/src/osdep/gui/ShowMessage.cpp b/src/osdep/gui/ShowMessage.cpp
index 36cf1cbf..86a51804 100644
--- a/src/osdep/gui/ShowMessage.cpp
+++ b/src/osdep/gui/ShowMessage.cpp
@@ -82,7 +82,7 @@ static void InitShowMessage(const std::string& message)
{
Uint32 flags = SDL_WINDOW_FULLSCREEN_DESKTOP;
#ifdef USE_OPENGL
- flags |= SDL_WINDOW_OPENGL;
+ flags |= SDL_WINDOW_VULKAN;
#endif
mon->sdl_window = SDL_CreateWindow("Amiberry",
SDL_WINDOWPOS_CENTERED,
diff --git a/src/osdep/gui/main_window.cpp b/src/osdep/gui/main_window.cpp
index 06fc5777..bccd47c6 100644
--- a/src/osdep/gui/main_window.cpp
+++ b/src/osdep/gui/main_window.cpp
@@ -472,7 +472,7 @@ void amiberry_gui_init()
flags |= SDL_WINDOW_ALLOW_HIGHDPI;
#ifdef USE_OPENGL
- flags |= SDL_WINDOW_OPENGL;
+ flags |= SDL_WINDOW_VULKAN;
#endif
mon->sdl_window = SDL_CreateWindow("Amiberry",

View file

@ -32,20 +32,20 @@ LIBRETRO_CORES="81-lr a5200-lr atari800-lr beetle-gba-lr beetle-lynx-lr beetle-n
case "${DEVICE}" in
AMD64)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="lutris-wine"
PKG_EMUS+=" cemu-sa citra-sa dolphin-sa duckstation-sa melonds-sa minivmacsa mupen64plus-sa pcsx2-sa \
PKG_EMUS+=" amiberry cemu-sa citra-sa dolphin-sa duckstation-sa melonds-sa minivmacsa mupen64plus-sa pcsx2-sa \
primehack rpcs3-sa ryujinx-sa scummvmsa xemu-sa yuzu-sa"
LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr citra-lr desmume-lr dolphin-lr flycast-lr lrps2-lr mame-lr \
minivmac-lr play-lr"
;;
RK358*)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 flycast-lr pcsx_rearmed-lr"
PKG_EMUS+=" aethersx2-sa duckstation-sa pcsx_rearmed-lr box64 scummvmsa yabasanshiro-sa box64 portmaster"
PKG_EMUS+=" amiberry aethersx2-sa duckstation-sa pcsx_rearmed-lr box64 scummvmsa yabasanshiro-sa box64 portmaster"
LIBRETRO_CORES+=" uae4arm beetle-psx-lr bsnes-hd-lr citra-lr dolphin-lr mame-lr"
PKG_RETROARCH+=" retropie-shaders"
;;
RK3399)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 pcsx_rearmed-lr"
PKG_EMUS+=" aethersx2-sa dolphin-sa drastic-sa duckstation-sa melonds-sa mupen64plus-sa box64 scummvmsa \
PKG_EMUS+=" amiberry aethersx2-sa dolphin-sa drastic-sa duckstation-sa melonds-sa mupen64plus-sa box64 scummvmsa \
yabasanshiro-sa portmaster"
LIBRETRO_CORES+=" uae4arm beetle-psx-lr bsnes-hd-lr dolphin-lr flycast-lr mame-lr pcsx_rearmed-lr"
PKG_RETROARCH+=" retropie-shaders"
@ -59,7 +59,7 @@ case "${DEVICE}" in
;;
S922X*)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 flycast-lr pcsx_rearmed-lr"
PKG_EMUS+=" aethersx2-sa citra-sa dolphin-sa duckstation-sa drastic-sa mupen64plus-sa yabasanshiro-sa \
PKG_EMUS+=" amiberry aethersx2-sa citra-sa dolphin-sa duckstation-sa drastic-sa mupen64plus-sa yabasanshiro-sa \
box64 portmaster"
LIBRETRO_CORES+=" uae4arm beetle-psx-lr bsnes-hd-lr dolphin-lr flycast-lr mame-lr"
PKG_RETROARCH+=" retropie-shaders"
@ -67,7 +67,7 @@ case "${DEVICE}" in
RK3326*)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="flycast-lr pcsx_rearmed-lr"
PKG_DEPENDS_TARGET+=" common-shaders glsl-shaders"
PKG_EMUS+=" drastic-sa mupen64plus-sa scummvmsa yabasanshiro-sa portmaster"
PKG_EMUS+=" amiberry drastic-sa mupen64plus-sa scummvmsa yabasanshiro-sa portmaster"
LIBRETRO_CORES+=" uae4arm flycast-lr"
PKG_RETROARCH+=" retropie-shaders"
;;
@ -128,12 +128,7 @@ makeinstall_target() {
add_emu_core amiga retroarch puae true
case ${TARGET_ARCH} in
aarch64)
case ${DEVICE} in
RK3566*)
### Amiberry does not like OpenGL with Weston
add_emu_core amiga amiberry amiberry false
;;
esac
add_emu_core amiga amiberry amiberry false
add_emu_core amiga retroarch uae4arm false
;;
esac