Fix griffin

Add MENU_ACTION_CONTEXT
Improve action_context
2026-11-09 11:41:35 -10:00 · 2021-11-08 10:14:35 +07:00 · 2021-11-07 13:44:24 +07:00 · 2021-11-07 13:39:39 +07:00 · 2021-11-07 13:35:30 +07:00 · 2021-11-07 13:30:15 +07:00
594 changed files with 71719 additions and 61458 deletions
@@ -0,0 +1,33 @@
+# Download translations from Crowdin and push to GitHub
+
+name: Crowdin Daily Workflow
+
+on:
+  schedule:
+    - cron: '0 0 * * *'  # every day at midnight
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Java JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Setup Python
+        uses: actions/setup-python@v2
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Crowdin Sync
+        shell: bash
+        env:
+          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
+        run: |
+          cd intl
+          python3 -m pip install requests yaml
+          python3 crowdin_sync.py "$CROWDIN_API_KEY"
+          git config user.name github-actions
+          git config user.email [email protected]
+          git add .
+          git commit -m "Fetch translations from Crowdin"
+          git push
@@ -0,0 +1,24 @@
+# Validates compilation of RetroArch binary
+
+name: RetroArch CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  linux-c89: # Smoketest build using most restrictive compiler and default options
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dependencies
+        run: sudo apt-get install build-essential libxkbcommon-dev libx11-xcb-dev zlib1g-dev libfreetype6-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev nvidia-cg-toolkit nvidia-cg-dev libavcodec-dev libsdl2-dev libsdl-image1.2-dev libxml2-dev yasm
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Configure
+        run: ./configure
+      - name: Build
+        run: make C89_BUILD=1
@@ -16,6 +16,7 @@
 .tmp.cxx
 .moc.h
 .moc.cpp
+.ccls-cache
 config.log
 /.project
 /.externalToolBuilders/
@@ -225,3 +226,6 @@ param.sfo
 *.vpk
 /.vs
 /deps/SPIRV-Cross/out/build/x64-Debug
+
+# Visual Studio Code
+.vscode/
@@ -104,9 +104,10 @@ build-retroarch-windows-msvc10-x64:
    SDK_BIN_DIR:    C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin
    RCEDIT_BIN_DIR: C:\Program Files\rcedit
    PEDEPS_BIN_DIR: C:\Program Files\pedeps-0.1.9-win64\bin
+    MSVC_PLATFORM:  windows_msvc2010_x64
  before_script:
    - $Env:HOME = "."
-    - $Env:Path += -join(";", "$Env:SDK_BIN_DIR", ";", "$Env:RCEDIT_BIN_DIR", ";", "$Env:PEDEPS_BIN_DIR")
+    - $Env:Path += -join(";", "$Env:MSYS_BIN_DIR", ";", "$Env:SDK_BIN_DIR", ";", "$Env:RCEDIT_BIN_DIR", ";", "$Env:PEDEPS_BIN_DIR")
  artifacts:
    paths:
    - retroarch.exe
@@ -114,26 +115,31 @@ build-retroarch-windows-msvc10-x64:
    expire_in: 10 min
  dependencies: []
  script:
-    # Build RetroArch
-    - $Script:MakeCmd = "$Env:MSYS_BIN_DIR\env.exe $Env:MSYS_BIN_DIR\bash.exe -l -c 'make -f Makefile.griffin platform=windows_msvc2010_x64'"
-    - Invoke-Expression $Script:MakeCmd
-    - mt.exe -nologo -manifest "retroarch.exe.manifest" -outputresource:"retroarch.exe;#1"
-    - rcedit-x64.exe "retroarch.exe" --set-icon "media\retroarch.ico"
-    # Create .media subdirectories
-    - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio" -ItemType Directory
-    - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video" -ItemType Directory
-    - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg" -ItemType Directory
-    - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist" -ItemType Directory
-    # Copy audio/video filters
-    - Get-ChildItem -Path "libretro-common/audio/dsp_filters/*" -Include *.dsp | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio"
-    - Get-ChildItem -Path "gfx/video_filters/*" -Include *.filt | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video"
-    # Copy default config file
-    - Copy-Item -Path "retroarch.cfg" -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg/retroarch.default.cfg"
-    # Copy dll dependencies
-    # (note that msvc10 build should not have any, but this
-    # may change in the future)
-    - copypedeps.exe -r retroarch.exe "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist"
-    - Remove-Item "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist/retroarch.exe" -ErrorAction Ignore
+    - |
+      $ErrorActionPreference = 'Stop'
+      # Build RetroArch
+      bash.exe -l -c "make -f Makefile.griffin platform=$Env:MSVC_PLATFORM"
+      if ($LastExitCode -ne 0){throw "Failed to build RetroArch"}
+      mt.exe -nologo -manifest "retroarch.exe.manifest" -outputresource:"retroarch.exe;#1"
+      if ($LastExitCode -ne 0){throw "Failed to add manifest to RetroArch binary"}
+      rcedit-x64.exe "retroarch.exe" --set-icon "media\retroarch.ico"
+      if ($LastExitCode -ne 0){throw "Failed to set icon of RetroArch binary"}
+      # Create .media subdirectories
+      New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio" -ItemType Directory
+      New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video" -ItemType Directory
+      New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg" -ItemType Directory
+      New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist" -ItemType Directory
+      # Copy audio/video filters
+      Get-ChildItem -Path "libretro-common/audio/dsp_filters/*" -Include *.dsp | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio"
+      Get-ChildItem -Path "gfx/video_filters/*" -Include *.filt | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video"
+      # Copy default config file
+      Copy-Item -Path "retroarch.cfg" -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg/retroarch.default.cfg"
+      # Copy dll dependencies
+      # (note that msvc builds should not have any, but this
+      # may change in the future)
+      copypedeps.exe -r retroarch.exe "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist"
+      if ($LastExitCode -ne 0){throw "Failed to copy RetroArch dependencies"}
+      Remove-Item "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist/retroarch.exe" -ErrorAction Ignore

 build-retroarch-windows-msvc10-i686:
  tags:
@@ -147,9 +153,10 @@ build-retroarch-windows-msvc10-i686:
    SDK_BIN_DIR:    C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin
    RCEDIT_BIN_DIR: C:\Program Files\rcedit
    PEDEPS_BIN_DIR: C:\Program Files\pedeps-0.1.9-win64\bin
+    MSVC_PLATFORM:  windows_msvc2010_x86
  before_script:
    - $Env:HOME = "."
-    - $Env:Path += -join(";", "$Env:SDK_BIN_DIR", ";", "$Env:RCEDIT_BIN_DIR", ";", "$Env:PEDEPS_BIN_DIR")
+    - $Env:Path += -join(";", "$Env:MSYS_BIN_DIR", ";", "$Env:SDK_BIN_DIR", ";", "$Env:RCEDIT_BIN_DIR", ";", "$Env:PEDEPS_BIN_DIR")
  artifacts:
    paths:
    - retroarch.exe
@@ -157,26 +164,31 @@ build-retroarch-windows-msvc10-i686:
    expire_in: 10 min
  dependencies: []
  script:
-    # Build RetroArch
-    - $Script:MakeCmd = "$Env:MSYS_BIN_DIR\env.exe $Env:MSYS_BIN_DIR\bash.exe -l -c 'make -f Makefile.griffin platform=windows_msvc2010_x86'"
-    - Invoke-Expression $Script:MakeCmd
-    - mt.exe -nologo -manifest "retroarch.exe.manifest" -outputresource:"retroarch.exe;#1"
-    - rcedit-x64.exe "retroarch.exe" --set-icon "media\retroarch.ico"
-    # Create .media subdirectories
-    - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio" -ItemType Directory
-    - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video" -ItemType Directory
-    - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg" -ItemType Directory
-    - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist" -ItemType Directory
-    # Copy audio/video filters
-    - Get-ChildItem -Path "libretro-common/audio/dsp_filters/*" -Include *.dsp | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio"
-    - Get-ChildItem -Path "gfx/video_filters/*" -Include *.filt | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video"
-    # Copy default config file
-    - Copy-Item -Path "retroarch.cfg" -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg/retroarch.default.cfg"
-    # Copy dll dependencies
-    # (note that msvc10 build should not have any, but this
-    # may change in the future)
-    - copypedeps.exe -r retroarch.exe "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist"
-    - Remove-Item "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist/retroarch.exe" -ErrorAction Ignore
+    - |
+      $ErrorActionPreference = 'Stop'
+      # Build RetroArch
+      bash.exe -l -c "make -f Makefile.griffin platform=$Env:MSVC_PLATFORM"
+      if ($LastExitCode -ne 0){throw "Failed to build RetroArch"}
+      mt.exe -nologo -manifest "retroarch.exe.manifest" -outputresource:"retroarch.exe;#1"
+      if ($LastExitCode -ne 0){throw "Failed to add manifest to RetroArch binary"}
+      rcedit-x64.exe "retroarch.exe" --set-icon "media\retroarch.ico"
+      if ($LastExitCode -ne 0){throw "Failed to set icon of RetroArch binary"}
+      # Create .media subdirectories
+      New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio" -ItemType Directory
+      New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video" -ItemType Directory
+      New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg" -ItemType Directory
+      New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist" -ItemType Directory
+      # Copy audio/video filters
+      Get-ChildItem -Path "libretro-common/audio/dsp_filters/*" -Include *.dsp | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio"
+      Get-ChildItem -Path "gfx/video_filters/*" -Include *.filt | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video"
+      # Copy default config file
+      Copy-Item -Path "retroarch.cfg" -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg/retroarch.default.cfg"
+      # Copy dll dependencies
+      # (note that msvc builds should not have any, but this
+      # may change in the future)
+      copypedeps.exe -r retroarch.exe "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist"
+      if ($LastExitCode -ne 0){throw "Failed to copy RetroArch dependencies"}
+      Remove-Item "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist/retroarch.exe" -ErrorAction Ignore

 build-retroarch-windows-msvc05-i686:
  tags:
@@ -191,9 +203,10 @@ build-retroarch-windows-msvc05-i686:
    RCEDIT_BIN_DIR: C:\Program Files\rcedit
    PEDEPS_BIN_DIR: C:\Program Files\pedeps-0.1.9-win64\bin
    VS80COMNTOOLS:  C:\Program Files (x86)\Microsoft Visual Studio 8\Common7\Tools\
+    MSVC_PLATFORM:  windows_msvc2005_x86
  before_script:
    - $Env:HOME = "."
-    - $Env:Path += -join(";", "$Env:SDK_BIN_DIR", ";", "$Env:RCEDIT_BIN_DIR", ";", "$Env:PEDEPS_BIN_DIR")
+    - $Env:Path += -join(";", "$Env:MSYS_BIN_DIR", ";", "$Env:SDK_BIN_DIR", ";", "$Env:RCEDIT_BIN_DIR", ";", "$Env:PEDEPS_BIN_DIR")
  artifacts:
    paths:
    - retroarch.exe
@@ -201,26 +214,31 @@ build-retroarch-windows-msvc05-i686:
    expire_in: 10 min
  dependencies: []
  script:
-    # Build RetroArch
-    - $Script:MakeCmd = "$Env:MSYS_BIN_DIR\env.exe $Env:MSYS_BIN_DIR\bash.exe -l -c 'make -f Makefile.griffin platform=windows_msvc2005_x86'"
-    - Invoke-Expression $Script:MakeCmd
-    - mt.exe -nologo -manifest "retroarch.exe.manifest" -outputresource:"retroarch.exe;#1"
-    - rcedit-x64.exe "retroarch.exe" --set-icon "media\retroarch.ico"
-    # Create .media subdirectories
-    - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio" -ItemType Directory
-    - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video" -ItemType Directory
-    - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg" -ItemType Directory
-    - New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist" -ItemType Directory
-    # Copy audio/video filters
-    - Get-ChildItem -Path "libretro-common/audio/dsp_filters/*" -Include *.dsp | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio"
-    - Get-ChildItem -Path "gfx/video_filters/*" -Include *.filt | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video"
-    # Copy default config file
-    - Copy-Item -Path "retroarch.cfg" -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg/retroarch.default.cfg"
-    # Copy dll dependencies
-    # (note that msvc05 build should not have any, but this
-    # may change in the future)
-    - copypedeps.exe -r retroarch.exe "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist"
-    - Remove-Item "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist/retroarch.exe" -ErrorAction Ignore
+    - |
+      $ErrorActionPreference = 'Stop'
+      # Build RetroArch
+      bash.exe -l -c "make -f Makefile.griffin platform=$Env:MSVC_PLATFORM"
+      if ($LastExitCode -ne 0){throw "Failed to build RetroArch"}
+      mt.exe -nologo -manifest "retroarch.exe.manifest" -outputresource:"retroarch.exe;#1"
+      if ($LastExitCode -ne 0){throw "Failed to add manifest to RetroArch binary"}
+      rcedit-x64.exe "retroarch.exe" --set-icon "media\retroarch.ico"
+      if ($LastExitCode -ne 0){throw "Failed to set icon of RetroArch binary"}
+      # Create .media subdirectories
+      New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio" -ItemType Directory
+      New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video" -ItemType Directory
+      New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg" -ItemType Directory
+      New-Item -Path "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist" -ItemType Directory
+      # Copy audio/video filters
+      Get-ChildItem -Path "libretro-common/audio/dsp_filters/*" -Include *.dsp | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/audio"
+      Get-ChildItem -Path "gfx/video_filters/*" -Include *.filt | Copy-Item -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/filters/video"
+      # Copy default config file
+      Copy-Item -Path "retroarch.cfg" -Destination "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/pkg/retroarch.default.cfg"
+      # Copy dll dependencies
+      # (note that msvc builds should not have any, but this
+      # may change in the future)
+      copypedeps.exe -r retroarch.exe "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist"
+      if ($LastExitCode -ne 0){throw "Failed to copy RetroArch dependencies"}
+      Remove-Item "$Env:MEDIA_PATH/$Env:CI_PROJECT_NAME/redist/retroarch.exe" -ErrorAction Ignore

 build-retroarch-linux-x64:
  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:xenial-gcc9
@@ -470,6 +488,29 @@ build-retroarch-retrofw-mips32:
    - "cp -f libretro-common/audio/dsp_filters/*.dsp ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
    - "cp -f gfx/video_filters/*.filt ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"

+build-retroarch-miyoo-arm32:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-dingux:latest
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+    STRIP_BIN:  1
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    - retroarch
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - "make -j$NUMPROC -f Makefile.miyoo"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+    - "cp -f libretro-common/audio/dsp_filters/*.dsp ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "cp -f gfx/video_filters/*.filt ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "cp -f pkg/miyoo/20a-retroarch ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+
 build-retroarch-android-normal:
  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
  stage: build
@@ -478,10 +519,15 @@ build-retroarch-android-normal:
    - retroarch-precompiled/
    expire_in: 10 min
  script:
-    - "cd pkg/android/phoenix && ./gradlew assembleNormalRelease && cd -"
-    - "mkdir .retroarch-precompiled"
-    - "cp -r ./* .retroarch-precompiled/"
-    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+  script:
+    - |
+      set -e
+      cd pkg/android/phoenix
+      ./gradlew assembleNormalRelease
+      cd -
+      mkdir .retroarch-precompiled
+      cp -r ./* .retroarch-precompiled/
+      mv .retroarch-precompiled/ retroarch-precompiled/

 build-retroarch-android-aarch64:
  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
@@ -491,10 +537,14 @@ build-retroarch-android-aarch64:
    - retroarch-precompiled/
    expire_in: 10 min
  script:
-    - "cd pkg/android/phoenix && ./gradlew assembleAarch64Release && cd -"
-    - "mkdir .retroarch-precompiled"
-    - "cp -r ./* .retroarch-precompiled/"
-    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+    - |
+      set -e
+      cd pkg/android/phoenix
+      ./gradlew assembleAarch64Release
+      cd -
+      mkdir .retroarch-precompiled
+      cp -r ./* .retroarch-precompiled/
+      mv .retroarch-precompiled/ retroarch-precompiled/

 build-retroarch-android-ra32:
  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
@@ -504,10 +554,14 @@ build-retroarch-android-ra32:
    - retroarch-precompiled/
    expire_in: 10 min
  script:
-    - "cd pkg/android/phoenix && ./gradlew assembleRa32Release && cd -"
-    - "mkdir .retroarch-precompiled"
-    - "cp -r ./* .retroarch-precompiled/"
-    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+    - |
+      set -e
+      cd pkg/android/phoenix
+      ./gradlew assembleRa32Release
+      cd -
+      mkdir .retroarch-precompiled
+      cp -r ./* .retroarch-precompiled/
+      mv .retroarch-precompiled/ retroarch-precompiled/

 build-retroarch-android-playstore-normal:
  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
@@ -517,10 +571,14 @@ build-retroarch-android-playstore-normal:
    - retroarch-precompiled/
    expire_in: 10 min
  script:
-    - "cd pkg/android/phoenix && ./gradlew bundlePlayStoreNormalRelease && cd -"
-    - "mkdir .retroarch-precompiled"
-    - "cp -r ./* .retroarch-precompiled/"
-    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+    - |
+      set -e
+      cd pkg/android/phoenix
+      ./gradlew bundlePlayStoreNormalRelease
+      cd -
+      mkdir .retroarch-precompiled
+      cp -r ./* .retroarch-precompiled/
+      mv .retroarch-precompiled/ retroarch-precompiled/

 build-retroarch-android-playstore-plus:
  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
@@ -530,10 +588,14 @@ build-retroarch-android-playstore-plus:
    - retroarch-precompiled/
    expire_in: 10 min
  script:
-    - "cd pkg/android/phoenix && ./gradlew bundlePlayStorePlusRelease && cd -"
-    - "mkdir .retroarch-precompiled"
-    - "cp -r ./* .retroarch-precompiled/"
-    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+    - |
+      set -e
+      cd pkg/android/phoenix
+      ./gradlew bundlePlayStorePlusRelease
+      cd -
+      mkdir .retroarch-precompiled
+      cp -r ./* .retroarch-precompiled/
+      mv .retroarch-precompiled/ retroarch-precompiled/

 build-static-retroarch-libnx-aarch64:
  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-libnx-devkitpro:latest
@@ -1,155 +1,191 @@
 {
-   "configurations": [
-      {
-         "name": "Mac",
-         "includePath": [
-            "/usr/include",
-            "/usr/local/include",
-            "${workspaceRoot}",
-            "${workspaceRoot}/libretro-common/include"
-         ],
-         "defines": [],
-         "intelliSenseMode": "clang-x64",
-         "browse": {
-            "path": [
-               "/usr/include",
-               "/usr/local/include",
-               "${workspaceRoot}"
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}",
+                "${workspaceRoot}/libretro-common/include"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         },
-         "macFrameworkPath": [
-            "/System/Library/Frameworks",
-            "/Library/Frameworks"
-         ]
-      },
-      {
-         "name": "Linux",
-         "includePath": [
-            "/usr/include",
-            "/usr/local/include",
-            "${workspaceRoot}",
-            "${workspaceFolder}/libretro-common/include",
-            "${workspaceRoot}/libretro-common/include"
-         ],
-         "defines": [],
-         "intelliSenseMode": "clang-x64",
-         "browse": {
-            "path": [
-               "/usr/include",
-               "/usr/local/include",
-               "${workspaceRoot}"
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "macFrameworkPath": [
+                "/System/Library/Frameworks",
+                "/Library/Frameworks"
+            ]
+        },
+        {
+            "name": "Linux",
+            "includePath": [
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}",
+                "${workspaceFolder}/libretro-common/include",
+                "${workspaceRoot}/libretro-common/include"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         }
-      },
-      {
-         "name": "Win32",
-         "includePath": [
-            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
-            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
-            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-            "${workspaceRoot}",
-            "${workspaceFolder}/libretro-common/include"
-         ],
-         "defines": [
-            "_DEBUG",
-            "UNICODE"
-         ],
-         "intelliSenseMode": "msvc-x64",
-         "browse": {
-            "path": [
-               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
-               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
-               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-               "${workspaceRoot}"
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+            "name": "Win32",
+            "includePath": [
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
+                "${workspaceRoot}",
+                "${workspaceFolder}/libretro-common/include"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         },
-         "cStandard": "c11",
-         "cppStandard": "c++17"
-      },
-      {
-         "name": "msys2-mingw32",
-         "includePath": [
-            "C:/msys64/mingw32/include",
-            "C:/msys64/mingw32/i686-w64-mingw32/include",
-            "${workspaceRoot}/libretro-common/include",
-            "${workspaceRoot}/include",
-            "${workspaceRoot}"
-         ],
-         "defines": [
-            "_DEBUG",
-            "UNICODE"
-         ],
-         "intelliSenseMode": "msvc-x64",
-         "browse": {
-            "path": [
-               "C:/msys64/mingw32/include",
-               "C:/msys64/mingw32/i686-w64-mingw32/include",
-               "${workspaceRoot}/libretro-common/include",
-               "${workspaceRoot}/include",
-               "${workspaceRoot}"
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         }
-      },
-      {
-         "name": "msys2-mingw64",
-         "includePath": [
-            "C:/msys64/mingw64/include",
-            "C:/msys64/mingw64/x86_64-w64-mingw32/include",
-            "${workspaceRoot}/libretro-common/include",
-            "${workspaceRoot}/include",
-            "${workspaceRoot}"
-         ],
-         "defines": [
-            "_DEBUG",
-            "UNICODE"
-         ],
-         "intelliSenseMode": "msvc-x64",
-         "browse": {
-            "path": [
-               "C:/msys64/mingw64/include",
-               "C:/msys64/mingw64/x86_64-w64-mingw32/include",
-               "${workspaceRoot}/libretro-common/include",
-               "${workspaceRoot}/include",
-               "${workspaceRoot}"
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "cStandard": "c11",
+            "cppStandard": "c++17",
+            "configurationProvider": "ms-vscode.makefile-tools"
+        },
+        {
+            "name": "msys2-mingw32",
+            "includePath": [
+                "C:/msys64/mingw32/include",
+                "C:/msys64/mingw32/i686-w64-mingw32/include",
+                "${workspaceRoot}/libretro-common/include",
+                "${workspaceRoot}/include",
+                "${workspaceRoot}"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         }
-      },
-      {
-         "name": "Switch",
-         "includePath": [
-            "/opt/devkitpro/devkitA64/aarch64-none-elf/include",
-            "/opt/devkitpro/devkitA64/lib/gcc/aarch64-none-elf/8.3.0/include",
-            "/opt/devkitpro/libnx/include",
-            "/opt/devkitpro/portlibs/switch/include",
-            "/opt/devkitpro/portlibs/switch/include/freetype2",
-            "${workspaceFolder}/**"
-         ],
-         "defines": [
-            "_DEBUG",
-            "UNICODE",
-            "_UNICODE",
-            "__aarch64__",
-            "__SWITCH__",
-            "HAVE_LIBNX"
-         ],
-         "windowsSdkVersion": "10.0.17763.0",
-         "compilerPath": "/opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc",
-         "cStandard": "c11",
-         "cppStandard": "c++11",
-         "intelliSenseMode": "gcc-x64"
-      }
-   ],
-   "version": 4
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/msys64/mingw32/include",
+                    "C:/msys64/mingw32/i686-w64-mingw32/include",
+                    "${workspaceRoot}/libretro-common/include",
+                    "${workspaceRoot}/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+            "name": "msys2-mingw64",
+            "includePath": [
+                "C:/msys64/mingw64/include",
+                "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+                "${workspaceRoot}/libretro-common/include",
+                "${workspaceRoot}/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/msys64/mingw64/include",
+                    "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+                    "${workspaceRoot}/libretro-common/include",
+                    "${workspaceRoot}/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+            "name": "Switch",
+            "includePath": [
+                "/opt/devkitpro/devkitA64/aarch64-none-elf/include",
+                "/opt/devkitpro/devkitA64/lib/gcc/aarch64-none-elf/8.3.0/include",
+                "/opt/devkitpro/libnx/include",
+                "/opt/devkitpro/portlibs/switch/include",
+                "/opt/devkitpro/portlibs/switch/include/freetype2",
+                "${workspaceFolder}/**"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE",
+                "_UNICODE",
+                "__aarch64__",
+                "__SWITCH__",
+                "HAVE_LIBNX"
+            ],
+            "windowsSdkVersion": "10.0.17763.0",
+            "compilerPath": "/opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc",
+            "cStandard": "c11",
+            "cppStandard": "c++11",
+            "intelliSenseMode": "gcc-x64"
+        },
+        {
+            "name": "WiiU",
+            "includePath": [
+                "/opt/devkitpro/devkitPPC/powerpc-eabi/include",
+                "/opt/devkitpro/devkitPPC/lib/gcc/powerpc-eabi/6.3.0/include",
+                "/opt/devkitpro/portlibs/ppc/include",
+                "${workspaceFolder}/**"
+            ],
+            "defines": [
+                "WIIU",
+                "WIIU_HID"
+            ],
+            "windowsSdkVersion": "10.0.17763.0",
+            "compilerPath": "/opt/devkitpro/devkitPPC/bin/powerpc-eabi-gcc",
+            "cStandard": "c11",
+            "cppStandard": "c++11",
+            "intelliSenseMode": "gcc-x64"
+        },
+        {
+            "name": "ps2sdk-ee",
+            "includePath": [
+                "${env:PS2DEV}/ps2sdk/common/include",
+                "${env:PS2DEV}/ps2sdk/ee/include",
+                "${env:PS2DEV}/gsKit/include",
+                "${workspaceFolder}/**"
+            ],
+            "defines": [
+                "PS2",
+                "_EE"
+            ],
+            "compilerPath": "${env:PS2DEV}/ee/bin/mips64r5900el-ps2-elf-gcc",
+            "cStandard": "c11",
+            "cppStandard": "c++11",
+            "intelliSenseMode": "gcc-x64"
+        }
+    ],
+    "version": 4
 }
@@ -1,9 +1,9 @@
 {
-   "terminal.integrated.shell.windows": "C:\\msys64\\usr\\bin\\bash.exe",
+   /*"terminal.integrated.shell.windows": "C:\\msys64\\usr\\bin\\bash.exe",
   "terminal.integrated.env.windows": {
      "PATH": "/mingw64/lib/ccache/bin:/mingw64/lib/ccache/bin:/mingw64/lib/ccache/bin:/mingw64/bin:/usr/local/bin:/usr/bin:/bin:$PATH",
      "MSYSTEM": "MINGW64",
-   },
+   },*/
   "terminal.integrated.cursorBlinking": true,
   "editor.tabSize": 3,
   "editor.detectIndentation": false,
@@ -11,20 +11,15 @@
   "editor.insertSpaces": true,
   "editor.formatOnSave": false,
   "files.associations": {
-      "frontend_driver.h": "c",
+      "*.h": "c",
      "*.in": "c",
      "*.rh": "c",
      "array": "c",
-      "file_stream.h": "c",
-      "driver.h": "c",
      "iosfwd": "c",
      "xlocbuf": "c",
      "xmemory0": "c",
      "ios": "c",
      "list": "c",
-      "input_driver.h": "c",
-      "menu_driver.h": "c",
-      "file_path.h": "c",
      "unordered_map": "c",
      "unordered_set": "c",
      "sstream": "cpp",
@@ -33,39 +28,15 @@
      "initializer_list": "c",
      "string_view": "c",
      "utility": "c",
-      "menu_input.h": "c",
-      "tasks_internal.h": "c",
-      "ozone.h": "c",
-      "ozone_theme.h": "c",
-      "ozone_texture.h": "c",
-      "string_list.h": "c",
-      "core_info.h": "c",
      "thread": "c",
      "xlocale": "c",
-      "gfx_widgets.h": "c",
-      "message_queue.h": "c",
-      "task_queue.h": "c",
-      "fifo_queue.h": "c",
-      "file_list.h": "c",
-      "strl.h": "c",
-      "configuration.h": "c",
-      "ozone_display.h": "c",
-      "verbosity.h": "c",
-      "retroarch.h": "c",
-      "gfx_animation.h": "c",
-      "netplay.h": "c",
-      "scaler.h": "c",
      "deque": "c",
      "vector": "c",
      "xhash": "c",
      "xiosbase": "c",
      "xstring": "c",
      "xtree": "c",
-      "xutility": "c",
-      "menu_input_dialog.h": "c",
-      "ozone_sidebar.h": "c",
-      "menu_thumbnail_path.h": "c",
-      "badges.h": "c"
+      "xutility": "c"
   },
   "C_Cpp.dimInactiveRegions": false,
 }
@@ -3,18 +3,26 @@ RetroArch and the libretro team would like to
 acknowledge the following contributors:

 1ch (L0sted)
-Aaahh Ahh (Aaahh)
+51eating (dnjstlr555)
+6lackmag3
+A Schain (aschain)
 Aaron Oneal (aarononeal)
 Adam Londero (alondero)
 Adam Mechtley (amechtley)
 AdrianoML
+Adrien Moulin (elyosh)
+Aethyrion
 ajefr
+AKuHAK
+Alberto Alonso Ruibal (albertoruibal)
 Alberto Simon (asimonf)
 Alcaro
 Aleksey Samoilov (Sunderland93)
 Alessandro Mangone (Vektor) (zevektor)
+Alessio Tosto (Rinnegatamante)
 Alex Eckhart (alex34567)
 Alex Folland (AlexFolland)
+Alex Kornitzer (alexkornitzer)
 Alexander Spady (alkaseltzerspadt)
 Alexandre Garcia (Alexandre-Garcia)
 Alfredo Monclus (alfrix)
@@ -23,98 +31,151 @@ alphanu1
 altiereslima
 Alwin Garside (Yogarine)
 Amiga1200Gamer (amigagamer)
+amtz
 Andre Leiradella (leiradel)
 Andrés (fr500)
+Andy Nguyen (TheOfficialFloW)
 Anthony J. Bentley (bentley)
 Antonio Jose Ramos Marquez (psxdev)
 AridRayne
 ArnaudFaucher
+arstn
 Arto Vainiolehto (arakerlu)
+asavah
 Ash (QuarkTheAwesome)
 Ashura (CoalaJoe)
-Autechre64
+Autechre (twinaphex)
 Avton1
 ayssia
 barbudreadmon
+Barry Rowe (BarryJRowe)
+Bartłomiej Burdukiewicz (dev-0x7C6)
 bearoso
+benklop
 benutzer193
+Bernhard Schelling (schellingb)
 blackgur
+bmaupin
+Bobby Smith (bslenul)
 Boris Timofeev (btimofeev)
-bparker06
-Brandon Johnson (Denu8thell)
+Brad (SpiralBrad)
+Braden Farmer (farmerbb)
+Brandon Johnson (BinaryFissionGames)
+Breno Dantas Mendonça (brenodantas10)
+Brian Hoem (ZornTaov)
 Brian Koropoff (bkoropoff)
 Brian S. Stephan (bsstephan)
+BringerethOfLight
 Brunnis
+bsmith (DogParty)
 bubuleur
+bulzipke
+C.W. Betts (MaddTheSane)
 Casey Borders (CaseyB)
+CatGreen90
 ceb33
 celerizer
+Charlène (julianaito)
+CheezeCake
 Chris Merrett (chrisfu)
 Christian Murphy (grimpunch)
+christianhaitian
+Christoffer Tibell (Brottweiler)
 chu (9chu)
+Chuck Smith (chucksmith)
 CidVonHighwind
 clienthax
 cold-brewed
 CompCom
+ComradeEcho
+confusedguy9
 Conn O'Griofa (psyke83)
+Connor McLaughlin (stenzek)
+Conrad Kreyling (konistehrad)
 CozmoP
+Cpasjuste
 cpsw
 Cray Elliott (MP2E)
+Crestwave
+CrewMdk
+Cristi Mitrana (cmitu)
 Cristian Sandu (crazyquark)
-ctult
+crystalct
+CTCaer
 cucholix
 cudencuden
-cxd4
+Cyan (44100hertz)
+Daehan Kim (iAmGhost)
 dalter
 Dan Weiss (Dwedit)
 danieljg
 Daniil Zhilin (LaserMoai)
 dankcushions
+Darren Thompson (DiscoStarslayer)
 Dave (freakdave)
 Dave Leaver (danzel)
+David CARLIER (devnexen)
 David Demelier (markand)
 David Erickson (daviderickson)
-David Shah (daveshah1)
+David G. F. (davidgfnet)
+David Lawson (dmrlawson)
 David Walters (hiddenasbestos)
 DEX357
 diablodiab
 dibas
 Diego A. (SuperrSonic)
 Diego Viola (diegoviola)
+digitalisland-nino
 Diogo Barros (BlueKore)
-DogParty
+Dmitry Sergeenkov (DuMOHsmol)
 dor3k
+Doug Christman (dobyrch)
 driver1998
 Dudu Akiva (duduke)
 duganchen
 dukemiller
 duskgao
+Dylan Scott (dyscott)
+eadmaster
+Eduard Strehlau (Herdinger)
 ekipan
+Elvira Khabirova (parport0)
+embercold
 Emmanuel Martin (daliaetnano)
-endrift
-erbridge
 Ethan Lee (flibitijibibo)
-Exvat
+extrowerk
 Ezio-PS
+F (erbridge)
 Fabio (Oibaf66)
 Fabio Ritrovato (Sephiroth87)
 Fayne Aldan (FayneAldan)
+fff (felinben)
 FIX94
 Flame Sage (chris062689)
 flyinghead
+FmT0
+francescotintori
 Francisco Javier Trujillo Mata (fjtrujy)
 Francisco José García García (frangarcj)
+FreeShippingParty
+fuzzydunlops732 (JKoppel93)
 Gabriel (Ghabry)
 GameDragon2k
 Garrett Brown (garbear)
+gatecat (daveshah1)
+GavinDarkglider
 gblues
 Geoffrey Plitt (GeoffreyPlitt)
 Glenn Hevey (hevey)
 Googer
+gordon-fish
 gouchi
 grant2258
 Gregor Richards (GregorR)
+Grzegorz Raciborski (graciborski)
 Gui Andrade (archshift)
+Guillaume Thiolliere (thiolliere)
+Guo Yunhe (guoyunhe)
 Gustavo Maciel Dias Vieira (gmdvieira)
 gvbr
 H. İbrahim Güngör (igungor)
@@ -122,44 +183,61 @@ hadess
 Hans-Kristian Arntzen (Themaister)
 Henri Gomez (hgomez)
 Henri Gomez (hgomez-sonarsource)
-Higor Eurípedes (heuripedes)
-Hisman Yosika (dnjstlr555)
+Henry Castro (hcvcastro)
+Higor E. (heuripedes)
 hizzlekizzle
 Hugo B. (hug0b)
 Hugo Hromic (hhromic)
 hunterk
-hyarsan
 Hyllian
+HyperspaceMadness
 i30817
-iAmGhost
+im4potato
+ImJezze
 Jack (jakcron)
 Jacob (cubtekki)
+Jacob Patterson (jacobpa)
+jacobsson (Roet-Ivar)
+Jake Stine (jstine35)
 James Le Cuirot (chewi)
 James Sexton (Bezier89)
 Jamiras
 Jan Holthuis (Holzhaus)
+Jason Tomsic (plaidman)
+Javier Martinez Canillas (martinezjavier)
 Jay McCarthy (jeapostrophe)
 jdgleaver
 Jean-André Santoni (kivutar)
 Jean-Paul Mari (djipi)
 Jean-Sébastien Guay (Skylark13)
-Jesse Bryan (winneon)
+Jeff (jeffbdavenport)
+Jeff Sousa (LordeIlluminati)
+jess (winneon)
+Joan Coll Cerdán (johanbcn)
+Job Adrian Salinas Gonzalez (efylan)
+Joe Osborn (JoeOsborn)
 Joel (joel16)
 Joerg Sonnenberger (jsonn)
 Johannes Schickel (lordhoto)
+John Parton (john-parton)
 John Regan (jprjr)
 Jon Maddox (maddox)
+Jonathan (JonnyMe)
 Jonathan Relf (jonathanrelf)
 Joohan Lee (losernator)
 Jools Wills (joolswills)
 Jose Lage Miguez (Joselagem)
 Joseph Carter (iKarith)
 Joseph Conan Montgomery (Grotke)
-Josh Palmer (ShiftyAxel)
+jsd1982 (JamesDunne)
 JuanVCS
 Justin Jacobs (dorkster)
 Justin Weiss (justinweiss)
+JustMeDaFaq
+Karl Forshaw (karlforshaw)
+Keith Bowes (keithbowes)
 Ken Rossato (rossato)
+Kopert
 krzys_h (krzys-h)
 kurumushi
 kwyxz
@@ -167,10 +245,12 @@ l3iggs
 lambolighting
 lasers
 Lawrence Kesteloot (lkesteloot)
-lifajucejo
-liffy (lifning)
+LazyBumHorse
+LazyFunker
+Lennard Kittner (Lennard599)
 Lionel Flandrin (simias)
 littleguy77
+liushuyu
 Logan (loganmc10)
 lordashram
 Lothar Serra Mari (lotharsm)
@@ -178,51 +258,63 @@ Lubosz Sarnecki (lubosz)
 lucianposton
 lxerandrew
 m4xw
+mahoneyt944
 Mahyar Koshkouei (deltabeard)
+Mai M. (lioncash)
+maksun
 Manuel Alfayate Corchete (vanfanel)
 Marcelo Munhoz Pélos (mpelos)
+Marcus Crisostomo (mcrisostomo)
 markwkidd
 Maschell
-Mat M. (lioncash)
-Mats A. (Datamats)
+Mats (m4tsa)
 Matt Sephton (gingerbeardman)
+Matthew Bauer (matthewbauer)
 Matthew Wang (asakous)
 Max K. (langerhans)
 Maxime Gauduin (alucryd)
-mcrisostomo
 meancoot
 meepingsnesroms
 meleu
+Merry Mello (merryMellody)
+micechal
+Michael Burgardt (DisasterMo)
 Michael K. (kuxii2016)
 Michael Lelli (ToadKing)
-Michał Durak (micechal)
 mickski56
 Mico Chopitea (micochops)
 miguelpinheiro
 Mike Swanson (chungy)
-miqlas (extrowerk)
+mikeOSX
+minucce
 misson20000
 Monroe88
+Morgane (Niouby)
 mprobinson
 MrHuu
 MrJs (mrjschulte)
+mudlord
+Muhamed Hobi (mmhobi7)
 muzuiget
-mwtremblay
-myfreeweb
+Nargash
 Nathan S. (natinusala)
 NathanStrong-Tripwire
 nattycleopatra
 nayslayer
-Nephilim
+negativeExponent
+Neil Barkhina (nbarkhina)
+Nephilim (Nephil1m)
 netux79
 nfnty
-nia (ensra)
+nia (alarixnia)
 Nicolas Adenis-Lamarre (nadenislamarre)
 Nicolas Guillaumin (nguillaumin)
-Nicolas Lopez Fernandez (pyroesp)
-Nikita Vakhrushev (SwooodGa)
+Nicolas Roehm (NicolasRoehm)
+Nikita Vakhrushev (XF10C)
 Nikola Kocić (nikola-kocic)
-Niouby
+Nikos Chantziaras (realnc)
+Nils Hasenbanck (hasenbanck)
+njordan64
 nosh01
 not6 (r-type)
 notaz
@@ -231,51 +323,77 @@ nurupo
 Oggom
 Oleg Shevchenko (olsh)
 opendata26
+Ophidon
 orbea
+Oschowa
+OsirizX
 OV2
+Palmic (mpalomas)
 pamapa
 Paolo Bonzini (bonzini)
 Paul McCarty (notabeatle)
+pcjco
+Pedro Ferraz (ferrazpedro)
 Pedro Ribeiro (pedrib)
 pinumbernumber
+pjft
 pponso1
+pyroesp
+R-YaTian
 Ramiro Morales (ramiro)
 Raphaël Zumer (rzumer)
-retro-wertz
+Reid Kleckner (rnk)
+repojohnray
 retrotails
+revvv
 reztek
 Richard Howell (rmaz)
 rlnilsen
 Rob Loach (RobLoach)
+Robin de Rooij (rrooij)
 Romain Gay (vikbez)
 Romain Graillot (notnotme)
 Romain TISSERAND (rtissera)
+Roman Fomin (rfomin)
 Roman Kalashnikov (lunixoid)
 Royerson
-rrooij
 rsn8887
+Ryan C. Gordon (icculus)
 Ryunam
 rz5
 Saggi Mizrahi (ficoos)
 SAKUJ0
-Sam Pagenkopf (44100hertz)
+Sam Lantinga (slouken)
 Sam Stenvall (Jalle19)
 Samuel P. (p-sam)
+Sanaki
 Scheiker
 Sebastien Ronsse (sronsse)
+SecularSteve
+Sefa Eyeoglu (Scrumplex)
+Sergei Nikitin (Kert)
 Sergi Granell (xerpi)
 Sergio Padrino (sergiou87)
 sergio-br2 (sergiobenrocha2)
 Seth Kingsley (sethk)
+Shadow (ShadowOne333)
 Shane Mouton (ismouton)
+shantigilbert
+Shfty
 Shizeeg Unadequatov (shizeeg)
+SimpleTease
+SindenLightgun
+Sirrempat
 slotek
+Soar Qin (soarqin)
 sparklewind
 spec-chum
 Stefan (gizmo98)
 stefan-gr
 stellarporter
-Steven M. Vascellaro (stevoisiak)
+Stephanie Gawroriski (XerTheSquirrel)
+Stevoisiak
+stoofin
 Stuart Carnie (stuartcarnie)
 Sunguk Lee (d3m3vilurr)
 Supernature2k
@@ -283,39 +401,56 @@ Sven (RetroSven)
 Swingflip
 Swizzy
 Sylvain Colinet (Skarsnik)
+Szunti
+Tadek Kijkowski (monkeyman79)
 Tatsuya79
 Terry Lewis (terry-au)
 thedax
 theheroGAC
 TheMrIron2
-TheOfficialFloW
-thiolliere
+ThePhxRises
 Thomas Lorblanchès (Zlika)
+Tim Van den Langenbergh (tmtvl)
+Tobias Gruetzmacher (TobiX)
 Tobias Jakobi (tobiasjakobi)
+Todd Laney (ToddLa)
 Tomáš Kelemen (ToKe79)
+Tony (sonninnos)
+Tor Arne Vestbø (torarnv)
 Torsten Paul (t-paul)
+toshixm
 TotalCaesar659
 TroggleMonkey
-Twinaphex
+tunip3
+Tyler Loch (TylerLoch)
+unrelentingtech
 URBANsUNITED
+Valerio Proietti (kamicane)
 vgmoose
+Vicki Pfau (endrift)
 Vicky C Lau (vickychenglau)
+vin (suseme)
 Vladimir Panteleev (CyberShadow)
 Vladimir Serbinenko (phcoder)
 Víctor "IlDucci" (IlDucci)
 waitingmoon
-Wang Vincent (susemm)
 webgeek1234
 Weedy Weed Smoker (WeedyWeedSmoker)
 WerWolv
+whorsemaster
 Wiimpathy
 Wiktor Strzębała (wiktorek140)
+Woohyun Shin (sinusinu)
+xenomorph-us
 xhp-creations
+Yari (hyarsan)
 yesfish (huwpascoe)
 Yongwoon Cho (ssangkong)
 yoshisuga
+Zer0xFF
 zeromus
 zlice
-Zoran Vuckovic (casdevel)
+Érico Nogueira Rolim (ericonr)
 Ömercan Kömür (fpscan)
+シーはディー四を取る (cxd4)
 )";
@@ -1,5 +1,125 @@
 # Future

