Merge remote-tracking branch 'upstream/master'

Merge with upstream
This commit is contained in:
Mitchell Lehman 2020-11-10 09:54:25 -05:00
commit be9f242195
9 changed files with 17 additions and 10 deletions

View File

@ -1,7 +1,7 @@
# Software Information
display_name = "Atari - 5200 (Atari800)"
authors = "Petr Stehlik"
supported_extensions = "xfd|atr|atx|cdm|cas|bin|a52|xex|zip"
supported_extensions = "xfd|atr|cdm|cas|bin|a52|zip|atx|car|com|xex"
corename = "Atari800"
categories = "Emulator"
license = "GPLv2"

View File

@ -1,6 +1,6 @@
display_name = "Arcade (FinalBurn Neo)"
authors = "Team FBNeo"
supported_extensions = "zip|7z|cue"
supported_extensions = "zip|7z|cue|ccd"
corename = "FinalBurn Neo"
manufacturer = "Various"
categories = "Emulator"
@ -10,7 +10,7 @@ database = "FBNeo - Arcade Games"
database_match_archive_member = "false"
license = "Non-commercial"
permissions = ""
display_version = "v0.2.97.44"
display_version = "v1.0.0.01"
supports_no_game = "false"
firmware_count = 18
firmware0_desc = "fbneo/neogeo.zip (Neo Geo BIOS)"

View File

@ -1,5 +1,4 @@
2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
@ -15,11 +14,13 @@ mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro
mednafen_pce_fast libretro-beetle_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git master YES GENERIC Makefile .
mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
mu libretro-mu https://github.com/libretro/Mu.git master YES GENERIC Makefile libretroBuildSystem
nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master NO GENERIC Makefile.libretro sdl
nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git master YES GENERIC Makefile .
o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENERIC Makefile .
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_ALT Makefile .
prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .

View File

@ -1,5 +1,4 @@
2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
@ -12,7 +11,9 @@ mednafen_pce_fast libretro-beetle_pce_fast https://github.com/libretro/beetle-pc
mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git master YES GENERIC Makefile .
mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
mu libretro-mu https://github.com/libretro/Mu.git master YES GENERIC Makefile libretroBuildSystem
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86
nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master NO GENERIC Makefile.libretro sdl

View File

@ -1,6 +1,5 @@
2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
3dengine libretro-3dengine https://github.com/libretro/libretro-3dengine.git master YES GENERIC Makefile .
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
craft libretro-craft https://github.com/libretro/craft master YES GENERIC Makefile.libretro .
fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
@ -19,12 +18,14 @@ mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetl
mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
melonds libretro-melonds https://github.com/libretro/melonDS.git master YES GENERIC Makefile .
mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
mu libretro-mu https://github.com/libretro/Mu.git master YES GENERIC Makefile libretroBuildSystem
parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64
nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master NO GENERIC Makefile.libretro sdl
nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git master YES GENERIC Makefile .
o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENERIC Makefile .
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_ALT Makefile .
prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .

View File

@ -1,6 +1,5 @@
2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
3dengine libretro-3dengine https://github.com/libretro/libretro-3dengine.git master YES GENERIC Makefile .
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
craft libretro-craft https://github.com/libretro/craft master YES GENERIC Makefile.libretro .
fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
@ -19,7 +18,9 @@ mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetl
mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
melonds libretro-melonds https://github.com/libretro/melonDS.git master YES GENERIC Makefile .
mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
mu libretro-mu https://github.com/libretro/Mu.git master YES GENERIC Makefile libretroBuildSystem
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86
nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master NO GENERIC Makefile.libretro sdl

View File

@ -1,5 +1,4 @@
2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro
fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
@ -23,10 +22,12 @@ mednafen_saturn libretro-beetle_saturn https://github.com/libretro/beetle-saturn
mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
mesen libretro-mesen https://github.com/libretro/Mesen.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x64
mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC Makefile.libretro sdl
nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git master YES GENERIC Makefile .
o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENERIC Makefile .
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .
pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .

View File

@ -1,5 +1,4 @@
2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro
fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
@ -22,10 +21,12 @@ mednafen_saturn libretro-beetle_saturn https://github.com/libretro/beetle-saturn
mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
mesen libretro-mesen https://github.com/libretro/Mesen.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x64
mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC Makefile.libretro sdl
nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git master YES GENERIC Makefile .
o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENERIC Makefile .
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .
pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .

View File

@ -1,5 +1,4 @@
2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master NO GENERIC Makefile.libretro .
dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro WITH_DYNAREC=x86
fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
@ -16,11 +15,13 @@ mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro
mednafen_pce_fast libretro-beetle_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git master YES GENERIC Makefile .
mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
mu libretro-mu https://github.com/libretro/Mu.git master YES GENERIC Makefile libretroBuildSystem
nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC Makefile.libretro sdl
nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git master YES GENERIC Makefile .
o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENERIC Makefile .
opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_ALT Makefile .
prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .