Merge branch 'master' of https://github.com/libretro/libretro-super

2025-01-26 21:35:36 +00:00 · 2020-05-30 02:09:55 +02:00 · 2020-05-30 02:09:55 +02:00 · c52a220749
commit c52a220749
parent 5b711085aa 8a2797902d
90 changed files with 1162 additions and 255 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,5 +7,6 @@
 /dist/win*/
 /dist/osx*/
 /dist/wiiu
+/dist/psl1ght
 /log/
 .DS_Store
--- a/cmake/blackberry.cmake
+++ b/cmake/blackberry.cmake
@ -0,0 +1,13 @@
+set(CMAKE_C_COMPILER "qcc")
+# -D_SSIZE_T_DEFINED is only for minizip dependency of TIC-80
+set(CMAKE_C_FLAGS "-V4.8.3,gcc_ntoarmv7le_gpp -std=gnu99 -D_SSIZE_T_DEFINED")
+set(CMAKE_CXX_COMPILER "QCC")
+set(CMAKE_CXX_FLAGS "-V4.8.3,gcc_ntoarmv7le_gpp -std=gnu++11")
+set(CMAKE_AR "arm-unknown-nto-qnx8.0.0eabi-ar")
+
+set(CMAKE_RANLIB "arm-unknown-nto-qnx8.0.0eabi-ranlib")
+set(CMAKE_SYSTEM_PROCESSOR arm)
+set(CMAKE_SYSTEM_NAME QNX)
+set(CMAKE_CROSSCOMPILING ON)
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-fPIC")
+set(CMAKE_C_LINK_FLAGS "-fPIC")
--- a/cmake/ctr.cmake
+++ b/cmake/ctr.cmake
@ -0,0 +1,26 @@
+set(CMAKE_C_COMPILER "$ENV{DEVKITARM}/bin/arm-none-eabi-gcc")
+set(CMAKE_CXX_COMPILER "$ENV{DEVKITARM}/bin/arm-none-eabi-g++")
+set(CMAKE_AR "$ENV{DEVKITARM}/bin/arm-none-eabi-gcc-ar")
+
+# Workaround for old cmake. Remove when we update cmake
+set(CMAKE_C_ARCHIVE_CREATE "${CMAKE_AR} qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+set(CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_AR} qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+set(CMAKE_CXX_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+
+set(CMAKE_RANLIB "$ENV{DEVKITARM}/bin/arm-none-eabi-gcc-ranlib")
+set(CMAKE_SYSTEM_PROCESSOR armv6k)
+set(CMAKE_SYSTEM_NAME Generic)
+set(CMAKE_CROSSCOMPILING ON)
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-fPIC")
+set(CMAKE_C_LINK_FLAGS "-fPIC")
+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+set(CMAKE_CXX_FLAGS " -march=armv6k -mtune=mpcore -mfloat-abi=hard -I$ENV{DEVKITPRO}/libctru/include")
+set(CMAKE_C_FLAGS " -march=armv6k -mtune=mpcore -mfloat-abi=hard -I$ENV{DEVKITPRO}/libctru/include")
+
+add_definitions(-DARM11 -D_3DS)
+
+# Workaround for old cmake. Remove when we update cmake
+add_definitions(-march=armv6k -mtune=mpcore -mfloat-abi=hard -I$ENV{DEVKITPRO}/libctru/include)
+
+set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available" )
--- a/cmake/libnx.cmake
+++ b/cmake/libnx.cmake
@ -0,0 +1,66 @@
+# Copied from https://github.com/vbe0201/switch-cmake/blob/master/devkita64-libnx.cmake
+# Copyright (c) 2019 SwitchPy Team
+# Licensed under MIT license, full text is available in COPYING
+if (NOT DEFINED ENV{DEVKITPRO})
+    cmake_panic("Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
+endif ()
+
+set(CMAKE_SYSTEM_NAME Generic)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+set(SWITCH TRUE) # To be used for multiplatform projects
+
+# devkitPro paths are broken on Windows. We need to use this macro to fix those.
+macro(msys_to_cmake_path msys_path resulting_path)
+    if (WIN32)
+        string(REGEX REPLACE "^/([a-zA-Z])/" "\\1:/" ${resulting_path} ${msys_path})
+    else ()
+        set(${resulting_path} ${msys_path})
+    endif ()
+endmacro()
+
+msys_to_cmake_path($ENV{DEVKITPRO} DEVKITPRO)
+set(DEVKITA64 ${DEVKITPRO}/devkitA64)
+set(LIBNX ${DEVKITPRO}/libnx)
+set(PORTLIBS_PATH ${DEVKITPRO}/portlibs)
+set(PORTLIBS ${PORTLIBS_PATH}/switch)
+
+set(TOOLCHAIN_PREFIX ${DEVKITA64}/bin/aarch64-none-elf-)
+if (WIN32)
+    set(TOOLCHAIN_SUFFIX ".exe")
+else ()
+    set(TOOLCHAIN_SUFFIX "")
+endif ()
+
+set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}gcc${TOOLCHAIN_SUFFIX})
+set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}g++${TOOLCHAIN_SUFFIX})
+set(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}as${TOOLCHAIN_SUFFIX})
+
+set(PKG_CONFIG_EXECUTABLE ${TOOLCHAIN_PREFIX}pkg-config${TOOLCHAIN_SUFFIX})
+set(CMAKE_AR ${TOOLCHAIN_PREFIX}gcc-ar${TOOLCHAIN_SUFFIX} CACHE STRING "")
+set(CMAKE_RANLIB ${TOOLCHAIN_PREFIX}gcc-ranlib${TOOLCHAIN_SUFFIX} CACHE STRING "")
+set(CMAKE_LD "/${TOOLCHAIN_PREFIX}ld${TOOLCHAIN_SUFFIX}" CACHE INTERNAL "")
+set(CMAKE_OBJCOPY "${TOOLCHAIN_PREFIX}objcopy${TOOLCHAIN_SUFFIX}" CACHE INTERNAL "")
+set(CMAKE_SIZE_UTIL "${TOOLCHAIN_PREFIX}size${TOOLCHAIN_SUFFIX}" CACHE INTERNAL "")
+
+set(WITH_PORTLIBS ON CACHE BOOL "use portlibs ?")
+if (WITH_PORTLIBS)
+    set(CMAKE_FIND_ROOT_PATH ${DEVKITA64} ${DEVKITPRO} ${LIBNX} ${PORTLIBS})
+else ()
+    set(CMAKE_FIND_ROOT_PATH ${DEVKITA64} ${DEVKITPRO} ${LIBNX})
+endif ()
+
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
+add_definitions(-D__SWITCH__)
+set(ARCH "-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -MMD -MP -g -Wall -O2 -ffunction-sections ${ARCH}")
+set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions")
+set(CMAKE_EXE_LINKER_FLAGS_INIT "${ARCH} -ftls-model=local-exec -L${LIBNX}/lib -L${PORTLIBS}/lib")
+set(CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT})
+
+set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available")
+set(CMAKE_INSTALL_PREFIX ${PORTLIBS})
+set(CMAKE_PREFIX_PATH ${PORTLIBS})
--- a/cmake/psp1.cmake
+++ b/cmake/psp1.cmake
@ -0,0 +1,30 @@
+set(CMAKE_C_COMPILER "psp-gcc")
+set(CMAKE_CXX_COMPILER "psp-g++")
+set(CMAKE_AR "psp-ar")
+
+# Workaround for old cmake. Remove when we update cmake
+set(CMAKE_C_ARCHIVE_CREATE "${CMAKE_AR} qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+set(CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_AR} qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+set(CMAKE_CXX_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+
+set(CMAKE_RANLIB "psp-ranlib")
+set(CMAKE_SYSTEM_PROCESSOR mipsel)
+set(CMAKE_SYSTEM_NAME Generic)
+set(CMAKE_CROSSCOMPILING ON)
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+set(CMAKE_C_LINK_FLAGS "")
+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+
+execute_process(COMMAND psp-config --pspsdk-path OUTPUT_VARIABLE PSPSDK_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+set(CMAKE_CXX_FLAGS " -I${PSPSDK_PATH}/include -G0 -Wcast-align")
+set(CMAKE_C_FLAGS " -I${PSPSDK_PATH}/include -G0 -Wcast-align")
+
+add_definitions(-DPSP)
+
+# Workaround for old cmake. Remove when we update cmake
+add_definitions(-I${PSPSDK_PATH}/include -G0 -Wcast-align)
+
+set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available" )
+set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
--- a/cmake/vita.cmake
+++ b/cmake/vita.cmake
@ -0,0 +1,21 @@
+set(CMAKE_C_COMPILER "arm-vita-eabi-gcc")
+set(CMAKE_CXX_COMPILER "arm-vita-eabi-g++")
+set(CMAKE_AR "arm-vita-eabi-ar")
+
+# Workaround for old cmake. Remove when we update cmake
+set(CMAKE_C_ARCHIVE_CREATE "${CMAKE_AR} qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+set(CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_AR} qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+set(CMAKE_CXX_CREATE_STATIC_LIBRARY "${CMAKE_AR} qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+
+set(CMAKE_RANLIB "arm-vita-eabi-ranlib")
+set(CMAKE_SYSTEM_PROCESSOR arm)
+set(CMAKE_SYSTEM_NAME Generic)
+set(CMAKE_CROSSCOMPILING ON)
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+set(CMAKE_C_LINK_FLAGS "")
+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+
+add_definitions(-DVITA -D_VITA)
+set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Shared libs not available" )
+set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
--- a/comptable.py
+++ b/comptable.py
@ -0,0 +1,205 @@
+# License: MIT
+# Copyright (C) Google
+# Author: Vladimit 'phcoder' Serbinenko
+
+import os
+import csv
+
+MISSING = 'missing'
+OK = 'OK'
+DISABLED = 'disabled'
+ENABLED = 'enabled'
+
+coremap = {}
+allcores = set()
+allplatformset = set()
+corestatus = {}
+corereason = {}
+
+GFX_FEATS = ['gfxaccel', 'gl1', 'gl2', 'gl3', 'gles2', 'gles3']
+CPU_FEATS = ['x86_any', 'libco', 'cpu64', 'threads', 'jit']
+PERIPHERAL_FEATS = ['cdrom', 'usb']
+ALL_FEATS = GFX_FEATS + CPU_FEATS + PERIPHERAL_FEATS
+DESKTOP_ALL = list(set(ALL_FEATS) - set(['gles2', 'gles3', 'cpu64', 'x86_any']))
+DESKTOP_X64 = DESKTOP_ALL + ['x86_any', 'cpu64']
+DESKTOP_X86 = DESKTOP_ALL + ['x86_any']
+DESKTOP_ARM32 = DESKTOP_ALL
+UWP = ['gfxaccel', 'gles2', 'threads', 'libco'] + ['cdrom', 'usb'] # unsure about second part
+MOBILE = ['gfxaccel', 'gles2', 'gles3', 'threads', 'libco']
+features_platforms = {
+    # Misc
+    'emscripten': ['gfxaccel', 'gles2'],
+
+    # consoles
+    '3ds': ['threads', 'libco', 'jit'],
+    'psl1ght': ['cpu64'] + ['libco', 'cdrom', 'usb', 'jit'], # unsure about second part
+    'gamecube': ['threads', 'libco'] + ['cdrom', 'jit'], # unsure about second part
+    'wii': ['threads', 'libco'] + ['cdrom', 'usb', 'jit'], # unsure about second part
+    'ps2': [] + ['libco', 'cpu64', 'threads', 'cdrom', 'usb', 'jit'],  # unsure about second part
+    'ps3': ['threads', 'cpu64'] + ['libco', 'cdrom', 'usb', 'jit'],  # unsure about second part
+    'psp': ['libco', 'threads'] + ['jit'],  # unsure about second part
+    'libnx': ['gfxaccel', 'gl1', 'gl2', 'gl3', 'libco', 'cpu64', 'threads', 'jit'] + ['usb'],  # unsure about second part
+    'wiiu': ['libco'] + ['cdrom', 'usb', 'jit'],  # unsure about second part
+    'vita': ['gfxaccel', 'gl1', 'gl2', 'threads', 'libco', 'jit'], # 'gl3', 'gles2', 'gles3'?
+
+    # UWP
+    'windows-uwp-arm': UWP,
+    'windows-uwp-x64': UWP + ['x86_any', 'cpu64'],
+    'windows-uwp-x86': UWP + ['x86_any'],
+
+    # Mobile
+    'android' : MOBILE + ['x86_any', 'cpu64', 'jit'],
+    'ios': MOBILE,
+    'ios9': MOBILE,
+    'ios-arm64': MOBILE + ['cpu64'],
+    'tvos-arm64': MOBILE + ['cpu64'],
+    'qnx': MOBILE, # Unsure about usb
+
+    # Desktop
+    'linux-x64': DESKTOP_X64,
+    'windows-x64': DESKTOP_X64,
+    'osx-x64': DESKTOP_X64,
+    'linux-x86': DESKTOP_X86,
+    'windows-x86': DESKTOP_X86,
+    'linux-arm7neonhf': DESKTOP_ARM32,
+    'linux-armhf': DESKTOP_ARM32,
+    'xbox-x86': DESKTOP_X86,
+}
+features_cores = {
+    '3dengine': ['gl2'], # Should be gl2 or gles2 but current bugs prevent operating with gles2
+    'atari800': ['libco'],
+    'blastem': ['x86_any'],
+    'boom3': ['gl1'],
+    'boom3_xp': ['gl1'],
+    'bsnes': ['libco'],
+    'bsnes2014': ['libco'],
+    'bsnes_cplusplus98': ['libco'],
+    'bsnes_hd_beta': ['libco'],
+    'bsnes_mercury': ['libco'],
+    'citra': ['gfxaccel'],
+    'citra_canary': ['gfxaccel'],
+    'craft': ['gfxaccel'],
+    'dolphin': ['cpu64', 'jit'],
+    'dosbox_svn': ['libco'],
+    'dosbox_svn_ce': ['libco'],
+    'dosbox_core': ['threads'],
+    'ffmpeg': ['threads'],
+    'flycast': ['gfxaccel'],
+    'frodo': ['libco'],
+    'hatari': ['libco'],
+    'gpsp': ['libco'],
+    'ishiiruka': ['cpu64'],
+    'kronos': ['gl3'],
+    'mednafen_psx_hw': ['gfxaccel'],
+    'mupen64plus_next': ['gfxaccel', 'libco'],
+    'mupen64plus_next_gles3': ['gles3', 'libco'],
+    'openlara': ['gfxaccel'],
+    'parallel_n64': ['gfxaccel', 'libco'],
+    'play': ['gfxaccel'],
+    'redbook': ['cdrom'],
+    'remotejoy': ['usb'],
+    'reminiscence': ['libco'],
+    'scummvm': ['libco'],
+    'thepowdertoy': ['threads'],
+    'vitaquake3': ['gl1'],
+    'vitavoyager': ['gl1'],
+    'yabasanshiro': ['gfxaccel']
+}
+
+def strip_suffix(s, suffix):
+    if s.endswith(suffix):
+        return s[:-len(suffix)]
+    return s
+
+def strip_suffixes(s, suffixes):
+    r = s
+    for suffix in suffixes:
+        r = strip_suffix(r, suffix)
+    return r
+
+
+def strip_prefix(s, prefix):
+    if s.startswith(prefix):
+        return s[len(prefix):]
+    return s
+
+def strip_prefixes(s, prefixes):
+    r = s
+    for prefix in prefixes:
+        r = strip_prefix(r, prefix)
+    return r
+
+
+def file_to_platform(fname):
+    s = strip_suffixes(fname, ["-generic", "-noccache", "-r16b", "-cross", "_dw2", "_seh", "_sjlj", "_w32"])
+    s = strip_prefixes(s, ["cores-"])
+    for infix in ["msvc2003", "msvc2005", "msvc2010", "msvc2017", "desktop"]:
+        s = s.replace("-" + infix + "-", "-")
+    return s
+
+for root, _, files in os.walk("recipes"):
+    for file in files:
+        if file.endswith(".conf") or file.endswith(".ra") or file.endswith(".yml") or file.endswith(".info") or file.endswith(".sh") or file.startswith("retroarch-"):
+            continue
+
+        if file in ["cores-android-aarch64", "cores-android-armv7-ndk-mame"]:
+            continue
+
+        platform = file_to_platform(file)
+        allplatformset.add(platform)
+
+        with open(os.path.join(root, file)) as fin:
+            for line in fin:
+                sp = line.split()
+                if len(sp) == 0:
+                    continue
+                core = sp[0]
+                k = (platform, core)
+                if k not in coremap:
+                    coremap[k] = []
+                coremap[k].append({'file': file, ENABLED: sp[4]})
+                allcores.add(core)
+
+allplatforms = sorted(allplatformset)
+cf = open ("comptable.csv", "w")
+c = csv.writer(cf)
+
+c.writerow([""] + allplatforms)
+
+for core in allcores:
+    row = [core]
+    for platform in allplatforms:
+        k = (platform, core)
+        if k not in coremap: 
+            status = MISSING
+        else:
+            enabled = False
+            for x in coremap[k]:
+                if x[ENABLED] == 'YES':
+                    enabled = True
+            if enabled:
+                status = OK
+            else:
+                status = DISABLED
+        corestatus[k] = status
+        if core in features_cores and platform in features_platforms:
+            missing = set(features_cores[core]) - set(features_platforms[platform])
+            if missing:
+                corereason[k] = ','.join(missing)
+        
+            
+                
+for core in sorted (allcores):
+    row = [core]
+    for platform in allplatforms:
+        k = (platform, core)
+        st = corestatus[k]
+        s = st
+        if st != OK and k in corereason:
+            s += " (" + corereason[k] + ")"
+        if st == OK and k in corereason:
+            print("%s is enabled on %s despite %s" % (core, platform, corereason[k]))
+        row += [s]
+    c.writerow(row)
+
+cf.close()
--- a/dist/info/00_example_libretro.info
+++ b/dist/info/00_example_libretro.info
@ -1,32 +1,20 @@
 ## All data is optional, but helps improve user experience.

+# Software Information - Information about the core software itself
 # Name displayed when the user is selecting the core:
 # display_name = "Nintendo - Game Boy (Core Name)"

+# Categories that the core belongs to (optional):
+# categories = "Emulator"
+
 # Name of the authors who wrote the core:
 # authors = "Martin Freij|R. Belmont|R. Danbrook"

-# List of extensions the core supports:
-# supported_extensions = "nes|fds"
-
 # Name of the core:
 # corename = "Nestopia"

-# Name of the manufacturer who produced the emulated system:
-# manufacturer = "Nintendo"
-#
-# Categories that the core belongs to (optional):
-# categories = "Emulator"
-
-# Name of the system that the core targets (optional):
-# systemname = "Nintendo Entertainment System"
-
-# ID of the primary platform the core uses. Use other core info files as guidance if possible.
-# If blank or not used, a standard core platform will be used (optional):
-# systemid = "nes"
-
-# Name of the database that the core supports (optional):
-# database = "Nintendo - Nintendo Entertainment System|Nintendo - Famicom Disk System"
+# List of extensions the core supports:
+# supported_extensions = "nes|fds"

 # License of the cores source code:
 # license = "GPLv3"
@ -37,8 +25,16 @@
 # Version of the core:
 # display_version = "v0.2.97.30"

-# Whether or not the core requires an external file to work:
-# supports_no_game = "false"
+# Hardware Information - Information about the hardware the core supports (when applicable)
+# Name of the manufacturer who produced the emulated system:
+# manufacturer = "Nintendo"
+
+# Name of the system that the core targets (optional):
+# systemname = "Nintendo Entertainment System"
+
+# ID of the primary platform the core uses. Use other core info files as guidance if possible.
+# If blank or not used, a standard core platform will be used (optional):
+# systemid = "nes"

 # The number of mandatory/optional firmware files the core needs:
 # firmware_count = 7
@ -52,7 +48,39 @@
 # firmware0_opt = "true/false"

 # Additional notes:
-#notes = "(!) hash|(!) game rom|(^) continue|[1] notes|[^] continue|[*] list"
+# notes = "(!) hash|(!) game rom|(^) continue|[1] notes|[^] continue|[*] list"

-# Graphics API(s) supported by the core... only use for cores that *require* hardware acceleration
-# required_hw_api = "OpenGL Core >= 3.3 | OpenGL ES >= 2.0 | Vulkan >= 1.0"
+# Libretro Features - The libretro API features the core supports. Useful for sorting cores
+# Does the core support savestates
+# savestate = "true"
+# If true, how complete is the savestate support? basic, serialized (rewind), deterministic (netplay/runahead)
+# savestate_features = "serialized"
+# Does the core support the libretro cheat interface?
+# cheats = "false"
+# Does the core support libretro input descriptors
+# input_descriptors = "true"
+# Does the core support memory descriptors commonly used for achievements
+# memory_descriptors = "false"
+# Does the core use the libretro save interface or does it do its own thing (like with shared memory cards)?
+# libretro_saves = "true"
+# Does the core support the core options interface?
+# core_options = "true"
+# What version of core options is supported? (later versions allow for localization and descriptions)
+# core_options_version = "1.0"
+# Does the core support the subsystem interface? Commonly used for chained/special loading, such as Super Game Boy
+# load_subsystem = "false"
+# Whether or not the core requires an external file to work:
+# supports_no_game = "false"
+# Name of the database that the core supports (optional):
+# database = "Nintendo - Nintendo Entertainment System|Nintendo - Famicom Disk System"
+# Does the core support/require support for libretro-gl or other hardware-acceleration in the frontend?
+# hw_render = "false"
+# Does the core require ongoing access to the file after loading? Mostly used for softpatching and streaming of data
+# needs_fullpath = "false"
+# Does the core support the libretro disk control interface for swapping disks on the fly?
+# disk_control = "false"
+# Is the core currently suitable for general use? That is, will regular users find it useful or is it for development/testing only (subject to change over time)?
+# is_experimental = "true"
+
+# Descriptive text, useful for tooltips, etc.
+# description = "This is a brief description of the core. It should be informative, but probably not super-long. 1024 characters, tops, all on one line (i.e., no manual line-breaks)."
--- a/dist/info/bk_libretro.info
+++ b/dist/info/bk_libretro.info
@ -9,5 +9,40 @@ license = "BSD"
 permissions = ""
 display_version = "1.00"
 supports_no_game = "true"
-notes = "(!) bk/B11M_BOS.ROM (md5): fe4627d1e3a1535874085050733263e7|(!) bk/B11M_EXT.ROM (md5): dc52f365d56fa1951f5d35b1101b9e3f|(!) bk/BAS11M_0.ROM (md5): 946f6f23ded03c0e26187f0b3ca75993|(!) bk/BAS11M_1.ROM (md5): 1e6637f32aa7d1de03510030cac40bcf|(!) bk/BASIC10.ROM (md5): 3fa774326d75410a065659aea80252f0|(!) bk/DISK_327.ROM (md5): 5015228eeeb238e65da8edcd1b6dfac7|(!) bk/FOCAL10.ROM (md5): 5737f972e8638831ab71e9139abae052|(!) bk/MONIT10.ROM (md5): 95f8c41c6abf7640e35a6a03cecebd01"

+# BIOS/Firmware
+firmware_count = 8
+
+firmware0_desc = "bk/B11M_BOS.ROM"
+firmware0_path = "bk/B11M_BOS.ROM"
+firmware0_opt = "true"
+
+firmware1_desc = "bk/B11M_EXT.ROM"
+firmware1_path = "bk/B11M_EXT.ROM"
+firmware1_opt = "true"
+
+firmware2_desc = "bk/BAS11M_0.ROM"
+firmware2_path = "bk/BAS11M_0.ROM"
+firmware2_opt = "true"
+
+firmware3_desc = "bk/BAS11M_1.ROM"
+firmware3_path = "bk/BAS11M_1.ROM"
+firmware3_opt = "true"
+
+firmware4_desc = "bk/DISK_327.ROM"
+firmware4_path = "bk/DISK_327.ROM"
+firmware4_opt = "true"
+
+firmware5_desc = "bk/BASIC10.ROM"
+firmware5_path = "bk/BASIC10.ROM"
+firmware5_opt = "true"
+
+firmware6_desc = "bk/FOCAL10.ROM"
+firmware6_path = "bk/FOCAL10.ROM"
+firmware6_opt = "true"
+
+firmware7_desc = "bk/MONIT10.ROM"
+firmware7_path = "bk/MONIT10.ROM"
+firmware7_opt = "true"
+
+notes = "(!) bk/B11M_BOS.ROM (md5): fe4627d1e3a1535874085050733263e7|(!) bk/B11M_EXT.ROM (md5): dc52f365d56fa1951f5d35b1101b9e3f|(!) bk/BAS11M_0.ROM (md5): 946f6f23ded03c0e26187f0b3ca75993|(!) bk/BAS11M_1.ROM (md5): 1e6637f32aa7d1de03510030cac40bcf|(!) bk/DISK_327.ROM (md5): 5015228eeeb238e65da8edcd1b6dfac7|(!) bk/BASIC10.ROM (md5): 3fa774326d75410a065659aea80252f0|(!) bk/FOCAL10.ROM (md5): 5737f972e8638831ab71e9139abae052|(!) bk/MONIT10.ROM (md5): 95f8c41c6abf7640e35a6a03cecebd01"
--- a/dist/info/blastem_libretro.info
+++ b/dist/info/blastem_libretro.info
@ -29,4 +29,12 @@ hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
 is_experimental = "false"
+
+# BIOS/Firmware
+firmware_count = 1
+
+firmware0_desc = "rom.db (ROM feature database)"
+firmware0_path = "rom.db"
+firmware0_opt = "true"
+
 notes = "(!) rom.db (md5): ff4a3572475236e859e3e9ac5c87d1f1"
--- a/dist/info/dosbox_core_libretro.info
+++ b/dist/info/dosbox_core_libretro.info
@ -14,7 +14,7 @@ systemname = "DOS"
 systemid = "dos"

 # BIOS / Firmware
-firmware_count = 4
+firmware_count = 10
 firmware0_desc = "MT32_CONTROL.ROM (MT-32 Control ROM v1.07)"
 firmware0_path = "MT32_CONTROL.ROM"
 firmware0_opt = "true"
@ -27,7 +27,25 @@ firmware2_opt = "true"
 firmware3_desc = "CM32L_PCM.ROM (CM-32L/CM-64/LAPC-I PCM ROM)"
 firmware3_path = "CM32L_PCM.ROM"
 firmware3_opt = "true"
-notes = "(!) This core requires libsdl1.2 and libsdl-net1.2.|(!) MT32_CONTROL.ROM (md5): 5626206284b22c2734f3e9efefcd2675|(!) MT32_PCM.ROM (md5): 89e42e386e82e0cacb4a2704a03706ca|(!) CM32L_CONTROL.ROM (md5): bfff32b6144c1d706109accb6e6b1113|(!) CM32L_PCM.ROM (md5): 08cdcfa0ed93e9cb16afa76e6ac5f0a4"
+firmware4_desc = "libbass.so (BASS Linux library)"
+firmware4_path = "libbass.so"
+firmware4_opt = "true"
+firmware5_desc = "libbassmidi.so (BASSMIDI Linux library)"
+firmware5_path = "libbassmidi.so"
+firmware5_opt = "true"
+firmware6_desc = "bass.dll (BASS Windows library)"
+firmware6_path = "bass.dll"
+firmware6_opt = "true"
+firmware7_desc = "bassmidi.dll (BASSMIDI Windows library)"
+firmware7_path = "bassmidi.dll"
+firmware7_opt = "true"
+firmware8_desc = "libbass.dylib (BASS macOS library)"
+firmware8_path = "libbass.dylib"
+firmware8_opt = "true"
+firmware9_desc = "libbassmidi.dylib (BASSMIDI macOS library)"
+firmware9_path = "libbassmidi.dylib"
+firmware9_opt = "true"
+notes = "(!) MT32_CONTROL.ROM (md5): 5626206284b22c2734f3e9efefcd2675|(!) MT32_PCM.ROM (md5): 89e42e386e82e0cacb4a2704a03706ca|(!) CM32L_CONTROL.ROM (md5): bfff32b6144c1d706109accb6e6b1113|(!) CM32L_PCM.ROM (md5): 08cdcfa0ed93e9cb16afa76e6ac5f0a4|(!) libbass.so|(!) libbassmidi.so|(!) bass.dll|(!) bassmidi.dll|(!) libbass.dylib|(!) libbassmidi.dylib"

 # Libretro Features
 database = "DOS"
--- a/dist/info/freechaf_libretro.info
+++ b/dist/info/freechaf_libretro.info
@ -1,6 +1,6 @@
 display_name = "Fairchild ChannelF (FreeChaF)"
 authors = "David Richardson"
-supported_extensions = "bin"
+supported_extensions = "bin|chf"
 corename = "FreeChaF"
 manufacturer = "Fairchild"
 categories = "Emulator"
--- a/dist/info/fuse_libretro.info
+++ b/dist/info/fuse_libretro.info
@ -1,4 +1,4 @@
-display_name = "ZX Spectrum (Fuse)"
+display_name = "Sinclair - ZX Spectrum (Fuse)"
 authors = "Team Fuse"
 supported_extensions = "tzx|tap|z80|rzx|scl|trd"
 corename = "Fuse"
--- a/dist/info/gearboy_libretro.info
+++ b/dist/info/gearboy_libretro.info
@ -9,5 +9,5 @@ systemid = "game_boy"
 database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv3"
 permissions = ""
-display_version = "2.7.0"
+display_version = "3.1.1"
 supports_no_game = "false"
--- a/dist/info/gearsystem_libretro.info
+++ b/dist/info/gearsystem_libretro.info
@ -9,5 +9,5 @@ systemid = "master_system"
 database = "Sega - Game Gear|Sega - Master System - Mark III|Sega - SG-1000"
 license = "GPLv3"
 permissions = ""
-display_version = "2.6.0"
+display_version = "3.1.1"
 supports_no_game = "false"
--- a/dist/info/hbmame_libretro.info
+++ b/dist/info/hbmame_libretro.info
@ -0,0 +1,15 @@
+display_name = "Arcade (HBMAME)"
+authors = "Robbbert,MAMEdev"
+supported_extensions = "zip|chd|7z|cmd"
+corename = "HBMAME (Git)"
+manufacturer = "Various"
+categories = "Emulator"
+systemname = "Arcade (various)"
+systemid = "hbmame"
+database = "HBMAME"
+database_match_archive_member = "true"
+license = "GPLv2+"
+permissions = ""
+display_version = "Git"
+supports_no_game = "false"
+notes = "[1] HBMAME supports MAME save states.|[2] HBMAME supports extracted MAME cheats.|[3] The BIOS files must be inside the ROM directory.|[4] CHD files and their directories must be inside the ROM directory.|[5] ARTWORK, CHEATS, HASH, INI and SAMPLES directories can be placed|[^] inside the 'SYSTEMDIR\mame' directory. (INI/Source for drivers)|[6] When saving, the following directories will be created in the 'SAVEDIR\mame'|[^] directory: STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, and DIFF.|[7] Default combo to call MAME GUI: Retropad Select + X|[^] Retropad Select + Start => CANCEL"
--- a/dist/info/kronos_libretro.info
+++ b/dist/info/kronos_libretro.info
@ -1,6 +1,6 @@
 display_name = "Sega - Saturn/ST-V (Kronos)"
-authors = "Guillaume Duhammel|Theo Berkau|Anders Montonen|devmiyax|FCare"
-supported_extensions = "cue|iso|mds|ccd|zip|chd"
+authors = "Guillaume Duhammel|Theo Berkau|Anders Montonen|devmiyax|FCare|barbudreadmon"
+supported_extensions = "ccd|chd|cue|iso|mds|zip|m3u"
 corename = "Kronos"
 manufacturer = "Sega"
 categories = "Emulator"
@ -9,7 +9,7 @@ systemid = "sega_saturn"
 database = "Sega - Saturn|Sega - ST-V"
 license = "GPLv2"
 permissions = ""
-display_version = "v2.0.0"
+display_version = "v2.1.2"
 supports_no_game = "false"
 firmware_count = 4
 firmware0_desc = "kronos/saturn_bios.bin (Saturn BIOS)"
--- a/dist/info/mednafen_saturn_libretro.info
+++ b/dist/info/mednafen_saturn_libretro.info
@ -1,6 +1,6 @@
 display_name = "Sega - Saturn (Beetle Saturn)"
 authors = "Mednafen Team"
-supported_extensions = "cue|toc|m3u|ccd|chd"
+supported_extensions = "ccd|chd|cue|toc|m3u"
 corename = "Beetle Saturn"
 manufacturer = "Sega"
 categories = "Emulator"
--- a/dist/info/mesen-s_libretro.info
+++ b/dist/info/mesen-s_libretro.info
@ -1,19 +1,19 @@
-display_name = "Nintendo - SNES / SFC (Mesen-S)"
+display_name = "Nintendo - SNES / SFC / Game Boy / Color (Mesen-S)"
 authors = "M. Bibaud (aka Sour)"
-supported_extensions = "sfc|smc|fig|swc"
+supported_extensions = "sfc|smc|fig|swc|gb|gbc"
 corename = "Mesen-S"
 manufacturer = "Nintendo"
 categories = "Emulator"
-systemname = "Super Nintendo Entertainment System"
+systemname = "Super Nintendo Entertainment System / Game Boy / Game Boy Color"
 systemid = "super_nes"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv3"
 permissions = ""
 display_version = "git"
 supports_no_game = "false"

 # BIOS / Firmware
-firmware_count = 14
+firmware_count = 16
 firmware0_desc = "dsp1.data.rom"
 firmware0_path = "dsp1.data.rom"
 firmware0_opt = "true"
@ -56,3 +56,9 @@ firmware12_opt = "true"
 firmware13_desc = "st011.program.rom"
 firmware13_path = "st011.program.rom"
 firmware13_opt = "true"
+firmware14_desc = "dmg_boot.bin"
+firmware14_path = "dmg_boot.bin"
+firmware14_opt = "true"
+firmware15_desc = "cgb_boot.bin"
+firmware15_path = "cgb_boot.bin"
+firmware15_opt = "true"
--- a/dist/info/mu_libretro.info
+++ b/dist/info/mu_libretro.info
@ -1,27 +1,36 @@
-display_name = "Palm OS (Mu)"
-authors = "guicrith / meepingsnesroms"
-supported_extensions = "prc|pqa|img"
-corename = "Mu"
-manufacturer = "Palm"
-categories = "Emulator"
-systemname = "Palm OS"
-license = "Non-commercial"
-permissions = ""
-display_version = "v1.1.0"
-supports_no_game = "true"
-firmware_count = 5
-firmware0_desc = "palmos40-en-m500.rom (Palm OS 4.0)"
-firmware0_path = "palmos40-en-m500.rom"
-firmware0_opt = "true"
-firmware1_desc = "palmos41-en-m515.rom (Palm OS 4.1)"
-firmware1_path = "palmos41-en-m515.rom"
-firmware1_opt = "true"
-firmware2_desc = "palmos52-en-t3.rom (Palm OS 5.2.1)"
-firmware2_path = "palmos52-en-t3.rom"
-firmware2_opt = "true"
-firmware3_desc = "palmos60-en-t3.rom (Palm OS 6.0)"
-firmware3_path = "palmos60-en-t3.rom"
-firmware3_opt = "true"
-firmware4_desc = "bootloader-dbvz.rom (MC68VZ328 UART Bootloader)"
-firmware4_path = "bootloader-dbvz.rom"
-firmware4_opt = "true"
+display_name = "Palm OS (Mu)"
+authors = "guicrith / meepingsnesroms"
+supported_extensions = "prc|pqa|img"
+corename = "Mu"
+manufacturer = "Palm"
+categories = "Emulator"
+systemname = "Palm OS"
+license = "Non-commercial"
+permissions = ""
+display_version = "v1.1.0"
+supports_no_game = "true"
+
+# BIOS/Firmware
+firmware_count = 5
+
+firmware0_desc = "palmos40-en-m500.rom (Palm OS 4.0)"
+firmware0_path = "palmos40-en-m500.rom"
+firmware0_opt = "true"
+
+firmware1_desc = "palmos41-en-m515.rom (Palm OS 4.1)"
+firmware1_path = "palmos41-en-m515.rom"
+firmware1_opt = "true"
+
+firmware2_desc = "palmos52-en-t3.rom (Palm OS 5.2.1)"
+firmware2_path = "palmos52-en-t3.rom"
+firmware2_opt = "true"
+
+firmware3_desc = "palmos60-en-t3.rom (Palm OS 6.0)"
+firmware3_path = "palmos60-en-t3.rom"
+firmware3_opt = "true"
+
+firmware4_desc = "bootloader-dbvz.rom (MC68VZ328 UART Bootloader)"
+firmware4_path = "bootloader-dbvz.rom"
+firmware4_opt = "true"
+
+notes = "(!) palmos40-en-m500.rom (md5): f50e4d5e4d98dc831f2c34a9107651eb|(!) palmos41-en-m515.rom (md5): 83cb1d1c76e568b916dc2e7c0bf669f6|(!) palmos52-en-t3.rom (md5): de46ec84d9aabf655eabdf9b00a3845d|(!) bootloader-dbvz.rom (md5): 9da101cd2317830649a31f8fa46debec"
--- a/dist/info/neocd_libretro.info
+++ b/dist/info/neocd_libretro.info
@ -10,40 +10,55 @@ license = "LGPLv3"
 display_version = "2019"
 supports_no_game = "false"

+# BIOS/Firmware
 firmware_count = 12
-firmware0_desc = "Front Loader BIOS"
+
+firmware0_desc = "neocd/neocd_f.rom (Front Loader BIOS)"
 firmware0_path = "neocd/neocd_f.rom"
 firmware0_opt = "true"
-firmware1_desc = "Front Loader BIOS (SMKDAN)"
+
+firmware1_desc = "neocd/neocd_sf.rom (Front Loader BIOS (SMKDAN))"
 firmware1_path = "neocd/neocd_sf.rom"
 firmware1_opt = "true"
-firmware2_desc = "Top Loader BIOS"
-firmware2_path = "neocd/neocd_t.rom"
+
+firmware2_desc = "neocd/front-sp1.bin (Front Loader BIOS (MAME))"
+firmware2_path = "neocd/front-sp1.bin"
 firmware2_opt = "true"
-firmware3_desc = "Top Loader BIOS (SMKDAN)"
-firmware3_path = "neocd/neocd_st.rom"
+
+firmware3_desc = "neocd/neocd_t.rom (Top Loader BIOS))"
+firmware3_path = "neocd/neocd_t.rom"
 firmware3_opt = "true"
-firmware4_desc = "CDZ BIOS"
-firmware4_path = "neocd/neocd_z.rom"
+
+firmware4_desc = "neocd/neocd_st.rom (Top Loader BIOS (SMKDAN))"
+firmware4_path = "neocd/neocd_st.rom"
 firmware4_opt = "true"
-firmware5_desc = "CDZ BIOS (SMKDAN)"
-firmware5_path = "neocd/neocd_sz.rom"
+
+firmware5_desc = "neocd/top-sp1.bin (Top Loader BIOS (MAME))"
+firmware5_path = "neocd/top-sp1.bin"
 firmware5_opt = "true"
-firmware6_desc = "Y-ZOOM ROM"
-firmware6_path = "neocd/ng-lo.rom"
+
+firmware6_desc = "neocd/neocd_z.rom (CDZ BIOS)"
+firmware6_path = "neocd/neocd_z.rom"
 firmware6_opt = "true"
-firmware7_desc = "Y-ZOOM ROM (MAME)"
-firmware7_path = "neocd/000-lo.lo"
+
+firmware7_desc = "neocd/neocd_sz.rom (CDZ BIOS (SMKDAN))"
+firmware7_path = "neocd/neocd_sz.rom"
 firmware7_opt = "true"
-firmware8_desc = "Front Loader BIOS (MAME)"
-firmware8_path = "neocd/front-sp1.bin"
+
+firmware8_desc = "neocd/neocd.bin (CDZ BIOS (MAME))"
+firmware8_path = "neocd/neocd.bin"
 firmware8_opt = "true"
-firmware9_desc = "Top Loader BIOS (MAME)"
-firmware9_path = "neocd/top-sp1.bin"
+
+firmware9_desc = "neocd/ng-lo.rom (Y-ZOOM ROM)"
+firmware9_path = "neocd/ng-lo.rom"
 firmware9_opt = "true"
-firmware10_desc = "CDZ BIOS (MAME)"
-firmware10_path = "neocd/neocd.bin"
+
+firmware10_desc = "neocd/000-lo.lo (Y-ZOOM ROM (MAME))"
+firmware10_path = "neocd/000-lo.lo"
 firmware10_opt = "true"
-firmware11_desc = "Universe BIOS"
+
+firmware11_desc = "neocd/uni-bioscd.rom (Universe BIOS 3.2)"
 firmware11_path = "neocd/uni-bioscd.rom"
 firmware11_opt = "true"
+
+notes = "(!) neocd/neocd_f.rom (sha1): a5f4a7a627b3083c979f6ebe1fabc5d2df6d083b|(!) neocd/neocd_sf.rom (sha1): c99c44a43bded1bff4570b30b74975601bd3f94e|(!) neocd/front-sp1.bin (sha1): 53bc1f283cdf00fa2efbb79f2e36d4c8038d743a|(!) neocd/neocd_t.rom (sha1): cc92b54a18a8bff6e595aabe8e5c360ba9e62eb5|(!) neocd/neocd_st.rom (sha1): d463b3a322b9674f9e227a21e43898019ce0e642|(!) neocd/top-sp1.bin (sha1): 235f4d1d74364415910f73c10ae5482d90b4274f|(!) neocd/neocd_z.rom (sha1): b0f1c4fa8d4492a04431805f6537138b842b549f|(!) neocd/neocd_sz.rom (sha1): 41ca1c031b844a46387be783ac862c76e65afbb3|(!) neocd/neocd.bin (sha1): 7bb26d1e5d1e930515219cb18bcde5b7b23e2eda|(!) neocd/ng-lo.rom (sha1): 2b1c719531dac9bb503f22644e6e4236b91e7cfc|(!) neocd/000-lo.lo (sha1): 5992277debadeb64d1c1c64b0a92d9293eaf7e4a|(!) neocd/uni-bioscd.rom (sha1): 5158b728e62b391fb69493743dcf7abbc62abc82"
--- a/dist/info/np2kai_libretro.info
+++ b/dist/info/np2kai_libretro.info
@ -11,20 +11,28 @@ license = "MIT"
 permissions = ""
 display_version = "0.86"
 supports_no_game = "false"
+
+# BIOS/Firmware
 firmware_count = 5
-firmware0_desc = "font.bmp (needed to display text)"
+
+firmware0_desc = "np2kai/font.bmp (needed to display text)"
 firmware0_path = "np2kai/font.bmp"
 firmware0_opt = "true"
-firmware1_desc = "FONT.ROM (alt font file)"
+
+firmware1_desc = "np2kai/FONT.ROM (alt font file)"
 firmware1_path = "np2kai/FONT.ROM"
 firmware1_opt = "true"
-firmware2_desc = "bios.rom"
+
+firmware2_desc = "np2kai/bios.rom"
 firmware2_path = "np2kai/bios.rom"
 firmware2_opt = "true"
-firmware3_desc = "itf.rom"
+
+firmware3_desc = "np2kai/itf.rom"
 firmware3_path = "np2kai/itf.rom"
 firmware3_opt = "true"
-firmware4_desc = "sound.rom"
+
+firmware4_desc = "np2kai/sound.rom"
 firmware4_path = "np2kai/sound.rom"
 firmware4_opt = "true"
-notes = " YM2608 RYTHM samples present in the np2kai folder will be used:|2608_bd.wav, 2608_sd.wav, 2608_top.wav, 2608_hh.wav, 2608_tom.wav, 2608_rim.wav|JOY2KEY buttons mapping: A=x B=z X=space Y=lctrl|L=backspace R=rshift SELECT=escape START=return|Keep 'end' key down when booting for machine options.|Many games need GDC set as 2.5Mhz there."
+
+notes = "YM2608 RYTHM samples present in the np2kai folder will be used:|2608_bd.wav, 2608_sd.wav, 2608_top.wav, 2608_hh.wav, 2608_tom.wav, 2608_rim.wav|JOY2KEY buttons mapping: A=x B=z X=space Y=lctrl|L=backspace R=rshift SELECT=escape START=return|Keep 'end' key down when booting for machine options.|Many games need GDC set as 2.5Mhz there."
--- a/dist/info/o2em_libretro.info
+++ b/dist/info/o2em_libretro.info
@ -24,4 +24,4 @@ firmware2_opt = "false"
 firmware3_desc = "jopac.bin (Videopac+ French BIOS - G7400 model)"
 firmware3_path = "jopac.bin"
 firmware3_opt = "false"
-notes = "(!) o2rom.bin (md5): 562d5ebf9e030a40d6fabfc2f33139fd|(!) bios_c52.bin (md5): f1071cdb0b6b10dde94d3bc8a6146387|(!) bios_g7400.bin (md5): c500ff71236068e0dc0d0603d265ae76|(!)bios_jopac.bin (md5): 279008e4a0db2dc5f1c048853b033828"
+notes = "(!) o2rom.bin (md5): 562d5ebf9e030a40d6fabfc2f33139fd|(!) c52.bin (md5): f1071cdb0b6b10dde94d3bc8a6146387|(!) g7400.bin (md5): c500ff71236068e0dc0d0603d265ae76|(!) jopac.bin (md5): 279008e4a0db2dc5f1c048853b033828"
--- a/dist/info/opera_libretro.info
+++ b/dist/info/opera_libretro.info
@ -35,64 +35,53 @@ firmware_count = 13
 firmware0_desc = "panafz1.bin (Panasonic FZ-1 BIOS)"
 firmware0_path = "panafz1.bin"
 firmware0_opt = "true"
-notes = "(!) panafz1.bin (md5): f47264dd47fe30f73ab3c010015c155b"

 firmware1_desc = "panafz10.bin (Panasonic FZ-10 BIOS)"
 firmware1_path = "panafz10.bin"
 firmware1_opt = "true"
-notes = "(!) panafz10.bin (md5): 51f2f43ae2f3508a14d9f56597e2d3ce"

 firmware2_desc = "panafz10-norsa.bin (Panasonic FZ-10 BIOS [Encryption Check Disabled])"
 firmware2_path = "panafz10-norsa.bin"
 firmware2_opt = "true"
-notes = "(!) panafz10-norsa.bin (md5): 1477bda80dc33731a65468c1f5bcbee9"

 firmware3_desc = "panafz10e-anvil.bin (Panasonic FZ-10E ANVIL BIOS)"
 firmware3_path = "panafz10e-anvil.bin"
 firmware3_opt = "true"
-notes = "(!) panafz10e-anvil.bin (md5): a48e6746bd7edec0f40cff078f0bb19f"

 firmware4_desc = "panafz10e-anvil-norsa.bin (Panasonic FZ-10E ANVIL BIOS [Encryption Check Disabled])"
 firmware4_path = "panafz10e-anvil-norsa.bin"
 firmware4_opt = "true"
-notes = "(!) panafz10e-anvil-norsa.bin (md5): cf11bbb5a16d7af9875cca9de9a15e09"

 firmware5_desc = "goldstar.bin (Goldstar GDO-101M BIOS)"
 firmware5_path = "goldstar.bin"
 firmware5_opt = "true"
-notes = "(!) goldstar.bin (md5): 8639fd5e549bd6238cfee79e3e749114"

 firmware6_desc = "sanyotry.bin (Sanyo Try IMP-21J BIOS)"
 firmware6_path = "sanyotry.bin"
 firmware6_opt = "true"
-notes = "(!) sanyotry.bin (md5): 35fa1a1ebaaeea286dc5cd15487c13ea"

 firmware7_desc = "3do_arcade_saot.bin (Shootout At Old Tucson BIOS)"
 firmware7_path = "3do_arcade_saot.bin"
 firmware7_opt = "true"
-notes = "(!) 3do_arcade_saot.bin (md5): 8970fc987ab89a7f64da9f8a8c4333ff"

 firmware8_desc = "panafz1-kanji.bin (Panasonic FZ-1 Kanji Font ROM)"
 firmware8_path = "panafz1-kanji.bin"
 firmware8_opt = "true"
-notes = "(!) panafz1-kanji.bin (md5): b8dc97f778a6245c58e064b0312e8281"

 firmware9_desc = "panafz10ja-anvil-kanji.bin (Panasonic FZ-10JA Kanji Font ROM)"
 firmware9_path = "panafz10ja-anvil-kanji.bin"
 firmware9_opt = "true"
-notes = "(!) panafz10ja-anvil-kanji.bin (md5): 428577250f43edc902ea239c50d2240d"

 firmware10_desc = "panafz1j.bin (Panasonic FZ-1J BIOS)"
 firmware10_path = "panafz1j.bin"
 firmware10_opt = "true"
-notes = "(!) panafz1j.bin (md5): a496cfdded3da562759be3561317b605"

 firmware11_desc = "panafz1j-norsa.bin (Panasonic FZ-1J BIOS [Encryption Check Disabled])"
 firmware11_path = "panafz1j-norsa.bin"
 firmware11_opt = "true"
-notes = "(!) panafz1j-norsa.bin (md5): f6c71de7470d16abe4f71b1444883dc8"

 firmware12_desc = "panafz1j-kanji.bin (Panasonic FZ-1J Kanji Font ROM)"
 firmware12_path = "panafz1j-kanji.bin"
 firmware12_opt = "true"
-notes = "(!) panafz1j-kanji.bin (md5): c23fb5d5e6bb1c240d02cf968972be37"
+
+notes = "(!) panafz1.bin (md5): f47264dd47fe30f73ab3c010015c155b|(!) panafz10.bin (md5): 51f2f43ae2f3508a14d9f56597e2d3ce|(!) panafz10-norsa.bin (md5): 1477bda80dc33731a65468c1f5bcbee9|(!) panafz10e-anvil.bin (md5): a48e6746bd7edec0f40cff078f0bb19f|(!) panafz10e-anvil-norsa.bin (md5): cf11bbb5a16d7af9875cca9de9a15e09|(!) goldstar.bin (md5): 8639fd5e549bd6238cfee79e3e749114|(!) sanyotry.bin (md5): 35fa1a1ebaaeea286dc5cd15487c13ea|(!) 3do_arcade_saot.bin (md5): 8970fc987ab89a7f64da9f8a8c4333ff|(!) panafz1-kanji.bin (md5): b8dc97f778a6245c58e064b0312e8281|(!) panafz10ja-anvil-kanji.bin (md5): 428577250f43edc902ea239c50d2240d|(!) panafz1j.bin (md5): a496cfdded3da562759be3561317b605|(!) panafz1j-norsa.bin (md5): f6c71de7470d16abe4f71b1444883dc8|(!) panafz1j-kanji.bin (md5): c23fb5d5e6bb1c240d02cf968972be37"
--- a/dist/info/scummvm_libretro.info
+++ b/dist/info/scummvm_libretro.info
@ -1,13 +1,105 @@
+# Software Information
 display_name = "ScummVM"
 authors = "SCUMMVMdev"
-supported_extensions = "scummvm"
+supported_extensions = "0|1|2|3|5|6|8|16|25|99|101|102|418|455|512|scummvm|scumm|gam|z5|dat|blb|z6|RAW|ROM|taf|zblorb|dcp|(a)|cup|HE0|(A)|D$$|STK|z8|hex|VMD|TGA|ITK|SCN|INF|pic|Z5|z3|blorb|ulx|DAT|cas|PIC|acd|006|SYS|alr|t3|gblorb|tab|AP|CRC|EXE|z4|W32|MAC|mac|WIN|001|003|000|bin|exe|asl|AVD|INI|SND|cat|ANG|CUP|SYS16|img|LB|TLK|MIX|VQA|RLB|FNT|win|HE1|DMU|FON|SCR|TEX|HEP|DIR|DRV|MAP|a3c|GRV|CUR|OPT|gfx|ASK|LNG|ini|RSC|SPP|CC|BND|LA0|TRS|add|HRS|DFW|DR1|ALD|004|002|005|R02|R00|C00|D00|GAM|IDX|ogg|TXT|GRA|BMV|H$$|MSG|VGA|PKD|OUT|99 (PG)|SAV|PAK|BIN|CPS|SHP|DXR|dxr|gmp|SNG|C35|C06|WAV|SMK|wav|CAB|game|Z6|(b)|slg|he2|he1|HE2|SYN|PAT|NUT|nl|PRC|V56|SEQ|P56|AUD|FKR|EX1|rom|LIC|$00|ALL|LTK|txt|acx|VXD|ACX|mpc|msd|ADF|nib|HELLO|dsk|xfd|woz|d$$|SET|SOL|Pat|CFG|BSF|RES|IMD|LFL|SQU|rsc|BBM|2 US|OVL|OVR|007|PNT|pat|CHK|MDT|EMC|ADV|FDT|GMC|FMC|info|HPF|hpf|INE|RBT|CSC|HEB|MID|lfl|LEC|HNM|QA|009|PRF|EGA|MHK|d64|prg|LZC|flac|IMS|REC|MOR|doc|HAG|AGA|BLB|TABLE|PAL|PRG|CLG|ORB|BRO|bro|PH1|DEF|IN|jpg|TOC|j2|Text|CEL|he0|AVI|1C|1c|BAK|L9|CGA|HRC|mhk|RED|SM0|SM1|SOU|RRM|LIB| Seuss's  ABC|CNV|VOC|OGG|GME|GERMAN|SHR|FRENCH|DNR|DSK|dnr|CAT|V16|cab|CLU|b25c|RL|mp3|FRM|SOG|HEX|mma|st|MPC|IMG|ENC|SPR|AD|C|CON|PGM|Z|RL2|MMM|OBJ|ZFS|zfs|STR|z2|z1"
 corename = "ScummVM"
-manufacturer = "LucasArts"
 categories = "Game"
+license = "GPLv2"
+permissions = ""
+
+# Hareware Information
+manufacturer = "LucasArts"
 systemname = "Game engine"
 systemid = "scummvm"
 database = "ScummVM"
-license = "GPLv2"
-permissions = ""
-display_version = "Git"
+display_version = "2.1.1"
+
+# Libretro Features
 supports_no_game = "true"
+savestate = "false"
+savestate_features = "null"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "false"
+libretro_saves = "false"
+core_options = "true"
+core_options_version = "1.3"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "false"
+is_experimental = "false"
+needs_kbd_mouse_focus = "true"
+
+# BIOS/Firmware
+firmware_count = 24
+firmware0_desc = "access.dat"
+firmware0_path = "scummvm/extra/access.dat"
+firmware0_opt = "true"
+firmware1_desc = "cryo.dat"
+firmware1_path = "scummvm/extra/cryo.dat"
+firmware1_opt = "true"
+firmware2_desc = "cryomni3d.dat"
+firmware2_path = "scummvm/extra/cryomni3d.dat"
+firmware2_opt = "true"
+firmware3_desc = "drascula.dat"
+firmware3_path = "scummvm/extra/drascula.dat"
+firmware3_opt = "true"
+firmware4_desc = "fonts.dat"
+firmware4_path = "scummvm/extra/fonts.dat"
+firmware4_opt = "true"
+firmware5_desc = "hugo.dat"
+firmware5_path = "scummvm/extra/hugo.dat"
+firmware5_opt = "true"
+firmware6_desc = "kyra.dat"
+firmware6_path = "scummvm/extra/kyra.dat"
+firmware6_opt = "true"
+firmware7_desc = "lure.dat"
+firmware7_path = "scummvm/extra/lure.dat"
+firmware7_opt = "true"
+firmware8_desc = "macventure.dat"
+firmware8_path = "scummvm/extra/macventure.dat"
+firmware8_opt = "true"
+firmware9_desc = "mort.dat"
+firmware9_path = "scummvm/extra/mort.dat"
+firmware9_opt = "true"
+firmware10_desc = "neverhood.dat"
+firmware10_path = "scummvm/extra/neverhood.dat"
+firmware10_opt = "true"
+firmware11_desc = "queen.tbl"
+firmware11_path = "scummvm/extra/queen.tbl"
+firmware11_opt = "true"
+firmware13_desc = "Roland_SC-55.sf2"
+firmware13_path = "scummvm/extra/Roland_SC-55.sf2"
+firmware13_opt = "true"
+firmware14_desc = "sky.cpt"
+firmware14_path = "scummvm/extra/sky.cpt"
+firmware14_opt = "true"
+firmware15_desc = "supernova.dat"
+firmware15_path = "scummvm/extra/supernova.dat"
+firmware15_opt = "true"
+firmware16_desc = "teenagent.dat"
+firmware16_path = "scummvm/extra/teenagent.dat"
+firmware16_opt = "true"
+firmware17_desc = "titanic.dat"
+firmware17_path = "scummvm/extra/titanic.dat"
+firmware17_opt = "true"
+firmware18_desc = "tony.dat"
+firmware18_path = "scummvm/extra/tony.dat"
+firmware18_opt = "true"
+firmware19_desc = "toon.dat"
+firmware19_path = "scummvm/extra/toon.dat"
+firmware19_opt = "true"
+firmware20_desc = "wintermute.zip"
+firmware20_path = "scummvm/extra/wintermute.zip"
+firmware20_opt = "true"
+firmware21_desc = "xeen.ccs"
+firmware21_path = "scummvm/extra/xeen.ccs"
+firmware21_opt = "true"
+firmware22_desc = "scummmodern.zip (ScummVM Modern Theme)"
+firmware22_path = "scummvm/theme/scummmodern.zip"
+firmware22_opt = "true"
+firmware23_desc = "scummremastered.zip (ScummVM Remastered Theme)"
+firmware23_path = "scummvm/theme/scummremastered.zip"
+firmware23_opt = "true"
+notes = "Auxiliary files available from https://docs.libretro.com/library/scummvm/#usage"
--- a/dist/info/smsplus_libretro.info
+++ b/dist/info/smsplus_libretro.info
@ -11,8 +11,14 @@ license = "GPLv2"
 permissions = ""
 display_version = "1.8"
 supports_no_game = "false"
-firmware_count = 1
+
+# BIOS/Firmware
+firmware_count = 2
+
 firmware0_desc = "bios.sms (Master System BIOS)"
 firmware0_path = "bios.sms"
 firmware0_opt = "true"
-notes = "(!) bios.sms (md5): missing"
+
+firmware1_desc = "BIOS.col (Colecovision BIOS)"
+firmware1_path = "BIOS.col"
+firmware1_opt = "true"
--- a/dist/info/snes9x2002_libretro.info
+++ b/dist/info/snes9x2002_libretro.info
@ -28,3 +28,5 @@ database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nint
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
+
+description = "Snes9x 2002 is a fork of the classic and popular SNES emulator Snes9x from circa 2002. This is the fastest of the Snes9x cores, but it also has the lowest accuracy and worst compatibility. Nevertheless, this core works well with most popular games and is a good choice for the weakest mobile and embedded devices, though it should be considered a last resort."
--- a/dist/info/snes9x2005_libretro.info
+++ b/dist/info/snes9x2005_libretro.info
@ -27,4 +27,6 @@ supports_no_game = "false"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
-disk_control = "false"
+disk_control = "false"
+
+description = "Snes9x 2005 is a fork of the classic and popular SNES emulator Snes9x from circa 2005. This core is significantly faster than the newer cores, but that speed comes at the price of accuracy, and this core has some bugs in mostly obscure games and lower audio quality. This core is ideal for very weak devices, such as New 3DS and single-board computers. Users who cannot maintain full speed with this core--much less any of the newer Snes9x cores--should fall back to Snes9x 2002 as a last resort."
--- a/dist/info/snes9x2005_plus_libretro.info
+++ b/dist/info/snes9x2005_plus_libretro.info
@ -27,4 +27,6 @@ supports_no_game = "false"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
-disk_control = "false"
+disk_control = "false"
+
+description = "Snes9x 2005 Plus is a fork of the classic and popular SNES emulator Snes9x from circa 2005, but with a more accurate sound core backported from later versions. This avoids the biggest problem with the regular Snes9x 2005 core (that is, poor audio quality) at the expense of being somewhat slower. Nevertheless, this core is ideal for very weak devices, such as New 3DS and single-board computers. Users who cannot maintain full speed with this core--much less any of the newer Snes9x cores--should fall back to Snes9x 2002 as a last resort."
--- a/dist/info/snes9x2010_libretro.info
+++ b/dist/info/snes9x2010_libretro.info
@ -28,3 +28,5 @@ database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nint
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
+
+description = "Snes9x 2010 is a fork of the classic and popular SNES emulator Snes9x from circa 2010, with some additional hacks and fixes backported. It was originally created and tuned specifically for maintaining full speed on Playstation 3 hardware, but it can also be useful for any device that is not quite full speed with the up-to-date Snes9x core, such as budget mobile devices. Users who cannot maintain full speed with this core, either, should fall back to Snes9x 2005."
--- a/dist/info/snes9x_libretro.info
+++ b/dist/info/snes9x_libretro.info
@ -37,4 +37,6 @@ supports_no_game = "false"
 database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
-disk_control = "false"
+disk_control = "false"
+
+description = "Snes9x is a classic and popular SNES emulator that is very fast while still maintaining solid accuracy and high compatibility. It is perfect for use on desktop and laptop PCs of all ages, as well as many reasonably powerful mobile devices. This core is based on the latest up-to-date Snes9x sources and is the one most users should try first, only falling back to the year-marked snapshots if this one can't maintain full speed on their device."
--- a/dist/info/supafaust_libretro.info
+++ b/dist/info/supafaust_libretro.info
@ -0,0 +1,30 @@
+# Software Information
+display_name = "Nintendo - SNES / SFC (Supafaust)"
+categories = "Emulator"
+authors = "Mednafen team"
+corename = "Supafaust"
+supported_extensions = "smc|fig|sfc|gd3|gd7|dx2|bsx|swc"
+license = "GPLv2+"
+permissions = ""
+display_version = "Apr 26 2020"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Super Nintendo Entertainment System"
+systemid = "super_nes"
+
+# Libretro Features
+savestate = "true"
+savestate_features = "deterministic"
+cheats = "true"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "true"
+core_options = "true"
+core_options_version = "1.0"
+load_subsystem = "false"
+supports_no_game = "false"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks"
+hw_render = "false"
+needs_fullpath = "false"
+disk_control = "false"
--- a/dist/info/tic80_libretro.info
+++ b/dist/info/tic80_libretro.info
@ -1,13 +1,30 @@
+# Software Information
 display_name = "TIC-80"
-authors = "Nesbox, Rob Loach"
+authors = "Nesbox|RobLoach"
 supported_extensions = "tic"
 corename = "TIC-80"
-manufacturer = "TIC-80"
 categories = "Game engine"
-systemname = "TIC-80"
-systemid = "tic80"
-database = "TIC-80"
 license = "MIT"
 permissions = ""
 display_version = "0.80.0"
+
+# Hardware Information
+manufacturer = "TIC-80"
+systemname = "TIC-80"
+systemid = "tic80"
+
+# Libretro Features
+database = "TIC-80"
 supports_no_game = "false"
+savestate = "true"
+savestate_features = "basic"
+cheats = "true"
+input_descriptors = "true"
+memory_descriptors = "false"
+libretro_saves = "true"
+core_options = "true"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "false"
+disk_control = "false"
+is_experimental = "false"
--- a/dist/info/vice_x128_libretro.info
+++ b/dist/info/vice_x128_libretro.info
@ -1,6 +1,6 @@
 display_name = "Commodore - C128 (VICE x128)"
 authors = "VICE Core Team Members"
-supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u"
+supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u|vsf|nib|nbz"
 corename = "VICE"
 manufacturer = "Commodore"
 categories = "Emulator"
@ -11,3 +11,20 @@ license = "GPLv2"
 permissions = ""
 display_version = "v3.3"
 supports_no_game = "false"
+firmware_count = 5
+firmware0_desc = "vice/JiffyDOS_C128.bin (JiffyDOS C128 Kernal)"
+firmware0_path = "vice/JiffyDOS_C128.bin"
+firmware0_opt = "true"
+firmware1_desc = "vice/JiffyDOS_C64.bin (JiffyDOS C64 Kernal)"
+firmware1_path = "vice/JiffyDOS_C64.bin"
+firmware1_opt = "true"
+firmware2_desc = "vice/JiffyDOS_1541-II.bin (JiffyDOS 1541 drive BIOS)"
+firmware2_path = "vice/JiffyDOS_1541-II.bin"
+firmware2_opt = "true"
+firmware3_desc = "vice/JiffyDOS_1571_repl310654.bin (JiffyDOS 1571 drive BIOS)"
+firmware3_path = "vice/JiffyDOS_1571_repl310654.bin"
+firmware3_opt = "true"
+firmware4_desc = "vice/JiffyDOS_1581.bin (JiffyDOS 1581 drive BIOS)"
+firmware4_path = "vice/JiffyDOS_1581.bin"
+firmware4_opt = "true"
+notes = "(!) JiffyDOS_C128.bin (md5): cbbd1bbcb5e4fd8046b6030ab71fc021|(!) JiffyDOS_C64.bin (md5): be09394f0576cf81fa8bacf634daf9a2|(!) JiffyDOS_1541-II.bin (md5): 1b1e985ea5325a1f46eb7fd9681707bf|(!) JiffyDOS_1571_repl310654.bin (md5): 41c6cc528e9515ffd0ed9b180f8467c0|(!) JiffyDOS_1581.bin (md5): 20b6885c6dc2d42c38754a365b043d71"
--- a/dist/info/vice_x64_libretro.info
+++ b/dist/info/vice_x64_libretro.info
@ -1,6 +1,6 @@
 display_name = "Commodore - C64 (VICE x64, fast)"
 authors = "VICE Core Team Members"
-supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u"
+supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u|vsf|nib|nbz"
 corename = "VICE"
 manufacturer = "Commodore"
 categories = "Emulator"
@ -11,3 +11,17 @@ license = "GPLv2"
 permissions = ""
 display_version = "v3.3"
 supports_no_game = "false"
+firmware_count = 4
+firmware0_desc = "vice/JiffyDOS_C64.bin (JiffyDOS C64 Kernal)"
+firmware0_path = "vice/JiffyDOS_C64.bin"
+firmware0_opt = "true"
+firmware1_desc = "vice/JiffyDOS_1541-II.bin (JiffyDOS 1541 drive BIOS)"
+firmware1_path = "vice/JiffyDOS_1541-II.bin"
+firmware1_opt = "true"
+firmware2_desc = "vice/JiffyDOS_1571_repl310654.bin (JiffyDOS 1571 drive BIOS)"
+firmware2_path = "vice/JiffyDOS_1571_repl310654.bin"
+firmware2_opt = "true"
+firmware3_desc = "vice/JiffyDOS_1581.bin (JiffyDOS 1581 drive BIOS)"
+firmware3_path = "vice/JiffyDOS_1581.bin"
+firmware3_opt = "true"
+notes = "(!) JiffyDOS_C64.bin (md5): be09394f0576cf81fa8bacf634daf9a2|(!) JiffyDOS_1541-II.bin (md5): 1b1e985ea5325a1f46eb7fd9681707bf|(!) JiffyDOS_1571_repl310654.bin (md5): 41c6cc528e9515ffd0ed9b180f8467c0|(!) JiffyDOS_1581.bin (md5): 20b6885c6dc2d42c38754a365b043d71"
--- a/dist/info/vice_x64sc_libretro.info
+++ b/dist/info/vice_x64sc_libretro.info
@ -1,6 +1,6 @@
 display_name = "Commodore - C64 (VICE x64sc, accurate)"
 authors = "VICE Core Team Members"
-supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u"
+supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u|vsf|nib|nbz"
 corename = "VICE"
 manufacturer = "Commodore"
 categories = "Emulator"
@ -11,3 +11,17 @@ license = "GPLv2"
 permissions = ""
 display_version = "v3.3"
 supports_no_game = "false"
+firmware_count = 4
+firmware0_desc = "vice/JiffyDOS_C64.bin (JiffyDOS C64 Kernal)"
+firmware0_path = "vice/JiffyDOS_C64.bin"
+firmware0_opt = "true"
+firmware1_desc = "vice/JiffyDOS_1541-II.bin (JiffyDOS 1541 drive BIOS)"
+firmware1_path = "vice/JiffyDOS_1541-II.bin"
+firmware1_opt = "true"
+firmware2_desc = "vice/JiffyDOS_1571_repl310654.bin (JiffyDOS 1571 drive BIOS)"
+firmware2_path = "vice/JiffyDOS_1571_repl310654.bin"
+firmware2_opt = "true"
+firmware3_desc = "vice/JiffyDOS_1581.bin (JiffyDOS 1581 drive BIOS)"
+firmware3_path = "vice/JiffyDOS_1581.bin"
+firmware3_opt = "true"
+notes = "(!) JiffyDOS_C64.bin (md5): be09394f0576cf81fa8bacf634daf9a2|(!) JiffyDOS_1541-II.bin (md5): 1b1e985ea5325a1f46eb7fd9681707bf|(!) JiffyDOS_1571_repl310654.bin (md5): 41c6cc528e9515ffd0ed9b180f8467c0|(!) JiffyDOS_1581.bin (md5): 20b6885c6dc2d42c38754a365b043d71"
--- a/dist/info/vice_xcbm2_libretro.info
+++ b/dist/info/vice_xcbm2_libretro.info
@ -1,12 +1,12 @@
 display_name = "Commodore - CBM-II (VICE xcbm2)"
 authors = "VICE Core Team Members"
-supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u"
+supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u|vsf|nib|nbz"
 corename = "VICE"
 manufacturer = "Commodore"
 categories = "Emulator"
-systemname = "CBM2"
+systemname = "CBM-II"
 systemid = "commodore_cbm2"
-database = "Commodore - CBM2"
+database = "Commodore - CBM-II"
 license = "GPLv2"
 permissions = ""
 display_version = "v3.3"
--- a/dist/info/vice_xpet_libretro.info
+++ b/dist/info/vice_xpet_libretro.info
@ -1,6 +1,6 @@
 display_name = "Commodore - PET (VICE xpet)"
 authors = "VICE Core Team Members"
-supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u"
+supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u|vsf|nib|nbz"
 corename = "VICE"
 manufacturer = "Commodore"
 categories = "Emulator"
@ -11,26 +11,3 @@ license = "GPLv2"
 permissions = ""
 display_version = "v3.3"
 supports_no_game = "false"
-firmware_count = 7
-firmware0_desc = "chargen (PET BIOS)"
-firmware0_path = "vice/PET/chargen"
-firmware0_opt = "false"
-firmware1_desc = "edit1g (PET BIOS)"
-firmware1_path = "vice/PET/edit1g"
-firmware1_opt = "false"
-firmware2_desc = "edit2b (PET BIOS)"
-firmware2_path = "vice/PET/edit2b"
-firmware2_opt = "false"
-firmware3_desc = "edit2g (PET BIOS)"
-firmware3_path = "vice/PET/edit2g"
-firmware3_opt = "false"
-firmware4_desc = "edit4b40 (PET BIOS)"
-firmware4_path = "vice/PET/edit4b40"
-firmware4_opt = "false"
-firmware5_desc = "edit4b80 (PET BIOS)"
-firmware5_path = "vice/PET/edit4b80"
-firmware5_opt = "false"
-firmware6_desc = "edit4g40 (PET BIOS)"
-firmware6_path = "vice/PET/edit4g40"
-firmware6_opt = "false"
-notes = "(i) Place BIOS files in system/vice/PET folder."
--- a/dist/info/vice_xplus4_libretro.info
+++ b/dist/info/vice_xplus4_libretro.info
@ -1,12 +1,12 @@
-display_name = "Commodore - PLUS4 (VICE xplus4)"
+display_name = "Commodore - PLUS/4 (VICE xplus4)"
 authors = "VICE Core Team Members"
-supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u"
+supported_extensions = "d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u|vsf|nib|nbz"
 corename = "VICE"
 manufacturer = "Commodore"
 categories = "Emulator"
-systemname = "PLUS4"
+systemname = "PLUS/4"
 systemid = "commodore_plus_4"
-database = "Commodore - PLUS4"
+database = "Commodore - PLUS-4"
 license = "GPLv2"
 permissions = ""
 display_version = "v3.3"
--- a/dist/info/vice_xvic_libretro.info
+++ b/dist/info/vice_xvic_libretro.info
@ -1,12 +1,12 @@
-display_name = "Commodore - VIC20 (VICE xvic)"
+display_name = "Commodore - VIC-20 (VICE xvic)"
 authors = "VICE Core Team Members"
-supported_extensions = "20|40|60|a0|b0|d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u"
+supported_extensions = "20|40|60|a0|b0|d64|d71|d80|d81|d82|g64|g41|x64|t64|tap|prg|p00|crt|bin|zip|gz|d6z|d7z|d8z|g6z|g4z|x6z|cmd|m3u|vsf|nib|nbz"
 corename = "VICE"
 manufacturer = "Commodore"
 categories = "Emulator"
-systemname = "VIC20"
+systemname = "VIC-20"
 systemid = "commodore_vic_20"
-database = "Commodore - VIC20"
+database = "Commodore - VIC-20"
 license = "GPLv2"
 permissions = ""
 display_version = "v3.3"
--- a/dist/info/x1_libretro.info
+++ b/dist/info/x1_libretro.info
@ -9,5 +9,16 @@ license = "BSD"
 permissions = ""
 display_version = "0.60"
 supports_no_game = "false"
-notes = "(!) xmil/IPLROM.X1 (md5): eeeea1cd29c6e0e8b094790ae969bfa7|(!) xmil/IPLROM.X1T (md5): 851e4a5936f17d13f8c39a980cf00d77"

+# BIOS / Firmware
+firmware_count = 2
+
+firmware0_desc = "xmil/IPLROM.X1 (Sharp X1 IPL ROM)"
+firmware0_path = "xmil/IPLROM.X1"
+firmware0_opt = "true"
+
+firmware1_desc = "xmil/IPLROM.X1T (Sharp X1 8x8 Font ROM)"
+firmware1_path = "xmil/IPLROM.X1T"
+firmware1_opt = "true"
+
+notes = "(!) xmil/IPLROM.X1 (md5): eeeea1cd29c6e0e8b094790ae969bfa7|(!) xmil/IPLROM.X1T (md5): 851e4a5936f17d13f8c39a980cf00d77"
--- a/dist/info/yabasanshiro_libretro.info
+++ b/dist/info/yabasanshiro_libretro.info
@ -1,6 +1,6 @@
 display_name = "Sega - Saturn (YabaSanshiro)"
 authors = "Guillaume Duhammel|Theo Berkau|Anders Montonen|devmiyax"
-supported_extensions = "cue|iso|mds|ccd|zip|chd"
+supported_extensions = "bin|ccd|chd|cue|iso|mds|zip"
 corename = "YabaSanshiro"
 manufacturer = "Sega"
 categories = "Emulator"
--- a/dist/info/yabause_libretro.info
+++ b/dist/info/yabause_libretro.info
@ -1,6 +1,6 @@
 display_name = "Sega - Saturn (Yabause)"
 authors = "Guillaume Duhammel|Theo Berkau|Anders Montonen"
-supported_extensions = "cue|iso|mds|ccd|zip|chd"
+supported_extensions = "bin|ccd|chd|cue|iso|mds|zip"
 corename = "Yabause"
 manufacturer = "Sega"
 categories = "Emulator"
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@ -343,6 +343,7 @@ build_libretro_databases() {
 	build_libretro_database "MAME 2010" "rom.crc"
 	build_libretro_database "MAME 2015" "rom.crc"
 	build_libretro_database "MAME 2016" "rom.crc"
+	build_libretro_database "HBMAME" "rom.crc"
 	build_libretro_database "FBNeo - Arcade Games" "rom.crc"
 	build_libretro_database "DOOM" "rom.crc"
 	build_libretro_database "Cave Story" "rom.crc"
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@ -384,6 +384,12 @@ build_libretro_generic_makefile() {
 				android ) EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} \
 								-DANDROID_ABI=${ABI_OVERRIDE} \
 								-DCMAKE_TOOLCHAIN_FILE=${NDK_ROOT}/build/cmake/android.toolchain.cmake" ;;
+				3ds|ctr ) EXTRAARGS="-DCMAKE_TOOLCHAIN_FILE=${WORK}/cmake/ctr.cmake" ;;
+				vita ) EXTRAARGS="-DCMAKE_TOOLCHAIN_FILE=${WORK}/cmake/vita.cmake" ;;
+				psp|psp1 ) EXTRAARGS="-DCMAKE_TOOLCHAIN_FILE=${WORK}/cmake/psp1.cmake" ;;
+				libnx ) EXTRAARGS="-DCMAKE_TOOLCHAIN_FILE=${WORK}/cmake/libnx.cmake" ;;
+				qnx ) EXTRAARGS="-DCMAKE_TOOLCHAIN_FILE=${WORK}/cmake/blackberry.cmake" ;;
+
 				* ) EXTRAARGS="" ;;
 			esac