+# 1.9.13
+- CHEEVOS/MSVC2010: Add Cheevos support
+- CRT/SWITCHRES: Fixes some issue where scaling is incorrect in some video modes for CRT output.
+- FRAMEDELAY: Add 'Automatic Frame Delay' option
+- INPUT: Add 'All users control the menu' setting - any gamepad can control the menu when this is enabled. Only limitation right now is that only player 1 can toggle the menu, but any set Menu Toggle Controller Combo will work fine for all users, so this should be acceptable for now
+- INPUT/UDEV: Fix Dolphin bar and safeguard against not adding devices with no mouse or touch buttons detected
+- NETPLAY/CLI: -C/--connect commandline fix
+- NETPLAY: Other improvements
+- NETPLAY: Remove forced disconnection on unknown netplay command -
+will be backwards compatible with any version that removed this
+disconnect. instead of disconnecting, we just read the data and
+ignore, like most network implementations do
+- TASKS/CHEEVOS: Replace coroutines with tasks/thread
+- TASKS/DATABASE/EXPLORE: Initialise 'Explore' menu on a background thread - no more stall when hovering over the Explore tab
+
+# 1.9.12
+- 3DS: Ensure parallax barrier is disabled when '3DS Display Mode' is '2D'
+- COMMAND: Command interface should work again
+- INPUT/HID: Rewrote the HID deregistration algorithm; it should no longer cause issues when dealing with multiple pads of the same HID/VID combo
+- INPUT/HID: Fix initialization bug that caused wiimotes to fail to register without an accessory attached
+- INPUT/HID: Fix Wiimote regression
+- INPUT/HID/MAC: Get Sony Sixaxis (DualShock 3) working on MacOS
+- INPUT/UDEV: Add extra abs check for dolphinbar
+- INPUT/UDEV: Add relative left mouse button when pointer device is not abs
+- INPUT/WAYLAND: Fix keyboard input on Wayland - fixes 'Certain cores ignore user input'
+- NETPLAY: Improvements from Cthulhu
+- OPENDINGUX: Fix HAS_ANALOG/HAS_MENU_TOGGLE defines in sdl_dingux joypad driver
+- LIBRETRO: Enable SRAM for contentless cores
+- LIBRETRO: Add environment callback to get the rate retro_run is called - GET_THROTTLE_STATE and RETRO_THROTTLE_UNBLOCKED environment callback
+- LINUX: Update metadata manifest
+- MENU/OZONE: New themes - Solarized Light, Solarized Dark
+- WINDOWS/WIN9X: Fix non-ASCII text display in window title
+
+# 1.9.11
+- ANDROID: New launcher logo - will fill the corners on the homescreen
+- D3D9: Driver works again (RGUI only and software rendered cores work, no shader support yet)
+- HID/MAC: WiiU GameCube Adapter now works
+- HID/WIIU: WiiU and general HID subsystem unified/merged
+- INPUT: Refactor menu toggle combo button logic to allow quit combo button
+- INPUT/UDEV: Add mouse relative check and set appropriately to fix issue
+- LIBNX/SWITCH: Splitted Joycon button mapping
+- LIBRETRO: Add environment callback to enable cores to notify the frontend that a core otion value has changed
+- MIYOO: Add initial port
+- OPENDINGUX/RG350: Enable tinyalsa for the RG350
+- PS2: Add 'Change Resolution' option
+- PS2: Add option to change video windows offsets
+- STEAM/LINUX: Move to new 'soldier' runtime
+- WAYLAND: Remove xdg-shell-v6 protocol
+- WINDOWS: Fix non-ASCII text display in window title
+- WINDOWS 11: Shows Windows 11 version name now (Information -> System Information)
+- UWP: Further improvements to WinRT VFS layer
+
+# 1.9.10
+- 3DS: Add bottom screen idle state
+- 3DS: Add unique IDs for Gearboy/Gearcoleco/Gearsystem, correct CAP32 code
+- 3DS/SAVESTATES: Fix RAM states to file when core deinits
+- AUDIO/MIXER: Pad sample buffers to prevent potential heap-buffer-overflows when resampling (fixes crash when using 30 kHz menu audio files)
+- AUDIO/LINUX/SNAP: Add JACK support
+- CHEEVOS: Don't write achievement credentials to overrides
+- CHEEVOS: Disable slowmotion when enabling hardcore mode
+- D3D9: Fixed MVP matrix issue for RGUI texture (main game frame still won't show up though)
+- D3D11/D3D12/HDR: Fixed contrast to be more correct - now scales from 0-10 linearly and behaves more the way you'd expect it to - changed name to ditch legacy settings users may have
+- D3D11/HDR: Fixed D3D11's blend, rasterizer and topology states not being set to the sames when using HDR and leaving the menu - caused issues with PCSX2's Shadow of the Colossus
+- D3D11/D3D12/HDR: Added ability to skip inverse tonemapper to the shader via the constant buffer using 'inverse_tonemap' - set to 0.0f to skip
+- D3D11/D3D12/HDR: Fixed potential bug when swapping between hdr and sdr and the bit depth not being set correctly
+- D3D11/D3D12/HDR: Added numerous helper functions to help create the correct values to colour the UI - normally the white UI elements should be rendered at paper white not max brightness for various reasons
+- BUGFIX/ANDROID: Fix crash that could happen on Android with Sameboy core - would crash on rumble function
+- GFX/WIDGETS: New regular widget message appearance
+- INPUT/MOUSE: Add distinct mouse zero index label for drivers that do not support multimouse
+- INPUT/RUMBLE: Add generic rumble gain to input settings
+- INPUT/UDEV/X11: Add workaround to fix keyboard input when using X11 + Udev
+- LIBNX/SWITCH: Add Video Filters support
+- LOCALIZATION: Fetch translations from Crowdin
+- OPENDINGUX/BETA: Disable OpenAL
+- PLAYLISTS: Add 'Refresh Playlist' option
+- STEAM: Initial release on Steam
+- UWP/VFS/XBOX: Improvements and bugfixes to UWP VFS driver
+- VIDEO/REFRESH RATE: Automatic PAL/NTSC refresh rate switch where available - as long as the platform display server allows changing refresh rates and the display has the desired refresh rate
+- VIDEO FILTERS: Add 'Picoscale_256x-320x240' video filter
+- WIIU/HID: Fix analog inputs on HID devices
+
+# 1.9.9
+- 3DS: Add bottom touchscreen menu
+- 3DS/SAVESTATES: Save and load save states to and from RAM
+- AUDIO/MIXER: Ensure than menu sounds are re-enabled when calling CMD_EVENT_AUDIO_REINIT
+- AUDIO/RESAMPLER/MIXER: Fix menu sounds (audio mixing) when using the 'sinc' resampler with quality lower than 'normal'
+- AUDIO/CONVERSION/ARM NEON: Add intrinsic NEON versions for float_to_s16/s16_to_float - should lead to optimized codepaths for AArch64/ARMv7 architectures without being dependent on ASM codepaths.
+- AUDIO/RESAMPLER/ARM NEON: Add intrinsic NEON version for lanczos sinc function - should lead to optimized codepaths for AArch64/ARMv7 architectures without being dependent on ASM codepaths.
+- CHEEVOS: Upgrade to rcheevos 10.2
+- CHEATS: Add enhanced search functionality to the 'Cheats' menu
+- CHEATS/RUNAHEAD: Fix cheats when using second instance runahead
+- CONFIG: Add option to (force-)write current core options to disk (Quick Menu)
+- CORE INFO CACHE: Remove core path from core info cache. Should make core info caches portable now (for example: you can move RetroArch to a separate dir and they would still work).
+- D3D11: Use Shader Model 5.0 for frontend shaders if D3D11 Feature level is at least 11.0 or higher. Should fix some new shaders that require SM 5.0 (like AMD FSR)
+- D3D11: Add HDR support (disabled for UWP for now)
+- D3D12: Add HDR support (disabled for UWP for now)
+- EMSCRIPTEN: Fixed web player bug with filesystem and runtime
+- INPUT/OVERLAY: Fix overlay input when analog to digital mapping is enabled
+- INPUT/UDEV: Look for "ID_INPUT_KEY", not "ID_INPUT_KEYBOARD"
+- INPUT/WINRAW: Fix crash when overlay is enabled
+- MAC/METAL: Add Discord RPC support
+- MENU: Allow 'Custom Aspect Ratio (X Position)/(Y Position)/(Width)/(Height)' to be entered manually via keyboard
+- MENU: Allow 'Vertical Refresh Rate' to be entered manually via keyboard
+- MENU/SHADERS: Highlight currently selected value in Shader Parameter drop-down lists
+- STABILITY: Safer way of avoiding the race condition in
+audio_driver_sample/audio_driver_sample_batch - we can check
+audio-suspended to see if we're doing a fs/windowed toggle - enhances stability when fullscreen toggling/tearing down context
+- STABILITY: When audio driver write callback function fails, don't
+turn audio off completely - look if audio_driver_output_samples_conv_buf
+is non-NULL first before we attempt to write audio - enhances stability when fullscreen toggling/tearing down context
+- STABILITY: Input robustness for cores that use internal threading
+(full teardown/setup), no audio should be processed at this point in
+time
+- VIDEO: Screen resolution list sanitizing
+- VULKAN: Fix some Vulkan validation layer errors
+- UWP: Updated icons courtesy of Danp142
+- UWP/XBOX: Disable CPU model check on Xbox as it doesn't work and can even crash
+- UWP/VFS/XBOX: Code cleanup and simplification of UWP VFS driver
+
+
 # 1.9.8
 - AUDIO/WINDOWS/WASAPI: Stop deactivating audio on fast forward
 - CHEEVOS: Hide challenge indicators when resetting
@@ -3,64 +3,107 @@ Struct ordering

 For POD-types, try to order structs as follows (first to last):

-* long double     (8 bytes, 16 bytes [64bit x86], 12 bytes [32bit x86])
-* double          (8 bytes)
-* int64_t         (8 bytes,         8 bytes [32bit ARM], 4 bytes [32bit x86])
-* uint64_t        (4 bytes [32bit], 8 bytes [32bit ARM], 8 bytes [64bit])
-* pointer         (4 bytes [32bit], 8 bytes [64bit] [1])
-* intptr_t        (4 bytes [32bit], 8 bytes [64bit] [1])
-* uintptr_t       (4 bytes [32bit], 8 bytes [64bit] [1])
-* ptrdiff_t       (4 bytes [32bit], 8 bytes [64bit] [1])
-* ssize_t         (4 bytes [32bit], 8 bytes [64bit])
-* size_t          (4 bytes [32bit], 8 bytes [64bit])
-* jmp_buf         (4 bytes)
-* long            (4 bytes [64bit Win], 8 bytes [64bit non-Win], 4 bytes [32bit])
-* int32_t         (4 bytes)
-* unsigned        (4 bytes)
-* float           (4 bytes)
-* int             (4 bytes)
-* enum            (4 bytes)
-* int16_t         (2 bytes)
-* char            (1 byte)
+   * long double     (8 bytes, 16 bytes [64bit x86], 12 bytes [32bit x86])
+   * double          (8 bytes)
+   * int64_t         (8 bytes,         8 bytes [32bit ARM], 
+                      4 bytes [32bit x86])
+   * uint64_t        (4 bytes [32bit], 8 bytes [32bit ARM], 8 bytes [64bit])
+   * pointer         (4 bytes [32bit], 8 bytes [64bit] [1])
+   * intptr_t        (4 bytes [32bit], 8 bytes [64bit] [1])
+   * uintptr_t       (4 bytes [32bit], 8 bytes [64bit] [1])
+   * ptrdiff_t       (4 bytes [32bit], 8 bytes [64bit] [1])
+   * ssize_t         (4 bytes [32bit], 8 bytes [64bit])
+   * size_t          (4 bytes [32bit], 8 bytes [64bit])
+   * jmp_buf         (4 bytes)
+   * long            (4 bytes [64bit Win], 8 bytes [64bit non-Win], 
+                      4 bytes [32bit])
+   * int32_t         (4 bytes)
+   * unsigned        (4 bytes)
+   * float           (4 bytes)
+   * int             (4 bytes)
+   * enum            (4 bytes)
+   * int16_t         (2 bytes)
+   * char            (1 byte)
 * bool            (1 byte)

-[1] PS3 uses 4 byte pointers despite having a 64bit processor
+   [1] PS3 uses 4 byte pointers despite having a 64bit processor

-Struct members should be sorted by alignment. Therefore, structs
-should be sorted by the largest type inside them.
+   Struct members should be sorted by alignment. Therefore, structs
+   should be sorted by the largest type inside them.

-For example, take a struct like this:
+   For example, take a struct like this:

-typedef struct
-{
-   size_t capacity;
-   bool old_format;
-   bool compress;
-   bool fuzzy_archive_match;
-   bool autofix_paths;   
-   char path[PATH_MAX_LENGTH];
-   char base_content_directory[PATH_MAX_LENGTH];
-} playlist_config_t;
+   typedef struct
+   {
+      size_t capacity;
+      bool old_format;
+      bool compress;
+      bool fuzzy_archive_match;
+      bool autofix_paths;   
+      char path[PATH_MAX_LENGTH];
+      char base_content_directory[PATH_MAX_LENGTH];
+   } playlist_config_t;

-size_t has the biggest alignment here, so 'struct playlist_config_t' inside a struct should come before or after size_t.
+size_t has the biggest alignment here, so 'struct playlist_config_t' 
+inside a struct should come before or after size_t.

 *** BEST PRACTICES ***

-* If we have pointers and size variable pairs, it's best to interleave them to increase the probability they go in the same cacheline. It also makes the code more readable, that these two variables are connected.
+* If we have pointers and size variable pairs, it's best to 
+interleave them to increase the probability they go in the 
+same cacheline. It also makes the code more readable, that 
+these two variables are connected.

 Example:

-struct a
-{
-   char* b;
-   size_t b_len;
-   char* c;
-   size_t c_len;
-};
+   struct a
+   {
+      char* b;
+      size_t b_len;
+      char* c;
+      size_t c_len;
+   };

 Stack size
 ----------

-You have to assume that stack size is going to be limited in RetroArch. Some game consoles (and other embedded systems) might have a default stack size as low as 128Kb or less. Be conservative with stack size but don't try to put very small structs on heap either [to avoid memory fragmentation among other things].
+You have to assume that stack size is going to be limited in 
+RetroArch. Some game consoles (and other embedded systems) 
+might have a default stack size as low as 128Kb or less. 
+Be conservative with stack size but don't try to put very 
+small structs on heap either [to avoid memory fragmentation 
+among other things]. A balancing act here is necessary.

 Be mindful that heap allocations are slow compared to stack.
+
+Functions
+---------
+- Avoid doing small getter/setter functions. We want a function 
+to justify its function call overhead by doing a significant 
+body of work. Small one-line getter/setter functions for what 
+is predominantly C-style structs is not useful, plus it leads 
+to people thinking this function is more complex than it 
+actually is, thus obfuscating the sourcecode instead of it 
+being easier to read.
+
+If you can find examples in the codebase that violate this 
+guideline, do not hesitate to point them out to us.
+
+Variable declaration
+--------------------
+For C source files, we have to insist you stick to the following:
+
+- Declare variables either at the start of a function or the start 
+   of a code block, depending on the scope they need.
+- Do not do initial for loop declarations. Refer to the bulletpoint above:
+   either declare them at the start of the function, or at the start
+   of the code block.
+
+Not doing this would break compilation on platforms where we are compiling
+these C source files in C89 compatibility mode. If such issues occur in pull
+requests, we have to request that it be fixed.
+
+VLA (Variable Length Array)
+---------------------------
+Do not use VLAs (Variable Length Array) in C source files. These are not
+C89-compliant.
@@ -110,7 +110,7 @@ endif

 ifneq ($(CXX_BUILD), 1)
   ifneq ($(C89_BUILD),)
-      CFLAGS += -std=c89 -ansi -pedantic -Werror=pedantic -Wno-long-long
+      CFLAGS += -std=c89 -ansi -pedantic -Werror=pedantic -Wno-long-long -Werror=declaration-after-statement
   else ifeq ($(HAVE_C99), 1)
      CFLAGS += $(C99_CFLAGS)
   endif
@@ -134,7 +134,6 @@ ifneq ($(findstring Darwin,$(OS)),)
   MINVERFLAGS=
   ifeq ($(shell uname -p),arm)
      MINVERFLAGS = -mmacosx-version-min=10.15 -stdlib=libc++ # macOS  (Metal, ARM 64bit)
-      MINVERFLAGS += -DDONT_WANT_ARM_ASM_OPTIMIZATIONS
   else ifeq ($(HAVE_METAL),1)
      MINVERFLAGS = -mmacosx-version-min=10.13 -stdlib=libc++  # macOS  (Metal, x86 64bit)
   else ifeq ($(shell uname -p),powerpc)
@@ -148,7 +147,6 @@ ifneq ($(findstring Darwin,$(OS)),)
 	# Build for a specific architecture when ARCH is defined as a switch
   ifeq ($(ARCH),arm64)
      MINVERFLAGS  = -mmacosx-version-min=10.15 -stdlib=libc++ # macOS  (Metal, ARM 64bit)
-      MINVERFLAGS += -DDONT_WANT_ARM_ASM_OPTIMIZATIONS
      ARCHFLAGS    = -arch arm64
   else ifeq ($(ARCH),x86_64)
      ifeq ($(HAVE_METAL),1)
@@ -190,6 +188,10 @@ endif

 ifeq ($(HAVE_UNIX), 1)
   OBJ += frontend/drivers/platform_unix.o
+
+	ifeq ($(UNIX_CWD_ENV), 1)
+		DEF_FLAGS += -DRARCH_UNIX_CWD_ENV
+	endif
 endif

 ifeq ($(TARGET), retroarch_3ds)
@@ -234,6 +236,8 @@ OBJ += frontend/frontend_driver.o \
       retroarch.o \
       command.o \
       msg_hash.o \
+       midi_driver.o \
+       location_driver.o \
       intl/msg_hash_us.o \
       $(LIBRETRO_COMM_DIR)/queues/task_queue.o \
       tasks/task_content.o
@@ -302,14 +306,16 @@ OBJ += \
       $(LIBRETRO_COMM_DIR)/file/file_path_io.o \
       file_path_special.o \
       $(LIBRETRO_COMM_DIR)/hash/lrc_hash.o \
+       audio/audio_driver.o \
       input/input_driver.o \
       input/common/input_hid_common.o \
       led/led_driver.o \
-       gfx/video_coord_array.o \
-		 gfx/gfx_display.o \
+       gfx/video_driver.o \
+       gfx/gfx_display.o \
       gfx/gfx_animation.o \
-		 gfx/gfx_thumbnail_path.o \
-		 gfx/gfx_thumbnail.o \
+       gfx/gfx_thumbnail_path.o \
+       gfx/gfx_thumbnail.o \
+       gfx/video_coord_array.o \
       configuration.o \
       $(LIBRETRO_COMM_DIR)/dynamic/dylib.o \
       cores/dynamic_dummy.o \
@@ -335,6 +341,10 @@ ifeq ($(HAVE_CHEATS), 1)
   OBJ     += cheat_manager.o
 endif

+ifeq ($(HAVE_CORE_INFO_CACHE), 1)
+   DEFINES += -DHAVE_CORE_INFO_CACHE
+endif
+
 OBJ += \
       core_info.o \
       core_backup.o \
@@ -553,7 +563,8 @@ ifeq ($(HAVE_LIBRETRODB), 1)
          tasks/task_database_cue.o

   ifeq ($(HAVE_MENU), 1)
-      OBJ += menu/menu_explore.o
+      OBJ += menu/menu_explore.o \
+             tasks/task_menu_explore.o
   endif
 endif

@@ -970,10 +981,6 @@ ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
      HAVE_XMB = 1
   endif

-   ifeq ($(HAVE_STRIPES),)
-      HAVE_STRIPES = 0
-   endif
-
   ifeq ($(HAVE_OZONE),)
      HAVE_OZONE = 1
   endif
@@ -981,7 +988,6 @@ else
   HAVE_RGUI        ?= 0
   HAVE_MATERIALUI  ?= 0
   HAVE_XMB         ?= 0
-   HAVE_STRIPES     ?= 0
   HAVE_OZONE       ?= 0
 endif

@@ -1013,22 +1019,12 @@ ifeq ($(HAVE_MENU), 1)
   endif

   ifeq ($(HAVE_OZONE), 1)
-      OBJ += menu/drivers/ozone/ozone.o \
-             menu/drivers/ozone/ozone_entries.o \
-             menu/drivers/ozone/ozone_display.o \
-             menu/drivers/ozone/ozone_texture.o \
-             menu/drivers/ozone/ozone_theme.o \
-             menu/drivers/ozone/ozone_sidebar.o
+      OBJ += menu/drivers/ozone.o
      DEFINES += -DHAVE_OZONE
      HAVE_ASSETS = 1
      HAVE_MENU_SCREENSAVER = 1
   endif

-   ifeq ($(HAVE_STRIPES), 1)
-      OBJ += menu/drivers/stripes.o
-      DEFINES += -DHAVE_STRIPES
-   endif
-
   ifeq ($(HAVE_MENU_SCREENSAVER), 1)
      OBJ += menu/menu_screensaver.o
   endif
@@ -1046,13 +1042,19 @@ ifeq ($(HAVE_LAKKA_SWITCH), 1)
   DEFINES += -DHAVE_LAKKA_SWITCH
 endif

+ifeq ($(HAVE_LAKKA_NIGHTLY), 1)
+   DEFINES += -DHAVE_LAKKA_NIGHTLY
+endif
+
 ifeq ($(HAVE_MENU_COMMON), 1)
   OBJ += menu/menu_setting.o \
+          menu/menu_driver.o \
          menu/cbs/menu_cbs_ok.o \
          menu/cbs/menu_cbs_cancel.o \
          menu/cbs/menu_cbs_select.o \
          menu/cbs/menu_cbs_start.o \
          menu/cbs/menu_cbs_info.o \
+          menu/cbs/menu_cbs_context.o \
          menu/cbs/menu_cbs_left.o \
          menu/cbs/menu_cbs_right.o \
          menu/cbs/menu_cbs_deferred_push.o \
@@ -1191,12 +1193,6 @@ ifeq ($(TARGET), retroarch_wiiu)
 			INCLUDE_DIRS += -Iinput/include
         OBJ += input/drivers_joypad/wiiu/hidpad_driver.o
         OBJ += input/drivers_hid/wiiu_hid.o
-         OBJ += input/connect/joypad_connection.o \
-                input/common/hid/hid_device_driver.o \
-                input/common/hid/device_wiiu_gca.o \
-                input/common/hid/device_ds3.o \
-                input/common/hid/device_ds4.o \
-                input/common/hid/device_null.o
      endif
 endif

@@ -1233,7 +1229,6 @@ ifeq ($(HAVE_WAYLAND), 1)
        input/common/wayland_common.o \
        input/drivers/wayland_input.o \
        gfx/common/wayland/xdg-shell.o \
-        gfx/common/wayland/xdg-shell-unstable-v6.o \
        gfx/common/wayland/idle-inhibit-unstable-v1.o \
        gfx/common/wayland/xdg-decoration-unstable-v1.o

@@ -1454,12 +1449,13 @@ ifeq ($(HAVE_VITAGLES), 1)
 endif

 ifeq ($(HAVE_GL_CONTEXT), 1)
+   OBJ += gfx/common/gl_common.o
   ifeq ($(HAVE_GL_MODERN), 1)
      DEFINES += -DHAVE_OPENGL
-      OBJ += gfx/drivers/gl.o \
+      OBJ += gfx/drivers/gl2.o \
             $(LIBRETRO_COMM_DIR)/gfx/gl_capabilities.o \
-             gfx/drivers_font/gl_raster_font.o \
-				 gfx/drivers_display/gfx_display_gl.o
+             gfx/drivers_font/gl2_raster_font.o \
+	     gfx/drivers_display/gfx_display_gl2.o
   endif

   OBJ += $(LIBRETRO_COMM_DIR)/glsym/rglgen.o
@@ -1468,7 +1464,7 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
      DEFINES += -DHAVE_OPENGL1
      OBJ += gfx/drivers/gl1.o \
             gfx/drivers_font/gl1_raster_font.o \
-				 gfx/drivers_display/gfx_display_gl1.o
+	     gfx/drivers_display/gfx_display_gl1.o
   endif

   ifeq ($(HAVE_VIDEOCORE), 1)
@@ -1582,6 +1578,8 @@ else ifeq ($(HAVE_SDL_DINGUX), 1)

   ifeq ($(RS90), 1)
      OBJ += gfx/drivers/sdl_rs90_gfx.o
+   else ifeq ($(MIYOO), 1)
+      OBJ += gfx/drivers/sdl_rs90_gfx.o
   else
      OBJ += gfx/drivers/sdl_dingux_gfx.o
   endif
@@ -1636,10 +1634,10 @@ ifeq ($(HAVE_VULKAN), 1)
 endif

 ifeq ($(HAVE_OPENGL_CORE), 1)
-   OBJ += gfx/drivers/gl_core.o \
-          gfx/drivers_font/gl_core_raster_font.o \
-			 gfx/drivers_shader/shader_gl_core.o \
-			 gfx/drivers_display/gfx_display_gl_core.o
+   OBJ += gfx/drivers/gl3.o \
+          gfx/drivers_font/gl3_raster_font.o \
+	  gfx/drivers_shader/shader_gl3.o \
+	  gfx/drivers_display/gfx_display_gl3.o

   DEFINES += -DHAVE_OPENGL_CORE
   NEED_CXX_LINKER  = 1
@@ -2111,10 +2109,9 @@ ifeq ($(HAVE_NETWORKING), 1)

   # Netplay
   DEFINES += -DHAVE_NETWORK_CMD
-   OBJ += network/netplay/netplay_handshake.o \
-			 network/netplay/netplay_io.o \
-			 network/netplay/netplay_discovery.o \
-			 network/netplay/netplay_room_parse.o
+   OBJ += \
+	  network/netplay/netplay_frontend.o \
+	  network/netplay/netplay_room_parse.o

   # RetroAchievements
   ifeq ($(HAVE_CHEEVOS), 1)
@@ -2124,7 +2121,6 @@ ifeq ($(HAVE_NETWORKING), 1)
      OBJ += cheevos/cheevos.o \
             cheevos/cheevos_client.o \
             cheevos/cheevos_menu.o \
-             cheevos/cheevos_parser.o \
             $(LIBRETRO_COMM_DIR)/formats/cdfs/cdfs.o \
             deps/rcheevos/src/rcheevos/alloc.o \
             deps/rcheevos/src/rcheevos/compat.o \
@@ -2145,7 +2141,6 @@ ifeq ($(HAVE_NETWORKING), 1)
             deps/rcheevos/src/rapi/rc_api_common.o \
             deps/rcheevos/src/rapi/rc_api_runtime.o \
             deps/rcheevos/src/rapi/rc_api_user.o \
-             deps/rcheevos/src/rurl/url.o

      ifeq ($(HAVE_LUA), 1)
         DEFINES += -DHAVE_LUA \
@@ -2203,6 +2198,8 @@ ifeq ($(HAVE_NETWORKING), 1)
                 deps/discord-rpc/src/rpc_connection.o \
                 deps/discord-rpc/src/serialization.o

+      OBJ     += network/discord.o
+
      ifneq ($(findstring Win32,$(OS)),)
         OBJ  += deps/discord-rpc/src/discord_register_win.o \
                 deps/discord-rpc/src/connection_win.o
@@ -2379,7 +2376,8 @@ ifeq ($(HAVE_STATIC_VIDEO_FILTERS), 1)
          gfx/video_filters/dot_matrix_3x.o \
          gfx/video_filters/dot_matrix_4x.o \
          gfx/video_filters/upscale_1_5x.o \
-          gfx/video_filters/upscale_256x_320x240.o
+          gfx/video_filters/upscale_256x_320x240.o \
+          gfx/video_filters/picoscale_256x_320x240.o
 endif

 ifeq ($(WANT_IOSUHAX), 1)
@@ -2,6 +2,7 @@ TARGET := retroarch_3ds
 LIBRETRO =

 DEBUG                   = 0
+CONSOLE_LOG             = 0
 GRIFFIN_BUILD           = 1
 WHOLE_ARCHIVE_LINK      = 0
 BUILD_3DSX              = 1
@@ -60,6 +61,7 @@ ifeq ($(GRIFFIN_BUILD), 1)
 	DEFINES += -DHAVE_THREADS
 	DEFINES += -DHAVE_GFX_WIDGETS
 	DEFINES += -DHAVE_OVERLAY
+	DEFINES += -DHAVE_CORE_INFO_CACHE
 	#DEFINES += -DHAVE_SOCKET_LEGACY
 	#-DHAVE_SSL -DHAVE_BUILTINMBEDTLS -DMBEDTLS_SSL_DEBUG_ALL
 	#ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file
@@ -91,6 +93,7 @@ else
 	HAVE_THREADS = 1
 	#HAVE_SSL = 1
 	#HAVE_BUILTINMBEDTLS = 1
+	HAVE_CORE_INFO_CACHE = 1

 	include Makefile.common
 	CFLAGS += $(DEF_FLAGS)
@@ -154,6 +157,10 @@ else
   CFLAGS	+= -O3
 endif

+ifeq ($(CONSOLE_LOG), 1)
+   CFLAGS	+= -DCONSOLE_LOG
+endif
+
 ifeq ($(LIBCTRU_NO_DEPRECATION), 1)
   CFLAGS	+= -DLIBCTRU_NO_DEPRECATION
 endif
@@ -2,6 +2,7 @@ TARGET := retroarch_3ds_salamander
 LIBRETRO =

 DEBUG                   = 0
+CONSOLE_LOG             = 0
 BUILD_3DSX              = 1
 BUILD_3DS               = 0
 BUILD_CIA               = 1
@@ -95,6 +96,10 @@ else
   CFLAGS	+= -O3
 endif

+ifeq ($(CONSOLE_LOG), 1)
+   CFLAGS	+= -DCONSOLE_LOG
+endif
+
 CFLAGS += -I. -Ideps/7zip -Ideps/stb -Ilibretro-common/include -Ilibretro-common/include/compat/zlib

 #CFLAGS += -DRARCH_INTERNAL
@@ -99,6 +99,7 @@ HAVE_CONFIGFILE = 1
 HAVE_PATCH = 1
 HAVE_CHEATS = 1
 HAVE_LIBSHAKE = 1
+HAVE_CORE_INFO_CACHE = 1

 OS = Linux
 TARGET = retroarch
@@ -42,6 +42,7 @@ HAVE_STB_FONT = 1
 HAVE_CONFIGFILE = 1
 HAVE_CHEATS = 1
 HAVE_IBXM = 1
+HAVE_CORE_INFO_CACHE = 1

 ASYNC ?= 0
 ifeq ($(LIBRETRO), mupen64plus)
@@ -219,6 +219,7 @@ else ifeq ($(libogc_platform), 1)
   HAVE_AUDIOMIXER          := 1
   HAVE_RWAV                := 1
   RARCH_CONSOLE             = 1
+   HAVE_CORE_INFO_CACHE     := 1

   ifeq ($(platform), wii)
      #HAVE_LANGEXTRA          := 1
@@ -286,6 +287,7 @@ else ifeq ($(platform), psp1)
   HAVE_CONFIGFILE          := 1
   HAVE_PATCH               := 1
   HAVE_CHEATS              := 1
+   HAVE_CORE_INFO_CACHE     := 1

   ifeq ($(BUILD_PRX), 1)
      LDFLAGS += $(addprefix -L,$(PSPSDK)/lib) -specs=$(PSPSDK)/lib/prxspecs -Wl,-q,-T$(PSPSDK)/lib/linkfile.prx $(LDFLAGS)
@@ -348,6 +350,7 @@ else ifeq ($(platform), vita)
   HAVE_CONFIGFILE          := 1
   HAVE_PATCH               := 1
   HAVE_CHEATS              := 1
+   HAVE_CORE_INFO_CACHE     := 1
 else ifeq ($(platform), windows_msvc6_x86)
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
@@ -374,6 +377,7 @@ else ifeq ($(platform), windows_msvc6_x86)
   HAVE_CONFIGFILE          := 1
   HAVE_PATCH               := 1
   HAVE_CHEATS              := 1
+   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -421,6 +425,7 @@ else ifeq ($(platform), windows_msvc2003_x86)
   HAVE_PATCH               := 1
   HAVE_CHEATS              := 1
   HAVE_GFX_WIDGETS         := 1
+   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -483,6 +488,7 @@ else ifeq ($(platform), windows_msvc2005_x86)
   HAVE_VIDEO_FILTER        := 1
   HAVE_FILTERS_BUILTIN     := 1
   HAVE_GFX_WIDGETS         := 1
+   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -525,6 +531,7 @@ else ifeq ($(platform), windows_msvc2005_x86)
   endif
 else ifneq (,$(findstring windows_msvc2010,$(platform)))
   HAVE_GDI                 := 1
+   HAVE_CHEEVOS             := 1
   HAVE_SCREENSHOTS         := 1
   HAVE_REWIND              := 1
   HAVE_AUDIOMIXER          := 1
@@ -563,6 +570,7 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
   HAVE_VIDEO_FILTER        := 1
   HAVE_FILTERS_BUILTIN     := 1
   HAVE_GFX_WIDGETS         := 1
+   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -649,6 +657,7 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
   HAVE_CONFIGFILE          := 1
   HAVE_PATCH               := 1
   HAVE_CHEATS              := 1
+   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -733,6 +742,7 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
   HAVE_CONFIGFILE          := 1
   HAVE_PATCH               := 1
   HAVE_CHEATS              := 1
+   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -817,6 +827,7 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
   HAVE_CONFIGFILE          := 1
   HAVE_PATCH               := 1
   HAVE_CHEATS              := 1
+   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -915,6 +926,7 @@ else ifeq (qnx,$(platform))
   HAVE_CONFIGFILE          := 1
   HAVE_PATCH               := 1
   HAVE_CHEATS              := 1
+   HAVE_CORE_INFO_CACHE     := 1

   CC=qcc -Vgcc_ntoarmv7le
   CXX=QCC -Vgcc_ntoarmv7le
@@ -959,6 +971,7 @@ else ifneq (,$(findstring unix,$(platform)))
   HAVE_CONFIGFILE          := 1
   HAVE_PATCH               := 1
   HAVE_CHEATS              := 1
+   HAVE_CORE_INFO_CACHE     := 1

   PLATCFLAGS += -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_FBO -DHAVE_GL_SYNC -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_VULKAN -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_X11 -DHAVE_XCB -DHAVE_UDEV -DHAVE_BSV_MOVIE -DHAVE_PULSE
   EXT_TARGET := $(TARGET_NAME)
@@ -992,6 +1005,7 @@ else ifeq (dos,$(platform))
 	HAVE_CONFIGFILE          := 1
   HAVE_PATCH               := 0
   HAVE_CHEATS              := 0
+   HAVE_CORE_INFO_CACHE     := 1
   CC=i586-pc-msdosdjgpp-gcc
   CXX=i586-pc-msdosdjgpp-g++

@@ -1141,6 +1155,10 @@ ifeq ($(RARCH_CONSOLE), 1)
   CFLAGS += -DRARCH_CONSOLE
 endif

+ifeq ($(HAVE_CORE_INFO_CACHE), 1)
+   CFLAGS += -DHAVE_CORE_INFO_CACHE
+endif
+
 ifeq ($(RARCH_MOBILE), 1)
   CFLAGS += -DRARCH_MOBILE
 endif
@@ -40,6 +40,7 @@ HAVE_DSP_FILTER = 1
 HAVE_VIDEO_FILTER = 1
 HAVE_STATIC_VIDEO_FILTERS = 1
 HAVE_STATIC_AUDIO_FILTERS = 1
+HAVE_FILTERS_BUILTIN = 1
 HAVE_MENU = 1
 HAVE_CONFIGFILE = 1
 HAVE_PATCH = 1
@@ -52,6 +53,7 @@ HAVE_CHEEVOS = 1
 HAVE_CHD = 0 # disabled due to static libretro-common and libchdr conflicts between different cores
 HAVE_STB_VORBIS = 1
 HAVE_IBXM = 1
+HAVE_CORE_INFO_CACHE = 1

 # RetroArch libnx useful flags
 HAVE_THREADS = 1
@@ -78,7 +80,6 @@ else
  HAVE_MATERIALUI = 0
  HAVE_XMB = 0
  HAVE_OZONE = 0
-  HAVE_STRIPES = 0
 endif

 include Makefile.common
@@ -129,6 +130,10 @@ CFLAGS := -g -Wall -O3 -fcommon -ffast-math -ffunction-sections \

 CFLAGS += $(INCLUDE) -DSWITCH=1 -DHAVE_LIBNX=1 -DNXLINK=1 -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_STB_FONT #-DHAVE_FREETYPE

+ifeq ($(HAVE_FILTERS_BUILTIN), 1)
+  CFLAGS += -DHAVE_FILTERS_BUILTIN
+endif
+
 ifeq ($(strip $(HAVE_STATIC_DUMMY)),1)
  CFLAGS	+=	-DHAVE_STATIC_DUMMY=1
 endif
@@ -0,0 +1,209 @@
+#########################
+## Toolchain variables ##
+#########################
+
+# Default toolchain directory
+TOOLCHAIN_DIR=/opt/miyoo
+
+# All toolchain-related variables may be
+# overridden via the command line
+
+ifdef GCW0_CC
+CC                    = $(GCW0_CC)
+else
+CC                    = $(TOOLCHAIN_DIR)/usr/bin/arm-linux-gcc
+endif
+
+ifdef GCW0_CXX
+CXX                   = $(GCW0_CXX)
+else
+CXX                   = $(TOOLCHAIN_DIR)/usr/bin/arm-linux-g++
+endif
+
+ifdef GCW0_STRIP
+STRIP                 = $(GCW0_STRIP)
+else
+STRIP                 = $(TOOLCHAIN_DIR)/usr/bin/arm-linux-strip
+endif
+
+GCW0_SDL_CONFIG      ?= $(TOOLCHAIN_DIR)/usr/arm-miyoo-linux-uclibcgnueabi/sysroot/usr/bin/sdl-config
+GCW0_FREETYPE_CONFIG ?= $(TOOLCHAIN_DIR)/usr/arm-miyoo-linux-uclibcgnueabi/sysroot/usr/bin/freetype-config
+
+GCW0_INC_DIR         ?= $(TOOLCHAIN_DIR)/usr/arm-miyoo-linux-uclibcgnueabi/sysroot/usr/include
+GCW0_LIB_DIR         ?= $(TOOLCHAIN_DIR)/usr/arm-miyoo-linux-uclibcgnueabi/sysroot/usr/lib
+
+#########################
+#########################
+
+PACKAGE_NAME = retroarch
+
+DEBUG ?= 0
+
+MIYOO = 1
+DINGUX = 1
+HAVE_SCREENSHOTS = 0
+HAVE_REWIND = 0
+HAVE_7ZIP = 1
+HAVE_AL = 0
+# ALSA freezes when switching back from menu
+HAVE_ALSA = 0
+HAVE_DSP_FILTER = 1
+HAVE_VIDEO_FILTER = 1
+HAVE_STATIC_VIDEO_FILTERS = 1
+HAVE_STATIC_AUDIO_FILTERS = 1
+HAVE_FILTERS_BUILTIN	= 1
+HAVE_BUILTINMBEDTLS = 0
+HAVE_BUILTINZLIB = 1
+HAVE_C99 = 1
+HAVE_CC = 1
+HAVE_CC_RESAMPLER = 1
+HAVE_CHD = 1
+HAVE_COMMAND = 0
+HAVE_CXX = 1
+HAVE_DR_MP3 = 1
+HAVE_DYNAMIC = 1
+HAVE_EGL = 0
+HAVE_FREETYPE = 0
+HAVE_GDI = 1
+HAVE_GETADDRINFO = 0
+HAVE_GETOPT_LONG = 1
+HAVE_GLSL = 0
+HAVE_HID = 1
+HAVE_IBXM = 1
+HAVE_IMAGEVIEWER = 0
+HAVE_LANGEXTRA = 0
+HAVE_LIBRETRODB = 1
+HAVE_MENU = 1
+HAVE_MENU_COMMON = 1
+HAVE_GFX_WIDGETS = 0
+HAVE_MMAP = 1
+HAVE_OPENDINGUX_FBDEV = 0
+HAVE_OPENGL = 0
+HAVE_OPENGL1 = 0
+HAVE_OPENGLES = 0
+HAVE_OPENGLES3 = 0
+HAVE_OPENGL_CORE = 0
+HAVE_OPENSSL = 0
+HAVE_OVERLAY = 0
+HAVE_RBMP = 1
+HAVE_RJPEG = 1
+HAVE_RPILED = 0
+HAVE_RPNG = 1
+HAVE_RUNAHEAD = 0
+HAVE_SDL_DINGUX = 1
+HAVE_SHADERPIPELINE = 0
+HAVE_STB_FONT = 0
+HAVE_STB_IMAGE = 0
+HAVE_STB_VORBIS = 0
+HAVE_STDIN_CMD = 0
+HAVE_STRCASESTR = 1
+HAVE_THREADS = 1
+HAVE_UDEV = 0
+HAVE_RGUI = 1
+HAVE_MATERIALUI = 0
+HAVE_XMB = 0
+HAVE_OZONE = 0
+HAVE_ZLIB = 1
+HAVE_CONFIGFILE = 1
+HAVE_PATCH = 1
+HAVE_CHEATS = 1
+HAVE_CHEEVOS = 0
+HAVE_LIBSHAKE = 0
+HAVE_CORE_INFO_CACHE = 1
+#HAVE_TINYALSA = 1
+#HAVE_NEAREST_RESAMPLER = 1
+
+OS = Linux
+TARGET = retroarch
+
+OBJ :=
+LINK := $(CXX)
+DEF_FLAGS := -march=armv5te -mtune=arm926ej-s -ffast-math -fomit-frame-pointer
+DEF_FLAGS += -ffunction-sections -fdata-sections
+DEF_FLAGS += -I. -Ideps -Ideps/stb -DMIYOO=1 -DDINGUX -MMD
+DEF_FLAGS += -Wall -Wno-unused-variable -flto
+DEF_FLAGS += -std=gnu99 -D_GNU_SOURCE
+LIBS := -ldl -lz -lrt -pthread
+CFLAGS :=
+CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
+ASFLAGS :=
+LDFLAGS := -Wl,--gc-sections
+INCLUDE_DIRS = -I$(GCW0_INC_DIR)
+LIBRARY_DIRS = -L$(GCW0_LIB_DIR)
+DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY
+DEFINES += -DHAVE_C99=1 -DHAVE_CXX=1
+DEFINES += -DHAVE_GETOPT_LONG=1 -DHAVE_STRCASESTR=1 -DHAVE_DYNAMIC=1
+DEFINES += -DHAVE_FILTERS_BUILTIN
+
+SDL_DINGUX_CFLAGS := $(shell $(GCW0_SDL_CONFIG) --cflags)
+SDL_DINGUX_LIBS := $(shell $(GCW0_SDL_CONFIG) --libs)
+FREETYPE_CFLAGS := $(shell $(GCW0_FREETYPE_CONFIG) --cflags)
+FREETYPE_LIBS := $(shell $(GCW0_FREETYPE_CONFIG) --libs)
+MMAP_LIBS = -lc
+
+OBJDIR_BASE := obj-unix
+
+ifeq ($(DEBUG), 1)
+   OBJDIR := $(OBJDIR_BASE)/debug
+   DEF_FLAGS += -O0 -g -DDEBUG -D_DEBUG
+else
+   OBJDIR := $(OBJDIR_BASE)/release
+   DEF_FLAGS += -O2 -DNDEBUG
+endif
+
+include Makefile.common
+
+DEF_FLAGS += $(INCLUDE_DIRS)
+LDFLAGS += $(CFLAGS) $(CXXFLAGS) $(DEF_FLAGS)
+CFLAGS += $(DEF_FLAGS)
+CXXFLAGS += $(DEF_FLAGS)
+
+HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
+
+Q := @
+
+RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
+
+all: $(TARGET)
+
+-include $(RARCH_OBJ:.o=.d)
+
+SYMBOL_MAP := -Wl,-Map=output.map
+
+$(TARGET): $(RARCH_OBJ)
+	@$(if $(Q), $(shell echo echo LD $@),)
+	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
+
+ifeq ($(STRIP_BIN),1)
+	$(STRIP) --strip-unneeded $(TARGET)
+endif
+
+$(OBJDIR)/%.o: %.c
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c -o $@ $<
+
+$(OBJDIR)/%.o: %.cpp
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo CXX $<),)
+	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
+
+$(OBJDIR)/%.o: %.m
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo OBJC $<),)
+	$(Q)$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<
+
+$(OBJDIR)/%.o: %.S $(HEADERS)
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo AS $<),)
+	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
+
+clean:
+	rm -rf $(OBJDIR_BASE)
+	rm -f $(TARGET)
+	rm -f *.d
+
+.PHONY: all clean
+
+print-%:
+	@echo '$*=$($*)'
@@ -67,6 +67,7 @@ HAVE_SHADERPIPELINE      := 1
 HAVE_IMAGEVIEWER         := 1
 HAVE_BSV_MOVIE           := 1
 HAVE_CHEATS              := 1
