Merge pull request #1747 from fewtarius/dev

Fix Amiberry for RK3566, drop it on other devices until OpenGL can be fixed up.
This commit is contained in:
fewtarius 2023-07-17 07:33:49 -04:00 committed by GitHub
commit bd90b1e870
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 169 additions and 96 deletions

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>**amiberry:** amiberry<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>**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>**amiberry:** amiberry<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>**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>**amiberry:** amiberry<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>**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>**amiberry:** amiberry<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>**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

@ -1,4 +1,4 @@
config_description=UAE Amiga 1200/ Amiga CD32 default configuration
config_description=UAE Amiga 1200 default configuration
config_hardware=true
config_host=true
config_version=3.6.0
@ -36,26 +36,42 @@ amiberry.rom_path=/storage/.config/amiberry/kickstarts/
amiberry.floppy_path=/storage/.config/amiberry/disks/
amiberry.hardfile_path=/storage/.config/amiberry/
amiberry.cd_path=/storage/.config/amiberry/cd32/
;
;
;
config_path=/storage/.config/amiberry/conf
controllers_path=/usr/config/SDL-GameControllerDB
retroarch_config=/storage/.config/retroarch/retroarch.cfg
;
; *** Controller/Input Configuration
;
;
joyport0=mouse
joyport0_autofire=none
joyport0_friendlyname=Mouse
joyport0_name=MOUSE0
;
joyport1=joy1
;
joyport1=joy0
joyport1_autofire=normal
joyport1_friendlyname=Logitech Gamepad F310
joyport1_name=JOY1
;
joyport2=joy0
joyport2_autofire=normal
joyport2_friendlyname=Keyboard as Joystick [Default]
joyport2_name=JOY0
;
;
;
joyport1_friendlyname=Retrogame Joypad
joyport1_name=JOY0
;
;
joyport1_amiberry_custom_none_a=Joy1 Fire/Mouse1 Left Button
joyport1_amiberry_custom_none_b=Swap joystick ports
joyport1_amiberry_custom_none_x=Joy1 2nd Button/Mouse1 Right Button
joyport1_amiberry_custom_none_y=Toggle Virtual Keyboard
joyport1_amiberry_custom_none_start=Pause emulation
joyport1_amiberry_custom_none_leftshoulder=Quick restore state
joyport1_amiberry_custom_none_rightshoulder=Quick save state
joyport1_amiberry_custom_none_dpup=Joy1 Up
joyport1_amiberry_custom_none_dpdown=Joy2 Down
joyport1_amiberry_custom_none_dpleft=Joy2 Left
joyport1_amiberry_custom_none_dpright=Joy2 Right
joyport1_amiberry_custom_axis_none_leftx=Joy1 Horizontal
joyport1_amiberry_custom_axis_none_lefty=Joy1 Vertical
joyport1_amiberry_custom_axis_none_rightx=Mouse1 Horizontal
joyport1_amiberry_custom_axis_none_righty=Mouse1 Vertical
;
;
input.joymouse_speed_analog=2
input.joymouse_speed_digital=10
input.joymouse_deadzone=33
@ -65,9 +81,9 @@ input.analog_joystick_offset=-1
input.mouse_speed=100
input.autofire_speed=2496
kbd_lang=us
;
;
; *** Host-Specific
;
;
amiberry.vertical_offset=0
amiberry.hide_idle_led=0
amiberry.gfx_correct_aspect=1
@ -78,34 +94,40 @@ amiberry.use_analogue_remap=false
amiberry.use_retroarch_quit=true
amiberry.use_retroarch_menu=true
amiberry.use_retroarch_reset=false
;
vkbd_enabled=true
vkbd_hires=true
vkbd_exit=true
vkbd_transparency=0
vkbd_language=US
vkbd_style=Original
;
; *** Common / Paths
;
;
use_gui=no
kickstart_rom_file=@BIOS_PATH@/kick40068.A1200.rom
kickstart_ext_rom_file=
ide_mb_rom_file=:ENABLED
flash_file=
cart_file=
;
;
; *** Floppy Drives
;
;
;floppy0=
;floppy1=
;floppy2=
;floppy3=
nr_floppies=4
floppy_speed=100
;
;
; *** Hard Drives
;
;
;
;
; *** CD / CD32
;
;
cd_speed=100
;
;
; *** Display / Screen Setup
;
;
gfx_framerate=0
gfx_width=NULL
gfx_height=NULL
@ -117,22 +139,21 @@ gfx_linemode=none
gfx_fullscreen_amiga=false
gfx_fullscreen_picasso=false
ntsc=false
;
;
; *** CPU options
;
;
cpu_speed=real
cpu_type=68ec020
cpu_model=68020
cpu_type=68000
cpu_model=68000
cpu_compatible=false
cpu_24bit_addressing=true
fpu_strict=false
compfpu=true
cachesize=0
finegrain_cpu_speed=1024
;
cachesize=8192
;
; *** Memory
;
chipmem_size=4
;
chipmem_size=2
z3mapping=real
fastmem_size=0
a3000mem_size=0
@ -141,19 +162,19 @@ z3mem_size=0
z3mem_start=0x40000000
bogomem_size=0
rtg_modes=0x502
;
;
; *** Chipset
;
chipset=aga
;
chipset=ecs
chipset_refreshrate=50.000000
collision_level=playfields
chipset_compatible=Generic
rtc=MSM6242B
immediate_blits=false
fast_copper=true
;
;
; *** Sound Options
;
;
sound_output=exact
sound_channels=stereo
sound_stereo_separation=7
@ -163,7 +184,7 @@ sound_interpol=none
sound_filter=off
sound_filter_type=standard
sound_volume_cd=20
;
;
; *** Misc. Options
;
;
bsdsocket_emu=false

View file

@ -36,26 +36,42 @@ amiberry.rom_path=/storage/.config/amiberry/kickstarts/
amiberry.floppy_path=/storage/.config/amiberry/disks/
amiberry.hardfile_path=/storage/.config/amiberry/
amiberry.cd_path=/storage/.config/amiberry/cd32/
;
;
;
config_path=/storage/.config/amiberry/conf
controllers_path=/usr/config/SDL-GameControllerDB
retroarch_config=/storage/.config/retroarch/retroarch.cfg
;
; *** Controller/Input Configuration
;
;
joyport0=mouse
joyport0_autofire=none
joyport0_friendlyname=Mouse
joyport0_name=MOUSE0
;
joyport1=joy1
;
joyport1=joy0
joyport1_autofire=normal
joyport1_friendlyname=Logitech Gamepad F310
joyport1_name=JOY1
;
joyport2=joy0
joyport2_autofire=normal
joyport2_friendlyname=Keyboard as Joystick [Default]
joyport2_name=JOY0
;
;
;
joyport1_friendlyname=Retrogame Joypad
joyport1_name=JOY0
;
;
joyport1_amiberry_custom_none_a=Joy1 Fire/Mouse1 Left Button
joyport1_amiberry_custom_none_b=Swap joystick ports
joyport1_amiberry_custom_none_x=Joy1 2nd Button/Mouse1 Right Button
joyport1_amiberry_custom_none_y=Toggle Virtual Keyboard
joyport1_amiberry_custom_none_start=Pause emulation
joyport1_amiberry_custom_none_leftshoulder=Quick restore state
joyport1_amiberry_custom_none_rightshoulder=Quick save state
joyport1_amiberry_custom_none_dpup=Joy1 Up
joyport1_amiberry_custom_none_dpdown=Joy2 Down
joyport1_amiberry_custom_none_dpleft=Joy2 Left
joyport1_amiberry_custom_none_dpright=Joy2 Right
joyport1_amiberry_custom_axis_none_leftx=Joy1 Horizontal
joyport1_amiberry_custom_axis_none_lefty=Joy1 Vertical
joyport1_amiberry_custom_axis_none_rightx=Mouse1 Horizontal
joyport1_amiberry_custom_axis_none_righty=Mouse1 Vertical
;
;
input.joymouse_speed_analog=2
input.joymouse_speed_digital=10
input.joymouse_deadzone=33
@ -65,9 +81,9 @@ input.analog_joystick_offset=-1
input.mouse_speed=100
input.autofire_speed=2496
kbd_lang=us
;
;
; *** Host-Specific
;
;
amiberry.vertical_offset=0
amiberry.hide_idle_led=0
amiberry.gfx_correct_aspect=1
@ -78,34 +94,40 @@ amiberry.use_analogue_remap=false
amiberry.use_retroarch_quit=true
amiberry.use_retroarch_menu=true
amiberry.use_retroarch_reset=false
;
vkbd_enabled=true
vkbd_hires=true
vkbd_exit=true
vkbd_transparency=0
vkbd_language=US
vkbd_style=Original
;
; *** Common / Paths
;
;
use_gui=no
kickstart_rom_file=@BIOS_PATH@/kick34005.A500.rom
kickstart_ext_rom_file=
ide_mb_rom_file=:ENABLED
flash_file=
cart_file=
;
;
; *** Floppy Drives
;
;
;floppy0=
;floppy1=
;floppy2=
;floppy3=
nr_floppies=4
floppy_speed=100
;
;
; *** Hard Drives
;
;
;
;
; *** CD / CD32
;
;
cd_speed=100
;
;
; *** Display / Screen Setup
;
;
gfx_framerate=0
gfx_width=NULL
gfx_height=NULL
@ -117,9 +139,9 @@ gfx_linemode=none
gfx_fullscreen_amiga=false
gfx_fullscreen_picasso=false
ntsc=false
;
;
; *** CPU options
;
;
cpu_speed=real
cpu_type=68000
cpu_model=68000
@ -128,9 +150,9 @@ cpu_24bit_addressing=true
fpu_strict=false
compfpu=true
cachesize=8192
;
;
; *** Memory
;
;
chipmem_size=2
z3mapping=real
fastmem_size=0
@ -140,9 +162,9 @@ z3mem_size=0
z3mem_start=0x40000000
bogomem_size=0
rtg_modes=0x502
;
;
; *** Chipset
;
;
chipset=ecs
chipset_refreshrate=50.000000
collision_level=playfields
@ -150,9 +172,9 @@ chipset_compatible=Generic
rtc=MSM6242B
immediate_blits=false
fast_copper=true
;
;
; *** Sound Options
;
;
sound_output=exact
sound_channels=stereo
sound_stereo_separation=7
@ -162,7 +184,7 @@ sound_interpol=none
sound_filter=off
sound_filter_type=standard
sound_volume_cd=20
;
;
; *** Misc. Options
;
;
bsdsocket_emu=false