@ -393,10 +399,10 @@ build_libretro_generic_makefile() {
 			fi

 			eval "set -- ${EXTRAARGS} \${CORE_ARGS} -DCMAKE_VERBOSE_MAKEFILE=ON"
-			echo "BUILD CMD: ${CMAKE} $*" 2>&1 | tee -a "$LOGFILE"
-			echo "$@" .. | xargs ${CMAKE} 2>&1 | tee -a "$LOGFILE"
-			echo "BUILD CMD: ${CMAKE} --build . --target ${core}_libretro --config Release -- ${JOBS_FLAG}${JOBS}" 2>&1 | tee -a "$LOGFILE"
-			${CMAKE} --build . --target ${core}_libretro --config Release -- ${JOBS_FLAG}${JOBS} 2>&1 | tee -a "$LOGFILE"
+			echo "BUILD CMD: ${HELPER} ${CMAKE} $*" 2>&1 | tee -a "$LOGFILE"
+			echo "$@" .. | xargs ${HELPER} ${CMAKE} 2>&1 | tee -a "$LOGFILE"
+			echo "BUILD CMD: ${HELPER} ${CMAKE} --build . --target ${core}_libretro --config Release -- ${JOBS_FLAG}${JOBS}" 2>&1 | tee -a "$LOGFILE"
+			${HELPER} ${CMAKE} --build . --target ${core}_libretro --config Release -- ${JOBS_FLAG}${JOBS} 2>&1 | tee -a "$LOGFILE"

 			find . -mindepth 2 -name "${CORENAM}" -exec cp -f "{}" . \;
 		elif [ "${COMMAND}" = "LEIRADEL" ]; then
@ -1588,6 +1594,30 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then
 	fi
 fi

+if [ "${PLATFORM}" == "psl1ght" ] && [ "${RA}" == "YES" ]; then
+
+	if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then
+
+		touch $TMPDIR/built-frontend
+
+		cd dist-scripts
+		rm *.a
+		cp $RARCH_DIST_DIR/*.a .
+
+		time sh ./dist-cores.sh psl1ght 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
+
+		RET=${PIPESTATUS[0]}
+		ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
+		buildbot_handle_message "$RET" "$ENTRY_ID" "retroarch-psl1ght" "$jobid" "$ERROR"
+
+		if [ -n "$LOGURL" ]; then
+			ENTRY_ID=`curl -X POST -d type="start" -d master_log="$MASTER_LOG_ID" -d platform="$jobid" -d name="retroarch" http://buildserver.libretro.com/build_entry/`
+		fi
+
+		ENTRY_ID=""
+	fi
+fi
+
 if [ "${PLATFORM}" = "emscripten" ] && [ "${RA}" = "YES" ]; then

 	if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" -o "${FORCE_RETROARCH_BUILD}" == "YES" -o "${CORES_BUILT}" == "YES" ]; then
--- a/libretro-config.sh
+++ b/libretro-config.sh
@ -510,6 +510,17 @@ case "$platform" in
 		CXX="psp-g++${BINARY_EXT}"
 		;;

+        psl1ght)
+		DIST_DIR="psl1ght"
+		FORMAT_EXT=a
+		FORMAT=_psl1ght
+		FORMAT_COMPILER_TARGET=psl1ght
+		FORMAT_COMPILER_TARGET_ALT=psl1ght
+
+		CC="powerpc64-ps3-elf-gcc${BINARY_EXT}"
+		CXX="powerpc64-ps3-elf-g++${BINARY_EXT}"
+		;;
+
 	ps2)
 		DIST_DIR="ps2"
 		FORMAT_EXT=a
--- a/recipes/android/cores-android
+++ b/recipes/android/cores-android
@ -4,7 +4,6 @@ opera libretro-opera https://github.com/libretro/opera-libretro.git master YES G
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC_JNI Makefile jni
 bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC_JNI Makefile.libretro jni
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC_JNI Makefile jni
-bnes libretro-bnes https://github.com/libretro/bnes-libretro.git master NO GENERIC_JNI Makefile libretro/jni
 bsnes libretro-bsnes https://github.com/libretro/bsnes.git master YES GENERIC_JNI Makefile bsnes/target-libretro/jni
 bsnes_hd_beta libretro-bsnes_hd_beta https://github.com/DerKoun/bsnes-hd.git master YES GENERIC_JNI Makefile bsnes/target-libretro/jni
 bsnes2014 libretro-bsnes2014 https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC_JNI Makefile target-libretro/jni | bsnes2014_accuracy:profile=accuracy bsnes2014_balanced:profile=balanced bsnes2014_performance:profile=performance
@ -102,7 +101,7 @@ test libretro-samples https://github.com/libretro/libretro-samples.git master YE
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC_JNI Makefile jni
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC_JNI Makefile jni
 thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES ANDROID_CMAKE Makefile build
-tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES ANDROID_CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES ANDROID_CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC_JNI Makefile jni
 uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC_JNI Makefile jni
 vba_next libretro-vba-next https://github.com/libretro/vba-next.git master YES GENERIC_JNI Makefile libretro/jni
--- a/recipes/apple/cores-ios-arm64-generic
+++ b/recipes/apple/cores-ios-arm64-generic
@ -16,6 +16,7 @@ desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENE
 desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master NO GENERIC Makefile.libretro desmume
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master NO GENERIC Makefile .
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
+ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro
 fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/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 .
@ -65,7 +66,7 @@ parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git
 mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master NO GENERIC Makefile.libretro libretro
 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 sdl2
+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 .
 play libretro-play https://github.com/jpd002/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DCMAKE_TOOLCHAIN_FILE=../deps/Dependencies/cmake-ios/ios.cmake -DTARGET_IOS=ON -DCMAKE_BUILD_TYPE="Release" --target play_libretro
@ -107,6 +108,7 @@ vice_xcbm2 libretro-vice_xcbm2 https://github.com/libretro/vice-libretro.git mas
 vice_xpet libretro-vice_xpet https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xpet
 vice_xvic libretro-vice_xvic https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xvic
 vice_xplus4 libretro-vice_xplus4 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xplus4
+x1 libretro-xmil https://github.com/libretro/xmil-libretro.git master YES GENERIC Makefile.libretro libretro
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git master YES GENERIC Makefile .
 yabause libretro-yabause https://github.com/libretro/yabause.git master YES GENERIC Makefile yabause/src/libretro
 uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
--- a/recipes/apple/cores-ios-generic
+++ b/recipes/apple/cores-ios-generic
@ -65,11 +65,11 @@ parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git
 mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 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 sdl2
+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 .
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . DYNAREC=ari64
-pcsx_rearmed_interpreter libretro-pcsx_rearmed_interpreter https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro .
+pcsx_rearmed_interpreter libretro-pcsx_rearmed_interpreter https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . DYNAREC=lightrec
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
 play libretro-play https://github.com/jpd002/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DCMAKE_TOOLCHAIN_FILE=../deps/Dependencies/cmake-ios/ios.cmake -DTARGET_IOS=ON -DCMAKE_BUILD_TYPE="Release" --target play_libretro
 pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .
@ -83,7 +83,7 @@ quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 race libretro-race https://github.com/libretro/RACE.git master YES GENERIC Makefile .
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC Makefile .
-remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git master YES GENERIC Makefile .
+remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git master NO GENERIC Makefile .
 scummvm libretro-scummvm https://github.com/libretro/scummvm.git master YES GENERIC Makefile backends/platform/libretro/build
 smsplus libretro-smsplus https://github.com/libretro/smsplus-gx.git master YES GENERIC Makefile.libretro .
 snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master YES GENERIC Makefile .
--- a/recipes/apple/cores-ios9-generic
+++ b/recipes/apple/cores-ios9-generic
@ -64,12 +64,12 @@ parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git
 mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 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 sdl2
+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 .
 play libretro-play https://github.com/jpd002/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DCMAKE_TOOLCHAIN_FILE=../deps/Dependencies/cmake-ios/ios.cmake -DTARGET_IOS=ON -DCMAKE_BUILD_TYPE="Release" --target play_libretro
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . DYNAREC=ari64
-pcsx_rearmed_interpreter libretro-pcsx_rearmed_interpreter https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro .
+pcsx_rearmed_interpreter libretro-pcsx_rearmed_interpreter https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . DYNAREC=lightrec
 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 .
@ -82,7 +82,7 @@ quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 race libretro-race https://github.com/libretro/RACE.git master YES GENERIC Makefile .
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC Makefile .
-remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git master YES GENERIC Makefile .
+remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git master NO GENERIC Makefile .
 scummvm libretro-scummvm https://github.com/libretro/scummvm.git master YES GENERIC Makefile backends/platform/libretro/build
 smsplus libretro-smsplus https://github.com/libretro/smsplus-gx.git master YES GENERIC Makefile.libretro .
 snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master YES GENERIC Makefile .
--- a/recipes/apple/cores-osx-x64-generic
+++ b/recipes/apple/cores-osx-x64-generic
@ -1,6 +1,7 @@
 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 .
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
+bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 blastem libretro-blastem https://github.com/libretro/blastem.git libretro YES GENERIC Makefile.libretro .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
 bsnes libretro-bsnes https://github.com/libretro/bsnes.git master YES GENERIC GNUmakefile bsnes target=libretro binary=library local=false platform=macos
@ -20,7 +21,7 @@ desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENE
 desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master YES GENERIC Makefile.libretro desmume
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile .
 dolphin libretro-dolphin https://github.com/libretro/dolphin.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release
-dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro WITH_DYNAREC=x86_64
+dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro download_github_macos
 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro target=x86_64
 dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro target=x86_64
 ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro
@ -35,6 +36,7 @@ ffmpeg libretro-ffmpeg https://github.com/libretro/FFmpeg.git master YES GENERIC
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
 freechaf libretro-freechaf https://github.com/libretro/FreeChaF.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile .
+frodo libretro-frodo https://github.com/libretro/frodo-libretro.git  master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
 ishiiruka libretro-ishiiruka https://github.com/libretro/Ishiiruka.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release
@ -44,6 +46,7 @@ gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC
 gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makefile .
 handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
 hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro .
+hbmame libretro-hbmame https://github.com/libretro/hbmame-libretro.git master YES GENERIC Makefile.libretro .
 higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES GENERIC GNUmakefile higan compiler=clang++ target=libretro binary=library
 higan_sfc_balanced libretro-nside https://github.com/libretro/nSide.git master NO GENERIC GNUmakefile nSide compiler=clang++ target=libretro binary=library
 kronos libretro-kronos https://github.com/libretro/yabause.git kronos YES GENERIC Makefile yabause/src/libretro
@ -77,7 +80,7 @@ parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 neocd libretro-neocd https://github.com/libretro/neocd_libretro.git master YES GENERIC Makefile libretro
 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 sdl2
+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 .
 openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES GENERIC Makefile src/platform/libretro
@ -110,7 +113,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE="Release"
-tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
 vitaquake2 libretro-vitaquake2 https://github.com/libretro/vitaquake2.git libretro YES GENERIC Makefile .
 vitaquake3 libretro-vitaquake3 https://github.com/libretro/vitaquake3.git libretro YES GENERIC Makefile .
--- a/recipes/apple/cores-tvos-arm64-generic
+++ b/recipes/apple/cores-tvos-arm64-generic
@ -16,6 +16,7 @@ desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENE
 desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master NO GENERIC Makefile.libretro desmume
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master NO GENERIC Makefile .
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
+ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro
 fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/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 .
@ -64,12 +65,12 @@ parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git
 mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master NO GENERIC Makefile.libretro libretro
 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 sdl2
+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 .
 play libretro-play https://github.com/jpd002/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DCMAKE_TOOLCHAIN_FILE=../deps/Dependencies/cmake-ios/ios.cmake -DTARGET_IOS=ON -DCMAKE_BUILD_TYPE="Release" --target play_libretro
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master NO GENERIC Makefile.libretro . DYNAREC=ari64
-pcsx_rearmed_interpreter libretro-pcsx_rearmed_interpreter https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro .
+pcsx_rearmed_interpreter libretro-pcsx_rearmed_interpreter https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . DYNAREC=lightrec
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master NO 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 .
--- a/recipes/blackberry/cores-qnx-generic
+++ b/recipes/blackberry/cores-qnx-generic
@ -1,10 +1,15 @@
 2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
+81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
 opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
+bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
 cannonball libretro-cannonball https://github.com/libretro/cannonball.git master YES GENERIC Makefile .
+cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile .
 crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile .
+dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro WITH_DYNAREC=arm
+ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro
 emux libretro-emux https://github.com/libretro/emux master YES LEIRADEL Makefile libretro | emux_chip8:MACHINE=chip8 emux_gb:MACHINE=gb emux_nes:MACHINE=nes emux_sms:MACHINE=sms
 fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
@ -12,14 +17,20 @@ fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha20
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
 fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha2012_neogeo.git master YES GENERIC Makefile .
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
+ffmpeg libretro-ffmpeg https://github.com/libretro/FFmpeg.git master YES GENERIC Makefile libretro
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
+freechaf libretro-freechaf https://github.com/libretro/FreeChaF.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile .
+frodo libretro-frodo https://github.com/libretro/frodo-libretro.git  master YES GENERIC Makefile .
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile.libretro .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
+gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
 gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makefile .
+gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
 hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro .
+lutro libretro-lutro https://github.com/libretro/libretro-lutro master YES GENERIC Makefile .
 mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile .
 mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile .
 mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile .
@ -37,10 +48,12 @@ mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.gi
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
 meteor libretro-meteor https://github.com/libretro/meteor-libretro.git master NO GENERIC Makefile libretro
 mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makefile.libretro .
+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
+nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 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 sdl2
+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 .
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . DYNAREC=ari64
@ -49,6 +62,7 @@ picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YE
 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 .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
+px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro .
 quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 race libretro-race https://github.com/libretro/RACE.git master YES GENERIC Makefile .
@ -62,10 +76,21 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER
 test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
+uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
 vbam libretro-vbam https://github.com/libretro/vbam-libretro.git master YES GENERIC Makefile src/libretro
 vecx libretro-vecx https://github.com/libretro/libretro-vecx.git master YES GENERIC Makefile.libretro .
+vice_x128 libretro-vice_x128 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=x128
+vice_x64 libretro-vice_x64 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile .
+vice_x64sc libretro-vice_x64sc https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=x64sc
+vice_xcbm2 libretro-vice_xcbm2 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xcbm2
+vice_xpet libretro-vice_xpet https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xpet
+vice_xplus4 libretro-vice_xplus4 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xplus4
+vice_xvic libretro-vice_xvic https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xvic
 virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git master YES GENERIC Makefile .
+vitaquake2 libretro-vitaquake2 https://github.com/libretro/vitaquake2.git libretro YES GENERIC Makefile .
+x1 libretro-xmil https://github.com/libretro/xmil-libretro.git master YES GENERIC Makefile.libretro libretro
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git master YES GENERIC Makefile .
 yabause libretro-yabause https://github.com/libretro/yabause.git master YES GENERIC Makefile yabause/src/libretro
--- a/recipes/emscripten/emscripten
+++ b/recipes/emscripten/emscripten
@ -2,11 +2,12 @@
 opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master NO GENERIC Makefile .
 bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
-bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master NO GENERIC Makefile.libretro .
+bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
 cannonball libretro-cannonball https://github.com/libretro/cannonball.git master YES GENERIC Makefile .
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile .
 chailove libretro-chailove https://github.com/libretro/libretro-chailove.git master YES GENERIC Makefile .
 craft libretro-craft https://github.com/libretro/craft master YES GENERIC Makefile.libretro .
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
 desmume libretro-desmume https://github.com/libretro/desmume.git master NO GENERIC Makefile.libretro desmume/src/frontend/libretro
 desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master NO GENERIC Makefile.libretro desmume
 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro NO GENERIC Makefile.libretro libretro
@ -20,6 +21,7 @@ ffmpeg libretro-ffmpeg https://github.com/libretro/FFmpeg.git master NO GENERIC_
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
 freechaf libretro-freechaf https://github.com/libretro/FreeChaF.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile .
+fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
 gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
@ -41,16 +43,19 @@ mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-li
 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 NO GENERIC_GL Makefile .
+nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
+neocd libretro-neocd https://github.com/libretro/neocd_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 sdl2
+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 .
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
 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 .
-quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master NO GENERIC Makefile .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 flycast libretro-flycast https://github.com/libretro/flycast.git master NO GENERIC Makefile .
+pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .
 snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master YES GENERIC Makefile .
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
@ -61,7 +66,9 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER
 test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON -DEMSCRIPTEN=1
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
+uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC_ALT Makefile.libretro .
 vecx libretro-vecx https://github.com/libretro/libretro-vecx.git master YES GENERIC Makefile.libretro .
 vice_x128 libretro-vice_x128 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=x128
--- a/recipes/emscripten/emscripten.conf
+++ b/recipes/emscripten/emscripten.conf
@ -5,3 +5,4 @@ HELPER emmake
 MAKE make
 RA YES
 CORE_JOB YES
+CMAKE cmake
--- a/recipes/linux/cores-linux-arm7neonhf
+++ b/recipes/linux/cores-linux-arm7neonhf
@ -3,8 +3,8 @@
 opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
 81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
+bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
-bnes libretro-bnes https://github.com/libretro/bnes-libretro.git master NO GENERIC Makefile .
 bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . | bsnes_accuracy:profile=accuracy bsnes_balanced:profile=balanced bsnes_performance:profile=performance
 bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC Makefile .
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC Makefile . | bsnes_mercury_accuracy:profile=accuracy bsnes_mercury_balanced:profile=balanced bsnes_mercury_performance:profile=performance
@ -73,7 +73,7 @@ mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64pl
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 neocd libretro-neocd https://github.com/libretro/neocd_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 sdl2
+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 .
 openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES GENERIC Makefile src/platform/libretro
@ -106,7 +106,7 @@ test libretro-samples https://github.com/libretro/libretro-samples.git master YE
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release
-tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
 uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
--- a/recipes/linux/cores-linux-armhf-generic
+++ b/recipes/linux/cores-linux-armhf-generic
@ -5,7 +5,6 @@ opera libretro-opera https://github.com/libretro/opera-libretro.git master YES G
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
 bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
-bnes libretro-bnes https://github.com/libretro/bnes-libretro.git master NO GENERIC Makefile .
 bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . | bsnes_accuracy:profile=accuracy bsnes_balanced:profile=balanced bsnes_performance:profile=performance
 bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git master YES GENERIC Makefile .
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC Makefile . | bsnes_mercury_accuracy:profile=accuracy bsnes_mercury_balanced:profile=balanced bsnes_mercury_performance:profile=performance
@ -17,6 +16,7 @@ crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master
 desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro
 desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master YES GENERIC Makefile.libretro desmume
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile .
+dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro download_github_armhf
 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro target=arm WITH_FAKE_SDL=1
 dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro target=arm WITH_FAKE_SDL=1
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
@ -71,7 +71,7 @@ mu libretro-mu https://github.com/libretro/Mu.git master YES GENERIC Makefile li
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 neocd libretro-neocd https://github.com/libretro/neocd_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 sdl2
+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 .
 openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES GENERIC Makefile src/platform/libretro
@ -104,7 +104,7 @@ test libretro-samples https://github.com/libretro/libretro-samples.git master YE
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release
-tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
 uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
--- a/recipes/linux/cores-linux-x64-generic
+++ b/recipes/linux/cores-linux-x64-generic
@ -6,7 +6,6 @@ atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git mas
 bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 blastem libretro-blastem https://github.com/libretro/blastem.git libretro YES GENERIC Makefile.libretro .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
-bnes libretro-bnes https://github.com/libretro/bnes-libretro.git master NO GENERIC Makefile .
 bsnes libretro-bsnes https://github.com/libretro/bsnes.git master YES GENERIC GNUmakefile bsnes compiler=g++-7 target=libretro binary=library local=false platform=linux
 bsnes_hd_beta libretro-bsnes_hd_beta https://github.com/DerKoun/bsnes-hd.git master YES GENERIC GNUmakefile bsnes compiler=g++-7 target=libretro binary=library local=false platform=linux
 bsnes2014 libretro-bsnes2014 https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . | bsnes2014_accuracy:profile=accuracy bsnes2014_balanced:profile=balanced bsnes2014_performance:profile=performance
@ -26,7 +25,7 @@ boom3 libretro-boom3 https://github.com/libretro/boom3.git master YES GENERIC Ma
 boom3_xp libretro-boom3_xp https://github.com/libretro/boom3.git master YES GENERIC Makefile neo D3XP=ON
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile .
 dolphin libretro-dolphin https://github.com/libretro/dolphin.git master YES CMAKE Makefile build -DLIBRETRO=ON -DLIBRETRO_STATIC=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-7 -DCMAKE_C_COMPILER=gcc-7
-dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro CC=gcc-9 CXX=g++-9 STATIC_LIBCXX=1 WITH_DYNAREC=x86_64
+dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core.git libretro YES GENERIC Makefile.libretro libretro download_github_linux64
 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro WITH_DYNAREC=x86_64
 dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro WITH_DYNAREC=x86_64
 ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro
@ -53,6 +52,7 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makef
 gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
 hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro .
+hbmame libretro-hbmame https://github.com/libretro/hbmame-libretro.git master YES GENERIC Makefile.libretro . PTR64=1
 higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES GENERIC GNUmakefile higan compiler=g++ target=libretro binary=library
 higan_sfc_balanced libretro-nside https://github.com/libretro/nSide.git master YES GENERIC GNUmakefile nSide compiler=g++ target=libretro binary=library
 ishiiruka libretro-ishiiruka https://github.com/libretro/Ishiiruka.git master YES CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-7 -DCMAKE_C_COMPILER=gcc-7
@ -89,11 +89,11 @@ mu libretro-mu https://github.com/libretro/Mu.git master YES GENERIC Makefile li
 mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git develop YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 HAVE_PARALLEL_RSP=1 HAVE_THR_AL=1
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 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 sdl2
+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 .
 openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES GENERIC Makefile src/platform/libretro
-parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 HAVE_PARALLEL_RSP=1 HAVE_THR_AL=1
+parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 HAVE_PARALLEL=1 HAVE_PARALLEL_RSP=1 HAVE_THR_AL=1
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . DYNAREC=lightrec
 play libretro-play https://github.com/jpd002/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DCMAKE_BUILD_TYPE="Release" --target play_libretro
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
@ -125,7 +125,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release
-tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
 vitaquake2 libretro-vitaquake2 https://github.com/libretro/vitaquake2.git libretro YES GENERIC Makefile .
 vitaquake3 libretro-vitaquake3 https://github.com/libretro/vitaquake3.git libretro YES GENERIC Makefile .
--- a/recipes/linux/cores-linux-x86-generic
+++ b/recipes/linux/cores-linux-x86-generic
@ -5,7 +5,6 @@ opera libretro-opera https://github.com/libretro/opera-libretro.git master YES G
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
 bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
-bnes libretro-bnes https://github.com/libretro/bnes-libretro.git master NO GENERIC Makefile .
 bsnes libretro-bsnes https://github.com/libretro/bsnes.git master YES GENERIC GNUmakefile bsnes target=libretro binary=library local=false platform=linux
 bsnes_hd_beta libretro-bsnes_hd_beta https://github.com/DerKoun/bsnes-hd.git master YES GENERIC GNUmakefile bsnes compiler=g++-7 target=libretro binary=library local=false platform=linux
 bsnes2014 libretro-bsnes2014 https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . | bsnes2014_accuracy:profile=accuracy bsnes2014_balanced:profile=balanced bsnes2014_performance:profile=performance
@ -21,7 +20,7 @@ desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENE
 desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master YES GENERIC Makefile.libretro desmume
 boom3 libretro-boom3 https://github.com/libretro/boom3.git master YES GENERIC Makefile neo
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile .
-dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro CC=gcc-9 CXX=g++-9 STATIC_LIBCXX=1 WITH_DYNAREC=x86
+dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro CC=gcc-9 CXX=g++-9 STATIC_LIBCXX=1 BUNDLED_SDL=1 WITH_DYNAREC=x86
 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro target=x86
 dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro target=x86
 ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro
@ -47,6 +46,7 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makef
 gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
 hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro .
+hbmame libretro-hbmame https://github.com/libretro/hbmame-libretro.git master YES GENERIC Makefile.libretro . PTR64=0
 higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES GENERIC GNUmakefile higan compiler=g++ target=libretro binary=library
 higan_sfc_balanced libretro-nside https://github.com/libretro/nSide.git master YES GENERIC GNUmakefile nSide compiler=g++ target=libretro binary=library
 kronos libretro-kronos https://github.com/libretro/yabause.git kronos YES GENERIC Makefile yabause/src/libretro
@ -82,7 +82,7 @@ mu libretro-mu https://github.com/libretro/Mu.git master YES GENERIC Makefile li
 mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git develop YES GENERIC_GL Makefile . WITH_DYNAREC=x86 HAVE_PARALLEL_RSP=1 HAVE_THR_AL=1
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 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 sdl2
+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 .
 openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES GENERIC Makefile src/platform/libretro
@ -118,7 +118,7 @@ test libretro-samples https://github.com/libretro/libretro-samples.git master YE
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release
-tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
 vitaquake2 libretro-vitaquake2 https://github.com/libretro/vitaquake2.git libretro YES GENERIC Makefile .
 vitaquake3 libretro-vitaquake3 https://github.com/libretro/vitaquake3.git libretro YES GENERIC Makefile .
--- a/recipes/nintendo/3ds
+++ b/recipes/nintendo/3ds
@ -5,6 +5,7 @@ atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git mas
 bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile .
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro WITH_DYNAREC=oldarm
 ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
@ -18,6 +19,7 @@ ffmpeg libretro-ffmpeg https://github.com/libretro/FFmpeg.git master YES GENERIC
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
 freechaf libretro-freechaf https://github.com/libretro/FreeChaF.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile .
+frodo libretro-frodo https://github.com/libretro/frodo-libretro.git master YES GENERIC Makefile .
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
@ -37,8 +39,9 @@ mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makef
 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
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
+neocd libretro-neocd https://github.com/libretro/neocd_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 sdl2
+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 .
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro .
@ -60,9 +63,11 @@ stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.g
 stella libretro-stella https://github.com/stella-emu/stella.git master NO GENERIC Makefile src/libretro
 test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
-tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master NO GENERIC Makefile .
-tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON -DCMAKE_C_COMPILER=${DEVKITARM}/bin/arm-none-eabi-gcc -DCMAKE_CXX_COMPILER=${DEVKITARM}/bin/arm-none-eabi-g++ -DCMAKE_SYSTEM_PROCESSOR=arm -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_CROSSCOMPILING=TRUE -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS=-fPIC -DCMAKE_C_LINK_FLAGS=-fPIC -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY -DDISABLE_NETWORKING=TRUE -DLIBRETRO_STATIC=TRUE -DLIBRETRO_SUFFIX=_ctr -DCMAKE_CXX_FLAGS=" -march=armv6k -mtune=mpcore -mfloat-abi=hard" -DCMAKE_C_FLAGS=" -march=armv6k -mtune=mpcore -mfloat-abi=hard"
+tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
+thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE=Release -DLIBRETRO_STATIC=ON -DLIBRETRO_SUFFIX=_ctr
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON -DDISABLE_NETWORKING=ON -DLIBRETRO_STATIC=ON -DLIBRETRO_SUFFIX=_ctr
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
+uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
 vice_x128 libretro-vice_x128 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=x128
 vice_x64 libretro-vice_x64 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile .
 vice_x64sc libretro-vice_x64sc https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=x64sc
--- a/recipes/nintendo/gamecube
+++ b/recipes/nintendo/gamecube
@ -1,9 +1,11 @@
 2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
 81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
+bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 cannonball libretro-cannonball https://github.com/libretro/cannonball.git master YES GENERIC Makefile .
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile .
-dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
+dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro NO GENERIC Makefile.libretro libretro
 ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
@ -13,10 +15,12 @@ fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha20
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
 fixgb libretro-fixgb https://github.com/FIX94/fixGB.git master YES GENERIC Makefile libretro
 fixnes libretro-fixnes https://github.com/FIX94/fixNES.git master YES GENERIC Makefile libretro
+freechaf libretro-freechaf https://github.com/libretro/FreeChaF.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile .
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
+gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
 gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 lutro libretro-lutro https://github.com/libretro/libretro-lutro master YES GENERIC Makefile .
 mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile .
@ -31,8 +35,9 @@ mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makef
 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 sdl2
+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 .
+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 .
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC Makefile .
 quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
@ -47,4 +52,6 @@ stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.g
 test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
+uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
+x1 libretro-xmil https://github.com/libretro/xmil-libretro.git master YES GENERIC Makefile.libretro libretro
--- a/recipes/nintendo/libnx
+++ b/recipes/nintendo/libnx
@ -7,6 +7,7 @@ bsnes_hd_beta libretro-bsnes_hd_beta https://github.com/DerKoun/bsnes-hd.git mas
 cannonball libretro-cannonball https://github.com/libretro/cannonball.git master YES GENERIC Makefile .
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile .
 crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
+dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core.git libretro YES GENERIC Makefile.libretro libretro CMAKE_GENERATOR="Unix Makefiles"
 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn.git libretro YES GENERIC Makefile.libretro libretro
 desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro
 boom3 libretro-boom3 https://github.com/libretro/boom3.git master YES GENERIC Makefile neo
@ -42,10 +43,10 @@ mu libretro-mu https://github.com/libretro/Mu.git master YES GENERIC Makefile li
 mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git develop YES GENERIC_GL Makefile .
 neocd libretro-neocd https://github.com/libretro/neocd_libretro.git master YES GENERIC Makefile libretro
 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 sdl2
+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 .
-pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed_switch.git master YES GENERIC Makefile.libretro .
+pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . DYNAREC=0
 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 .
@ -59,7 +60,7 @@ px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES G
 quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 race libretro-race https://github.com/libretro/RACE.git master YES GENERIC Makefile .
-flycast libretro-flycast https://github.com/m4xw/flycast.git master YES GENERIC Makefile .
+flycast libretro-flycast https://github.com/libretro/flycast.git master YES GENERIC Makefile .
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC Makefile .
 sameboy libretro-sameboy https://github.com/libretro/SameBoy.git buildbot YES GENERIC Makefile libretro
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
@ -70,9 +71,10 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER
 test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON -DDISABLE_NETWORKING=ON -DLIBRETRO_STATIC=ON -DLIBRETRO_SUFFIX=_libnx
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
 fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
-uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master NO  GENERIC Makefile .
+uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
 vecx libretro-vecx https://github.com/libretro/libretro-vecx.git master YES GENERIC Makefile.libretro .
--- a/recipes/nintendo/libnx.conf
+++ b/recipes/nintendo/libnx.conf
@ -8,6 +8,6 @@ RA YES
 JOBS 4
 CORE_JOB YES
 MAKE make
-
+CMAKE cmake


--- a/recipes/nintendo/wii
+++ b/recipes/nintendo/wii
@ -1,8 +1,10 @@
 2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
 81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
+bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 cannonball libretro-cannonball https://github.com/libretro/cannonball.git master YES GENERIC Makefile .
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile .
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro
 ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
@ -13,10 +15,12 @@ fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha20
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
 fixgb libretro-fixgb https://github.com/FIX94/fixGB.git master YES GENERIC Makefile libretro
 fixnes libretro-fixnes https://github.com/FIX94/fixNES.git master YES GENERIC Makefile libretro
+freechaf libretro-freechaf https://github.com/libretro/FreeChaF.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile .
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
+gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
 gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 lutro libretro-lutro https://github.com/libretro/libretro-lutro master YES GENERIC Makefile .
 mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile .
@ -31,8 +35,9 @@ mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makef
 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 sdl2
+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 .
+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 .
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC Makefile .
 quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
@ -47,4 +52,6 @@ stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.g
 test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
+uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
+x1 libretro-xmil https://github.com/libretro/xmil-libretro.git master YES GENERIC Makefile.libretro libretro
--- a/recipes/nintendo/wiiu
+++ b/recipes/nintendo/wiiu
@ -1,10 +1,15 @@
+2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master NO GENERIC Makefile .
 cannonball libretro-cannonball https://github.com/libretro/cannonball.git master YES GENERIC Makefile .
 hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro .
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
+bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile .
+cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile .
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 stella libretro-stella https://github.com/stella-emu/stella.git master NO GENERIC Makefile src/libretro
+ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro
 fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/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 .
@ -13,6 +18,7 @@ fbalpha2012_cps3 libretro-fbalpha2012_cps3 https://github.com/libretro/fbalpha20
 fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha2012_neogeo.git master YES GENERIC Makefile .
 fixgb libretro-fixgb https://github.com/FIX94/fixGB.git master YES GENERIC Makefile libretro
 fixnes libretro-fixnes https://github.com/FIX94/fixNES.git master YES GENERIC Makefile libretro
+freechaf libretro-freechaf https://github.com/libretro/FreeChaF.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile .
 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
@ -20,6 +26,7 @@ gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git mas
 gearboy libretro-gearboy https://github.com/drhelius/Gearboy.git master YES GENERIC Makefile platforms/libretro
 gearsystem libretro-gearsystem https://github.com/drhelius/Gearsystem.git master YES GENERIC Makefile platforms/libretro
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
+gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
 mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile .
 mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile .
 mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile .
@ -34,11 +41,13 @@ mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libre
 mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makefile.libretro .
 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
+neocd libretro-neocd https://github.com/libretro/neocd_libretro.git master YES GENERIC Makefile .
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
-np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master NO GENERIC Makefile.libretro sdl2
+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 .
+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 .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
 quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
@ -59,6 +68,8 @@ prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YE
 gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
+test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
+uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
 vecx libretro-vecx https://github.com/libretro/libretro-vecx.git master YES GENERIC Makefile.libretro .
 vice_x128 libretro-vice_x128 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=x128
@ -68,4 +79,5 @@ vice_xcbm2 libretro-vice_xcbm2 https://github.com/libretro/vice-libretro.git mas
 vice_xpet libretro-vice_xpet https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xpet
 vice_xplus4 libretro-vice_xplus4 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xplus4
 vice_xvic libretro-vice_xvic https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xvic
-test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
+vitaquake2 libretro-vitaquake2 https://github.com/libretro/vitaquake2.git libretro YES GENERIC Makefile .
+x1 libretro-xmil https://github.com/libretro/xmil-libretro.git master YES GENERIC Makefile.libretro libretro
--- a/recipes/playstation/ps2
+++ b/recipes/playstation/ps2
@ -4,3 +4,4 @@ fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YE
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
 mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makefile.libretro .
 test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
+theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
--- a/recipes/playstation/ps3
+++ b/recipes/playstation/ps3
@ -34,7 +34,7 @@ mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetl
 mgba libretro-mgba https://github.com/libretro/mgba.git master NO GENERIC Makefile.libretro .
 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 sdl2
+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 .
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master NO GENERIC Makefile.libretro .
--- a/recipes/playstation/psl1ght
+++ b/recipes/playstation/psl1ght
@ -0,0 +1,83 @@
+2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
+81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
+atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master NO GENERIC Makefile .
+bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
+bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
+cannonball libretro-cannonball https://github.com/libretro/cannonball.git master YES GENERIC Makefile .
+cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile .
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
+desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master NO GENERIC Makefile.libretro desmume
+dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro NO GENERIC Makefile.libretro libretro
+ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/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 NO GENERIC makefile.libretro .
+fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master NO GENERIC makefile.libretro .
+fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha2012_neogeo.git master NO GENERIC Makefile .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/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 NO GENERIC Makefile .
+freechaf libretro-freechaf https://github.com/libretro/FreeChaF.git master YES GENERIC Makefile .
+freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile .
+fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
+gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
+gearboy libretro-gearboy https://github.com/drhelius/Gearboy.git master NO GENERIC Makefile platforms/libretro
+gearsystem libretro-gearsystem https://github.com/drhelius/Gearsystem.git master NO GENERIC Makefile platforms/libretro
+genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master NO GENERIC Makefile.libretro .
+gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
+gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makefile .
+gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
+handy libretro-handy https://github.com/libretro/libretro-handy.git master NO GENERIC Makefile .
+hatari libretro-hatari https://github.com/libretro/hatari.git master NO GENERIC Makefile.libretro .
+lutro libretro-lutro https://github.com/libretro/libretro-lutro master NO GENERIC Makefile .
+mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master NO GENERIC Makefile .
+mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master NO GENERIC Makefile .
+mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master NO GENERIC Makefile .
+mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC Makefile .
+mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git master YES GENERIC Makefile .
+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 .
+mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git master NO GENERIC Makefile .
+mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makefile.libretro .
+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
+neocd libretro-neocd https://github.com/libretro/neocd_libretro.git master YES GENERIC Makefile .
+nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
+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 NO GENERIC Makefile .
+pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master NO GENERIC Makefile.libretro .
+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 .
+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 NO GENERIC Makefile .
+puae libretro-uae https://github.com/libretro/libretro-uae.git master NO GENERIC Makefile .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
+quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
+snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
+snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master NO GENERIC Makefile .
+snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
+snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
+snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
+stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master NO GENERIC Makefile .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
+test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
+tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master NO GENERIC Makefile .
+theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
+tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
+uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
+vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
+vecx libretro-vecx https://github.com/libretro/libretro-vecx.git master YES GENERIC Makefile.libretro .
+vice_x128 libretro-vice_x128 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=x128
+vice_x64 libretro-vice_x64 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile .
+vice_x64sc libretro-vice_x64sc https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=x64sc
+vice_xcbm2 libretro-vice_xcbm2 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xcbm2
+vice_xpet libretro-vice_xpet https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xpet
+vice_xplus4 libretro-vice_xplus4 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xplus4
+vice_xvic libretro-vice_xvic https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xvic
+virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git master NO GENERIC Makefile .
+vitaquake2 libretro-vitaquake2 https://github.com/libretro/vitaquake2.git libretro YES GENERIC Makefile .
+x1 libretro-xmil https://github.com/libretro/xmil-libretro.git master YES GENERIC Makefile.libretro libretro
+xrick libretro-xrick https://github.com/libretro/xrick-libretro.git master YES GENERIC Makefile .
--- a/recipes/playstation/psl1ght.conf
+++ b/recipes/playstation/psl1ght.conf
@ -0,0 +1,13 @@
+PSL1GHT /home/buildbot/ps3dev
+PS3DEV /home/buildbot/ps3dev
+PATH /home/buildbot/ps3dev/bin:/home/buildbot/ps3dev/ppu/bin:/home/buildbot/ps3dev/spu/bin
+platform psl1ght
+PLATFORM psl1ght
+RA YES
+JOBS 2
+CORE_JOB YES
+MAKE make
+TARGET psl1ght
+ARCH powerpc
+CC powerpc64-ps3-elf-gcc
+CXX powerpc64-ps3-elf-g++
--- a/recipes/playstation/psl1ght.ra
+++ b/recipes/playstation/psl1ght.ra
@ -0,0 +1,2 @@
+retroarch retroarch https://github.com/libretro/Retroarch.git PROJECT YES .
+libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch/media
--- a/recipes/playstation/psp
+++ b/recipes/playstation/psp
@ -3,13 +3,16 @@
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
 bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
 ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/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 .
 freechaf libretro-freechaf https://github.com/libretro/FreeChaF.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile .
+frodo libretro-frodo https://github.com/libretro/frodo-libretro.git  master YES GENERIC Makefile .
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
+gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
 gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makefile .
 gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
@ -17,11 +20,14 @@ mednafen_pce_fast libretro-beetle_pce_fast https://github.com/aliaspider/beetle-
 mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makefile.libretro .
 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
+nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 njemu_cps2 libretro-njemu https://github.com/aliaspider/NJEMU-libretro.git master YES GENERIC Makefile .
-np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC Makefile.libretro sdl2
+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 .
 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 .
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC Makefile .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 race libretro-race https://github.com/libretro/RACE.git master YES GENERIC Makefile .
 snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master NO GENERIC Makefile .
@ -32,3 +38,5 @@ tempgba libretro-tempgba https://github.com/libretro/TempGBA-libretro.git master
 test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON -DDISABLE_NETWORKING=ON -DLIBRETRO_STATIC=ON -DLIBRETRO_SUFFIX=_psp1
+x1 libretro-xmil https://github.com/libretro/xmil-libretro.git master YES GENERIC Makefile.libretro libretro
--- a/recipes/playstation/psp.conf
+++ b/recipes/playstation/psp.conf
@ -9,3 +9,4 @@ MAKE /usr/bin/make
 RA YES
 CORE_JOB YES
 MAKE make
+CMAKE cmake
--- a/recipes/playstation/vita
+++ b/recipes/playstation/vita
@ -1,9 +1,11 @@
 2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
+bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
+cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile .
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
 desmume libretro-desmume https://github.com/libretro/desmume.git master NO GENERIC Makefile.libretro desmume
-dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC Makefile.libretro .
-dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn vita NO GENERIC Makefile.libretro libretro WITH_DYNAREC=arm
+dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro
 ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
 fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
@ -15,13 +17,16 @@ fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YE
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
 freechaf libretro-freechaf https://github.com/libretro/FreeChaF.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile .
+frodo libretro-frodo https://github.com/libretro/frodo-libretro.git  master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 gearboy libretro-gearboy https://github.com/drhelius/Gearboy.git master YES GENERIC Makefile platforms/libretro
 gearsystem libretro-gearsystem https://github.com/drhelius/Gearsystem.git master YES GENERIC Makefile platforms/libretro
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
+gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
 gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makefile .
 handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
-lutro libretro-lutro https://github.com/libretro/libretro-lutro master NO GENERIC Makefile .
+hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro .
+lutro libretro-lutro https://github.com/libretro/libretro-lutro master YES GENERIC Makefile .
 mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile .
 mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile .
 mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile .
@ -33,9 +38,12 @@ mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-li
 mgba libretro-mgba https://github.com/libretro/mgba.git master NO GENERIC Makefile.libretro .
 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
+nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES Makefile . WITH_DYNAREC=arm
+pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git master YES GENERIC Makefile .
+neocd libretro-neocd https://github.com/libretro/neocd_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 NO GENERIC Makefile.libretro sdl2
+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 .
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . DYNAREC=ari64
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
@ -43,6 +51,7 @@ pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES G
 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 .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
+px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro .
 quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 race libretro-race https://github.com/libretro/RACE.git master YES GENERIC Makefile .
@ -57,7 +66,9 @@ stella libretro-stella https://github.com/stella-emu/stella.git master NO GENERI
 test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile builddir -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON -DDISABLE_NETWORKING=ON -DLIBRETRO_STATIC=ON -DLIBRETRO_SUFFIX=_vita
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
+uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENERIC Makefile .
 vice_x128 libretro-vice_x128 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=x128
 vice_x64 libretro-vice_x64 https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile .
 vice_x64sc libretro-vice_x64sc https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=x64sc
@ -67,6 +78,7 @@ vice_xplus4 libretro-vice_xplus4 https://github.com/libretro/vice-libretro.git m
 vice_xvic libretro-vice_xvic https://github.com/libretro/vice-libretro.git master YES GENERIC Makefile . EMUTYPE=xvic
 vecx libretro-vecx https://github.com/libretro/libretro-vecx.git master YES GENERIC Makefile.libretro .
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
+x1 libretro-xmil https://github.com/libretro/xmil-libretro.git master YES GENERIC Makefile.libretro libretro
 yabause libretro-yabause https://github.com/libretro/yabause.git master YES GENERIC Makefile yabause/src/libretro
 gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
--- a/recipes/playstation/vita.conf
+++ b/recipes/playstation/vita.conf
@ -6,3 +6,4 @@ RA YES
 JOBS 4
 CORE_JOB YES
 MAKE make
+CMAKE cmake
--- a/recipes/windows/cores-windows-msvc2003-x86_dw2-generic
+++ b/recipes/windows/cores-windows-msvc2003-x86_dw2-generic
@ -17,7 +17,7 @@ mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.gi
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-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 sdl2
+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 .
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_ALT Makefile .
--- a/recipes/windows/cores-windows-msvc2005-x86_dw2-generic
+++ b/recipes/windows/cores-windows-msvc2005-x86_dw2-generic
@ -15,7 +15,7 @@ mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-li
 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
 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 sdl2
+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 .
 pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
--- a/recipes/windows/cores-windows-msvc2010-x64_seh-generic
+++ b/recipes/windows/cores-windows-msvc2010-x64_seh-generic
@ -22,7 +22,7 @@ melonds libretro-melonds https://github.com/libretro/melonDS.git master YES GENE
 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 sdl2
+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 .
 pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
--- a/recipes/windows/cores-windows-msvc2010-x86_dw2-generic
+++ b/recipes/windows/cores-windows-msvc2010-x86_dw2-generic
@ -22,7 +22,7 @@ melonds libretro-melonds https://github.com/libretro/melonDS.git master YES GENE
 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
 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 sdl2
+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 .
 pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
--- a/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic
+++ b/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic
@ -24,7 +24,7 @@ mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.gi
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
 mesen libretro-mesen https://github.com/SourMesen/Mesen.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x64
 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 sdl2
+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 .
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
--- a/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic
+++ b/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic
@ -23,7 +23,7 @@ mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.gi
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
 mesen libretro-mesen https://github.com/SourMesen/Mesen.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x64
 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 sdl2
+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 .
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
--- a/recipes/windows/cores-windows-msvc2017-uwp-arm-generic
+++ b/recipes/windows/cores-windows-msvc2017-uwp-arm-generic
@ -25,7 +25,7 @@ mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.gi
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
 mesen libretro-mesen https://github.com/SourMesen/Mesen.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x64
 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 sdl2
+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 .
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
--- a/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic
+++ b/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic
@ -24,7 +24,7 @@ mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.gi
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
 mesen libretro-mesen https://github.com/SourMesen/Mesen.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x64
 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 sdl2
+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 .
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
--- a/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic
+++ b/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic
@ -25,7 +25,7 @@ mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.gi
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
 mesen libretro-mesen https://github.com/SourMesen/Mesen.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x64
 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 sdl2
+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 .
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
--- a/recipes/windows/cores-windows-x64_seh-generic
+++ b/recipes/windows/cores-windows-x64_seh-generic
@ -3,9 +3,9 @@
 opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
 81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
+bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 blastem libretro-blastem https://github.com/libretro/blastem.git libretro YES GENERIC Makefile.libretro .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
-bnes libretro-bnes https://github.com/libretro/bnes-libretro.git master NO GENERIC Makefile .
 bsnes libretro-bsnes https://github.com/libretro/bsnes.git master YES GENERIC GNUmakefile bsnes target=libretro binary=library local=false platform=windows
 bsnes_hd_beta libretro-bsnes_hd_beta https://github.com/DerKoun/bsnes-hd.git master YES GENERIC GNUmakefile bsnes target=libretro binary=library local=false platform=windows
 bsnes2014 libretro-bsnes2014 https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . | bsnes2014_accuracy:profile=accuracy bsnes2014_balanced:profile=balanced bsnes2014_performance:profile=performance
@ -23,6 +23,7 @@ boom3 libretro-boom3 https://github.com/libretro/boom3.git master YES GENERIC Ma
 boom3_xp libretro-boom3_xp https://github.com/libretro/boom3.git master YES GENERIC Makefile neo D3XP=ON
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile .
 dolphin libretro-dolphin https://github.com/libretro/dolphin.git master YES CMAKE sln build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release -G\"Visual Studio 15 2017 Win64\"
+dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro download_github_windows_x64
 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro
 dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro
 ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro
@ -38,6 +39,7 @@ fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENE
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
 freechaf libretro-freechaf https://github.com/libretro/FreeChaF.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile .
+frodo libretro-frodo https://github.com/libretro/frodo-libretro.git  master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 gearboy libretro-gearboy https://github.com/drhelius/Gearboy.git master YES GENERIC Makefile platforms/libretro
 gearsystem libretro-gearsystem https://github.com/drhelius/Gearsystem.git master YES GENERIC Makefile platforms/libretro
@ -47,6 +49,7 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makef
 gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
 hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro .
+hbmame libretro-hbmame https://github.com/libretro/hbmame-libretro.git master YES GENERIC Makefile.libretro . PTR64=1
 higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES GENERIC GNUmakefile higan compiler=g++ target=libretro binary=library
 higan_sfc_balanced libretro-nside https://github.com/libretro/nSide.git master NO GENERIC GNUmakefile nSide compiler=g++ target=libretro binary=library
 ishiiruka libretro-ishiiruka https://github.com/libretro/Ishiiruka.git master YES CMAKE sln build -DLIBRETRO=ON -DCMAKE_BUILD_TYPE=Release -G\"Visual Studio 15 2017 Win64\"
@ -83,11 +86,11 @@ mu libretro-mu https://github.com/libretro/Mu.git master YES GENERIC Makefile li
 mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git develop YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 HAVE_PARALLEL_RSP=1 HAVE_THR_AL=1
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 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 sdl2
+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 .
 openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES GENERIC Makefile src/platform/libretro
-parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 HAVE_THR_AL=1 HAVE_PARALLEL_RSP=1
+parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 HAVE_THR_AL=1 HAVE_PARALLEL=1 HAVE_PARALLEL_RSP=1
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . DYNAREC=lightrec
 play libretro-play https://github.com/jpd002/Play-.git master YES CMAKE sln build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no  -DCMAKE_BUILD_TYPE="Release" -G"Visual Studio 15 2017 Win64" --target play_libretro
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
@ -117,7 +120,7 @@ stella libretro-stella https://github.com/stella-emu/stella.git master YES GENER
 squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
-tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile build -G\"Unix Makefiles\" -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile build -G\"Unix Makefiles\" -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
 vitaquake2 libretro-vitaquake2 https://github.com/libretro/vitaquake2.git libretro YES GENERIC Makefile .
 vitaquake3 libretro-vitaquake3 https://github.com/libretro/vitaquake3.git libretro YES GENERIC Makefile .
--- a/recipes/windows/cores-windows-x64_seh-noccache
+++ b/recipes/windows/cores-windows-x64_seh-noccache
@ -1,5 +1,4 @@
 citra libretro-citra https://github.com/libretro/citra.git master YES CMAKE Makefile build -G "MSYS Makefiles" -DENABLE_LIBRETRO=1 -DENABLE_SDL2=0 -DENABLE_QT=0 -DENABLE_WEB_SERVICE=0 -DCMAKE_BUILD_TYPE="Release" --target citra_libretro
 citra_canary libretro-citra_canary https://github.com/libretro/citra.git canary YES CMAKE Makefile build -G "MSYS Makefiles" -DENABLE_LIBRETRO=1 -DENABLE_SDL2=0 -DENABLE_QT=0 -DENABLE_WEB_SERVICE=0 -DCMAKE_BUILD_TYPE="Release" --target citra_canary_libretro
-dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro
 px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro .
 thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE="Release"
--- a/recipes/windows/cores-windows-x86_dw2-generic
+++ b/recipes/windows/cores-windows-x86_dw2-generic
@ -3,9 +3,9 @@
 opera libretro-opera https://github.com/libretro/opera-libretro.git master YES GENERIC Makefile .
 81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
+bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
 blastem libretro-blastem https://github.com/libretro/blastem.git libretro YES GENERIC Makefile.libretro .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
-bnes libretro-bnes https://github.com/libretro/bnes-libretro.git master NO GENERIC Makefile .
 bsnes libretro-bsnes https://github.com/libretro/bsnes.git master YES GENERIC GNUmakefile bsnes compiler=g++ target=libretro binary=library local=false platform=windows
 bsnes_hd_beta libretro-bsnes_hd_beta https://github.com/DerKoun/bsnes-hd.git master YES GENERIC GNUmakefile bsnes compiler=g++ target=libretro binary=library local=false platform=windows
 bsnes2014 libretro-bsnes2014 https://github.com/libretro/bsnes-libretro.git libretro YES GENERIC Makefile . | bsnes2014_accuracy:profile=accuracy bsnes2014_balanced:profile=balanced bsnes2014_performance:profile=performance
@ -21,6 +21,7 @@ desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENE
 desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master YES GENERIC Makefile.libretro desmume
 boom3 libretro-boom3 https://github.com/libretro/boom3.git master YES GENERIC Makefile neo
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile .
+dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro download_github_windows_x86
 dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro
 dosbox_svn_ce libretro-dosbox_svn_ce https://github.com/libretro/dosbox-svn community-patches YES GENERIC Makefile.libretro libretro
 ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/libretro
@ -33,6 +34,7 @@ fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha20
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
 ffmpeg libretro-ffmpeg https://github.com/libretro/FFmpeg.git master YES GENERIC_GL Makefile libretro
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
+frodo libretro-frodo https://github.com/libretro/frodo-libretro.git  master YES GENERIC Makefile .
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
 freechaf libretro-freechaf https://github.com/libretro/FreeChaF.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/libretro/FreeIntv.git master YES GENERIC Makefile .
@ -45,6 +47,7 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makef
 gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
 hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro .
+hbmame libretro-hbmame https://github.com/libretro/hbmame-libretro.git master YES GENERIC Makefile.libretro . PTR64=0
 higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES GENERIC GNUmakefile higan compiler=g++ target=libretro binary=library
 higan_sfc_balanced libretro-nside https://github.com/libretro/nSide.git master YES GENERIC GNUmakefile nSide compiler=g++ target=libretro binary=library
 kronos libretro-kronos https://github.com/libretro/yabause.git kronos YES GENERIC Makefile yabause/src/libretro
@ -80,11 +83,11 @@ mu libretro-mu https://github.com/libretro/Mu.git master YES GENERIC Makefile li
 mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git develop YES GENERIC_GL Makefile . WITH_DYNAREC=x86 HAVE_PARALLEL_RSP=1 HAVE_THR_AL=1
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 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 sdl2
+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 .
 openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES GENERIC Makefile src/platform/libretro
-parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86 HAVE_THR_AL=1 HAVE_PARALLEL_RSP=1
+parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86 HAVE_THR_AL=1 HAVE_PARALLEL=1 HAVE_PARALLEL_RSP=1
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . DYNAREC=lightrec
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
 play libretro-play https://github.com/jpd002/Play-.git master YES CMAKE sln build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DCMAKE_BUILD_TYPE="Release" -G"Visual Studio 15 2017" --target play_libretro
@ -117,7 +120,7 @@ test libretro-samples https://github.com/libretro/libretro-samples.git master YE
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE="Release"
-tic80 libretro-tic80 https://github.com/libretro/TIC-80.git master YES CMAKE Makefile build -G\"Unix Makefiles\" -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
+tic80 libretro-tic80 https://github.com/nesbox/TIC-80.git master YES CMAKE Makefile build -G\"Unix Makefiles\" -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_DEMO_CARTS=OFF -DBUILD_LIBRETRO=ON
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
 vitaquake2 libretro-vitaquake2 https://github.com/libretro/vitaquake2.git libretro YES GENERIC Makefile .
 vitaquake3 libretro-vitaquake3 https://github.com/libretro/vitaquake3.git libretro YES GENERIC Makefile .
--- a/recipes/windows/cores-windows-x86_dw2-noccache
+++ b/recipes/windows/cores-windows-x86_dw2-noccache
@ -1 +0,0 @@
-dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro
--- a/recipes/windows/cores-windows-x86_dw2-noccache.conf
+++ b/recipes/windows/cores-windows-x86_dw2-noccache.conf
@ -1,11 +0,0 @@
-PATH /mingw32/bin
-MSYSTEM MINGW32
-platform MINGW32
-PLATFORM windows
-ARCH x86
-MAKE make.exe
-CMAKE cmake.exe
-CC gcc
-CXX g++
-CXX11 g++
-CORE_JOB YES
--- a/recipes/xbox/cores-xbox-msvc2003-x86_dw2-generic
+++ b/recipes/xbox/cores-xbox-msvc2003-x86_dw2-generic
@ -18,7 +18,7 @@ mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.gi
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-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 sdl2
+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 .
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_ALT Makefile .
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@ -292,8 +292,7 @@ include_core_blastem() {
 }
 libretro_blastem_name="BlastEm"
 libretro_blastem_git_url="https://github.com/libretro/blastem.git"
-libretro_blastem_build_subdir="libretro"
-libretro_blastem_build_makefile="Makefile"
+libretro_blastem_build_makefile="Makefile.libretro"

 include_core_vba_next() {
 	register_module core "vba_next"
@ -969,7 +968,7 @@ libretro_play_name="Play!"
 libretro_play_git_url="https://github.com/libretro/Play-.git"
 libretro_play_git_submodules="yes"
 libretro_play_build_opengl="yes"
-libretro_play_post_fetch_cmd="cd .. && git clone https://github.com/jpd002/Play-Build.git Play_tmp && cd Play_tmp && git submodule update -q --init --recursive && git submodule foreach \"git checkout -q master\" && cd Dependencies && git submodule update --init && cd ../.. && rm -rf Play_tmp/Play && mv libretro-play/ Play_tmp/Play && mv Play_tmp libretro-play"
+libretro_play_post_fetch_cmd="cd .. && git clone https://github.com/jpd002/Play-.git Play_tmp && cd Play_tmp && git submodule update -q --init --recursive && git submodule foreach \"git checkout -q master\" && cd deps && git submodule update --init && cd ../.. && rm -rf Play_tmp/Play && mv libretro-play/ Play_tmp/Play && mv Play_tmp libretro-play"
 libretro_play_subdir="libretro-play/Play/build_retro"

 include_core_prosystem() {
@ -1091,7 +1090,7 @@ include_core_np2kai() {
 }
 libretro_np2kai_name="Neko Project II"
 libretro_np2kai_git_url="https://github.com/libretro/NP2kai.git"
-libretro_np2kai_build_subdir="sdl2"
+libretro_np2kai_build_subdir="sdl"
 libretro_np2kai_build_makefile="Makefile.libretro"

 include_core_px68k() {
@ -1134,7 +1133,7 @@ include_core_tic80() {
 	register_module core "tic80" -theos_ios -ngc -sncps3 -ps3 -psp1 -qnx -wii
 }
 libretro_tic80_name="TIC-80"
-libretro_tic80_git_url="https://github.com/libretro/TIC-80.git"
+libretro_tic80_git_url="https://github.com/nesbox/TIC-80.git"
 libretro_tic80_git_submodules="yes"
 libretro_tic80_build_makefile="Makefile"
 libretro_tic80_build_subdir="build"
				`@ -1 +0,0 @@`
				`dosbox_core libretro-dosbox_core https://github.com/libretro/dosbox-core libretro YES GENERIC Makefile.libretro libretro`