+HAVE_CORE_INFO_CACHE     := 1

 ifeq ($(HAVE_D3D8), 1)
   D3D8_LIBS := -ld3d8
@@ -126,6 +126,7 @@ HAVE_AUDIOMIXER          := 1
 HAVE_RWAV                := 1
 RARCH_CONSOLE             = 1
 HAVE_CHEATS              := 1
+HAVE_CORE_INFO_CACHE     := 1

 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE)
 INCLUDE += -I./libretro-common/include \
@@ -322,6 +323,10 @@ ifeq ($(HAVE_DYNAMIC), 1)
   CFLAGS += -DHAVE_DYNAMIC
 endif

+ifeq ($(HAVE_CORE_INFO_CACHE), 1)
+   CFLAGS += -DHAVE_CORE_INFO_CACHE
+endif
+
 ifeq ($(DEBUG), 1)
   CFLAGS += -O0 -g -DDEBUG
 else
@@ -1,25 +1,46 @@
 include version.all

-DEBUG = 0
+DEBUG    = 0

-CC = $(PNDSDK)/bin/arm-none-linux-gnueabi-gcc
-LD = $(PNDSDK)/bin/arm-none-linux-gnueabi-gcc -o
+CC       = $(PNDSDK)/bin/arm-none-linux-gnueabi-gcc
+LD       = $(PNDSDK)/bin/arm-none-linux-gnueabi-gcc -o

-TARGET := retroarch-pandora
+TARGET  := retroarch-pandora

-LDDIRS = -L. -L$(PNDSDK)/usr/lib
-INCDIRS = -I. -I$(PNDSDK)/usr/include
+LDDIRS   = -L. -L$(PNDSDK)/usr/lib
+INCDIRS  = -I. -I$(PNDSDK)/usr/include

-OBJ = griffin/griffin.o audio/resamplers/sinc_resampler_neon.o libretro-common/conversion/s16_to_float_neon.o libretro-common/conversion/float_to_s16_neon.o
-LDFLAGS = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib
+OBJ      = griffin/griffin.o audio/resamplers/sinc_resampler_neon.o libretro-common/conversion/s16_to_float_neon.o libretro-common/conversion/float_to_s16_neon.o
+LDFLAGS  = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib

-LIBS = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound
-DEFINES = -std=gnu99 -DHAVE_THREADS -DHAVE_GETOPT_LONG=1 -DHAVE_GRIFFIN -DRARCH_INTERNAL
-DEFINES += -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SCREENSHOTS -DHAVE_REWIND -D__ARM_ARCH_6__ -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_OVERLAY -DHAVE_VIDEO_LAYOUT -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
-DEFINES += -DHAVE_DSP_FILTER
-DEFINES += -DHAVE_VIDEO_FILTER
+LIBS     = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound
+DEFINES  = -std=gnu99
+DEFINES += -DHAVE_THREADS \
+	   -DHAVE_GETOPT_LONG=1 \
+	   -DHAVE_GRIFFIN \
+	   -DRARCH_INTERNAL \
+	   -DHAVE_CONFIGFILE \
+	   -DHAVE_PATCH \
+	   -DHAVE_SCREENSHOTS \
+	   -DHAVE_REWIND \
+	   -D__ARM_ARCH_6__ \
+	   -DHAVE_OPENGL \
+	   -DHAVE_OPENGLES \
+	   -DHAVE_OPENGLES2 \
+	   -DHAVE_GLSL \
+	   -DHAVE_DYNAMIC \
+	   -DHAVE_RPNG \
+	   -DHAVE_RJPEG \
+	   -DHAVE_OVERLAY \
+	   -DHAVE_VIDEO_LAYOUT \
+	   -DHAVE_ALSA \
+	   -DHAVE_ZLIB \
+	   -D__linux__ \
+	   -DHAVE_DSP_FILTER \
+	   -DHAVE_VIDEO_FILTER \
+	   -D__OPENPANDORA__ \
+	   -DPANDORA
 DEFINES += $(INCDIRS)
-DEFINES += -D__OPENPANDORA__ -DPANDORA
 DEFINES += -marm -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -ftree-vectorize

 ifeq ($(DEBUG), 1)
@@ -19,6 +19,7 @@ ifeq ($(GRIFFIN_BUILD), 1)
 	DEFINES += -DHAVE_MENU -DHAVE_LIBRETRODB -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SCREENSHOTS -DHAVE_CHEATS
 	DEFINES += -DHAVE_REWIND
 	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_CC_RESAMPLER
+	DEFINES += -DHAVE_CORE_INFO_CACHE
 	ifeq ($(DEBUG), 1)
 		DEFINES += -DHAVE_NETLOGGER
 	endif
@@ -59,6 +60,7 @@ else
 	RARCH_CONSOLE		:= 1
 	HAVE_STATIC_VIDEO_FILTERS = 1
 	HAVE_STATIC_AUDIO_FILTERS = 1
+	HAVE_CORE_INFO_CACHE	:= 1

 	ifeq ($(DEBUG), 1)
 		HAVE_NETLOGGER = 1
@@ -28,10 +28,30 @@ INCDIR += -Ips2/include -Ilibretro-common/include -Ideps -Ideps/stb -Ideps/7zip
 CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) -ffast-math -fsingle-precision-constant
 ASFLAGS = $(CFLAGS)

-RARCH_DEFINES += -DPS2 -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS
-RARCH_DEFINES += -DHAVE_ZLIB -DHAVE_NO_BUILTINZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -D_7ZIP_ST -DHAVE_CC_RESAMPLER -DHAVE_AUDIOMIXER
-RARCH_DEFINES += -DHAVE_VIDEO_FILTER -DHAVE_RGUI
-RARCH_DEFINES += -DHAVE_DSP_FILTER
+RARCH_DEFINES += -DPS2 \
+		 -DHAVE_GRIFFIN=1 \
+		 -DRARCH_INTERNAL \
+		 -DHAVE_SCREENSHOTS \
+		 -DHAVE_REWIND \
+		 -DRARCH_CONSOLE \
+		 -DHAVE_MENU \
+		 -DHAVE_CONFIGFILE \
+		 -DHAVE_PATCH \
+		 -DHAVE_CHEATS \
+		 -DHAVE_ZLIB \
+		 -DHAVE_NO_BUILTINZLIB \
+		 -DHAVE_RPNG \
+		 -DHAVE_RJPEG \
+		 -DHAVE_FILTERS_BUILTIN \
+		 -DHAVE_7ZIP \
+		 -D_7ZIP_ST \
+		 -DHAVE_CC_RESAMPLER \
+		 -DHAVE_AUDIOMIXER \
+		 -DHAVE_WINDOW_OFFSET \
+		 -DHAVE_VIDEO_FILTER \
+		 -DHAVE_RGUI \
+		 -DHAVE_DSP_FILTER \
+		 -DHAVE_CORE_INFO_CACHE

 LDFLAGS += -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ports/lib -L.
 # Lib cdvd is needed to get proper time
@@ -58,7 +78,7 @@ EE_OBJS += $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o
 EE_OBJS += $(IRX_DIR)/usbd_irx.o $(IRX_DIR)/bdm_irx.o $(IRX_DIR)/bdmfs_vfat_irx.o $(IRX_DIR)/usbmass_bd_irx.o
 EE_OBJS += $(IRX_DIR)/libsd_irx.o $(IRX_DIR)/audsrv_irx.o
 EE_OBJS += $(IRX_DIR)/cdfs_irx.o
-EE_OBJS += $(IRX_DIR)/ps2dev9_irx.o $(IRX_DIR)/ps2atad_irx.o $(IRX_DIR)/ps2hdd_irx.o $(IRX_DIR)/ps2fs_irx.o $(IRX_DIR)/poweroff_irx.o 
+EE_OBJS += $(IRX_DIR)/ps2dev9_irx.o $(IRX_DIR)/ps2atad_irx.o $(IRX_DIR)/ps2hdd_irx.o $(IRX_DIR)/ps2fs_irx.o $(IRX_DIR)/poweroff_irx.o
 EE_OBJS += $(IRX_DIR)/mtapman_irx.o $(IRX_DIR)/padman_irx.o

 # Missing objecst on the PS2SDK
@@ -66,7 +66,34 @@ endif
 SHARED_FLAGS :=

 SHARED_FLAGS += -DHAVE_VIDEO_LAYOUT
-SHARED_FLAGS += -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DRARCH_CONSOLE -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts -DHAVE_CC_RESAMPLER -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DHAVE_MULTIMAN -DHAVE_RGUI
+SHARED_FLAGS += -DHAVE_MENU \
+		-DHAVE_CONFIGFILE \
+		-DHAVE_PATCH \
+		-DHAVE_CHEATS \
+		-DRARCH_CONSOLE \
+		-DHAVE_OVERLAY \
+		-DHAVE_HEADSET \
+		-DHAVE_CG \
+		-DHAVE_CG_RUNTIME_COMPILER \
+		-DHAVE_SYSMODULES \
+		-DHAVE_SYSUTILS \
+		-DHAVE_RARCH_EXEC \
+		-DHAVE_MOUSE \
+		-DHAVE_ZLIB \
+		-DHAVE_RPNG \
+		-DHAVE_GRIFFIN=1 \
+		-DHAVE_NETWORKING=1 \
+		-DHAVE_SOCKET_LEGACY=1 \
+		-DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" \
+		-DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) \
+		-Wno-char-subscripts \
+		-DHAVE_CC_RESAMPLER \
+		-DRARCH_INTERNAL \
+		-DHAVE_SCREENSHOTS \
+		-DHAVE_REWIND \
+		-DHAVE_MULTIMAN \
+		-DHAVE_RGUI \
+		-DHAVE_CORE_INFO_CACHE
 CFLAGS += -std=gnu99 $(SHARED_FLAGS)
 CXXFLAGS += $(SHARED_FLAGS)

@@ -23,7 +23,31 @@ INCDIR = deps deps/stb deps/7zip libretro-common/include libretro-common/include
 CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math -fsingle-precision-constant
 ASFLAGS = $(CFLAGS)

-RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LANGEXTRA -DHAVE_ZLIB -DHAVE_AUDIOMIXER -DHAVE_RWAV -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DHAVE_RGUI -DHAVE_FILTERS_BUILTIN -DHAVE_DSP_FILTER -DHAVE_VIDEO_FILTER -DHAVE_7ZIP -D_7ZIP_ST -DHAVE_CC_RESAMPLER
+RARCH_DEFINES = -DPSP \
+		-D_MIPS_ARCH_ALLEGREX \
+		-DHAVE_LANGEXTRA \
+		-DHAVE_ZLIB \
+		-DHAVE_AUDIOMIXER \
+		-DHAVE_RWAV \
+		-DHAVE_RPNG \
+		-DHAVE_RJPEG \
+		-DHAVE_GRIFFIN=1 \
+		-DRARCH_INTERNAL \
+		-DHAVE_SCREENSHOTS \
+		-DHAVE_REWIND \
+		-DRARCH_CONSOLE \
+		-DHAVE_MENU \
+		-DHAVE_CONFIGFILE \
+		-DHAVE_PATCH \
+		-DHAVE_CHEATS \
+		-DHAVE_RGUI \
+		-DHAVE_FILTERS_BUILTIN \
+		-DHAVE_DSP_FILTER \
+		-DHAVE_VIDEO_FILTER \
+		-DHAVE_7ZIP \
+		-D_7ZIP_ST \
+		-DHAVE_CC_RESAMPLER \
+		-DHAVE_CORE_INFO_CACHE

 LIBDIR =
 LDFLAGS =
@@ -110,6 +110,7 @@ HAVE_PATCH = 1
 HAVE_CHEATS = 1
 HAVE_CHEEVOS = 0
 HAVE_LIBSHAKE = 0
+HAVE_CORE_INFO_CACHE = 1

 #comment out for now not working
 #HAVE_OSS =1
@@ -108,6 +108,7 @@ HAVE_PATCH = 1
 HAVE_CHEATS = 1
 HAVE_CHEEVOS = 0
 HAVE_LIBSHAKE = 1
+HAVE_CORE_INFO_CACHE = 1

 OS = Linux
 TARGET = retroarch
@@ -44,7 +44,7 @@ DINGUX_BETA = 1
 HAVE_SCREENSHOTS = 0
 HAVE_REWIND = 1
 HAVE_7ZIP = 1
-HAVE_AL = 1
+HAVE_AL = 0
 HAVE_ALSA = 1
 HAVE_DSP_FILTER = 1
 HAVE_VIDEO_FILTER = 1
@@ -108,6 +108,8 @@ HAVE_PATCH = 1
 HAVE_CHEATS = 1
 HAVE_CHEEVOS = 0
 HAVE_LIBSHAKE = 1
+HAVE_TINYALSA = 1
+HAVE_CORE_INFO_CACHE = 1

 OS = Linux
 TARGET = retroarch
@@ -117,6 +119,7 @@ OBJ :=
 LINK := $(CXX)
 DEF_FLAGS := -mplt -mno-shared
 DEF_FLAGS += -ffunction-sections -fdata-sections
+DEF_FLAGS += -ffast-math
 DEF_FLAGS += -I. -Ideps -Ideps/stb -DDINGUX=1 -DDINGUX_BETA=1 -MMD
 DEF_FLAGS += -Wall -Wno-unused-variable
 DEF_FLAGS += -std=gnu99 -D_GNU_SOURCE -flto
@@ -131,7 +134,6 @@ LIBRARY_DIRS = -L$(GCW0_LIB_DIR)
 DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY
 DEFINES += -DHAVE_C99=1 -DHAVE_CXX=1
 DEFINES += -DHAVE_GETOPT_LONG=1 -DHAVE_STRCASESTR=1 -DHAVE_DYNAMIC=1
-DEFINES += -DHAVE_AL=1
 DEFINES += -DHAVE_FILTERS_BUILTIN
 DEFINES += -DHAVE_UDEV=1
 DEFINES += -DHAVE_ALSA
@@ -112,6 +112,7 @@ HAVE_CHEEVOS = 0
 HAVE_LIBSHAKE = 0
 HAVE_TINYALSA = 1
 HAVE_NEAREST_RESAMPLER = 1
+HAVE_CORE_INFO_CACHE = 1

 OS = Linux
 TARGET = retroarch
@@ -15,7 +15,7 @@ ifeq ($(GRIFFIN_BUILD), 1)
 	DEFINES += -DHAVE_RUNAHEAD -DHAVE_DYNAMIC
 	DEFINES += -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS
 else
-   HAVE_REWIND = 1
+	HAVE_REWIND = 1
 	HAVE_AUDIOMIXER = 1
 	HAVE_RWAV       = 1
 	HAVE_CC_RESAMPLER = 1
@@ -26,8 +26,8 @@ else
 	HAVE_RBMP = 1
 	HAVE_RGUI = 1
 	HAVE_ZLIB = 1
-   HAVE_DSP_FILTER = 1
-   HAVE_VIDEO_FILTER = 1
+	HAVE_DSP_FILTER = 1
+	HAVE_VIDEO_FILTER = 1
 	HAVE_BUILTINZLIB = 1
 	HAVE_LIBRETRODB = 1
 	HAVE_MATERIALUI = 0 # enable later?
@@ -41,6 +41,7 @@ else
 	HAVE_PATCH   = 1
 	HAVE_CHEATS  = 1
 	HAVE_IBXM = 1
+	HAVE_CORE_INFO_CACHE = 1

 	include Makefile.common
 	CFLAGS += $(DEF_FLAGS)
@@ -18,22 +18,40 @@ INCDIRS :=

 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
-	DEFINES += -DHAVE_GRIFFIN=1
-	DEFINES += -DHAVE_REWIND
-	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB DEFINES -DHAVE_KEYMAPPER
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_CC_RESAMPLER
+	DEFINES += -DHAVE_GRIFFIN=1 \
+		   -DHAVE_REWIND \
+		   -DHAVE_NEON \
+		   -DHAVE_MENU \
+		   -DHAVE_CONFIGFILE \
+		   -DHAVE_PATCH \
+		   -DHAVE_CHEATS \
+		   -DHAVE_XMB \
+		   -DHAVE_MATERIALUI \
+		   -DHAVE_LIBRETRODB \
+		   -DHAVE_KEYMAPPER \
+		   -DHAVE_ZLIB \
+		   -DHAVE_RPNG \
+		   -DHAVE_RJPEG \
+		   -DHAVE_RBMP \
+		   -DHAVE_RTGA \
+		   -DHAVE_CC_RESAMPLER \
+		   -DHAVE_CORE_INFO_CACHE
 	ifeq ($(DEBUG), 1)
 		DEFINES += -DHAVE_NETLOGGER
 	endif
-	INCDIRS += -I. -Ideps/7zip -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -Ideps/stb
+	INCDIRS += -I. \
+		   -Ideps/7zip \
+		   -Ilibretro-common/include \
+		   -Ilibretro-common/include/compat/zlib \
+		   -Ideps/stb
 else
-   HAVE_REWIND := 1
-   HAVE_UPDATE_ASSETS      := 1
-   HAVE_ONLINE_UPDATER     := 1
+	HAVE_REWIND		:= 1
+	HAVE_UPDATE_ASSETS      := 1
+	HAVE_ONLINE_UPDATER     := 1
 	HAVE_NEON		:= 1
-   HAVE_DSP_FILTER := 1
-   HAVE_VIDEO_FILTER := 1
-   HAVE_SCREENSHOTS := 1
+	HAVE_DSP_FILTER		:= 1
+	HAVE_VIDEO_FILTER	:= 1
+	HAVE_SCREENSHOTS	:= 1
 	HAVE_FILTERS_BUILTIN	:= 1
 	HAVE_LANGEXTRA		:= 1
 	HAVE_RPNG		:= 1
@@ -43,29 +61,29 @@ else
 	HAVE_ZLIB		:= 1
 	HAVE_7ZIP		:= 1
   ifeq ($(HAVE_VITAGLES), 1)
-      HAVE_VITA2D		:= 0
-      HAVE_VITAGL		:= 0
-      HAVE_VITAGLES := 1
-      HAVE_OPENGL := 1
-      HAVE_OPENGLES := 1
-      HAVE_OPENGLES2 := 1
-      HAVE_EGL := 1
-      HAVE_GLSL := 1
-      HAVE_SHADERPIPELINE := 1
+	HAVE_VITA2D		:= 0
+	HAVE_VITAGL		:= 0
+	HAVE_VITAGLES 		:= 1
+	HAVE_OPENGL 		:= 1
+	HAVE_OPENGLES 		:= 1
+	HAVE_OPENGLES2 		:= 1
+	HAVE_EGL 		:= 1
+	HAVE_GLSL 		:= 1
+	HAVE_SHADERPIPELINE 	:= 1
   else
-      HAVE_VITA2D		:= 1
-      HAVE_VITAGL		:= 0
+	HAVE_VITA2D		:= 1
+	HAVE_VITAGL		:= 0
   endif
 	HAVE_NETWORKING		:= 1
 	HAVE_SOCKET_LEGACY	:= 1
 	HAVE_MENU		:= 1
 	HAVE_MENU_COMMON	:= 1
-	HAVE_GFX_WIDGETS := 1
-	HAVE_CONFIGFILE := 1
-	HAVE_PATCH      := 1
-	HAVE_CHEATS     := 1
+	HAVE_GFX_WIDGETS 	:= 1
+	HAVE_CONFIGFILE 	:= 1
+	HAVE_PATCH      	:= 1
+	HAVE_CHEATS     	:= 1
 	HAVE_OVERLAY		:= 1
-	HAVE_VIDEO_LAYOUT := 0
+	HAVE_VIDEO_LAYOUT 	:= 0
 	HAVE_MATERIALUI		:= 1
 	HAVE_XMB		:= 1
 	HAVE_RGUI		:= 1
@@ -80,16 +98,17 @@ else
 	HAVE_STATIC_AUDIO_FILTERS = 1
 	HAVE_AUDIOMIXER 	:= 1
 	HAVE_RWAV       	:= 1
+	HAVE_CORE_INFO_CACHE    := 1

 	ifeq ($(DEBUG), 1)
-		HAVE_NETLOGGER = 1
+		HAVE_NETLOGGER	= 1
 	endif

 	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
-	BLACKLIST :=
-	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-	INCDIRS += $(INCLUDE_DIRS)
+	CFLAGS			+= $(DEF_FLAGS)
+	BLACKLIST 		:=
+	OBJ			:= $(filter-out $(BLACKLIST),$(OBJ))
+	INCDIRS			+= $(INCLUDE_DIRS)
 endif

 ifeq ($(strip $(VITASDK)),)
@@ -113,6 +113,7 @@ HAVE_CHEEVOS = 1
 HAVE_LIBSHAKE = 1
 HAVE_UPDATE_ASSETS = 1
 HAVE_UPDATE_CORES = 1
+HAVE_CORE_INFO_CACHE = 1

 OS = Linux
 TARGET = retroarch
@@ -131,6 +131,7 @@ RARCH_CONSOLE             = 1
 #HAVE_LANGEXTRA          := 1
 HAVE_WIIUSB_HID          := 1
 HAVE_RARCH_EXEC          := 1
+HAVE_CORE_INFO_CACHE     := 1
 HAVE_RSOUND              := 0

 APP_BOOTER_DIR = wii/app_booter
@@ -7,6 +7,7 @@ GRIFFIN_BUILD              = 0
 SALAMANDER_BUILD           = 0
 WHOLE_ARCHIVE_LINK         = 0
 WIIU_HID                   = 1
+HAVE_HID                   = 1
 HAVE_RUNAHEAD              = 1
 WIIU_LOG_RPX               = 0
 BUILD_DIR                  = objs/wiiu
@@ -123,6 +124,7 @@ endif
      DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
      DEFINES += -DHAVE_HID
      DEFINES += -DWANT_LIBFAT -DHAVE_LIBFAT -DWANT_IOSUHAX -DHAVE_IOSUHAX
+      DEFINES += -DHAVE_CORE_INFO_CACHE
      DEFINES += -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS

   # $(GRIFFIN_BUILD),0
@@ -166,6 +168,7 @@ endif
      HAVE_STATIC_AUDIO_FILTERS = 1
      WANT_LIBFAT = 1
      WANT_IOSUHAX = 1
+      HAVE_CORE_INFO_CACHE = 1

      include Makefile.common
      DEFINES += $(DEF_FLAGS)
@@ -27,6 +27,7 @@ HAVE_VIDEO_FILTER = 1
 HAVE_7ZIP = 1
 HAVE_PYTHON = 0
 DYNAMIC = 1
+HAVE_CORE_INFO_CACHE = 1

 HAVE_XINPUT = 1
 HAVE_WINMM = 1
@@ -30,4 +30,63 @@
 #include "config.h"
 #endif

+#include "configuration.h"
+
+typedef struct
+{
+   int ai_service_auto;
+   /* Is text-to-speech accessibility turned on? */
+   bool enabled;
+} access_state_t;
+
+bool is_accessibility_enabled(bool accessibility_enable, bool accessibility_enabled);
+
+#ifdef HAVE_TRANSLATE
+bool is_narrator_running(bool accessibility_enable);
+#endif
+
+/*
+   This function does all the stuff needed to translate the game screen,
+   using the URL given in the settings.  Once the image from the frame
+   buffer is sent to the server, the callback will write the translated
+   image to the screen.
+
+   Supported client/services (thus far)
+   -VGTranslate client ( www.gitlab.com/spherebeaker/vg_translate )
+   -Ztranslate client/service ( www.ztranslate.net/docs/service )
+
+   To use a client, download the relevant code/release, configure
+   them, and run them on your local machine, or network.  Set the
+   retroarch configuration to point to your local client (usually
+   listening on localhost:4404 ) and enable translation service.
+
+   If you don't want to run a client, you can also use a service,
+   which is basically like someone running a client for you.  The
+   downside here is that your retroarch device will have to have
+   an internet connection, and you may have to sign up for it.
+
+   To make your own server, it must listen for a POST request, which
+   will consist of a JSON body, with the "image" field as a base64
+   encoded string of a 24bit-BMP/PNG that the will be translated.
+   The server must output the translated image in the form of a
+   JSON body, with the "image" field also as a base64 encoded
+   24bit-BMP, or as an alpha channel png.
+
+  "paused" boolean is passed in to indicate if the current call
+   was made during a paused frame.  Due to how the menu widgets work,
+   if the ai service is called in "auto" mode, then this call will
+   be made while the menu widgets unpause the core for a frame to update
+   the on-screen widgets.  To tell the ai service what the pause
+   mode is honestly, we store the runloop_paused variable from before
+   the handle_translation_cb wipes the widgets, and pass that in here.
+*/
+bool run_translation_service(settings_t *settings, bool paused);
+
+bool accessibility_speak_priority(
+      bool accessibility_enable,
+      unsigned accessibility_narrator_speech_speed,
+      const char* speak_text, int priority);
+
+access_state_t *access_state_get_ptr(void);
+
 #endif