View file

@ -3,7 +3,7 @@
PKG_NAME="amiberry"
PKG_ARCH="aarch64"
PKG_VERSION="4bd019c"
PKG_VERSION="346d096d8478b1bc489bf36c25c18f2ddb1e8ba3"
PKG_LICENSE="GPLv3"
PKG_SITE="https://github.com/midwan/amiberry"
PKG_URL="${PKG_SITE}.git"
@ -12,15 +12,20 @@ PKG_LONGDESC="Amiberry is an optimized Amiga emulator for ARM-based boards."
GET_HANDLER_SUPPORT="git"
PKG_TOOLCHAIN="make"
PKG_GIT_CLONE_BRANCH="master"
PKG_PATCH_DIRS+="${DEVICE}"
PKG_PATCH_DIRS+=" ${DEVICE}"
pre_configure_target() {
cd ${PKG_BUILD}
export SYSROOT_PREFIX=${SYSROOT_PREFIX}
AMIBERRY_PLATFORM="PLATFORM=${DEVICE}"
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} all SDL_CONFIG=${SYSROOT_PREFIX}/usr/bin/sdl2-config"
PKG_MAKE_OPTS_TARGET+="${AMIBERRY_PLATFORM} ${SET_OPENGL} all SDL_CONFIG=${SYSROOT_PREFIX}/usr/bin/sdl2-config"
}
makeinstall_target() {

View file

@ -9,7 +9,7 @@
jslisten set "-9 amiberry"
# Set some common variables
AMIBERRY_DIR="/storage/.config/game/configs/amiberry"
AMIBERRY_DIR="/storage/.config/amiberry"
AMIBERRY_CONFIG_DIR="${AMIBERRY_DIR}/conf"
AMIBERRY_TMP_DIR="/tmp/emulation/amiberry"
AMIBERRY_TMP_CONFIG="${AMIBERRY_TMP_DIR}/.amiberry_conf.uae"
@ -33,11 +33,8 @@ then
cp -rf /usr/config/amiberry ${AMIBERRY_DIR}
fi
### Refresh the config if there's incorrect data in it.
if [ "$(grep FIND_FILE ${AMIBERRY_DIR}/conf/*.uae >/dev/null 2>&1)" ]
then
cp /usr/config/amiberry/conf/* ${AMIBERRY_DIR}/conf
fi
### Refresh the configs so we can manage them.
cp -f /usr/config/amiberry/conf/* ${AMIBERRY_DIR}/conf
find_gamepad() {
GAMEPAD=$(grep -b4 js0 /proc/bus/input/devices | awk 'BEGIN {FS="\""}; /Name/ {printf $2}')

View file

@ -42,3 +42,15 @@ input_x = "s"
input_x_btn = "2"
input_y = "a"
input_y_btn = "3"
input_enable_hotkey_btn = "8"
input_exit_emulator_btn = "9"
input_screenshot_btn = "nul"
input_pause_toggle_btn = "nul"
input_menu_toggle_btn = "2"
input_fps_toggle_btn = "3"
input_state_slot_increase_btn = "nul"
input_state_slot_decrease_btn = "nul"
input_load_state_btn = "4"
input_save_state_btn = "5"
input_rewind_btn = "6"
input_toggle_fast_forward_btn = "7"

View file

@ -25,3 +25,15 @@ input_r_x_minus_axis = "-2"
input_r_y_plus_axis = "+3"
input_r_y_minus_axis = "-3"
input_gun_trigger_mbtn = "1"
input_enable_hotkey_btn = "8"
input_exit_emulator_btn = "9"
input_screenshot_btn = "nul"
input_pause_toggle_btn = "nul"
input_menu_toggle_btn = "2"
input_fps_toggle_btn = "3"
input_state_slot_increase_btn = "nul"
input_state_slot_decrease_btn = "nul"
input_load_state_btn = "4"
input_save_state_btn = "5"
input_rewind_btn = "6"
input_toggle_fast_forward_btn = "7"

View file

@ -39,13 +39,13 @@ case "${DEVICE}" in
;;
RK358*)
[ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 flycast-lr pcsx_rearmed-lr"
PKG_EMUS+=" amiberry aethersx2-sa duckstation-sa pcsx_rearmed-lr box64 scummvmsa yabasanshiro-sa box64 portmaster"
PKG_EMUS+=" 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+=" amiberry aethersx2-sa dolphin-sa drastic-sa duckstation-sa melonds-sa mupen64plus-sa box64 scummvmsa \
PKG_EMUS+=" 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+=" amiberry aethersx2-sa citra-sa dolphin-sa duckstation-sa drastic-sa mupen64plus-sa yabasanshiro-sa \
PKG_EMUS+=" 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"
@ -128,7 +128,11 @@ makeinstall_target() {
add_emu_core amiga retroarch puae true
case ${TARGET_ARCH} in
aarch64)
add_emu_core amiga amiberry amiberry false
case ${DEVICE} in
RK3566*)
add_emu_core amiga amiberry amiberry false
;;
esac
add_emu_core amiga retroarch uae4arm false
;;
esac