@@ -0,0 +1,417 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __AUDIO_DRIVER__H
+#define __AUDIO_DRIVER__H
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <sys/types.h>
+
+#include <boolean.h>
+#include <retro_common_api.h>
+#include <retro_inline.h>
+#include <libretro.h>
+#include <retro_miscellaneous.h>
+
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif /* HAVE_CONFIG_H */
+
+#ifdef HAVE_DSP_FILTER
+#include <audio/dsp_filter.h>
+#endif
+#ifdef HAVE_AUDIOMIXER
+#include <audio/audio_mixer.h>
+#endif
+#include <audio/audio_resampler.h>
+
+#include "audio_defines.h"
+
+#define AUDIO_BUFFER_FREE_SAMPLES_COUNT (8 * 1024)
+
+RETRO_BEGIN_DECLS
+
+#ifdef HAVE_AUDIOMIXER
+typedef struct audio_mixer_stream
+{
+   audio_mixer_sound_t *handle;
+   audio_mixer_voice_t *voice;
+   audio_mixer_stop_cb_t stop_cb;
+   void *buf;
+   char *name;
+   size_t bufsize;
+   float volume;
+   enum audio_mixer_stream_type  stream_type;
+   enum audio_mixer_type type;
+   enum audio_mixer_state state;
+} audio_mixer_stream_t;
+
+typedef struct audio_mixer_stream_params
+{
+   void *buf;
+   char *basename;
+   audio_mixer_stop_cb_t cb;
+   size_t bufsize;
+   unsigned slot_selection_idx;
+   float volume;
+   enum audio_mixer_slot_selection_type slot_selection_type;
+   enum audio_mixer_stream_type  stream_type;
+   enum audio_mixer_type  type;
+   enum audio_mixer_state state;
+} audio_mixer_stream_params_t;
+#endif
+
+typedef struct audio_driver
+{
+   /* Creates and initializes handle to audio driver.
+    *
+    * Returns: audio driver handle on success, otherwise NULL.
+    **/
+   void *(*init)(const char *device, unsigned rate,
+         unsigned latency, unsigned block_frames, unsigned *new_rate);
+
+   /*
+    * @data         : Pointer to audio data handle.
+    * @buf          : Audio buffer data.
+    * @size         : Size of audio buffer.
+    *
+    * Write samples to audio driver.
+    *
+    * Write data in buffer to audio driver.
+    * A frame here is defined as one combined sample of left and right
+    * channels. (I.e. 44.1kHz, 16-bit stereo has 88.2k samples/s, and
+    * 44.1k frames/s.)
+    *
+    * Samples are interleaved in format LRLRLRLRLR ...
+    * If the driver returns true in use_float(), a floating point
+    * format will be used, with range [-1.0, 1.0].
+    * If not, signed 16-bit samples in native byte ordering will be used.
+    *
+    * This function returns the number of frames successfully written.
+    * If an error occurs, -1 should be returned.
+    * Note that non-blocking behavior that cannot write at this time
+    * should return 0 as returning -1 will terminate the driver.
+    *
+    * Unless said otherwise with set_nonblock_state(), all writes
+    * are blocking, and it should block till it has written all frames.
+    */
+   ssize_t (*write)(void *data, const void *buf, size_t size);
+
+   /* Temporarily pauses the audio driver. */
+   bool (*stop)(void *data);
+
+   /* Resumes audio driver from the paused state. */
+   bool (*start)(void *data, bool is_shutdown);
+
+   /* Is the audio driver currently running? */
+   bool (*alive)(void *data);
+
+   /* Should we care about blocking in audio thread? Fast forwarding.
+    *
+    * If state is true, nonblocking operation is assumed.
+    * This is typically used for fast-forwarding. If driver cannot
+    * implement nonblocking writes, this can be disregarded, but should
+    * log a message to stderr.
+    * */
+   void (*set_nonblock_state)(void *data, bool toggle);
+
+   /* Stops and frees driver data. */
+   void (*free)(void *data);
+
+   /* Defines if driver will take standard floating point samples,
+    * or int16_t samples.
+    *
+    * If true is returned, the audio driver is capable of using
+    * floating point data. This will likely increase performance as the
+    * resampler unit uses floating point. The sample range is
+    * [-1.0, 1.0].
+    * */
+   bool (*use_float)(void *data);
+
+   /* Human-readable identifier. */
+   const char *ident;
+
+   /* Optional. Get audio device list (allocates, caller has to free this) */
+   void *(*device_list_new)(void *data);
+
+   /* Optional. Frees audio device list */
+   void (*device_list_free)(void *data, void *data2);
+
+   /* Optional. */
+   size_t (*write_avail)(void *data);
+
+   size_t (*buffer_size)(void *data);
+} audio_driver_t;
+
+typedef struct
+{
+   double source_ratio_original;
+   double source_ratio_current;
+
+   uint64_t free_samples_count;
+
+   struct string_list *devices_list;
+   float  *output_samples_buf;
+#ifdef HAVE_REWIND
+   int16_t *rewind_buf;
+#endif
+   int16_t *output_samples_conv_buf;
+#ifdef HAVE_DSP_FILTER
+   retro_dsp_filter_t *dsp;
+#endif
+   const retro_resampler_t *resampler;
+
+   void *resampler_data;
+   const audio_driver_t *current_audio;
+   void *context_audio_data;
+   float *input_data;
+#ifdef HAVE_AUDIOMIXER
+   struct audio_mixer_stream
+      mixer_streams[AUDIO_MIXER_MAX_SYSTEM_STREAMS];
+#endif
+   struct retro_audio_callback callback;                 /* ptr alignment */
+                                                         /* ptr alignment */
+   size_t chunk_size;
+   size_t chunk_nonblock_size;
+   size_t chunk_block_size;
+
+#ifdef HAVE_REWIND
+   size_t rewind_ptr;
+   size_t rewind_size;
+#endif
+   size_t buffer_size;
+   size_t data_ptr;
+
+   unsigned free_samples_buf[
+      AUDIO_BUFFER_FREE_SAMPLES_COUNT];
+
+#ifdef HAVE_AUDIOMIXER
+   float mixer_volume_gain;
+#endif
+
+   float rate_control_delta;
+   float input;
+   float volume_gain;
+
+   enum resampler_quality resampler_quality;
+
+   char resampler_ident[64];
+
+   bool active;
+   bool control;
+   bool mute_enable;
+   bool use_float;
+   bool suspended;
+#ifdef HAVE_AUDIOMIXER
+   bool mixer_mute_enable;
+   bool mixer_active;
+#endif
+#ifdef HAVE_RUNAHEAD
+   bool hard_disable;
+#endif
+} audio_driver_state_t;
+
+bool audio_driver_enable_callback(void);
+
+bool audio_driver_disable_callback(void);
+
+bool audio_driver_mixer_extension_supported(const char *ext);
+
+void audio_driver_dsp_filter_free(void);
+
+bool audio_driver_dsp_filter_init(const char *device);
+
+void audio_driver_set_buffer_size(size_t bufsize);
+
+bool audio_driver_get_devices_list(void **ptr);
+
+void audio_driver_setup_rewind(void);
+
+bool audio_driver_callback(void);
+
+bool audio_driver_has_callback(void);
+
+void audio_driver_frame_is_reverse(void);
+
+void audio_set_float(enum audio_action action, float val);
+
+float *audio_get_float_ptr(enum audio_action action);
+
+bool *audio_get_bool_ptr(enum audio_action action);
+
+#ifdef HAVE_AUDIOMIXER
+audio_mixer_stream_t *audio_driver_mixer_get_stream(unsigned i);
+
+bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params);
+
+void audio_driver_mixer_play_stream(unsigned i);
+
+void audio_driver_mixer_play_menu_sound(unsigned i);
+
+void audio_driver_mixer_play_menu_sound_looped(unsigned i);
+
+void audio_driver_mixer_play_stream_sequential(unsigned i);
+
+void audio_driver_mixer_play_stream_looped(unsigned i);
+
+void audio_driver_mixer_stop_stream(unsigned i);
+
+float audio_driver_mixer_get_stream_volume(unsigned i);
+
+void audio_driver_mixer_set_stream_volume(unsigned i, float vol);
+
+void audio_driver_mixer_remove_stream(unsigned i);
+
+enum audio_mixer_state audio_driver_mixer_get_stream_state(unsigned i);
+
+const char *audio_driver_mixer_get_stream_name(unsigned i);
+
+void audio_driver_load_system_sounds(void);
+
+#endif
+
+bool audio_driver_start(bool is_shutdown);
+
+bool audio_driver_stop(void);
+
+#ifdef HAVE_TRANSLATE
+/* TODO/FIXME - Doesn't currently work.  Fix this. */
+bool audio_driver_is_ai_service_speech_running(void);
+#endif
+
+extern audio_driver_t audio_rsound;
+extern audio_driver_t audio_audioio;
+extern audio_driver_t audio_oss;
+extern audio_driver_t audio_alsa;
+extern audio_driver_t audio_alsathread;
+extern audio_driver_t audio_tinyalsa;
+extern audio_driver_t audio_roar;
+extern audio_driver_t audio_openal;
+extern audio_driver_t audio_opensl;
+extern audio_driver_t audio_jack;
+extern audio_driver_t audio_sdl;
+extern audio_driver_t audio_xa;
+extern audio_driver_t audio_pulse;
+extern audio_driver_t audio_dsound;
+extern audio_driver_t audio_wasapi;
+extern audio_driver_t audio_coreaudio;
+extern audio_driver_t audio_coreaudio3;
+extern audio_driver_t audio_xenon360;
+extern audio_driver_t audio_ps3;
+extern audio_driver_t audio_gx;
+extern audio_driver_t audio_ax;
+extern audio_driver_t audio_psp;
+extern audio_driver_t audio_ps2;
+extern audio_driver_t audio_ctr_csnd;
+extern audio_driver_t audio_ctr_dsp;
+#ifdef HAVE_THREADS
+extern audio_driver_t audio_ctr_dsp_thread;
+#endif
+extern audio_driver_t audio_switch;
+extern audio_driver_t audio_switch_thread;
+extern audio_driver_t audio_switch_libnx_audren;
+extern audio_driver_t audio_switch_libnx_audren_thread;
+extern audio_driver_t audio_rwebaudio;
+
+audio_driver_state_t *audio_state_get_ptr(void);
+
+extern audio_driver_t *audio_drivers[];
+
+/**
+ * audio_compute_buffer_statistics:
+ *
+ * Computes audio buffer statistics.
+ *
+ **/
+bool audio_compute_buffer_statistics(audio_statistics_t *stats);
+
+float audio_driver_monitor_adjust_system_rates(
+      double input_sample_rate,
+      double input_fps,
+      float video_refresh_rate,
+      unsigned video_swap_interval,
+      float audio_max_timing_skew);
+
+bool audio_driver_init_internal(
+      void *settings_data,
+      bool audio_cb_inited);
+
+bool audio_driver_deinit(void);
+
+bool audio_driver_find_driver(
+      void *settings_data,
+      const char *prefix,
+      bool verbosity_enabled);
+
+/**
+ * audio_driver_sample:
+ * @left                 : value of the left audio channel.
+ * @right                : value of the right audio channel.
+ *
+ * Audio sample render callback function.
+ **/
+void audio_driver_sample(int16_t left, int16_t right);
+
+/**
+ * audio_driver_sample_batch:
+ * @data                 : pointer to audio buffer.
+ * @frames               : amount of audio frames to push.
+ *
+ * Batched audio sample render callback function.
+ *
+ * Returns: amount of frames sampled. Will be equal to @frames
+ * unless @frames exceeds (AUDIO_CHUNK_SIZE_NONBLOCKING / 2).
+ **/
+size_t audio_driver_sample_batch(const int16_t *data, size_t frames);
+
+#ifdef HAVE_REWIND
+/**
+ * audio_driver_sample_rewind:
+ * @left                 : value of the left audio channel.
+ * @right                : value of the right audio channel.
+ *
+ * Audio sample render callback function (rewind version).
+ * This callback function will be used instead of
+ * audio_driver_sample when rewinding is activated.
+ **/
+void audio_driver_sample_rewind(int16_t left, int16_t right);
+
+/**
+ * audio_driver_sample_batch_rewind:
+ * @data                 : pointer to audio buffer.
+ * @frames               : amount of audio frames to push.
+ *
+ * Batched audio sample render callback function (rewind version).
+ *
+ * This callback function will be used instead of
+ * audio_driver_sample_batch when rewinding is activated.
+ *
+ * Returns: amount of frames sampled. Will be equal to @frames
+ * unless @frames exceeds (AUDIO_CHUNK_SIZE_NONBLOCKING / 2).
+ **/
+size_t audio_driver_sample_batch_rewind(
+      const int16_t *data, size_t frames);
+#endif
+
+#ifdef HAVE_MENU
+void audio_driver_menu_sample(void);
+#endif
+
+RETRO_END_DECLS
+
+#endif /* __AUDIO_DRIVER__H */
@@ -21,6 +21,7 @@
 #include <rthreads/rthreads.h>

 #include "audio_thread_wrapper.h"
+#include "audio_driver.h"
 #include "../verbosity.h"

 typedef struct audio_thread
@@ -19,7 +19,7 @@

 #include <boolean.h>

-#include "../retroarch.h"
+#include "audio_driver.h"

 /**
 * audio_init_thread:
@@ -21,7 +21,7 @@

 #include <alsa/asoundlib.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 typedef struct alsa
@@ -19,7 +19,7 @@
 #include <sys/asoundlib.h>
 #include <retro_math.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"

 #define MAX_FRAG_SIZE 3072
 #define DEFAULT_RATE 48000
@@ -24,7 +24,7 @@
 #include <queues/fifo_queue.h>
 #include <string/stdstring.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 #define TRY_ALSA(x) if (x < 0) \
@@ -24,10 +24,10 @@
 #include <sys/audioio.h>

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../../config.h"
 #endif

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 #define DEFAULT_DEV "/dev/audio"
@@ -31,7 +31,7 @@
 #include <retro_endianness.h>
 #include <string/stdstring.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 typedef struct coreaudio
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <memory.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 #pragma mark - ringbuffer
@@ -19,7 +19,7 @@
 #include <retro_miscellaneous.h>
 #include <retro_timers.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"

 typedef struct
 {
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <malloc.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../ctr/ctr_debug.h"

 typedef struct
@@ -19,7 +19,7 @@
 #include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../ctr/ctr_debug.h"

 typedef struct
@@ -39,7 +39,7 @@
 #include <queues/fifo_queue.h>
 #include <string/stdstring.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 #ifdef _XBOX
@@ -27,9 +27,10 @@
 #include <boolean.h>
 #include <retro_inline.h>

-#include "../../retroarch.h"
 #include <defines/gx_defines.h>

+#include "../audio_driver.h"
+
 typedef struct
 {
   size_t write_ptr;
@@ -26,7 +26,7 @@
 #include <rthreads/rthreads.h>

 #include "../../configuration.h"
-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 #define FRAMES(x) (x / (sizeof(float) * 2))
@@ -33,7 +33,7 @@
 #include <retro_miscellaneous.h>
 #include <retro_timers.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 #define BUFSIZE 1024
@@ -21,7 +21,7 @@

 #include <rthreads/rthreads.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"

 /* Helper macros, COM-style. */
 #define SLObjectItf_Realize(a, ...) ((*(a))->Realize(a, __VA_ARGS__))
@@ -116,7 +116,7 @@ static void *sl_init(const char *device, unsigned rate, unsigned latency,
   if (!sl)
      goto error;

-   RARCH_LOG("[OpenSL]: Requested audio latency: %u ms.", latency);
+   RARCH_LOG("[OpenSL]: Requested audio latency: %u ms.\n", latency);

   GOTO_IF_FAIL(slCreateEngine(&sl->engine_object, 0, NULL, 0, NULL, NULL));
   GOTO_IF_FAIL(SLObjectItf_Realize(sl->engine_object, SL_BOOLEAN_FALSE));
@@ -30,10 +30,10 @@
 #include <retro_endianness.h>

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../../config.h"
 #endif

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 #ifdef HAVE_OSS_BSD
@@ -20,7 +20,7 @@
 #include <kernel.h>
 #include <audsrv.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"

 #define AUDIO_BUFFER 128 * 1024
 #define AUDIO_CHANNELS 2
@@ -19,10 +19,10 @@

 #include <queues/fifo_queue.h>

-#include "../../retroarch.h"
-
 #include <defines/ps3_defines.h>

+#include "../audio_driver.h"
+
 #define AUDIO_BLOCKS 8
 #define AUDIO_CHANNELS 2

@@ -40,7 +40,7 @@
 #define SceUID uint32_t
 #endif

-#include "../../retroarch.h"
+#include "../audio_driver.h"

 typedef struct psp_audio
 {
@@ -23,7 +23,7 @@
 #include <retro_miscellaneous.h>
 #include <retro_endianness.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 typedef struct
@@ -23,7 +23,7 @@

 #include <boolean.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 typedef struct
@@ -21,7 +21,7 @@
 #include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "rsound.h"

 typedef struct rsd
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <boolean.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"

 /* forward declarations */
 unsigned RWebAudioSampleRate(void);
@@ -25,12 +25,12 @@
 #include <retro_inline.h>
 #include <retro_math.h>

-#include "../../retroarch.h"
-#include "../../verbosity.h"
-
 #include "SDL.h"
 #include "SDL_audio.h"

+#include "../audio_driver.h"
+#include "../../verbosity.h"
+
 typedef struct sdl_audio
 {
 #ifdef HAVE_THREADS
@@ -20,7 +20,7 @@
 #include <stdint.h>

 #include "switch_audio_compat.h"
-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 #ifdef HAVE_LIBNX
@@ -23,7 +23,7 @@

 #include <switch.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 #define BUFFER_COUNT 5
@@ -21,7 +21,8 @@
 #include <switch.h>

 #include <queues/fifo_queue.h>
-#include "../../retroarch.h"
+
+#include "../audio_driver.h"
 #include "../../verbosity.h"
 #include "../../tasks/tasks_internal.h"

@@ -28,7 +28,8 @@
 #endif

 #include <queues/fifo_queue.h>
-#include "../../retroarch.h"
+
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 #include "../../tasks/tasks_internal.h"
@@ -64,7 +64,7 @@
 #include <retro_inline.h>
 #include <retro_endianness.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 /* Implementation tinyalsa pcm */
@@ -22,7 +22,7 @@
 #include "../common/mmdevice_common.h"
 #include "../common/mmdevice_common_inline.h"

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"
 #include "../../configuration.h"

@@ -24,7 +24,7 @@
 #include "../../wiiu/wiiu_dbg.h"
 #include "../../wiiu/system/memory.h"

-#include "../../retroarch.h"
+#include "../audio_driver.h"

 typedef struct
 {
@@ -42,7 +42,7 @@
 #include "../common/mmdevice_common.h"
 #endif

-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 typedef struct xaudio2 xaudio2_t;
@@ -21,7 +21,7 @@

 #include <retro_inline.h>

-#include "../../retroarch.h"
+#include "../audio_driver.h"

 #define SOUND_FREQUENCY 48000
 #define MAX_BUFFER 2048
@@ -29,12 +29,6 @@

 #include <audio/audio_resampler.h>

-#if (defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_ASM_OPTIMIZATIONS)) || defined(HAVE_NEON)
-#ifndef HAVE_ARM_NEON_ASM_OPTIMIZATIONS
-#define HAVE_ARM_NEON_ASM_OPTIMIZATIONS
-#endif
-#endif
-
 /* Since SSE and NEON don't provide support for trigonometric functions
 * we approximate those with polynoms
 *
@@ -776,7 +776,7 @@ int cheat_manager_initialize_memory(rarch_setting_t *setting, size_t idx, bool w
   retro_ctx_memory_info_t meminfo;
   bool refresh                           = false;
   bool is_search_initialization          = (setting != NULL);
-   rarch_system_info_t *system            = runloop_get_system_info();
+   rarch_system_info_t *system            = &runloop_state_get_ptr()->system;
   unsigned offset                        = 0;
   cheat_manager_t              *cheat_st = &cheat_manager_state;

@@ -20,13 +20,29 @@

 RETRO_BEGIN_DECLS

+typedef void (*rcheevos_client_callback)(void* userdata);
+
+void rcheevos_client_initialize(void);
+
+void rcheevos_client_login_with_password(const char* username, const char* password,
+                                         rcheevos_client_callback callback, void* userdata);
+void rcheevos_client_login_with_token(const char* username, const char* token,
+                                      rcheevos_client_callback callback, void* userdata);
+
+void rcheevos_client_identify_game(const char* hash, rcheevos_client_callback callback, void* userdata);
+
+void rcheevos_client_initialize_runtime(unsigned game_id, rcheevos_client_callback callback, void* userdata);
+
 void rcheevos_client_start_session(unsigned game_id);
 void rcheevos_client_award_achievement(unsigned achievement_id);
 void rcheevos_client_submit_lboard_entry(unsigned leaderboard_id, int value);

+void rcheevos_client_fetch_badges(rcheevos_client_callback callback, void* userdata);
+
 void rcheevos_log_url(const char* api, const char* url);
 void rcheevos_get_user_agent(rcheevos_locals_t *locals, char *buffer, size_t len);

+
 RETRO_END_DECLS

 #endif /* __RARCH_CHEEVOS_MENU_H */
@@ -61,7 +61,8 @@ enum
 {
   RCHEEVOS_ACTIVE_SOFTCORE = 1 << 0,
   RCHEEVOS_ACTIVE_HARDCORE = 1 << 1,
-   RCHEEVOS_ACTIVE_UNOFFICIAL = 1 << 2
+   RCHEEVOS_ACTIVE_UNOFFICIAL = 1 << 2,
+   RCHEEVOS_ACTIVE_UNSUPPORTED = 1 << 3
 };

 typedef struct rcheevos_racheevo_t
@@ -94,20 +95,45 @@ typedef struct rcheevos_ralboard_t
  unsigned format;
 } rcheevos_ralboard_t;

-typedef struct rcheevos_rapatchdata_t
-{
-   char* title;
-   rcheevos_racheevo_t* core;
-   rcheevos_racheevo_t* unofficial;
-   rcheevos_ralboard_t* lboards;
-   char* richpresence_script;

-   unsigned game_id;
-   unsigned console_id;
-   unsigned core_count;
-   unsigned unofficial_count;
-   unsigned lboard_count;
-} rcheevos_rapatchdata_t;
+enum rcheevos_load_state
+{
+   RCHEEVOS_LOAD_STATE_NONE,
+   RCHEEVOS_LOAD_STATE_IDENTIFYING_GAME,
+   RCHEEVOS_LOAD_STATE_FETCHING_GAME_DATA,
+   RCHEEVOS_LOAD_STATE_STARTING_SESSION,
+   RCHEEVOS_LOAD_STATE_FETCHING_BADGES,
+   RCHEEVOS_LOAD_STATE_DONE,
+   RCHEEVOS_LOAD_STATE_UNKNOWN_GAME,
+   RCHEEVOS_LOAD_STATE_NETWORK_ERROR,
+   RCHEEVOS_LOAD_STATE_LOGIN_FAILED,
+   RCHEEVOS_LOAD_STATE_ABORTED
+};
+
+typedef struct rcheevos_load_info_t
+{
+   enum rcheevos_load_state state;
+   int  hashes_tried;
+   int  outstanding_requests;
+#ifdef HAVE_THREADS
+   slock_t* request_lock;
+#endif
+} rcheevos_load_info_t;
+
+typedef struct rcheevos_game_info_t
+{
+   int   id;
+   int   console_id;
+   char* title;
+   char  hash[33];
+
+   rcheevos_racheevo_t* achievements;
+   rcheevos_ralboard_t* leaderboards;
+
+   unsigned achievement_count;
+   unsigned leaderboard_count;
+
+} rcheevos_game_info_t;

 #ifdef HAVE_MENU

@@ -124,18 +150,15 @@ void rcheevos_menu_reset_badges(void);
 typedef struct rcheevos_locals_t
 {
   rc_runtime_t runtime;              /* rcheevos runtime state */
-   rcheevos_rapatchdata_t patchdata;  /* achievement/leaderboard data from the server */
+   rcheevos_game_info_t game;         /* information about the current game */
   rc_libretro_memory_regions_t memory;/* achievement addresses to core memory mappings */

-   retro_task_t* task;                /* load task */
 #ifdef HAVE_THREADS
-   slock_t* task_lock;                /* mutex for starting/stopping load task */
   enum event_command queued_command; /* action queued by background thread to be run on main thread */
 #endif

   char username[32];                 /* case-corrected username */
   char token[32];                    /* user's session token */
-   char hash[33];                     /* retroachievements hash for current content */
   char user_agent_prefix[128];       /* RetroArch/OS version information */
   char user_agent_core[256];         /* RetroArch/OS/Core version information */

@@ -145,16 +168,28 @@ typedef struct rcheevos_locals_t
   unsigned menuitem_count;           /* current number of items in the menuitems array */
 #endif

+   rcheevos_load_info_t load_info;    /* load info */
+
   bool hardcore_active;              /* hardcore functionality is active */
   bool loaded;                       /* load task has completed */
   bool core_supports;                /* false if core explicitly disables achievements */
-   bool network_error;                /* hash lookup or login failed with network error */
   bool leaderboards_enabled;         /* leaderboards are enabled */
   bool leaderboard_notifications;    /* leaderboard notifications are enabled */
   bool leaderboard_trackers;         /* leaderboard trackers are enabled */
 } rcheevos_locals_t;

 rcheevos_locals_t* get_rcheevos_locals(void);
+void rcheevos_begin_load_state(enum rcheevos_load_state state);
+int rcheevos_end_load_state(void);
+bool rcheevos_load_aborted(void);
+
+#ifdef HAVE_THREADS
+ #define CHEEVOS_LOCK(l)   do { slock_lock(l); } while (0)
+ #define CHEEVOS_UNLOCK(l) do { slock_unlock(l); } while (0)
+#else
+ #define CHEEVOS_LOCK(l)
+ #define CHEEVOS_UNLOCK(l)
+#endif

 RETRO_END_DECLS

@@ -35,6 +35,7 @@ enum rcheevos_menuitem_bucket
   RCHEEVOS_MENUITEM_BUCKET_LOCKED,
   RCHEEVOS_MENUITEM_BUCKET_UNLOCKED,
   RCHEEVOS_MENUITEM_BUCKET_UNSUPPORTED,
+   RCHEEVOS_MENUITEM_BUCKET_UNOFFICIAL,
   RCHEEVOS_MENUITEM_BUCKET_RECENTLY_UNLOCKED,
   RCHEEVOS_MENUITEM_BUCKET_ACTIVE_CHALLENGE,
   RCHEEVOS_MENUITEM_BUCKET_ALMOST_THERE
@@ -44,7 +45,7 @@ static void rcheevos_menu_update_bucket(rcheevos_racheevo_t* cheevo)
 {
   cheevo->menu_progress = 0;

-   if (!cheevo->memaddr)
+   if (cheevo->active & RCHEEVOS_ACTIVE_UNSUPPORTED)
   {
      /* non-active unsupported achievement */
      cheevo->menu_bucket = RCHEEVOS_MENUITEM_BUCKET_UNSUPPORTED;
@@ -67,7 +68,10 @@ static void rcheevos_menu_update_bucket(rcheevos_racheevo_t* cheevo)
      }

      /* active achievement */
-      cheevo->menu_bucket = RCHEEVOS_MENUITEM_BUCKET_LOCKED;
+      if (cheevo->active & RCHEEVOS_ACTIVE_UNOFFICIAL)
+         cheevo->menu_bucket = RCHEEVOS_MENUITEM_BUCKET_UNOFFICIAL;
+      else
+         cheevo->menu_bucket = RCHEEVOS_MENUITEM_BUCKET_LOCKED;

      trigger = rc_runtime_get_achievement(&rcheevos_locals->runtime, cheevo->id);
      if (trigger)
@@ -88,29 +92,17 @@ static void rcheevos_menu_update_bucket(rcheevos_racheevo_t* cheevo)
   }
 }

-static void rcheevos_menu_update_buckets(bool cheevos_test_unofficial)
+static void rcheevos_menu_update_buckets(void)
 {
   const rcheevos_locals_t* rcheevos_locals = get_rcheevos_locals();
-   rcheevos_racheevo_t* cheevo = rcheevos_locals->patchdata.core;
-   rcheevos_racheevo_t* stop = cheevo + rcheevos_locals->patchdata.core_count;
+   rcheevos_racheevo_t* cheevo = rcheevos_locals->game.achievements;
+   rcheevos_racheevo_t* stop = cheevo + rcheevos_locals->game.achievement_count;

   while (cheevo < stop)
   {
      rcheevos_menu_update_bucket(cheevo);
      ++cheevo;
   }
-
-   if (cheevos_test_unofficial)
-   {
-      cheevo = rcheevos_locals->patchdata.unofficial;
-      stop = cheevo + rcheevos_locals->patchdata.unofficial_count;
-
-      while (cheevo < stop)
-      {
-         rcheevos_menu_update_bucket(cheevo);
-         ++cheevo;
-      }
-   }
 }

 bool rcheevos_menu_get_state(unsigned menu_offset, char *buffer, size_t len)
@@ -123,15 +115,11 @@ bool rcheevos_menu_get_state(unsigned menu_offset, char *buffer, size_t len)
      if (cheevo)
      {
         if (cheevo->menu_progress)
-         {
            snprintf(buffer, len, "%s - %d%%",
                  msg_hash_to_str(menuitem->state_label_idx),
                  cheevo->menu_progress);
-         }
         else
-         {
            strlcpy(buffer, msg_hash_to_str(menuitem->state_label_idx), len);
-         }

         return true;
      }
@@ -165,18 +153,8 @@ bool rcheevos_menu_get_sublabel(unsigned menu_offset, char *buffer, size_t len)
 void rcheevos_menu_reset_badges(void)
 {
   const rcheevos_locals_t* rcheevos_locals = get_rcheevos_locals();
-   rcheevos_racheevo_t* cheevo = rcheevos_locals->patchdata.core;
-   rcheevos_racheevo_t* stop = cheevo + rcheevos_locals->patchdata.core_count;
-
-   while (cheevo < stop)
-   {
-      if (cheevo->menu_badge_texture)
-         video_driver_texture_unload(&cheevo->menu_badge_texture);
-      ++cheevo;
-   }
-
-   cheevo = rcheevos_locals->patchdata.unofficial;
-   stop = cheevo + rcheevos_locals->patchdata.unofficial_count;
+   rcheevos_racheevo_t* cheevo = rcheevos_locals->game.achievements;
+   rcheevos_racheevo_t* stop = cheevo + rcheevos_locals->game.achievement_count;

   while (cheevo < stop)
   {
@@ -201,9 +179,7 @@ static rcheevos_menuitem_t* rcheevos_menu_allocate(
                       rcheevos_locals->menuitem_capacity * sizeof(rcheevos_menuitem_t));

         if (new_menuitems)
-         {
            rcheevos_locals->menuitems = new_menuitems;
-         }
         else
         {
            /* realloc failed */
@@ -250,6 +226,7 @@ static void rcheevos_menu_update_badge(rcheevos_racheevo_t* cheevo)
   switch (cheevo->menu_bucket)
   {
      case RCHEEVOS_MENUITEM_BUCKET_LOCKED:
+      case RCHEEVOS_MENUITEM_BUCKET_UNOFFICIAL:
      case RCHEEVOS_MENUITEM_BUCKET_UNSUPPORTED:
      case RCHEEVOS_MENUITEM_BUCKET_ALMOST_THERE:
      case RCHEEVOS_MENUITEM_BUCKET_ACTIVE_CHALLENGE:
@@ -292,27 +269,15 @@ static void rcheevos_menu_update_badge(rcheevos_racheevo_t* cheevo)
 }

 static void rcheevos_menu_append_items(rcheevos_locals_t* rcheevos_locals,
-      bool cheevos_test_unofficial, enum rcheevos_menuitem_bucket bucket)
+      enum rcheevos_menuitem_bucket bucket)
 {
   const settings_t *settings = config_get_ptr();
-   rcheevos_racheevo_t* cheevo = rcheevos_locals->patchdata.core;
-   rcheevos_racheevo_t* stop   = cheevo + rcheevos_locals->patchdata.core_count;
-   bool processing_unofficial  = false;
+   rcheevos_racheevo_t* cheevo = rcheevos_locals->game.achievements;
+   rcheevos_racheevo_t* stop   = cheevo + rcheevos_locals->game.achievement_count;
   const unsigned first_index  = rcheevos_locals->menuitem_count;

-   do
+   while (cheevo < stop)
   {
-      if (cheevo == stop)
-      {
-         if (!cheevos_test_unofficial || processing_unofficial)
-            break;
-
-         processing_unofficial = true;
-         cheevo = rcheevos_locals->patchdata.unofficial;
-         stop = cheevo + rcheevos_locals->patchdata.unofficial_count;
-         continue;
-      }
-
      if (cheevo->menu_bucket == bucket)
      {
         rcheevos_menuitem_t* menuitem = rcheevos_menu_allocate(rcheevos_locals, cheevo);
@@ -371,7 +336,7 @@ static void rcheevos_menu_append_items(rcheevos_locals_t* rcheevos_locals,
            /* fallthrough to default */

            default:
-               if (processing_unofficial)
+               if (cheevo->active & RCHEEVOS_ACTIVE_UNOFFICIAL)
                  menuitem->state_label_idx = MENU_ENUM_LABEL_VALUE_CHEEVOS_UNOFFICIAL_ENTRY;
               else if (!(cheevo->active & RCHEEVOS_ACTIVE_SOFTCORE))
                  menuitem->state_label_idx = MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ENTRY;
@@ -382,13 +347,11 @@ static void rcheevos_menu_append_items(rcheevos_locals_t* rcheevos_locals,

         if (cheevo->badge && cheevo->badge[0] && settings &&
               settings->bools.cheevos_badges_enable)
-         {
            rcheevos_menu_update_badge(cheevo);
-         }
      }

      ++cheevo;
-   } while (true);
+   }
 }

 uintptr_t rcheevos_menu_get_badge_texture(unsigned menu_offset)
@@ -460,7 +423,6 @@ void rcheevos_menu_populate(void* data)
   menu_displaylist_info_t* info            = (menu_displaylist_info_t*)data;
   rcheevos_locals_t* rcheevos_locals       = get_rcheevos_locals();
   const settings_t* settings               = config_get_ptr();
-   const bool cheevos_test_unofficial       = settings->bools.cheevos_test_unofficial;
   unsigned num_locked                      = 0;
   unsigned num_unlocked                    = 0;
   unsigned num_recently_unlocked           = 0;
@@ -472,7 +434,6 @@ void rcheevos_menu_populate(void* data)
   {
      const retro_time_t now                = cpu_features_get_time_usec();
      const retro_time_t recent_unlock_time = now - (10 * 60 * 1000000); /* 10 minutes ago */
-      bool processing_unofficial            = false;
      rcheevos_racheevo_t* cheevo           = NULL;
      rcheevos_racheevo_t* stop             = NULL;

@@ -494,25 +455,14 @@ void rcheevos_menu_populate(void* data)
      }

      /* update the bucket for each achievement */
-      rcheevos_menu_update_buckets(cheevos_test_unofficial);
+      rcheevos_menu_update_buckets();

      /* count items in each bucket */
-      cheevo = rcheevos_locals->patchdata.core;
-      stop = cheevo + rcheevos_locals->patchdata.core_count;
+      cheevo = rcheevos_locals->game.achievements;
+      stop   = cheevo + rcheevos_locals->game.achievement_count;

-      do
+      while (cheevo < stop)
      {
-         if (cheevo == stop)
-         {
-            if (!cheevos_test_unofficial || processing_unofficial)
-               break;
-
-            processing_unofficial = true;
-            cheevo = rcheevos_locals->patchdata.unofficial;
-            stop = cheevo + rcheevos_locals->patchdata.unofficial_count;
-            continue;
-         }
-
         switch (cheevo->menu_bucket)
         {
            case RCHEEVOS_MENUITEM_BUCKET_UNLOCKED:
@@ -522,12 +472,11 @@ void rcheevos_menu_populate(void* data)
                  ++num_recently_unlocked;
               }
               else
-               {
                  ++num_unlocked;
-               }
               break;

            case RCHEEVOS_MENUITEM_BUCKET_LOCKED:
+            case RCHEEVOS_MENUITEM_BUCKET_UNOFFICIAL:
               ++num_locked;
               break;

@@ -545,14 +494,12 @@ void rcheevos_menu_populate(void* data)
         }

         ++cheevo;
-      } while(true);
+      }

      if (!rcheevos_locals->menuitems)
      {
         /* reserve space for all achievements and up to 6 headers before we need to realloc */
-         rcheevos_locals->menuitem_capacity = rcheevos_locals->patchdata.core_count + 6;
-         if (cheevos_test_unofficial)
-            rcheevos_locals->menuitem_capacity += rcheevos_locals->patchdata.unofficial_count;
+         rcheevos_locals->menuitem_capacity = rcheevos_locals->game.achievement_count + 6;

         rcheevos_locals->menuitems = (rcheevos_menuitem_t*)
               malloc(rcheevos_locals->menuitem_capacity * sizeof(rcheevos_menuitem_t));
@@ -570,7 +517,7 @@ void rcheevos_menu_populate(void* data)
      rcheevos_menu_append_header(rcheevos_locals,
            MENU_ENUM_LABEL_VALUE_CHEEVOS_ACTIVE_CHALLENGES_ENTRY);

-      rcheevos_menu_append_items(rcheevos_locals, cheevos_test_unofficial,
+      rcheevos_menu_append_items(rcheevos_locals,
            RCHEEVOS_MENUITEM_BUCKET_ACTIVE_CHALLENGE);
   }

@@ -580,7 +527,7 @@ void rcheevos_menu_populate(void* data)
      rcheevos_menu_append_header(rcheevos_locals,
            MENU_ENUM_LABEL_VALUE_CHEEVOS_RECENTLY_UNLOCKED_ENTRY);

-      rcheevos_menu_append_items(rcheevos_locals, cheevos_test_unofficial,
+      rcheevos_menu_append_items(rcheevos_locals,
            RCHEEVOS_MENUITEM_BUCKET_RECENTLY_UNLOCKED);
   }

@@ -590,7 +537,7 @@ void rcheevos_menu_populate(void* data)
      rcheevos_menu_append_header(rcheevos_locals,
            MENU_ENUM_LABEL_VALUE_CHEEVOS_ALMOST_THERE_ENTRY);

-      rcheevos_menu_append_items(rcheevos_locals, cheevos_test_unofficial,
+      rcheevos_menu_append_items(rcheevos_locals,
            RCHEEVOS_MENUITEM_BUCKET_ALMOST_THERE);
   }

@@ -598,45 +545,53 @@ void rcheevos_menu_populate(void* data)
   if (num_locked)
   {
      if (rcheevos_locals->menuitem_count > 0)
-      {
         rcheevos_menu_append_header(rcheevos_locals,
               MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ENTRY);
-      }

-      rcheevos_menu_append_items(rcheevos_locals, cheevos_test_unofficial,
+      rcheevos_menu_append_items(rcheevos_locals,
            RCHEEVOS_MENUITEM_BUCKET_LOCKED);
+      rcheevos_menu_append_items(rcheevos_locals,
+            RCHEEVOS_MENUITEM_BUCKET_UNOFFICIAL);
+   }
+
+   /* unsupported */
+   if (num_unsupported)
+   {
+      if (rcheevos_locals->menuitem_count > 0)
+         rcheevos_menu_append_header(rcheevos_locals,
+            MENU_ENUM_LABEL_VALUE_CHEEVOS_UNSUPPORTED_ENTRY);
+
+      rcheevos_menu_append_items(rcheevos_locals,
+         RCHEEVOS_MENUITEM_BUCKET_UNSUPPORTED);
   }

   /* unlocked */
   if (num_unlocked)
   {
      if (rcheevos_locals->menuitem_count > 0)
-      {
         rcheevos_menu_append_header(rcheevos_locals,
               MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ENTRY);
-      }

-      rcheevos_menu_append_items(rcheevos_locals, cheevos_test_unofficial,
+      rcheevos_menu_append_items(rcheevos_locals,
            RCHEEVOS_MENUITEM_BUCKET_UNLOCKED);
   }

   if (rcheevos_locals->menuitem_count > 0)
   {
-      /* convert to menu entries */
-      rcheevos_menuitem_t* menuitem = rcheevos_locals->menuitems;
-      rcheevos_menuitem_t* stop = menuitem + rcheevos_locals->menuitem_count;
      char buffer[128];
      unsigned idx = 0;
+      /* convert to menu entries */
+      rcheevos_menuitem_t* menuitem = rcheevos_locals->menuitems;
+      rcheevos_menuitem_t* stop     = menuitem + 
+         rcheevos_locals->menuitem_count;

      do
      {
         if (menuitem->cheevo)
-         {
            menu_entries_append_enum(info->list, menuitem->cheevo->title,
                  menuitem->cheevo->description,
                  MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
                  MENU_SETTINGS_CHEEVOS_START + idx, 0, 0);
-         }
         else
         {
            snprintf(buffer, sizeof(buffer), "----- %s -----",
@@ -655,45 +610,35 @@ void rcheevos_menu_populate(void* data)
   {
      /* no achievements found */
      if (!rcheevos_locals->core_supports)
-      {
         menu_entries_append_enum(info->list,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CANNOT_ACTIVATE_ACHIEVEMENTS_WITH_THIS_CORE),
            msg_hash_to_str(MENU_ENUM_LABEL_CANNOT_ACTIVATE_ACHIEVEMENTS_WITH_THIS_CORE),
            MENU_ENUM_LABEL_CANNOT_ACTIVATE_ACHIEVEMENTS_WITH_THIS_CORE,
            FILE_TYPE_NONE, 0, 0);
-      }
-      else if (rcheevos_locals->network_error)
-      {
+      else if (rcheevos_locals->load_info.state == RCHEEVOS_LOAD_STATE_NETWORK_ERROR)
         menu_entries_append_enum(info->list,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETWORK_ERROR),
            msg_hash_to_str(MENU_ENUM_LABEL_NETWORK_ERROR),
            MENU_ENUM_LABEL_NETWORK_ERROR,
            FILE_TYPE_NONE, 0, 0);
-      }
-      else if (!rcheevos_locals->patchdata.game_id)
-      {
+      else if (!rcheevos_locals->game.id)
         menu_entries_append_enum(info->list,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNKNOWN_GAME),
            msg_hash_to_str(MENU_ENUM_LABEL_UNKNOWN_GAME),
            MENU_ENUM_LABEL_UNKNOWN_GAME,
            FILE_TYPE_NONE, 0, 0);
-      }
      else if (!rcheevos_locals->token[0])
-      {
         menu_entries_append_enum(info->list,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_LOGGED_IN),
            msg_hash_to_str(MENU_ENUM_LABEL_NOT_LOGGED_IN),
            MENU_ENUM_LABEL_NOT_LOGGED_IN,
            FILE_TYPE_NONE, 0, 0);
-      }
      else
-      {
         menu_entries_append_enum(info->list,
            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY),
            msg_hash_to_str(MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY),
            MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY,
            FILE_TYPE_NONE, 0, 0);
-      }
   }
 }

@@ -716,10 +661,7 @@ uintptr_t rcheevos_get_badge_texture(const char *badge, bool locked)

   if (!gfx_display_reset_textures_list(badge_file, fullpath,
         &tex, TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL))
-   {
-      tex = 0;
-   }
+      return 0;

   return tex;
 }
-
@@ -1,692 +0,0 @@
-#include "cheevos_parser.h"
-
-#include "cheevos_locals.h"
-
-#include <encodings/utf.h>
-#include <formats/rjson.h>
-#include <string/stdstring.h>
-#include <compat/strl.h>
-
-#include "../deps/rcheevos/include/rcheevos.h"
-
-/* C89 wants only int values in enums. */
-#define CHEEVOS_JSON_KEY_GAMEID       0xb4960eecU
-#define CHEEVOS_JSON_KEY_ACHIEVEMENTS 0x69749ae1U
-#define CHEEVOS_JSON_KEY_ID           0x005973f2U
-#define CHEEVOS_JSON_KEY_MEMADDR      0x1e76b53fU
-#define CHEEVOS_JSON_KEY_TITLE        0x0e2a9a07U
-#define CHEEVOS_JSON_KEY_DESCRIPTION  0xe61a1f69U
-#define CHEEVOS_JSON_KEY_POINTS       0xca8fce22U
-#define CHEEVOS_JSON_KEY_AUTHOR       0xa804edb8U
-#define CHEEVOS_JSON_KEY_MODIFIED     0xdcea4fe6U
-#define CHEEVOS_JSON_KEY_CREATED      0x3a84721dU
-#define CHEEVOS_JSON_KEY_BADGENAME    0x887685d9U
-#define CHEEVOS_JSON_KEY_CONSOLE_ID   0x071656e5U
-#define CHEEVOS_JSON_KEY_TOKEN        0x0e2dbd26U
-#define CHEEVOS_JSON_KEY_USERNAME     0x7c8da264U
-#define CHEEVOS_JSON_KEY_FLAGS        0x0d2e96b2U
-#define CHEEVOS_JSON_KEY_LEADERBOARDS 0xf1247d2dU
-#define CHEEVOS_JSON_KEY_RICHPRESENCE 0xf18dd230U
-#define CHEEVOS_JSON_KEY_MEM          0x0b8807e4U
-#define CHEEVOS_JSON_KEY_FORMAT       0xb341208eU
-#define CHEEVOS_JSON_KEY_SUCCESS      0x110461deU
-#define CHEEVOS_JSON_KEY_ERROR        0x0d2011cfU
-
-typedef struct
-{
-   char*       value;
-   int         is_key;
-   size_t      length;
-   unsigned    key_hash;
-} rcheevos_getvalueud_t;
-
-#define CHEEVOS_RJSON_OPTIONS                               \
-      /* Inside the field RichPresencePatch newlines are
-       * encoded as '\r\n'. This will filter the \r out. */ \
-        RJSON_OPTION_IGNORE_STRING_CARRIAGE_RETURN          \
-      /* This matches the behavior of the previously used
-       * json parser. It is probably not required */        \
-      | RJSON_OPTION_ALLOW_TRAILING_DATA
-
-/*****************************************************************************
-Gets a value in a JSON
-*****************************************************************************/
-
-static uint32_t rcheevos_djb2(const char* str, size_t length)
-{
-   const unsigned char* aux = (const unsigned char*)str;
-   uint32_t            hash = 5381;
-
-   while (length--)
-      hash = (hash << 5) + hash + *aux++;
-
-   return hash;
-}
-
-static bool rcheevos_getvalue_key(void* userdata,
-      const char* name, size_t length)
-{
-   rcheevos_getvalueud_t* ud = (rcheevos_getvalueud_t*)userdata;
-
-   ud->is_key = rcheevos_djb2(name, length) == ud->key_hash;
-   return true;
-}
-
-static bool rcheevos_getvalue_string(void* userdata,
-      const char* string, size_t length)
-{
-   rcheevos_getvalueud_t* ud = (rcheevos_getvalueud_t*)userdata;
-
-   if (ud->is_key && ud->length > length)
-   {
-      strlcpy(ud->value, string, ud->length);
-      ud->is_key = 2;
-      return false;
-   }
-
-   return true;
-}
-
-static bool rcheevos_getvalue_boolean(void* userdata, bool istrue)
-{
-   rcheevos_getvalueud_t* ud = (rcheevos_getvalueud_t*)userdata;
-
-   if (ud->is_key)
-   {
-      if (istrue && ud->length > 4)
-      {
-         strlcpy(ud->value, "true", ud->length);
-         ud->is_key = 2;
-         return false;
-      }
-      if (!istrue && ud->length > 5)
-      {
-         strlcpy(ud->value, "false", ud->length);
-         ud->is_key = 2;
-         return false;
-      }
-   }
-
-   return true;
-}
-
-static bool rcheevos_getvalue_null(void* userdata)
-{
-   rcheevos_getvalueud_t* ud = (rcheevos_getvalueud_t*)userdata;
-
-   if (ud->is_key && ud->length > 4)
-   {
-      strlcpy(ud->value, "null", ud->length);
-      ud->is_key = 2;
-      return false;
-   }
-
-   return true;
-}
-
-static int rcheevos_get_value(const char* json, unsigned key_hash,
-      char* value, size_t length)
-{
-   rcheevos_getvalueud_t ud;
-
-   ud.key_hash = key_hash;
-   ud.is_key   = 0;
-   ud.value    = value;
-   ud.length   = length;
-   *value      = 0;
-
-   rjson_parse_quick(json, &ud, CHEEVOS_RJSON_OPTIONS,
-         rcheevos_getvalue_key,
-         rcheevos_getvalue_string,
-         rcheevos_getvalue_string, /* number */
-         NULL, NULL, NULL, NULL,
-         rcheevos_getvalue_boolean,
-         rcheevos_getvalue_null, NULL);
-
-   return (ud.is_key == 2 ? 0 : -1);
-}
-
-/*****************************************************************************
-Returns the token or the error message
-*****************************************************************************/
-
-int rcheevos_get_token(const char* json, char* username, size_t username_length,
-      char* token, size_t length)
-{
-   rcheevos_get_value(json, CHEEVOS_JSON_KEY_ERROR, token, length);
-
-   if (!string_is_empty(token))
-      return -1;
-
-   return rcheevos_get_value(json, CHEEVOS_JSON_KEY_TOKEN, token, length) +
-          rcheevos_get_value(json, CHEEVOS_JSON_KEY_USERNAME, username, username_length);
-}
-
-int rcheevos_get_json_error(const char* json, char* token, size_t length)
-{
-   return rcheevos_get_value(json, CHEEVOS_JSON_KEY_ERROR, token, length);
-}
-
-/*****************************************************************************
-Count number of achievements in a JSON file
-*****************************************************************************/
-
-typedef struct
-{
-   int      in_cheevos;
-   int      in_lboards;
-   int      has_error;
-   uint32_t field_hash;
-   unsigned core_count;
-   unsigned unofficial_count;
-   unsigned lboard_count;
-} rcheevos_countud_t;
-
-static bool rcheevos_count_end_array(void* userdata)
-{
-  rcheevos_countud_t* ud = (rcheevos_countud_t*)userdata;
-
-   ud->in_cheevos       = 0;
-   ud->in_lboards       = 0;
-   return true;
-}
-
-static bool rcheevos_count_key(void* userdata,
-      const char* name, size_t length)
-{
-   rcheevos_countud_t* ud = (rcheevos_countud_t*)userdata;
-
-   ud->field_hash        = rcheevos_djb2(name, length);
-
-   if (ud->field_hash == CHEEVOS_JSON_KEY_ACHIEVEMENTS)
-      ud->in_cheevos = 1;
-   else if (ud->field_hash == CHEEVOS_JSON_KEY_LEADERBOARDS)
-      ud->in_lboards = 1;
-   else if (ud->field_hash == CHEEVOS_JSON_KEY_ERROR)
-      ud->has_error  = 1;
-
-   return true;
-}
-
-static bool rcheevos_count_number(void* userdata,
-      const char* number, size_t length)
-{
-   rcheevos_countud_t* ud = (rcheevos_countud_t*)userdata;
-
-   if (ud->in_cheevos && ud->field_hash == CHEEVOS_JSON_KEY_FLAGS)
-   {
-      long flags = strtol(number, NULL, 10);
-
-      if (flags == 3)
-         ud->core_count++;       /* Core achievements */
-      else if (flags == 5)
-         ud->unofficial_count++; /* Unofficial achievements */
-   }
-   else if (ud->in_lboards && ud->field_hash == CHEEVOS_JSON_KEY_ID)
-      ud->lboard_count++;
-
-   return true;
-}
-
-static bool rcheevos_count_cheevos(const char* json,
-      unsigned* core_count, unsigned* unofficial_count,
-      unsigned* lboard_count, int* has_error)
-{
-   bool res;
-   rcheevos_countud_t ud;
-   ud.in_cheevos       = 0;
-   ud.in_lboards       = 0;
-   ud.has_error        = 0;
-   ud.core_count       = 0;
-   ud.unofficial_count = 0;
-   ud.lboard_count     = 0;
-
-
-   res = rjson_parse_quick(json, &ud, CHEEVOS_RJSON_OPTIONS,
-               rcheevos_count_key,
-               NULL,
-               rcheevos_count_number,
-               NULL, NULL, NULL,
-               rcheevos_count_end_array,
-               NULL, NULL, NULL);
-
-   *core_count         = ud.core_count;
-   *unofficial_count   = ud.unofficial_count;
-   *lboard_count       = ud.lboard_count;
-   *has_error          = ud.has_error;
-
-   return res;
-}
-
-/*****************************************************************************
-Parses the cheevos in the JSON
-*****************************************************************************/
-
-typedef struct
-{
-   int      in_cheevos;
-   int      in_lboards;
-   int      lboard_had_id;
-   unsigned core_count;
-   unsigned unofficial_count;
-   unsigned lboard_count;
-
-   unsigned     cheevo_flags;
-   const char*  lboard_format;
-   const char** field_string;
-   unsigned*    field_unsigned;
-
-   rcheevos_racheevo_t cheevo;
-   rcheevos_ralboard_t lboard;
-
-   rcheevos_rapatchdata_t* patchdata;
-} rcheevos_readud_t;
-
-static bool rcheevos_new_cheevo(rcheevos_readud_t* ud)
-{
-   rcheevos_racheevo_t* cheevo = NULL;
-
-   if (ud->cheevo_flags == 3)
-      cheevo = ud->patchdata->core + ud->core_count++;
-   else if (ud->cheevo_flags == 5)
-      cheevo = ud->patchdata->unofficial + ud->unofficial_count++;
-   ud->cheevo_flags = 0;
-
-   if (!cheevo
-       || !ud->cheevo.title
-       || !ud->cheevo.description
-       || !ud->cheevo.badge
-       || !ud->cheevo.memaddr)
-   {
-      CHEEVOS_FREE(ud->cheevo.title);
-      CHEEVOS_FREE(ud->cheevo.description);
-      CHEEVOS_FREE(ud->cheevo.badge);
-      CHEEVOS_FREE(ud->cheevo.memaddr);
-      memset(&ud->cheevo, 0, sizeof(ud->cheevo));
-      return (cheevo ? false : true);
-   }
-
-   *cheevo = ud->cheevo;
-   memset(&ud->cheevo, 0, sizeof(ud->cheevo));
-
-   return true;
-}
-
-static bool rcheevos_new_lboard(rcheevos_readud_t* ud)
-{
-   rcheevos_ralboard_t* lboard = NULL;
-
-   if (ud->lboard_had_id)
-      lboard = ud->patchdata->lboards + ud->lboard_count++;
-   ud->lboard_had_id = 0;
-
-   if (!lboard
-       || !ud->lboard.title
-       || !ud->lboard.description
-       || !ud->lboard.mem)
-   {
-      CHEEVOS_FREE(ud->lboard.title);
-      CHEEVOS_FREE(ud->lboard.description);
-      CHEEVOS_FREE(ud->lboard.mem);
-      memset(&ud->lboard, 0, sizeof(ud->lboard));
-      CHEEVOS_FREE(ud->lboard_format);
-      ud->lboard_format = NULL;
-      return (lboard ? false : true);
-   }
-
-   *lboard = ud->lboard;
-   memset(&ud->lboard, 0, sizeof(ud->lboard));
-
-   if (ud->lboard_format)
-   {
-      lboard->format = rc_parse_format(ud->lboard_format);
-      CHEEVOS_FREE(ud->lboard_format);
-      ud->lboard_format = NULL;
-   }
-
-   return true;
-}
-
-static bool rcheevos_read_end_object(void* userdata)
-{
-   rcheevos_readud_t* ud = (rcheevos_readud_t*)userdata;
-
-   if (ud->in_cheevos)
-      return rcheevos_new_cheevo(ud);
-
-   if (ud->in_lboards)
-      return rcheevos_new_lboard(ud);
-
-   return true;
-}
-
-static bool rcheevos_read_end_array(void* userdata)
-{
-   rcheevos_readud_t* ud = (rcheevos_readud_t*)userdata;
-
-   ud->in_cheevos       = 0;
-   ud->in_lboards       = 0;
-   return true;
-}
-
-static bool rcheevos_read_key(void* userdata,
-      const char* name, size_t length)
-{
-   rcheevos_readud_t* ud = (rcheevos_readud_t*)userdata;
-
-   uint32_t hash        = rcheevos_djb2(name, length);
-   ud->field_unsigned   = NULL;
-   ud->field_string     = NULL;
-
-   switch (hash)
-   {
-      case CHEEVOS_JSON_KEY_ACHIEVEMENTS:
-         ud->in_cheevos = 1;
-         break;
-      case CHEEVOS_JSON_KEY_LEADERBOARDS:
-         ud->in_lboards = 1;
-         break;
-      case CHEEVOS_JSON_KEY_CONSOLE_ID:
-         ud->field_unsigned = &ud->patchdata->console_id;
-         break;
-      case CHEEVOS_JSON_KEY_RICHPRESENCE:
-         ud->field_string = (const char**)&ud->patchdata->richpresence_script;
-         break;
-      case CHEEVOS_JSON_KEY_ID:
-         if (ud->in_cheevos)
-            ud->field_unsigned = &ud->cheevo.id;
-         else if (ud->in_lboards)
-         {
-            ud->field_unsigned = &ud->lboard.id;
-            ud->lboard_had_id = 1;
-         }
-         else
-            ud->field_unsigned = &ud->patchdata->game_id;
-         break;
-      case CHEEVOS_JSON_KEY_MEMADDR:
-         if (ud->in_cheevos)
-            ud->field_string = &ud->cheevo.memaddr;
-         break;
-      case CHEEVOS_JSON_KEY_MEM:
-         if (ud->in_lboards)
-            ud->field_string = &ud->lboard.mem;
-         break;
-      case CHEEVOS_JSON_KEY_TITLE:
-         if (ud->in_cheevos)
-            ud->field_string = &ud->cheevo.title;
-         else if (ud->in_lboards)
-            ud->field_string = &ud->lboard.title;
-         else
-            ud->field_string = (const char**)&ud->patchdata->title;
-         break;
-      case CHEEVOS_JSON_KEY_DESCRIPTION:
-         if (ud->in_cheevos)
-            ud->field_string = &ud->cheevo.description;
-         else if (ud->in_lboards)
-            ud->field_string = &ud->lboard.description;
-         break;
-      case CHEEVOS_JSON_KEY_POINTS:
-         if (ud->in_cheevos)
-            ud->field_unsigned = &ud->cheevo.points;
-         break;
-      /* UNUSED
-      case CHEEVOS_JSON_KEY_AUTHOR:
-         if (ud->in_cheevos)
-            ud->field_string = &ud->cheevo.author;
-         break;
-      case CHEEVOS_JSON_KEY_MODIFIED:
-         if (ud->in_cheevos)
-            ud->field_string = &ud->cheevo.modified;
-         break;
-      case CHEEVOS_JSON_KEY_CREATED:
-         if (ud->in_cheevos)
-            ud->field_string = &ud->cheevo.created;
-         break; */
-      case CHEEVOS_JSON_KEY_BADGENAME:
-         if (ud->in_cheevos)
-            ud->field_string = &ud->cheevo.badge;
-         break;
-      case CHEEVOS_JSON_KEY_FLAGS:
-         if (ud->in_cheevos)
-            ud->field_unsigned = &ud->cheevo_flags;
-         break;
-      case CHEEVOS_JSON_KEY_FORMAT:
-         if (ud->in_lboards)
-            ud->field_string = &ud->lboard_format;
-         break;
-      default:
-         break;
-   }
-
-   return true;
-}
-
-static bool rcheevos_read_string(void* userdata,
-      const char* string, size_t length)
-{
-   rcheevos_readud_t* ud = (rcheevos_readud_t*)userdata;
-
-   if (ud->field_string)
-   {
-      if (*ud->field_string)
-         CHEEVOS_FREE((*ud->field_string));
-      *ud->field_string = strdup(string);
-      ud->field_string = NULL;
-   }
-
-   return true;
-}
-
-static bool rcheevos_read_number(void* userdata,
-      const char* number, size_t length)
-{
-   rcheevos_readud_t* ud = (rcheevos_readud_t*)userdata;
-
-   if (ud->field_unsigned)
-   {
-      *ud->field_unsigned = (unsigned)strtol(number, NULL, 10);
-      ud->field_unsigned = NULL;
-   }
-
-   return true;
-}
-
-int rcheevos_get_patchdata(const char* json, rcheevos_rapatchdata_t* patchdata)
-{
-   rcheevos_readud_t ud;
-   bool res;
-   int has_error;
-
-   /* Count the number of achievements in the JSON file. */
-   res = rcheevos_count_cheevos(json, &patchdata->core_count,
-      &patchdata->unofficial_count, &patchdata->lboard_count, &has_error);
-
-   if (!res || has_error)
-      return -1;
-
-   /* Allocate the achievements. */
-
-   patchdata->core = (rcheevos_racheevo_t*)
-      calloc(patchdata->core_count, sizeof(rcheevos_racheevo_t));
-
-   patchdata->unofficial = (rcheevos_racheevo_t*)
-      calloc(patchdata->unofficial_count, sizeof(rcheevos_racheevo_t));
-
-   patchdata->lboards = (rcheevos_ralboard_t*)
-      calloc(patchdata->lboard_count, sizeof(rcheevos_ralboard_t));
-
-   if (!patchdata->core       ||
-       !patchdata->unofficial ||
-       !patchdata->lboards)
-   {
-      CHEEVOS_FREE(patchdata->core);
-      CHEEVOS_FREE(patchdata->unofficial);
-      CHEEVOS_FREE(patchdata->lboards);
-
-      return -1;
-   }
-
-   patchdata->richpresence_script = NULL;
-   patchdata->title = NULL;
-
-   /* Load the achievements. */
-   memset(&ud, 0, sizeof(ud));
-   ud.patchdata        = patchdata;
-
-   res = rjson_parse_quick(json, &ud, CHEEVOS_RJSON_OPTIONS,
-            rcheevos_read_key,
-            rcheevos_read_string,
-            rcheevos_read_number,
-            NULL, rcheevos_read_end_object,
-            NULL, rcheevos_read_end_array,
-            NULL, NULL, NULL);
-
-   CHEEVOS_FREE(ud.cheevo.title);
-   CHEEVOS_FREE(ud.cheevo.description);
-   CHEEVOS_FREE(ud.cheevo.badge);
-   CHEEVOS_FREE(ud.cheevo.memaddr);
-   CHEEVOS_FREE(ud.lboard.title);
-   CHEEVOS_FREE(ud.lboard.description);
-   CHEEVOS_FREE(ud.lboard.mem);
-   CHEEVOS_FREE(ud.lboard_format);
-
-   if (!res)
-   {
-      rcheevos_free_patchdata(patchdata);
-      return -1;
-   }
-
-   return 0;
-}
-
-/*****************************************************************************
-Frees the patchdata
-*****************************************************************************/
-
-void rcheevos_free_patchdata(rcheevos_rapatchdata_t* patchdata)
-{
-   unsigned i = 0, count = 0;
-   const rcheevos_racheevo_t* cheevo = NULL;
-   const rcheevos_ralboard_t* lboard = NULL;
-
-   cheevo = patchdata->core;
-
-   for (i = 0, count = patchdata->core_count; i < count; i++, cheevo++)
-   {
-      CHEEVOS_FREE(cheevo->title);
-      CHEEVOS_FREE(cheevo->description);
-      CHEEVOS_FREE(cheevo->badge);
-      CHEEVOS_FREE(cheevo->memaddr);
-   }
-
-   cheevo = patchdata->unofficial;
-
-   for (i = 0, count = patchdata->unofficial_count; i < count; i++, cheevo++)
-   {
-      CHEEVOS_FREE(cheevo->title);
-      CHEEVOS_FREE(cheevo->description);
-      CHEEVOS_FREE(cheevo->badge);
-      CHEEVOS_FREE(cheevo->memaddr);
-   }
-
-   lboard = patchdata->lboards;
-
-   for (i = 0, count = patchdata->lboard_count; i < count; i++, lboard++)
-   {
-      CHEEVOS_FREE(lboard->title);
-      CHEEVOS_FREE(lboard->description);
-      CHEEVOS_FREE(lboard->mem);
-   }
-
-   CHEEVOS_FREE(patchdata->core);
-   CHEEVOS_FREE(patchdata->unofficial);
-   CHEEVOS_FREE(patchdata->lboards);
-   CHEEVOS_FREE(patchdata->richpresence_script);
-   CHEEVOS_FREE(patchdata->title);
-
-   patchdata->game_id          = 0;
-   patchdata->console_id       = 0;
-   patchdata->core             = NULL;
-   patchdata->unofficial       = NULL;
-   patchdata->lboards          = NULL;
-   patchdata->title            = NULL;
-   patchdata->richpresence_script = NULL;
-   patchdata->core_count       = 0;
-   patchdata->unofficial_count = 0;
-   patchdata->lboard_count     = 0;
-}
-
-/*****************************************************************************
-Deactivates unlocked cheevos
-*****************************************************************************/
-
-typedef struct
-{
-   int is_element;
-   rcheevos_unlock_cb_t unlock_cb;
-   void* userdata;
-} rcheevos_deactivate_t;
-
-static bool rcheevos_deactivate_elements_begin(void* userdata)
-{
-   rcheevos_deactivate_t* ud = (rcheevos_deactivate_t*)userdata;
-
-   ud->is_element           = 1;
-   return true;
-}
-
-static bool rcheevos_deactivate_elements_stop(void* userdata)
-{
-   rcheevos_deactivate_t* ud = (rcheevos_deactivate_t*)userdata;
-
-   ud->is_element           = 0;
-   return true;
-}
-
-static bool rcheevos_deactivate_number(void* userdata,
-      const char* number, size_t length)
-{
-   rcheevos_deactivate_t* ud = (rcheevos_deactivate_t*)userdata;
-   unsigned id              = 0;
-
-   if (ud->is_element)
-   {
-      id             = (unsigned)strtol(number, NULL, 10);
-
-      ud->unlock_cb(id, ud->userdata);
-   }
-
-   return true;
-}
-
-void rcheevos_deactivate_unlocks(const char* json, rcheevos_unlock_cb_t unlock_cb, void* userdata)
-{
-   rcheevos_deactivate_t ud;
-
-   ud.is_element = 0;
-   ud.unlock_cb  = unlock_cb;
-   ud.userdata   = userdata;
-
-   rjson_parse_quick(json, &ud, CHEEVOS_RJSON_OPTIONS,
-         NULL, NULL,
-         rcheevos_deactivate_number,
-         rcheevos_deactivate_elements_stop,
-         rcheevos_deactivate_elements_stop,
-         rcheevos_deactivate_elements_begin,
-         rcheevos_deactivate_elements_stop,
-         NULL, NULL, NULL);
-}
-
-/*****************************************************************************
-Returns the game ID
-*****************************************************************************/
-
-unsigned chevos_get_gameid(const char* json)
-{
-   char gameid[32];
-
-   if (rcheevos_get_value(json, CHEEVOS_JSON_KEY_GAMEID, gameid, sizeof(gameid)) != 0)
-      return 0;
-
-   return (unsigned)strtol(gameid, NULL, 10);
-}
@@ -1,39 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2018 - Andre Leiradella
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RARCH_CHEEVOS_PARSER_H
-#define __RARCH_CHEEVOS_PARSER_H
-
-#include "cheevos_locals.h"
-
-RETRO_BEGIN_DECLS
-
-typedef void (*rcheevos_unlock_cb_t)(unsigned id, void* userdata);
-
-int rcheevos_get_json_error(const char* json, char* token, size_t length);
-
-int rcheevos_get_token(const char* json, char* username, size_t username_length,
-      char* token, size_t length);
-
-int  rcheevos_get_patchdata(const char* json, rcheevos_rapatchdata_t* patchdata);
-void rcheevos_free_patchdata(rcheevos_rapatchdata_t* patchdata);
-
-void rcheevos_deactivate_unlocks(const char* json, rcheevos_unlock_cb_t unlock_cb, void* userdata);
-
-unsigned chevos_get_gameid(const char* json);
-
-RETRO_END_DECLS
-
-#endif
@@ -1,75 +0,0 @@
-#ifndef __RARCH_CHEEVOS_CORO_H
-#define __RARCH_CHEEVOS_CORO_H
-
-/*
-Released under the CC0: https://creativecommons.org/publicdomain/zero/1.0/
-*/
-
-/* Use at the beginning of the coroutine, you must have declared a variable rcheevos_coro_t* coro */
-#define CORO_ENTER() \
-  { \
-  CORO_again: ; \
-  switch ( coro->step ) { \
-  case CORO_BEGIN: ;
-
-/* Use to define labels which are targets to GOTO and GOSUB */
-#define CORO_SUB( x ) \
-  case x: ;
-
-/* Use at the end of the coroutine */
-#define CORO_LEAVE() \
-  } } \
-  do { return 0; } while ( 0 )
-
-/* Go to the x label */
-#define CORO_GOTO( x ) \
-  do { \
-    coro->step = ( x ); \
-    goto CORO_again; \
-  } while ( 0 )
-
-/* Go to a subroutine, execution continues until the subroutine returns via RET */
-#define CORO_GOSUB( x ) \
-  do { \
-    coro->stack[ coro->sp++ ] = __LINE__; \
-    coro->step = ( x ); \
-    goto CORO_again; \
-    case __LINE__: ; \
-  } while ( 0 )
-
-/* Returns from a subroutine */
-#define CORO_RET() \
-  do { \
-    coro->step = coro->stack[ --coro->sp ]; \
-    goto CORO_again; \
-  } while ( 0 )
-
-/* Yields to the caller, execution continues from this point when the coroutine is resumed */
-#define CORO_YIELD() \
-  do { \
-    coro->step = __LINE__; \
-    return 1; \
-    case __LINE__: ; \
-  } while ( 0 )
-
-/* The coroutine entry point, never use 0 as a label */
-#define CORO_BEGIN 0
-
-/* Sets up the coroutine */
-#define CORO_SETUP() \
-  do { \
-    coro->step = CORO_BEGIN; \
-    coro->sp   = 0; \
-  } while ( 0 )
-
-#define CORO_STOP() \
-  do { \
-    return 0; \
-  } while ( 0 )
-
-/* Add this macro to your rcheevos_coro_t structure containing the variables for the coroutine */
-#define CORO_FIELDS \
-  int step, sp; \
-  int stack[ 8 ];
-
-#endif /* __RARCH_CHEEVOS_CORO_H */
@@ -23,13 +23,17 @@
 #include <boolean.h>
 #include <retro_common_api.h>

-#include "retroarch.h"
-#include "input/input_defines.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

+#include <streams/interface_stream.h>
+
+#include "retroarch_types.h"
+#include "input/input_defines.h"
+
+#include "configuration.h"
+
 RETRO_BEGIN_DECLS

 #define MAX_CMD_DRIVERS              3
@@ -73,16 +77,22 @@ enum event_command
   /* Loads core. */
   CMD_EVENT_LOAD_CORE,
   CMD_EVENT_LOAD_CORE_PERSIST,
+#if defined(HAVE_RUNAHEAD) && (defined(HAVE_DYNAMIC) || defined(HAVE_DYLIB))
+   CMD_EVENT_LOAD_SECOND_CORE,
+#endif
   CMD_EVENT_UNLOAD_CORE,
   CMD_EVENT_CLOSE_CONTENT,
   CMD_EVENT_LOAD_STATE,
+   CMD_EVENT_LOAD_STATE_FROM_RAM,
   /* Swaps the current state with what's on the undo load buffer */
   CMD_EVENT_UNDO_LOAD_STATE,
   /* Rewrites a savestate on disk */
   CMD_EVENT_UNDO_SAVE_STATE,
   CMD_EVENT_SAVE_STATE,
+   CMD_EVENT_SAVE_STATE_TO_RAM,
   CMD_EVENT_SAVE_STATE_DECREMENT,
   CMD_EVENT_SAVE_STATE_INCREMENT,
+   CMD_EVENT_RAM_STATE_TO_FILE,
   /* Takes screenshot. */
   CMD_EVENT_TAKE_SCREENSHOT,
   /* Quits RetroArch. */
@@ -274,12 +284,116 @@ command_t* command_uds_new(void);

 bool command_network_send(const char *cmd_);

-/* These forward declarations need to be declared before
- * the global state is declared */
+#ifdef HAVE_BSV_MOVIE
+struct bsv_state
+{
+   /* Movie playback/recording support. */
+   char movie_path[PATH_MAX_LENGTH];
+   /* Immediate playback/recording. */
+   char movie_start_path[PATH_MAX_LENGTH];
+
+   bool movie_start_recording;
+   bool movie_start_playback;
+   bool movie_playback;
+   bool eof_exit;
+   bool movie_end;
+
+};
+
+struct bsv_movie
+{
+   intfstream_t *file;
+   uint8_t *state;
+   /* A ring buffer keeping track of positions
+    * in the file for each frame. */
+   size_t *frame_pos;
+   size_t frame_mask;
+   size_t frame_ptr;
+   size_t min_file_pos;
+   size_t state_size;
+
+   bool playback;
+   bool first_rewind;
+   bool did_rewind;
+};
+
+typedef struct bsv_movie bsv_movie_t;
+#endif
+
+#ifdef HAVE_CONFIGFILE
+bool command_event_save_config(
+      const char *config_path,
+      char *s, size_t len);
+#endif
+
+void command_event_undo_save_state(char *s, size_t len);
+
+void command_event_undo_load_state(char *s, size_t len);
+
+void command_event_set_mixer_volume(
+      settings_t *settings,
+      float gain);
+
+bool command_event_resize_windowed_scale(settings_t *settings,
+      unsigned window_scale);
+
+bool command_event_save_auto_state(
+      bool savestate_auto_save,
+      global_t *global,
+      const enum rarch_core_type current_core_type);
+
+/**
+ * event_set_volume:
+ * @gain      : amount of gain to be applied to current volume level.
+ *
+ * Adjusts the current audio volume level.
+ *
+ **/
+void command_event_set_volume(
+      settings_t *settings,
+      float gain,
+      bool widgets_active,
+      bool audio_driver_mute_enable);
+
+/**
+ * command_event_init_controllers:
+ *
+ * Initialize libretro controllers.
+ **/
+void command_event_init_controllers(rarch_system_info_t *info,
+      settings_t *settings, unsigned num_active_users);
+
+void command_event_load_auto_state(global_t *global);
+
+void command_event_set_savestate_auto_index(
+      settings_t *settings,
+      const global_t *global);
+
+void command_event_set_savestate_garbage_collect(
+      const global_t *global,
+      unsigned max_to_keep,
+      bool show_hidden_files
+      );
+
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
 bool command_set_shader(command_t *cmd, const char *arg);
 #endif
+
+#ifdef HAVE_CHEATS
+void command_event_init_cheats(
+      bool apply_cheats_after_load,
+      const char *path_cheat_db,
+      void *bsv_movie_data);
+#endif
+
 #if defined(HAVE_COMMAND)
+struct cmd_action_map
+{
+   const char *str;
+   bool (*action)(command_t* cmd, const char *arg);
+   const char *arg_desc;
+};
+
 bool command_version(command_t *cmd, const char* arg);
 bool command_get_status(command_t *cmd, const char* arg);
 bool command_get_config_param(command_t *cmd, const char* arg);
@@ -290,13 +404,13 @@ bool command_write_ram(command_t *cmd, const char *arg);
 #endif
 bool command_read_memory(command_t *cmd, const char *arg);
 bool command_write_memory(command_t *cmd, const char *arg);
-
-struct cmd_action_map
-{
-   const char *str;
-   bool (*action)(command_t* cmd, const char *arg);
-   const char *arg_desc;
-};
+uint8_t *command_memory_get_pointer(
+      const rarch_system_info_t* system,
+      unsigned address,
+      unsigned int* max_bytes,
+      int for_write,
+      char *reply_at,
+      size_t len);

 static const struct cmd_action_map action_map[] = {
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
@@ -368,6 +482,40 @@ static const struct cmd_map map[] = {
 };
 #endif

+#ifdef HAVE_CONFIGFILE
+/**
+ * command_event_save_core_config:
+ *
+ * Saves a new (core) configuration to a file. Filename is based
+ * on heuristics to avoid typing.
+ *
+ * Returns: true (1) on success, otherwise false (0).
+ **/
+bool command_event_save_core_config(
+      const char *dir_menu_config,
+      const char *rarch_path_config);
+
+/**
+ * command_event_save_current_config:
+ *
+ * Saves current configuration file to disk, and (optionally)
+ * autosave state.
+ **/
+void command_event_save_current_config(enum override_type type);
+#endif
+
+/**
+ * command_event_disk_control_append_image:
+ * @path                 : Path to disk image.
+ *
+ * Appends disk image to disk image list.
+ **/
+bool command_event_disk_control_append_image(const char *path);
+
+void command_event_reinit(const int flags);
+
+bool command_event_main_state(unsigned cmd);
+
 RETRO_END_DECLS

 #endif
@@ -280,6 +280,12 @@
 #define DEFAULT_FULLSCREEN_Y 0
 #endif

+#if defined(HAVE_WINDOW_OFFSET)
+/* Screen offsets to center content in CTRs */
+#define DEFAULT_WINDOW_OFFSET_X 0
+#define DEFAULT_WINDOW_OFFSET_Y 0
+#endif
+
 /* Number of threads to use for video recording */
 #define DEFAULT_VIDEO_RECORD_THREADS 2

@@ -338,6 +344,7 @@
 */
 #define DEFAULT_FRAME_DELAY 0
 #define MAXIMUM_FRAME_DELAY 19
+#define DEFAULT_FRAME_DELAY_AUTO false

 /* Inserts black frame(s) inbetween frames.
 * Useful for Higher Hz monitors (set to multiples of 60 Hz) who want to play 60 Hz 
@@ -412,6 +419,21 @@
 #define DEFAULT_SHADER_ENABLE false
 #endif

+/* Should we enable hdr when its supported*/
+#define DEFAULT_VIDEO_HDR_ENABLE false
+
+/* The maximum nunmber of nits the actual display can show - needs to be calibrated */
+#define DEFAULT_VIDEO_HDR_MAX_NITS 1000.0f
+
+/* The number of nits that paper white is at */
+#define DEFAULT_VIDEO_HDR_PAPER_WHITE_NITS 200.0f
+
+/* The contrast setting for hdr used to calculate the display gamma by dividing this value by gamma 2.2  */
+#define DEFAULT_VIDEO_HDR_CONTRAST 5.0f
+
+/* Should we expand the colour gamut when using hdr */
+#define DEFAULT_VIDEO_HDR_EXPAND_GAMUT true
+
 /* When presets are saved they will be saved using the #reference 
 * directive by default */
 #define DEFAULT_VIDEO_SHADER_PRESET_SAVE_REFERENCE_ENABLE true
@@ -458,7 +480,7 @@
 * in Dingux devices */
 #define DEFAULT_DINGUX_REFRESH_RATE DINGUX_REFRESH_RATE_60HZ
 #endif
-#if defined(RS90)
+#if defined(RS90) || defined(MIYOO)
 /* Sets image filtering method on the RS90
 * when integer scaling is disabled */
 #define DEFAULT_DINGUX_RS90_SOFTFILTER_TYPE DINGUX_RS90_SOFTFILTER_POINT
@@ -785,22 +807,24 @@ static const bool default_savefiles_in_content_dir = false;
 static const bool default_systemfiles_in_content_dir = false;
 static const bool default_screenshots_in_content_dir = false;

-#if defined(RS90) || defined(RETROFW)
-#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_TOGGLE_START_SELECT
+#if defined(RS90) || defined(RETROFW) || defined(MIYOO)
+#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_COMBO_START_SELECT
 #elif defined(_XBOX1) || defined(__PS3__) || defined(_XBOX360) || defined(DINGUX)
-#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_TOGGLE_L3_R3
+#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_COMBO_L3_R3
 #elif defined(PS2) || defined(PSP)
-#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_TOGGLE_HOLD_START
+#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_COMBO_HOLD_START
 #elif defined(VITA)
-#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_TOGGLE_L1_R1_START_SELECT
+#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_COMBO_L1_R1_START_SELECT
 #elif defined(SWITCH) || defined(ORBIS)
-#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_TOGGLE_START_SELECT
+#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_COMBO_START_SELECT
 #elif TARGET_OS_TV
-#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_TOGGLE_DOWN_Y_L_R
+#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_COMBO_DOWN_Y_L_R
 #else
-#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_TOGGLE_NONE
+#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_COMBO_NONE
 #endif

+#define DEFAULT_QUIT_GAMEPAD_COMBO INPUT_COMBO_NONE
+
 #if defined(VITA)
 static const unsigned input_backtouch_enable       = false;
 static const unsigned input_backtouch_toggle       = false;
@@ -818,14 +842,18 @@ static const unsigned input_backtouch_toggle       = false;

 #define DEFAULT_OVERLAY_SHOW_INPUTS_PORT 0

-#define DEFAULT_ALL_USERS_CONTROL_MENU false
-
 #if defined(ANDROID) || defined(_WIN32)
 #define DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS true
 #else
 #define DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS false
 #endif

+#if defined(WIIU)
+#define DEFAULT_ALL_USERS_CONTROL_MENU true
+#else
+#define DEFAULT_ALL_USERS_CONTROL_MENU false
+#endif
+
 #define DEFAULT_QUIT_PRESS_TWICE true

 #define DEFAULT_LOG_TO_FILE false
@@ -992,10 +1020,14 @@ static const bool audio_enable_menu_bgm    = false;
 #define DEFAULT_NOTIFICATION_SHOW_REFRESH_RATE true
 #endif

+#ifdef HAVE_NETWORKING
+#define DEFAULT_NOTIFICATION_SHOW_NETPLAY_EXTRA false
+#endif
+
 /* Output samplerate. */
 #ifdef GEKKO
 #define DEFAULT_OUTPUT_RATE 32000
-#elif defined(_3DS) || defined(RETROFW)
+#elif defined(_3DS) || defined(RETROFW) || defined(MIYOO)
 #define DEFAULT_OUTPUT_RATE 32730
 #else
 #define DEFAULT_OUTPUT_RATE 48000
@@ -1006,7 +1038,7 @@ static const bool audio_enable_menu_bgm    = false;

 /* Desired audio latency in milliseconds. Might not be honored
 * if driver can't provide given latency. */
-#if defined(ANDROID) || defined(EMSCRIPTEN) || defined(RETROFW)
+#if defined(ANDROID) || defined(EMSCRIPTEN) || defined(RETROFW) || defined(MIYOO)
 /* For most Android devices, 64ms is way too low. */
 #define DEFAULT_OUT_LATENCY 128
 #else
@@ -1080,7 +1112,7 @@ static const bool audio_enable_menu_bgm    = false;
 #define DEFAULT_APPLY_CHEATS_AFTER_LOAD false


-#if defined(RETROFW)
+#if defined(RETROFW) || defined(MIYOO)
 /*RETROFW jz4760 has signficant slowdown with default settings */
 #define DEFAULT_REWIND_BUFFER_SIZE (1 << 20)
 #define DEFAULT_REWIND_BUFFER_SIZE_STEP 1 
@@ -1143,6 +1175,7 @@ static const bool netplay_use_mitm_server = false;
 #define DEFAULT_NETPLAY_MITM_SERVER "nyc"

 #ifdef HAVE_NETWORKING
+static const unsigned netplay_max_connections = 3;
 static const unsigned netplay_share_digital = RARCH_NETPLAY_SHARE_DIGITAL_NO_PREFERENCE;

 static const unsigned netplay_share_analog = RARCH_NETPLAY_SHARE_ANALOG_NO_PREFERENCE;
@@ -1379,7 +1412,7 @@ static const unsigned menu_left_thumbnails_default = 0;
 static const unsigned gfx_thumbnail_upscale_threshold = 0;

 #ifdef HAVE_MENU
-#if defined(RS90)
+#if defined(RS90) || defined(MIYOO)
 /* The RS-90 has a hardware clock that is neither
 * configurable nor persistent, rendering it useless.
 * We therefore hide it in the menu by default. */
@@ -1449,7 +1482,9 @@ static const bool enable_device_vibration    = false;
 /* Defines the strength of rumble effects
 * on OpenDingux devices */
 #if defined(DINGUX) && defined(HAVE_LIBSHAKE)
-#define DEFAULT_DINGUX_RUMBLE_GAIN 50
+#define DEFAULT_RUMBLE_GAIN 50
+#else
+#define DEFAULT_RUMBLE_GAIN 100
 #endif

 #ifdef HAVE_VULKAN
@@ -25,6 +25,10 @@
 #include <retro_common_api.h>
 #include <retro_miscellaneous.h>

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "gfx/video_defines.h"
 #include "input/input_defines.h"
 #include "led/led_defines.h"
@@ -33,6 +37,8 @@
 #include "lakka.h"
 #endif

+#include "msg_hash.h"
+
 #define configuration_set_float(settings, var, newvar) \
 { \
   settings->modified = true; \
@@ -63,6 +69,8 @@
   strlcpy(var, newvar, sizeof(var)); \
 }

+#define INPUT_CONFIG_BIND_MAP_GET(i) ((const struct input_bind_map*)&input_config_bind_map[(i)])
+
 enum crt_switch_type
 {
   CRT_SWITCH_NONE = 0,
@@ -82,6 +90,25 @@ enum override_type

 RETRO_BEGIN_DECLS

+/* Input config. */
+struct input_bind_map
+{
+   const char *base;
+
+   enum msg_hash_enums desc;
+
+   /* Meta binds get input as prefix, not input_playerN".
+    * 0 = libretro related.
+    * 1 = Common hotkey.
+    * 2 = Uncommon/obscure hotkey.
+    */
+   uint8_t meta;
+
+   uint8_t retro_key;
+
+   bool valid;
+};
+
 typedef struct settings
 {
   struct
@@ -113,6 +140,10 @@ typedef struct settings
 #endif
 #ifdef HAVE_D3D12
      int d3d12_gpu_index;
+#endif
+#ifdef HAVE_WINDOW_OFFSET
+      int video_window_offset_x;
+      int video_window_offset_y;
 #endif
      int content_favorites_size;
   } ints;
@@ -160,14 +191,16 @@ typedef struct settings
 #endif
      unsigned input_touch_scale;
      unsigned input_hotkey_block_delay;
+      unsigned input_quit_gamepad_combo;
      unsigned input_menu_toggle_gamepad_combo;
      unsigned input_keyboard_gamepad_mapping_type;
      unsigned input_poll_type_behavior;
-      unsigned input_dingux_rumble_gain;
+      unsigned input_rumble_gain;
      unsigned input_auto_game_focus;
      unsigned input_max_users;

      unsigned netplay_port;
+      unsigned netplay_max_connections;
      unsigned netplay_input_latency_frames_min;
      unsigned netplay_input_latency_frames_range;
      unsigned netplay_share_digital;
@@ -318,6 +351,9 @@ typedef struct settings
      float video_msg_color_g;
      float video_msg_color_b;
      float video_msg_bgcolor_opacity;
+      float video_hdr_max_nits;
+      float video_hdr_paper_white_nits;
+      float video_hdr_display_contrast;

      float menu_scale_factor;
      float menu_widget_scale_factor;
@@ -498,6 +534,7 @@ typedef struct settings
      bool video_smooth;
      bool video_ctx_scaling;
      bool video_force_aspect;
+      bool video_frame_delay_auto;
      bool video_crop_overscan;
      bool video_aspect_ratio_auto;
      bool video_dingux_ipu_keep_aspect;
@@ -526,6 +563,8 @@ typedef struct settings
 #ifdef HAVE_VIDEO_LAYOUT
      bool video_layout_enable;
 #endif
+      bool video_hdr_enable;
+      bool video_hdr_expand_gamut;

      /* Accessibility */
      bool accessibility_enable;
@@ -556,6 +595,7 @@ typedef struct settings
      bool input_overlay_auto_scale;
      bool input_descriptor_label_show;
      bool input_descriptor_hide_unbound;
+      bool input_all_users_control_menu;
      bool input_menu_swap_ok_cancel_buttons;
      bool input_backtouch_enable;
      bool input_backtouch_toggle;
@@ -586,6 +626,7 @@ typedef struct settings
      bool notification_show_screenshot;
 #endif
      bool notification_show_refresh_rate;
+      bool notification_show_netplay_extra;
      bool menu_widget_scale_auto;
      bool menu_show_start_screen;
      bool menu_pause_libretro;
@@ -1042,6 +1083,10 @@ void config_load_file_salamander(void);
 void config_save_file_salamander(void);
 #endif

+void config_init(void);
+
+void config_deinit(void);
+
 settings_t *config_get_ptr(void);

 #ifdef HAVE_LAKKA
@@ -1049,6 +1094,27 @@ const char *config_get_all_timezones(void);
 void config_set_timezone(char *timezone);
 #endif

+bool input_config_bind_map_get_valid(unsigned bind_index);
+
+void input_config_parse_joy_button(
+      char *s,
+      void *data, const char *prefix,
+      const char *btn, void *bind_data);
+
+void input_config_parse_joy_axis(
+      char *s,
+      void *conf_data, const char *prefix,
+      const char *axis, void *bind_data);
+
+void input_config_parse_mouse_button(
+      char *s,
+      void *conf_data, const char *prefix,
+      const char *btn, void *bind_data);
+
+const char *input_config_get_prefix(unsigned user, bool meta);
+
+extern const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL];
+
 RETRO_END_DECLS

 #endif
@@ -45,12 +45,24 @@ bool content_load_ram_file(unsigned slot);
 /* Save a RAM state from memory to disk. */
 bool content_save_ram_file(unsigned slot, bool compress);

+/* Load a state from memory. */
+bool content_load_state_from_ram(void);
+
+/* Save a state to memory. */
+bool content_save_state_to_ram(void);
+
+/* Save a ram state from memory to disk. */
+bool content_ram_state_to_file(const char *path);
+
 /* Load a state from disk to memory. */
 bool content_load_state(const char* path, bool load_to_backup_buffer, bool autoload);

 /* Save a state from memory to disk. */
 bool content_save_state(const char *path, bool save_to_disk, bool autosave);

+/* Check a ram state write to disk. */
+bool content_ram_state_pending(void);
+
 /* Gets the number of bytes required to serialize the state. */
 size_t content_get_serialized_size(void);

@@ -23,130 +23,10 @@

 #include <retro_common_api.h>

-#include "core_type.h"
-#include "input/input_defines.h"
-#include "disk_control_interface.h"
+#include "retroarch_types.h"

 RETRO_BEGIN_DECLS

-enum
-{
-   /* Polling is performed before
-    * call to retro_run. */
-   POLL_TYPE_EARLY = 0,
-
-   /* Polling is performed when requested. */
-   POLL_TYPE_NORMAL,
-
-   /* Polling is performed on first call to
-    * retro_input_state per frame. */
-   POLL_TYPE_LATE
-};
-
-typedef struct rarch_memory_descriptor
-{
-   struct retro_memory_descriptor core;        /* uint64_t alignment */
-   size_t disconnect_mask;
-} rarch_memory_descriptor_t;
-
-typedef struct rarch_memory_map
-{
-   rarch_memory_descriptor_t *descriptors;
-   unsigned num_descriptors;
-} rarch_memory_map_t;
-
-typedef struct rarch_system_info
-{
-   struct retro_location_callback location_cb; /* ptr alignment */
-   disk_control_interface_t disk_control;      /* ptr alignment */
-   struct retro_system_info info;              /* ptr alignment */
-   rarch_memory_map_t mmaps;                   /* ptr alignment */
-   const char *input_desc_btn[MAX_USERS][RARCH_FIRST_META_KEY];
-   struct
-   {
-      struct retro_subsystem_info *data;
-      unsigned size;
-   } subsystem;
-   struct
-   {
-      struct retro_controller_info *data;
-      unsigned size;
-   } ports;
-   unsigned rotation;
-   unsigned performance_level;
-   char valid_extensions[255];
-   bool load_no_content;
-   bool supports_vfs;
-} rarch_system_info_t;
-
-typedef struct retro_ctx_input_state_info
-{
-   retro_input_state_t cb;
-} retro_ctx_input_state_info_t;
-
-typedef struct retro_ctx_cheat_info
-{
-   const char *code;
-   unsigned index;
-   bool enabled;
-} retro_ctx_cheat_info_t;
-
-typedef struct retro_ctx_api_info
-{
-   unsigned version;
-} retro_ctx_api_info_t;
-
-typedef struct retro_ctx_region_info
-{
-  unsigned region;
-} retro_ctx_region_info_t;
-
-typedef struct retro_ctx_controller_info
-{
-   unsigned port;
-   unsigned device;
-} retro_ctx_controller_info_t;
-
-typedef struct retro_ctx_memory_info
-{
-   void *data;
-   size_t size;
-   unsigned id;
-} retro_ctx_memory_info_t;
-
-typedef struct retro_ctx_load_content_info
-{
-   struct retro_game_info *info;
-   const struct string_list *content;
-   const struct retro_subsystem_info *special;
-} retro_ctx_load_content_info_t;
-
-typedef struct retro_ctx_serialize_info
-{
-   const void *data_const;
-   void *data;
-   size_t size;
-} retro_ctx_serialize_info_t;
-
-typedef struct retro_ctx_size_info
-{
-   size_t size;
-} retro_ctx_size_info_t;
-
-typedef struct retro_ctx_environ_info
-{
-   retro_environment_t env;
-} retro_ctx_environ_info_t;
-
-typedef struct retro_callbacks
-{
-   retro_video_refresh_t frame_cb;
-   retro_audio_sample_t sample_cb;
-   retro_audio_sample_batch_t sample_batch_cb;
-   retro_input_state_t state_cb;
-   retro_input_poll_t poll_cb;
-} retro_callbacks_t;
-
 #ifdef HAVE_REWIND
 bool core_set_rewind_callbacks(void);
 #endif
@@ -187,6 +67,14 @@ bool core_set_controller_port_device(retro_ctx_controller_info_t *pad);

 bool core_has_set_input_descriptor(void);

+/**
+ * core_set_default_callbacks:
+ * @data           : pointer to retro_callbacks object
+ *
+ * Binds the libretro callbacks to default callback functions.
+ **/
+bool core_set_default_callbacks(void *data);
+
 RETRO_END_DECLS

 #endif
@@ -152,7 +152,7 @@ bool core_backup_get_backup_path(

   /* Generate backup filename */
   snprintf(backup_filename, sizeof(backup_filename),
-         "%s.%04u%02u%02uT%02u%02u%02u.%08x.%u%s",
+         "%s.%04u%02u%02uT%02u%02u%02u.%08lx.%u%s",
         core_filename,
         (unsigned)time_info.tm_year + 1900,
         (unsigned)time_info.tm_mon + 1,
@@ -160,7 +160,7 @@ bool core_backup_get_backup_path(
         (unsigned)time_info.tm_hour,
         (unsigned)time_info.tm_min,
         (unsigned)time_info.tm_sec,
-         crc,
+         (unsigned long)crc,
         (unsigned)backup_mode,
         FILE_PATH_CORE_BACKUP_EXTENSION);

@@ -423,6 +423,7 @@ static bool core_backup_add_entry(core_backup_list_t *backup_list,
 {
   char *backup_filename           = NULL;
   core_backup_list_entry_t *entry = NULL;
+   unsigned long crc               = 0;
   unsigned backup_mode            = 0;

   if (!backup_list ||
@@ -449,12 +450,13 @@ static bool core_backup_add_entry(core_backup_list_t *backup_list,
   entry = &backup_list->entries[backup_list->size];

   if (sscanf(backup_filename + strlen(core_filename),
-       ".%04u%02u%02uT%02u%02u%02u.%08x.%u",
+       ".%04u%02u%02uT%02u%02u%02u.%08lx.%u",
       &entry->date.year, &entry->date.month, &entry->date.day,
       &entry->date.hour, &entry->date.minute, &entry->date.second,
-       &entry->crc, &backup_mode) != 8)
+       &crc, &backup_mode) != 8)
      goto error;

+   entry->crc         = (uint32_t)crc;
   entry->backup_mode = (enum core_backup_mode)backup_mode;

   /* Cache backup path */
@@ -748,6 +750,6 @@ bool core_backup_list_get_entry_crc_str(
   if (!entry || (len < 9))
      return false;

-   snprintf(crc, len, "%08x", entry->crc);
+   snprintf(crc, len, "%08lx", (unsigned long)entry->crc);
   return true;
 }
@@ -81,12 +81,22 @@ typedef struct
 static void core_info_free(core_info_t* info);
 static uint32_t core_info_hash_string(const char *str);
 static core_info_cache_list_t *core_info_cache_list_new(void);
-static void core_info_cache_add(core_info_cache_list_t *list, core_info_t *info,
-      bool transfer);
+static void core_info_cache_add(core_info_cache_list_t *list,
+      core_info_t *info, bool transfer);
+
+static core_info_state_t core_info_st = {
+#ifdef HAVE_COMPRESSION
+   NULL,
+#endif
+   NULL,
+   NULL,
+   NULL
+};

 /* JSON Handlers START */

-static bool CCJSONObjectMemberHandler(void *context, const char *pValue, size_t length)
+static bool CCJSONObjectMemberHandler(void *context,
+      const char *pValue, size_t length)
 {
   CCJSONContext *pCtx = (CCJSONContext *)context;

@@ -223,7 +233,8 @@ static bool CCJSONObjectMemberHandler(void *context, const char *pValue, size_t
   return true;
 }

-static bool CCJSONStringHandler(void *context, const char *pValue, size_t length)
+static bool CCJSONStringHandler(void *context,
+      const char *pValue, size_t length)
 {
   CCJSONContext *pCtx = (CCJSONContext*)context;

@@ -247,7 +258,8 @@ static bool CCJSONStringHandler(void *context, const char *pValue, size_t length
   return true;
 }

-static bool CCJSONNumberHandler(void *context, const char *pValue, size_t length)
+static bool CCJSONNumberHandler(void *context,
+      const char *pValue, size_t length)
 {
   CCJSONContext *pCtx = (CCJSONContext*)context;

@@ -1803,6 +1815,7 @@ static core_info_list_t *core_info_list_new(const char *path,
   core_info_list->list  = core_info;
   core_info_list->count = path_list->core_list->size;

+#ifdef HAVE_CORE_INFO_CACHE
   /* Read core info cache, if enabled */
   if (enable_cache)
   {
@@ -1810,6 +1823,7 @@ static core_info_list_t *core_info_list_new(const char *path,
      if (!core_info_cache_list)
         goto error;
   }
+#endif

   for (i = 0; i < path_list->core_list->size; i++)
   {
@@ -1977,7 +1991,7 @@ static bool core_info_does_support_file(

 static int core_info_qsort_cmp(const void *a_, const void *b_)
 {
-   core_info_state_t *p_coreinfo = coreinfo_get_ptr();
+   core_info_state_t *p_coreinfo = &core_info_st;
   const core_info_t          *a = (const core_info_t*)a_;
   const core_info_t          *b = (const core_info_t*)b_;
   int support_a                 = core_info_does_support_file(a,
@@ -2031,8 +2045,9 @@ static bool core_info_list_update_missing_firmware_internal(
   return true;
 }

-void core_info_free_current_core(core_info_state_t *p_coreinfo)
+void core_info_free_current_core(void)
 {
+   core_info_state_t *p_coreinfo = &core_info_st;
   if (p_coreinfo->current)
      free(p_coreinfo->current);
   p_coreinfo->current = NULL;
@@ -2040,7 +2055,7 @@ void core_info_free_current_core(core_info_state_t *p_coreinfo)

 bool core_info_init_current_core(void)
 {
-   core_info_state_t *p_coreinfo          = coreinfo_get_ptr();
+   core_info_state_t *p_coreinfo          = &core_info_st;
   core_info_t *current                   = (core_info_t*)
      malloc(sizeof(*current));
   if (!current)
@@ -2085,7 +2100,7 @@ bool core_info_init_current_core(void)

 bool core_info_get_current_core(core_info_t **core)
 {
-   core_info_state_t *p_coreinfo = coreinfo_get_ptr();
+   core_info_state_t *p_coreinfo          = &core_info_st;
   if (!core)
      return false;
   *core = p_coreinfo->current;
@@ -2094,7 +2109,7 @@ bool core_info_get_current_core(core_info_t **core)

 void core_info_deinit_list(void)
 {
-   core_info_state_t *p_coreinfo = coreinfo_get_ptr();
+   core_info_state_t *p_coreinfo          = &core_info_st;
   if (p_coreinfo->curr_list)
      core_info_list_free(p_coreinfo->curr_list);
   p_coreinfo->curr_list = NULL;
@@ -2104,9 +2119,12 @@ bool core_info_init_list(const char *path_info, const char *dir_cores,
      const char *exts, bool dir_show_hidden_files,
      bool enable_cache, bool *cache_supported)
 {
-   core_info_state_t *p_coreinfo = coreinfo_get_ptr();
-   if (!(p_coreinfo->curr_list = core_info_list_new(dir_cores,
-               !string_is_empty(path_info) ? path_info : dir_cores,
+   core_info_state_t *p_coreinfo          = &core_info_st;
+   if (!(p_coreinfo->curr_list            = core_info_list_new(
+               dir_cores,
+               !string_is_empty(path_info) 
+               ? path_info 
+               : dir_cores,
               exts,
               dir_show_hidden_files,
               enable_cache,
@@ -2117,7 +2135,7 @@ bool core_info_init_list(const char *path_info, const char *dir_cores,

 bool core_info_get_list(core_info_list_t **core)
 {
-   core_info_state_t *p_coreinfo = coreinfo_get_ptr();
+   core_info_state_t *p_coreinfo          = &core_info_st;
   if (!core)
      return false;
   *core = p_coreinfo->curr_list;
@@ -2127,7 +2145,7 @@ bool core_info_get_list(core_info_list_t **core)
 /* Returns number of installed cores */
 size_t core_info_count(void)
 {
-   core_info_state_t *p_coreinfo = coreinfo_get_ptr();
+   core_info_state_t *p_coreinfo          = &core_info_st;
   if (!p_coreinfo || !p_coreinfo->curr_list)
      return 0;
   return p_coreinfo->curr_list->count;
@@ -2136,7 +2154,7 @@ size_t core_info_count(void)
 bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info,
      bool *set_missing_bios)
 {
-   core_info_state_t *p_coreinfo = coreinfo_get_ptr();
+   core_info_state_t *p_coreinfo          = &core_info_st;
   if (!info)
      return false;
   return core_info_list_update_missing_firmware_internal(
@@ -2145,9 +2163,9 @@ bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info,
         set_missing_bios);
 }

-bool core_info_load(const char *core_path,
-      core_info_state_t *p_coreinfo)
+bool core_info_load(const char *core_path)
 {
+   core_info_state_t *p_coreinfo = &core_info_st;
   core_info_t    *core_info     = NULL;

   if (!p_coreinfo->current)
@@ -2168,7 +2186,7 @@ bool core_info_load(const char *core_path,
 bool core_info_find(const char *core_path,
      core_info_t **core_info)
 {
-   core_info_state_t *p_coreinfo = coreinfo_get_ptr();
+   core_info_state_t *p_coreinfo = &core_info_st;
   core_info_t *info             = NULL;

   if (!core_info || !p_coreinfo->curr_list)
@@ -2204,7 +2222,7 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
 #ifdef HAVE_COMPRESSION
   struct string_list *list      = NULL;
 #endif
-   core_info_state_t *p_coreinfo = coreinfo_get_ptr();
+   core_info_state_t *p_coreinfo = &core_info_st;

   if (!core_info_list)
      return;
@@ -2287,7 +2305,7 @@ bool core_info_database_match_archive_member(const char *database_path)

   path_remove_extension(database);

-   p_coreinfo               = coreinfo_get_ptr();
+   p_coreinfo                     = &core_info_st;

   if (p_coreinfo->curr_list)
   {
@@ -2326,7 +2344,7 @@ bool core_info_database_supports_content_path(

   path_remove_extension(database);

-   p_coreinfo                    = coreinfo_get_ptr();
+   p_coreinfo                    = &core_info_st;

   if (p_coreinfo->curr_list)
   {
@@ -148,7 +148,7 @@ void core_info_free_core_updater_info(core_updater_info_t *info);

 core_info_t *core_info_get(core_info_list_t *list, size_t i);

-void core_info_free_current_core(core_info_state_t *p_coreinfo);
+void core_info_free_current_core(void);

 bool core_info_init_current_core(void);

@@ -171,8 +171,7 @@ bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info,
 bool core_info_find(const char *core_path,
      core_info_t **core_info);

-bool core_info_load(const char *core_path,
-      core_info_state_t *p_coreinfo);
+bool core_info_load(const char *core_path);

 bool core_info_database_supports_content_path(const char *database_path, const char *path);

@@ -201,8 +200,6 @@ bool core_info_set_core_lock(const char *core_path, bool lock);
 *   must be checked externally */
 bool core_info_get_core_lock(const char *core_path, bool validate_path);

-core_info_state_t *coreinfo_get_ptr(void);
-
 bool core_info_core_file_id_is_equal(const char *core_path_a, const char *core_path_b);

 /* When called, generates a temporary file
@@ -25,6 +25,7 @@
 #endif

 #include "core_option_manager.h"
+#include "msg_hash.h"

 #define CORE_OPTION_MANAGER_MAP_TAG "#"
 #define CORE_OPTION_MANAGER_MAP_DELIM ":"
@@ -725,13 +726,20 @@ static bool core_option_manager_parse_variable(
   if (!option->val_labels)
      goto error;

-   /* > Loop over values and 'extract' labels */
+   /* > Loop over values and:
+    *   - Set value hashes
+    *   - 'Extract' labels */
   for (i = 0; i < option->vals->size; i++)
   {
      const char *value       = option->vals->elems[i].data;
+      uint32_t *value_hash    = (uint32_t *)malloc(sizeof(uint32_t));
      const char *value_label = core_option_manager_parse_value_label(
            value, NULL);

+      /* Set value hash */
+      *value_hash = core_option_manager_hash_string(value);
+      option->vals->elems[i].userdata = (void*)value_hash;
+
      /* Redundant safely check... */
      value_label = string_is_empty(value_label) ?
            value : value_label;
@@ -753,9 +761,15 @@ static bool core_option_manager_parse_variable(
   /* Set current config value */
   if (entry && !string_is_empty(entry->value))
   {
+      uint32_t entry_value_hash = core_option_manager_hash_string(entry->value);
+
      for (i = 0; i < option->vals->size; i++)
      {
-         if (string_is_equal(option->vals->elems[i].data, entry->value))
+         const char *value   = option->vals->elems[i].data;
+         uint32_t value_hash = *((uint32_t*)option->vals->elems[i].userdata);
+
+         if ((value_hash == entry_value_hash) &&
+             string_is_equal(value, entry->value))
         {
            option->index = i;
            break;
@@ -998,12 +1012,17 @@ static bool core_option_manager_parse_option(
   for (i = 0; i < num_vals; i++)
   {
      const char *value       = values[i].value;
+      uint32_t *value_hash    = (uint32_t *)malloc(sizeof(uint32_t));
      const char *value_label = values[i].label;

      /* Append value string
       * > We know that 'value' is always valid */
      string_list_append(option->vals, value, attr);

+      /* > Set value hash */
+      *value_hash = core_option_manager_hash_string(value);
+      option->vals->elems[option->vals->size - 1].userdata = (void*)value_hash;
+
      /* Value label requires additional processing */
      value_label = core_option_manager_parse_value_label(
            value, value_label);
@@ -1034,9 +1053,15 @@ static bool core_option_manager_parse_option(
   /* Set current config value */
   if (entry && !string_is_empty(entry->value))
   {
+      uint32_t entry_value_hash = core_option_manager_hash_string(entry->value);
+
      for (i = 0; i < option->vals->size; i++)
      {
-         if (string_is_equal(option->vals->elems[i].data, entry->value))
+         const char *value   = option->vals->elems[i].data;
+         uint32_t value_hash = *((uint32_t*)option->vals->elems[i].userdata);
+
+         if ((value_hash == entry_value_hash) &&
+             string_is_equal(value, entry->value))
         {
            option->index = i;
            break;
@@ -1479,6 +1504,57 @@ bool core_option_manager_get_idx(core_option_manager_t *opt,
   return false;
 }

+/**
+ * core_option_manager_get_val_idx:
+ *
+ * @opt     : options manager handle
+ * @idx     : core option index
+ * @val     : string representation of the
+ *            core option value
+ * @val_idx : index of core option value
+ *            corresponding to @val
+ *
+ * Fetches the index of the core option value
+ * identified by the specified core option @idx
+ * and @val string.
+ *
+ * Returns: true if option value matching the
+ * specified option index and value string
+ * was found, otherwise false.
+ **/
+bool core_option_manager_get_val_idx(core_option_manager_t *opt,
+      size_t idx, const char *val, size_t *val_idx)
+{
+   struct core_option *option = NULL;
+   uint32_t val_hash;
+   size_t i;
+
+   if (!opt ||
+       (idx >= opt->size) ||
+       string_is_empty(val) ||
+       !val_idx)
+      return false;
+
+   val_hash = core_option_manager_hash_string(val);
+   option   = (struct core_option*)&opt->opts[idx];
+
+   for (i = 0; i < option->vals->size; i++)
+   {
+      const char *option_val   = option->vals->elems[i].data;
+      uint32_t option_val_hash = *((uint32_t*)option->vals->elems[i].userdata);
+
+      if ((val_hash == option_val_hash) &&
+          !string_is_empty(option_val) &&
+          string_is_equal(val, option_val))
+      {
+         *val_idx = i;
+         return true;
+      }
+   }
+
+   return false;
+}
+
 /**
 * core_option_manager_get_desc:
 *
@@ -1678,7 +1754,7 @@ void core_option_manager_set_val(core_option_manager_t *opt,
   /* Refresh menu (if required) if core option
    * visibility has changed as a result of modifying
    * the current option value */
-   if (rarch_ctl(RARCH_CTL_CORE_OPTION_UPDATE_DISPLAY, NULL) &&
+   if (retroarch_ctl(RARCH_CTL_CORE_OPTION_UPDATE_DISPLAY, NULL) &&
       refresh_menu)
   {
      bool refresh = false;
@@ -1730,7 +1806,7 @@ void core_option_manager_adjust_val(core_option_manager_t* opt,
   /* Refresh menu (if required) if core option
    * visibility has changed as a result of modifying
    * the current option value */
-   if (rarch_ctl(RARCH_CTL_CORE_OPTION_UPDATE_DISPLAY, NULL) &&
+   if (retroarch_ctl(RARCH_CTL_CORE_OPTION_UPDATE_DISPLAY, NULL) &&
       refresh_menu)
   {
      bool refresh = false;
@@ -1776,7 +1852,7 @@ void core_option_manager_set_default(core_option_manager_t *opt,
   /* Refresh menu (if required) if core option
    * visibility has changed as a result of modifying
    * the current option value */
-   if (rarch_ctl(RARCH_CTL_CORE_OPTION_UPDATE_DISPLAY, NULL) &&
+   if (retroarch_ctl(RARCH_CTL_CORE_OPTION_UPDATE_DISPLAY, NULL) &&
       refresh_menu)
   {
      bool refresh = false;
@@ -23,8 +23,10 @@
 #include <retro_common_api.h>
 #include <lists/string_list.h>
 #include <lists/nested_list.h>
+#include <file/config_file.h>
+#include <libretro.h>

-#include "retroarch.h"
+#include <retro_miscellaneous.h>

 RETRO_BEGIN_DECLS

@@ -278,6 +280,27 @@ bool core_option_manager_get_category_visible(core_option_manager_t *opt,
 bool core_option_manager_get_idx(core_option_manager_t *opt,
      const char *key, size_t *idx);

+/**
+ * core_option_manager_get_val_idx:
+ *
+ * @opt     : options manager handle
+ * @idx     : core option index
+ * @val     : string representation of the
+ *            core option value
+ * @val_idx : index of core option value
+ *            corresponding to @val
+ *
+ * Fetches the index of the core option value
+ * identified by the specified core option @idx
+ * and @val string.
+ *
+ * Returns: true if option value matching the
+ * specified option index and value string
+ * was found, otherwise false.
+ **/
+bool core_option_manager_get_val_idx(core_option_manager_t *opt,
+      size_t idx, const char *val, size_t *val_idx);
+
 /**
 * core_option_manager_get_desc:
 *
@@ -8,7 +8,7 @@

 #ifdef RARCH_INTERNAL
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../../config.h"
 #endif
 #endif

@@ -8,7 +8,7 @@

 #ifdef RARCH_INTERNAL
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../../config.h"
 #endif
 #endif

@@ -149,31 +149,29 @@ int _FAT_open_r (struct _reent *r, void *fileStruct, const char *path, int flags
 		return -1;
 	}

-	/* Determine which mode the file is openned for */
-	if ((flags & 0x03) == O_RDONLY)
-   {
-		/* Open the file for read-only access */
-		file->read = true;
-		file->write = false;
-		file->append = false;
-	}
-   else if ((flags & 0x03) == O_WRONLY)
-   {
-		/* Open file for write only access */
-		file->read = false;
-		file->write = true;
-		file->append = false;
-	}
-   else if ((flags & 0x03) == O_RDWR)
-   {
-		/* Open file for read/write access */
-		file->read = true;
-		file->write = true;
-		file->append = false;
-	} else {
-		r->_errno = EACCES;
-		return -1;
-	}
+   switch((flags & 0x03)) {
+      case O_RDONLY:
+         /* Open the file for read-only access */
+         file->read = true;
+         file->write = false;
+         file->append = false;
+         break;
+      case O_WRONLY:
+         /* Open file for write only access */
+         file->read = false;
+         file->write = true;
+         file->append = false;
+         break;
+      case O_RDWR:
+   		/* Open file for read/write access */
+         file->read = true;
+         file->write = true;
+         file->append = false;
+         break;
+      default:
+		   r->_errno = EACCES;
+		   return -1;
+   }

 	/* Make sure we aren't trying to write to a read-only disc */
 	if (file->write && partition->readOnly)
@@ -1,3 +1,24 @@
+# v10.2.0
+
+* add RC_MEMSIZE_16_BITS_BE, RC_MEMSIZE_24_BITS_BE, and RC_MEMSIZE_32_BITS_BE
+* add secondary flag for RC_CONDITION_MEASURED that tells the UI when to show progress as raw vs. as a percentage
+* add rapi calls for fetch_leaderboard_info, fetch_achievement_info and fetch_game_list
+* add hash support for RC_CONSOLE_PSP
+* add RCHEEVOS_URL_SSL compile flag to use https in rurl functions
+* add space to "PC Engine" label
+* update RC_CONSOLE_INTELLIVISION memory map to acknowledge non-8-bit addresses
+* standardize to z64 format when hashing RC_CONSOLE_N64
+* prevent generating hash for PSX disc when requesting RC_CONSOLE_PLAYSTATION2
+* fix wrong error message being returned when a leaderboard was only slightly malformed
+
+# v10.1.0
+
+* add RC_RUNTIME_EVENT_ACHIEVEMENT_UNPRIMED
+* add rc_runtime_validate_addresses
+* add external memory to memory map for Magnavox Odyssey 2
+* fix memory map base address for NeoGeo Pocket
+* fix bitcount always returning 0 when used in rich presence
+
 # v10.0.0

 * add rapi sublibrary for communicating with server (eliminates need for client-side JSON parsing; client must still
@@ -0,0 +1,182 @@
+#ifndef RC_API_INFO_H
+#define RC_API_INFO_H
+
+#include "rc_api_request.h"
+
+#include <time.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* --- Fetch Achievement Info --- */
+
+/**
+ * API parameters for a fetch achievement info request.
+ */
+typedef struct rc_api_fetch_achievement_info_request_t {
+  /* The username of the player */
+  const char* username;
+  /* The API token from the login request */
+  const char* api_token;
+  /* The unique identifier of the achievement */
+  unsigned achievement_id;
+  /* The 1-based index of the first entry to retrieve */
+  unsigned first_entry;
+  /* The number of entries to retrieve */
+  unsigned count;
+  /* Non-zero to only return unlocks earned by the user's friends */
+  unsigned friends_only;
+}
+rc_api_fetch_achievement_info_request_t;
+
+/* An achievement awarded entry */
+typedef struct rc_api_achievement_awarded_entry_t {
+  /* The user associated to the entry */
+  const char* username;
+  /* When the achievement was awarded */
+  time_t awarded;
+}
+rc_api_achievement_awarded_entry_t;
+
+/**
+ * Response data for a fetch achievement info request.
+ */
+typedef struct rc_api_fetch_achievement_info_response_t {
+  /* The unique identifier of the achievement */
+  unsigned id;
+  /* The unique identifier of the game to which the leaderboard is associated */
+  unsigned game_id;
+  /* The number of times the achievement has been awarded */
+  unsigned num_awarded;
+  /* The number of players that have earned at least one achievement for the game */
+  unsigned num_players;
+
+  /* An array of recently rewarded entries */
+  rc_api_achievement_awarded_entry_t* recently_awarded;
+  /* The number of items in the recently_awarded array */
+  unsigned num_recently_awarded;
+
+  /* Common server-provided response information */
+  rc_api_response_t response;
+}
+rc_api_fetch_achievement_info_response_t;
+
+int rc_api_init_fetch_achievement_info_request(rc_api_request_t* request, const rc_api_fetch_achievement_info_request_t* api_params);
+int rc_api_process_fetch_achievement_info_response(rc_api_fetch_achievement_info_response_t* response, const char* server_response);
+void rc_api_destroy_fetch_achievement_info_response(rc_api_fetch_achievement_info_response_t* response);
+
+/* --- Fetch Leaderboard Info --- */
+
+/**
+ * API parameters for a fetch leaderboard info request.
+ */
+typedef struct rc_api_fetch_leaderboard_info_request_t {
+  /* The unique identifier of the leaderboard */
+  unsigned leaderboard_id;
+  /* The number of entries to retrieve */
+  unsigned count;
+  /* The 1-based index of the first entry to retrieve */
+  unsigned first_entry;
+  /* The username of the player around whom the entries should be returned */
+  const char* username;
+}
+rc_api_fetch_leaderboard_info_request_t;
+
+/* A leaderboard info entry */
+typedef struct rc_api_lboard_info_entry_t {
+  /* The user associated to the entry */
+  const char* username;
+  /* The rank of the entry */
+  unsigned rank;
+  /* The index of the entry */
+  unsigned index;
+  /* The value of the entry */
+  int score;
+  /* When the entry was submitted */
+  time_t submitted;
+}
+rc_api_lboard_info_entry_t;
+
+/**
+ * Response data for a fetch leaderboard info request.
+ */
+typedef struct rc_api_fetch_leaderboard_info_response_t {
+  /* The unique identifier of the leaderboard */
+  unsigned id;
+  /* The format to pass to rc_format_value to format the leaderboard value */
+  int format;
+  /* If non-zero, indicates that lower scores appear first */
+  int lower_is_better;
+  /* The title of the leaderboard */
+  const char* title;
+  /* The description of the leaderboard */
+  const char* description;
+  /* The definition of the leaderboard to be passed to rc_runtime_activate_lboard */
+  const char* definition;
+  /* The unique identifier of the game to which the leaderboard is associated */
+  unsigned game_id;
+  /* The author of the leaderboard */
+  const char* author;
+  /* When the leaderboard was first uploaded to the server */
+  time_t created;
+  /* When the leaderboard was last modified on the server */
+  time_t updated;
+
+  /* An array of requested entries */
+  rc_api_lboard_info_entry_t* entries;
+  /* The number of items in the entries array */
+  unsigned num_entries;
+
+  /* Common server-provided response information */
+  rc_api_response_t response;
+}
+rc_api_fetch_leaderboard_info_response_t;
+
+int rc_api_init_fetch_leaderboard_info_request(rc_api_request_t* request, const rc_api_fetch_leaderboard_info_request_t* api_params);
+int rc_api_process_fetch_leaderboard_info_response(rc_api_fetch_leaderboard_info_response_t* response, const char* server_response);
+void rc_api_destroy_fetch_leaderboard_info_response(rc_api_fetch_leaderboard_info_response_t* response);
+
+/* --- Fetch Games List --- */
+
+/**
+ * API parameters for a fetch games list request.
+ */
+typedef struct rc_api_fetch_games_list_request_t {
+  /* The unique identifier of the console to query */
+  unsigned console_id;
+}
+rc_api_fetch_games_list_request_t;
+
+/* A game list entry */
+typedef struct rc_api_game_list_entry_t {
+  /* The unique identifier of the game */
+  unsigned id;
+  /* The name of the game */
+  const char* name;
+}
+rc_api_game_list_entry_t;
+
+/**
+ * Response data for a fetch games list request.
+ */
+typedef struct rc_api_fetch_games_list_response_t {
+  /* An array of requested entries */
+  rc_api_game_list_entry_t* entries;
+  /* The number of items in the entries array */
+  unsigned num_entries;
+
+  /* Common server-provided response information */
+  rc_api_response_t response;
+}
+rc_api_fetch_games_list_response_t;
+
+int rc_api_init_fetch_games_list_request(rc_api_request_t* request, const rc_api_fetch_games_list_request_t* api_params);
+int rc_api_process_fetch_games_list_response(rc_api_fetch_games_list_response_t* response, const char* server_response);
+void rc_api_destroy_fetch_games_list_response(rc_api_fetch_games_list_response_t* response);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RC_API_INFO_H */