Bump version to 1.9.3

Merge pull request #12397 from jdgleaver/info-cache-default
Enable core info cache by default on all 'console' platforms
2026-11-10 03:21:30 -10:00 · 2021-05-15 19:57:59 +02:00 · 2021-05-14 17:58:04 +02:00 · 2021-05-14 16:49:30 +01:00 · 2021-05-14 16:15:15 +02:00 · 2021-05-14 13:47:46 +01:00
1960 changed files with 273964 additions and 148750 deletions
@@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Setup Java JDK
-        uses: actions/setup-java@v1.3.0
+        uses: actions/setup-java@v1
        with:
          java-version: 1.8
      - name: Setup Python
@@ -23,6 +23,9 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v2
      - name: Crowdin Sync
+        shell: bash
+        env:
+          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
        run: |
          cd intl
-          python3 crowdin_sync.py
+          python3 crowdin_sync.py "$CROWDIN_API_KEY"
@@ -9,6 +9,8 @@
 *.map
 *.swp
 *.cache
+*.gcda
+*.gcno
 .tmp
 .tmp.c
 .tmp.cxx
@@ -34,6 +36,7 @@ Release
 ipch
 *.user
 /bootstrap/gx/wii/app_booter/app_booter.bin
+/wii/app_booter/app_booter.bin
 *.zip
 RetroArch-w32/
 RetroArch-w64/
@@ -68,6 +71,7 @@ apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
 /rsound.h
 .pc
 /media/shaders_glsl/
+/media/shaders_slang/
 /obj-w32/
 .cproject
 .settings
@@ -77,12 +81,31 @@ convert_rumble.awk
 *~
 assets
 info
+content_favorites.lpl
 content_history.lpl
 content_image_history.lpl
 content_music_history.lpl
+content_video_history.lpl
 saves
 screenshots
+autoconfig
+config
+database
+overlays
+playlists
+states
+system
+shaders/shaders_cg
+shaders/shaders_glsl
+shaders/shaders_slang

+# Qt Creator
+*.cflags
+*.cxxflags
+*.creator*
+*.config
+*.files
+*.includes

 # Wii U
 *.depend
@@ -188,3 +211,17 @@ gfx/common/wayland/xdg-decoration-unstable-v1.h
 gfx/common/wayland/xdg-decoration-unstable-v1.c
 gfx/common/wayland/xdg-shell.c
 gfx/common/wayland/xdg-shell.h
+
+# libretro-common samples
+libretro-common/samples/streams/rzip/rzip
+
+# DINGUX
+*.opk
+
+#VITA
+param.sfo
+*.S
+*.wo
+*.elf
+*.self
+*.vpk
@@ -1,8 +1,911 @@
-before_script:
-  - apt-get update -qq && apt-get install -y -qq git build-essential
-  - apt-get update -qq && apt-get build-dep -y retroarch
+image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:latest

-build:
+stages:
+  - build-prepare
+  - build
+  - prepare-for-static-cores
+  - trigger-static-cores
+
+build-retroarch-windows-x64:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-mxe-win64-cross:gcc10
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+    STRIP_BIN:  1
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    - retroarch.exe
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
  script:
-    - ./configure
-    - make -j2
+    - "MOC=/usr/lib/mxe/usr/x86_64-w64-mingw32.shared/qt5/bin/moc ./configure --host=x86_64-w64-mingw32.shared"
+    - "make -j$NUMPROC"
+    - if [ $STRIP_BIN -eq 1 ]; then strip --strip-unneeded retroarch.exe; fi
+    - "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"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/redist"
+    - "cd libretro-common/audio/dsp_filters && make -j$NUMPROC platform=win compiler=x86_64-w64-mingw32.static-gcc build=release && make -j$NUMPROC platform=win compiler=x86_64-w64-mingw32.static-gcc build=release strip && cd -"
+    - "cp -f libretro-common/audio/dsp_filters/*.dll ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "cp -f libretro-common/audio/dsp_filters/*.dsp ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "cd gfx/video_filters && make -j$NUMPROC platform=win compiler=x86_64-w64-mingw32.static-gcc build=release && make -j$NUMPROC platform=win compiler=x86_64-w64-mingw32.static-gcc build=release strip && cd -"
+    - "cp -f gfx/video_filters/*.dll ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "cp -f gfx/video_filters/*.filt ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "cp -f retroarch.cfg ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/retroarch.default.cfg"
+    - "echo -e '[Paths]\nPlugins = ./' > ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/qt.conf"
+    - "/bin/bash /usr/lib/mxe/tools/copydlldeps.sh
+        --infile retroarch.exe
+        --destdir ${MEDIA_PATH}/${CI_PROJECT_NAME}/redist/
+        --recursivesrcdir /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/
+        --enforcedir /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/bearer/
+        --enforcedir /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/iconengines/
+        --enforcedir /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/imageformats/
+        --enforcedir /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/platforms/
+        --enforcedir /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/styles/
+        --copy
+        --objdump x86_64-w64-mingw32.shared-objdump"
+    - "rm -f ${MEDIA_PATH}/${CI_PROJECT_NAME}/redist/opengl32.dll"
+
+build-retroarch-windows-i686:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-mxe-win32-cross:gcc10
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+    STRIP_BIN:  1
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    - retroarch.exe
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - "MOC=/usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/bin/moc ./configure --host=i686-w64-mingw32.shared"
+    - "make -j$NUMPROC"
+    - if [ $STRIP_BIN -eq 1 ]; then strip --strip-unneeded retroarch.exe; fi
+    - "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"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/redist"
+    - "cd libretro-common/audio/dsp_filters && make -j$NUMPROC platform=win compiler=i686-w64-mingw32.static-gcc build=release && make -j$NUMPROC platform=win compiler=i686-w64-mingw32.static-gcc build=release strip && cd -"
+    - "cp -f libretro-common/audio/dsp_filters/*.dll ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "cp -f libretro-common/audio/dsp_filters/*.dsp ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "cd gfx/video_filters && make -j$NUMPROC platform=win compiler=i686-w64-mingw32.static-gcc build=release && make -j$NUMPROC platform=win compiler=i686-w64-mingw32.static-gcc build=release strip && cd -"
+    - "cp -f gfx/video_filters/*.dll ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "cp -f gfx/video_filters/*.filt ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "cp -f retroarch.cfg ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/retroarch.default.cfg"
+    - "echo -e '[Paths]\nPlugins = ./' > ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/qt.conf"
+    - "/bin/bash /usr/lib/mxe/tools/copydlldeps.sh
+        --infile retroarch.exe
+        --destdir ${MEDIA_PATH}/${CI_PROJECT_NAME}/redist/
+        --recursivesrcdir /usr/lib/mxe/usr/i686-w64-mingw32.shared/
+        --enforcedir /usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/bearer/
+        --enforcedir /usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/iconengines/
+        --enforcedir /usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/imageformats/
+        --enforcedir /usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/platforms/
+        --enforcedir /usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/styles/
+        --copy
+        --objdump i686-w64-mingw32.shared-objdump"
+    - "rm -f ${MEDIA_PATH}/${CI_PROJECT_NAME}/redist/opengl32.dll"
+
+build-retroarch-windows-msvc10-x64:
+  tags:
+    - msvc2010
+  stage: build
+  variables:
+    MEDIA_PATH:     .media
+    MSYSTEM:        MINGW64
+    ARCH:           x86_64
+    MSYS_BIN_DIR:   C:\msys64\usr\bin
+    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
+  before_script:
+    - $Env:HOME = "."
+    - $Env:Path += -join(";", "$Env:SDK_BIN_DIR", ";", "$Env:RCEDIT_BIN_DIR", ";", "$Env:PEDEPS_BIN_DIR")
+  artifacts:
+    paths:
+    - retroarch.exe
+    - ${MEDIA_PATH}
+    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
+
+build-retroarch-windows-msvc10-i686:
+  tags:
+    - msvc2010
+  stage: build
+  variables:
+    MEDIA_PATH:     .media
+    MSYSTEM:        MINGW32
+    ARCH:           x86
+    MSYS_BIN_DIR:   C:\msys64\usr\bin
+    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
+  before_script:
+    - $Env:HOME = "."
+    - $Env:Path += -join(";", "$Env:SDK_BIN_DIR", ";", "$Env:RCEDIT_BIN_DIR", ";", "$Env:PEDEPS_BIN_DIR")
+  artifacts:
+    paths:
+    - retroarch.exe
+    - ${MEDIA_PATH}
+    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
+
+build-retroarch-windows-msvc05-i686:
+  tags:
+    - win10
+  stage: build
+  variables:
+    MEDIA_PATH:     .media
+    MSYSTEM:        MINGW32
+    ARCH:           x86
+    MSYS_BIN_DIR:   C:\msys64\usr\bin
+    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
+    VS80COMNTOOLS:  C:\Program Files (x86)\Microsoft Visual Studio 8\Common7\Tools\
+  before_script:
+    - $Env:HOME = "."
+    - $Env:Path += -join(";", "$Env:SDK_BIN_DIR", ";", "$Env:RCEDIT_BIN_DIR", ";", "$Env:PEDEPS_BIN_DIR")
+  artifacts:
+    paths:
+    - retroarch.exe
+    - ${MEDIA_PATH}
+    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
+
+build-retroarch-linux-x64:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:xenial-gcc9
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+    STRIP_BIN:  1
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    - retroarch
+    - retroarch_qt
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    # Qt build
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/AppDirQt"
+    - "./configure --prefix=/usr"
+    - "make -j$NUMPROC"
+    - if [ $STRIP_BIN -eq 1 ]; then strip --strip-unneeded retroarch; fi
+    - "make install DESTDIR=${MEDIA_PATH}/${CI_PROJECT_NAME}/AppDirQt prefix=/usr"
+    - "rm -rf ${MEDIA_PATH}/${CI_PROJECT_NAME}/AppDirQt/etc"
+    - "cd ${MEDIA_PATH}/${CI_PROJECT_NAME}/ && tar -czf AppDirQt.tar.gz AppDirQt && rm -rf AppDirQt && cd -"
+    - "mv -f retroarch retroarch_qt"
+    # Non-Qt build
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/AppDir"
+    - "make clean"
+    - "./configure --disable-qt --prefix=/usr"
+    - "make -j$NUMPROC"
+    - if [ $STRIP_BIN -eq 1 ]; then strip --strip-unneeded retroarch; fi
+    - "make install DESTDIR=${MEDIA_PATH}/${CI_PROJECT_NAME}/AppDir prefix=/usr"
+    - "rm -rf ${MEDIA_PATH}/${CI_PROJECT_NAME}/AppDir/etc"
+    - "cd ${MEDIA_PATH}/${CI_PROJECT_NAME}/ && tar -czf AppDir.tar.gz AppDir && rm -rf AppDir && cd -"
+    # Filters
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "cd libretro-common/audio/dsp_filters && make -j$NUMPROC build=release && make -j$NUMPROC build=release strip && cd -"
+    - "cp -f libretro-common/audio/dsp_filters/*.so ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "cp -f libretro-common/audio/dsp_filters/*.dsp ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "cd gfx/video_filters && make -j$NUMPROC build=release && make -j$NUMPROC build=release strip && cd -"
+    - "cp -f gfx/video_filters/*.so ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "cp -f gfx/video_filters/*.filt ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+
+build-retroarch-linux-i686:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-i386-ubuntu:xenial-gcc9
+  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:
+    # Qt build
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/AppDirQt"
+    - "./configure --prefix=/usr"
+    - "make -j$NUMPROC"
+    - if [ $STRIP_BIN -eq 1 ]; then strip --strip-unneeded retroarch; fi
+    - "make install DESTDIR=${MEDIA_PATH}/${CI_PROJECT_NAME}/AppDirQt prefix=/usr"
+    - "rm -rf ${MEDIA_PATH}/${CI_PROJECT_NAME}/AppDirQt/etc"
+    - "cd ${MEDIA_PATH}/${CI_PROJECT_NAME}/ && tar -czf AppDirQt.tar.gz AppDirQt && rm -rf AppDirQt && cd -"
+    - "mv -f retroarch retroarch_qt"
+    # Non-Qt build
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/AppDir"
+    - "make clean"
+    - "./configure --disable-qt --prefix=/usr"
+    - "make -j$NUMPROC"
+    - if [ $STRIP_BIN -eq 1 ]; then strip --strip-unneeded retroarch; fi
+    - "make install DESTDIR=${MEDIA_PATH}/${CI_PROJECT_NAME}/AppDir prefix=/usr"
+    - "rm -rf ${MEDIA_PATH}/${CI_PROJECT_NAME}/AppDir/etc"
+    - "cd ${MEDIA_PATH}/${CI_PROJECT_NAME}/ && tar -czf AppDir.tar.gz AppDir && rm -rf AppDir && cd -"
+    # Filters
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "cd libretro-common/audio/dsp_filters && make -j$NUMPROC build=release && make -j$NUMPROC build=release strip && cd -"
+    - "cp -f libretro-common/audio/dsp_filters/*.so ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "cp -f libretro-common/audio/dsp_filters/*.dsp ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "cd gfx/video_filters && make -j$NUMPROC build=release && make -j$NUMPROC build=release strip && cd -"
+    - "cp -f gfx/video_filters/*.so ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "cp -f gfx/video_filters/*.filt ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+  
+.build-retroarch-macos-xcode:
+  # Metal/Universal x86_64 arm64 is default
+  tags:
+    - macosx-packaging
+  stage: build
+  variables:
+    XCARCHIVE_PATH: pkg/apple/build/RetroArchUniversal
+    XCPROJECT_NAME: RetroArch_Metal
+    XCCONFIG: GitLabCI.xcconfig
+  artifacts:
+    paths:
+    - ${XCPROJECT_NAME}.zip
+    - retroarch-repo/
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - xcodebuild -project pkg/apple/${XCPROJECT_NAME}.xcodeproj -config Release -scheme RetroArch -archivePath ${XCARCHIVE_PATH} -xcconfig pkg/apple/${XCCONFIG} archive
+    - pushd ${XCARCHIVE_PATH}.xcarchive/Products/Users/gitlab/Applications/
+    - ditto -c -k --sequesterRsrc --keepParent RetroArch.app RetroArch.zip
+    - popd
+    - mv ${XCARCHIVE_PATH}.xcarchive/Products/Users/gitlab/Applications/RetroArch.zip ${XCPROJECT_NAME}.zip
+    - mkdir .retroarch-repo
+    - "cp -r ./* .retroarch-repo"
+    - "mv .retroarch-repo/ retroarch-repo/"
+
+# Mac OS Universal, Metal
+build-retroarch-osx-universal-metal:
+  extends: .build-retroarch-macos-xcode
+
+build-retroarch-osx-opengl-x64:
+  extends: .build-retroarch-macos-xcode
+  variables:
+    XCARCHIVE_PATH: pkg/apple/build/RetroArchOpenGL
+    XCPROJECT_NAME: RetroArch
+    XCCONFIG: OpenGL_GitLabCI.xcconfig
+
+build-retroarch-ios-arm64:
+  extends: .build-retroarch-macos-xcode
+  variables:
+    XCPROJECT_NAME: RetroArch_iOS11_Metal
+    XCCONFIG: GitLabCI.xcconfig
+    XCSCHEME: "RetroArch iOS Release"
+  artifacts:
+    paths:
+    - retroarch-repo/
+    expire_in: 10 min
+  script:
+    - xcodebuild -project pkg/apple/${XCPROJECT_NAME}.xcodeproj -config Release -scheme "${XCSCHEME}" -xcconfig pkg/apple/iOS/GitLabCI.xcconfig build
+    - mkdir .retroarch-repo
+    - "cp -r ./* .retroarch-repo"
+    - "mv .retroarch-repo/ retroarch-repo/"
+
+build-retroarch-ios9:
+  extends: .build-retroarch-macos-xcode
+  variables:
+    XCPROJECT_NAME: RetroArch_iOS9
+    XCCONFIG: GitLabCI.xcconfig
+    XCSCHEME: "RetroArchiOS9"
+  artifacts:
+    paths:
+    - retroarch-repo/
+    expire_in: 10 min
+  script:
+    - xcodebuild -project pkg/apple/${XCPROJECT_NAME}.xcodeproj -config Release -scheme "${XCSCHEME}" -xcconfig pkg/apple/iOS/GitLabCI.xcconfig build
+    - mkdir .retroarch-repo
+    - "cp -r ./* .retroarch-repo"
+    - "mv .retroarch-repo/ retroarch-repo/"
+
+build-retroarch-tvos-arm64:
+  extends: build-retroarch-ios-arm64
+  variables:
+    XCSCHEME: "RetroArch tvOS Release"
+
+build-retroarch-dingux-mips32:
+  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
+    - retroarch_rg350.opk
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - "make -j$NUMPROC -f Makefile.rg350"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "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-dingux-odbeta-mips32:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-dingux:odbeta
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+    STRIP_BIN:  1
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    - retroarch
+    - retroarch_rg350_odbeta.opk
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - "make -j$NUMPROC -f Makefile.rg350_odbeta"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "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-android-normal:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
+  stage: build
+  artifacts:
+    paths:
+    - 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/"
+
+build-retroarch-android-aarch64:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
+  stage: build
+  artifacts:
+    paths:
+    - 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/"
+
+build-retroarch-android-ra32:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
+  stage: build
+  artifacts:
+    paths:
+    - 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/"
+
+build-retroarch-android-playstore-normal:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
+  stage: build
+  artifacts:
+    paths:
+    - 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/"
+
+build-retroarch-android-playstore-plus:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-android:latest
+  stage: build
+  artifacts:
+    paths:
+    - 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/"
+
+build-static-retroarch-libnx-aarch64:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-libnx-devkitpro:latest
+  stage: prepare-for-static-cores
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    -  retroarch-precompiled/
+    expire_in: 10 min
+  dependencies: []
+  needs:
+    # Static dummy builds without a core so its a good check if it properly builds
+    - build-static-retroarch-dummy-libnx-aarch64
+  script:
+    # Allow failure since we don't have a core
+    - "make -f Makefile.libnx -j$NUMPROC ||:"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+
+build-static-retroarch-dummy-libnx-aarch64:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-libnx-devkitpro:latest
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    - retroarch_switch.nro
+    - retroarch_switch.elf
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - "make -f Makefile.libnx -j$NUMPROC HAVE_STATIC_DUMMY=1"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+    - "cp -f gfx/video_filters/*.filt ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "cp -f pkg/libnx/retroarch.jpg ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+
+build-static-retroarch-vita:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-vita:latest
+  stage: prepare-for-static-cores
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    -  retroarch-precompiled/
+    -  retroarch-precompiled-gl/
+    expire_in: 10 min
+  dependencies: []
+  needs:
+    # Dummy build requires no core
+    - build-static-retroarch-dummy-vita
+  script:
+    # Allow failure since we don't have a core
+    - "make -f Makefile.vita -j$NUMPROC ||:"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "make -f Makefile.vita clean"
+    - "HAVE_VITAGLES=1 make -f Makefile.vita -j$NUMPROC ||:"
+    - "mkdir .retroarch-precompiled-gl"
+    - "cp -r ./* .retroarch-precompiled-gl/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+    - "mv .retroarch-precompiled-gl/ retroarch-precompiled-gl/"
+
+build-static-retroarch-dummy-vita:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-vita:latest
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    -  eboot.bin
+    -  param.sfo
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - "make -f Makefile.vita.salamander -j$NUMPROC"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+    - "cp -f gfx/video_filters/*.filt ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "cp -fr pkg/vita/* ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+
+build-static-retroarch-ps2:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-ps2:latest
+  stage: prepare-for-static-cores
+  artifacts:
+    paths:
+    -  retroarch-precompiled/
+    expire_in: 10 min
+  dependencies: []
+  needs:
+    # Dummy build requires no core
+    - build-static-retroarch-dummy-ps2
+  script:
+    # Allow failure since we don't have a core
+    # PS2 makefile for now doesn't allow -jX so this is why is hardcoded to -j1
+    - "make -f Makefile.ps2 -j1 ||:"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+
+build-static-retroarch-dummy-ps2:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-ps2:latest
+  stage: build
+  before_script:
+    # PS2 doesn't allow to use -jX for now
+    - export NUMPROC=1
+  artifacts:
+    paths:
+    -  raboot.elf
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - "make -f Makefile.ps2.salamander -j$NUMPROC release"
+
+build-static-retroarch-psp:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-psp:latest
+  stage: prepare-for-static-cores
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    -  retroarch-precompiled/
+    expire_in: 10 min
+  dependencies: []
+  needs:
+    # Dummy build requires no core
+    - build-static-retroarch-dummy-psp
+  script:
+    # We need to boostrap before compile
+    - "(cd bootstrap/psp1/kernel_functions_prx/ && make && cd -)"
+    # Allow failure since we don't have a core
+    - "make -f Makefile.psp1 -j$NUMPROC ||:"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+
+build-static-retroarch-dummy-psp:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-psp:latest
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    - EBOOT.PBP
+    - kernel_functions.prx
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - "(cd bootstrap/psp1/kernel_functions_prx/ && make && cd -)"
+    - "make -f Makefile.psp1.salamander -j$NUMPROC"
+    - "make -C bootstrap/psp1/kernel_functions_prx/"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+    - "cp -f pkg/psp1/ICON0.PNG ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+    - "cp -f pkg/psp1/PIC1.PNG ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+
+build-static-retroarch-ctr:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-devkitpro:latest
+  stage: prepare-for-static-cores
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    -  retroarch-precompiled/
+    expire_in: 10 min
+  dependencies: []
+  needs:
+    # Dummy build requires no core
+    - build-static-retroarch-dummy-ctr
+  script:
+    # Allow failure since we don't have a core
+    - "make -f Makefile.ctr -j$NUMPROC USE_CTRULIB_2=1 ||:"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+
+build-static-retroarch-ctr-legacy:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-devkitpro:ctr-legacy
+  stage: prepare-for-static-cores
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    -  retroarch-precompiled/
+    expire_in: 10 min
+  dependencies: []
+  script:
+    # Allow failure since we don't have a core
+    - "make -f Makefile.ctr -j$NUMPROC ||:"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+
+build-static-retroarch-dummy-ctr:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-devkitpro:latest
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    - retroarch_3ds.cia
+    - RetroArch.3dsx
+    - RetroArch.smdh
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - "make -f Makefile.ctr.salamander -j$NUMPROC USE_CTRULIB_2=1"
+    - "mv -f retroarch_3ds_salamander.cia retroarch_3ds.cia"
+    - "mv -f retroarch_3ds_salamander.3dsx RetroArch.3dsx"
+    - "mv -f retroarch_3ds_salamander.smdh RetroArch.smdh"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "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-static-retroarch-wiiu:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-wiiu:latest
+  stage: prepare-for-static-cores
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    -  retroarch-precompiled/
+    expire_in: 10 min
+  dependencies: []
+  needs:
+    # Dummy build requires no core
+    - build-static-retroarch-dummy-wiiu
+  script:
+    # Allow failure since we don't have a core
+    - "make -f Makefile.wiiu -j$NUMPROC ||:"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+
+build-static-retroarch-dummy-wiiu:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-devkitpro:latest
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    - retroarch.rpx
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - "make -f Makefile.wiiu -j$NUMPROC SALAMANDER_BUILD=1"
+    - "mv -f retroarch_wiiu_salamander.rpx retroarch.rpx"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+    - "cp -f gfx/video_filters/*.filt ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "cp -f pkg/wiiu/icon.png ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+    - "cp -f pkg/wiiu/meta.xml ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+
+build-static-retroarch-wii:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-devkitpro:latest
+  stage: prepare-for-static-cores
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    -  retroarch-precompiled/
+    expire_in: 10 min
+  dependencies: []
+  needs:
+    # Dummy build requires no core
+    - build-static-retroarch-dummy-wii
+  script:
+    # Allow failure since we don't have a core
+    - "make -f Makefile.wii -j$NUMPROC EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0 ||:"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+
+build-static-retroarch-dummy-wii:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-devkitpro:latest
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    - boot.dol
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - "make -f Makefile.wii.salamander -j$NUMPROC EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0"
+    - "mv -f retroarch-salamander_wii.dol boot.dol"
+    - "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/wii/icon.png ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+    - "cp -f pkg/wii/meta.xml ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+
+build-static-retroarch-ngc:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-devkitpro:latest
+  stage: prepare-for-static-cores
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    -  retroarch-precompiled/
+    expire_in: 10 min
+  dependencies: []
+  needs:
+    # Dummy build requires no core
+    - build-static-retroarch-dummy-ngc
+  script:
+    # Allow failure since we don't have a core
+    - "make -f Makefile.ngc -j$NUMPROC EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0 ||:"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+
+build-static-retroarch-dummy-ngc:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-devkitpro:latest
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio"
+    - "mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
+    - "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-static-retroarch-emscripten:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-emscripten:latest
+  stage: prepare-for-static-cores
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    - retroarch-precompiled/
+    expire_in: 10 min
+  dependencies: []
+  needs:
+    # Dummy build requires no core
+    - build-static-retroarch-dummy-emscripten
+  script:
+    # Allow failure since we don't have a core
+    - "emmake make -f Makefile.emscripten -j$NUMPROC ||:"
+    - "mkdir .retroarch-precompiled"
+    - "cp -r ./* .retroarch-precompiled/"
+    - "mv .retroarch-precompiled/ retroarch-precompiled/"
+
+build-static-retroarch-dummy-emscripten:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:latest
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+  artifacts:
+    paths:
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - "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/media"
+    - "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 -rf pkg/emscripten/libretro ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg"
+    - "cp -f media/canvas.png ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/media"
+    - "cp -f media/icon_dark.ico ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/media"
+    - "cp -f media/icon_light.ico ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/media"
+    - "cp -f media/invader_dark.png ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/media"
+    - "cp -f media/invader_light.png ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/media"
+    - "cp -f media/libretro-logo.png ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/media"
+    - "cp -f media/retroarch-16x16.ico ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/media"
+    - "cp -f media/retroarch-16x16.png ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/media"
+    - "cp -f media/retroarch-96x96.png ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/media"
+    - "cp -f media/retroarch.ico ${MEDIA_PATH}/${CI_PROJECT_NAME}/pkg/media"
+
+trigger_static-cores:
+  stage: trigger-static-cores
+  needs:
+  - build-static-retroarch-libnx-aarch64
+  - build-static-retroarch-vita
+  - build-static-retroarch-ps2
+  - build-static-retroarch-psp
+  - build-static-retroarch-ctr
+  - build-static-retroarch-ctr-legacy
+  - build-static-retroarch-wiiu
+  - build-static-retroarch-wii
+  - build-static-retroarch-ngc
+  - build-static-retroarch-emscripten
+  dependencies: []
+  script:
+    # Dummy for now
+    - /bin/true
@@ -70,37 +70,14 @@ matrix:
      script:
        - ./configure --enable-opengl --disable-metal
        - make
-    - os: osx
-      osx_image: xcode8
-      script:
-        - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
-    - os: osx
-      osx_image: xcode11.2
-      script:
-        - brew update-reset
-        - brew install --force-bottle qt5
-        - security create-keychain -p travis build.keychain
-        - security default-keychain -s build.keychain
-        - security unlock-keychain -p travis build.keychain
-        - echo $OSX_CERT | base64 --decode > dev.p12
-        - security import dev.p12 -k build.keychain -P $OSX_CERT_PASS -T /usr/bin/codesign
-        - rm dev.p12
-        - security set-key-partition-list -S "apple-tool:,apple:,codesign:" -s -k travis build.keychain
-        - xcodebuild -target RetroArchQt -configuration Release -project pkg/apple/RetroArch_Metal.xcodeproj
-      deploy:
-        skip_cleanup: true
-        provider: script
-        script: bash travis_metal_deploy.sh
-        on:
-          branch: master
    - language: android
      # Android builds are only supported on Trusty
      dist: trusty
      android:
        components:
          - tools
-          - build-tools-28.0.3
-          - android-28
+          - build-tools-29.0.3
+          - android-29
      install:
        - echo y | sdkmanager "ndk-bundle"
      before_script:
@@ -93,7 +93,6 @@ ekipan
 Emmanuel Martin (daliaetnano)
 endrift
 erbridge
-esoptron
 Ethan Lee (flibitijibibo)
 Exvat
 Ezio-PS
@@ -214,6 +213,7 @@ Nathan S. (natinusala)
 NathanStrong-Tripwire
 nattycleopatra
 nayslayer
+Nephilim
 netux79
 nfnty
 nia (ensra)
@@ -1,5 +1,267 @@
 # Future

+# 1.9.2
+- 3DS: Enable graphics widgets / overlays
+- 3DS: Load texture images as BGR colors
+- 3DS: Change default asset directory
+- CHEEVOS: Allow rcheevos_patch_address to be called on game without achievements
+- CHEEVOS: Update achievement memory maps (add Supervision)
+- CONFIG/FILE: Use hash map to optimise key/value lookups
+- CORE INFO: Performance optimisations + code clean-ups/refactors
+- CRT/SWITCHRES: Fixed CRTSwitchRes framebuffer bug
+- DISCORD/RP: Fix regression
+- DRM: set the correct video mode
+- FASTFORWARD: Enforce minimum fastforward_ratio of 1.0
+- FONTS/FREETYPE/STB_UNICODE/BITMAPFONT: Prevent texture bleed when rendering text at non-integer scales
+- INPUT: Ensure that 'retro_set_controller_port_device' is called when updating 'Max Users'
+- INPUT/XEGL/MOUSE: Fix xegl_ctx.c mouse activation
+- INPUT/SDL: Fix crash in SDL input driver when analogs are bound.
+- INPUT/POINTER: Add scaling to pointer input.
+- INPUT REMAPPING: Fix regression on loading file
+- INPUT REMAPPING: Fix regression where disabling input remapping would disable input
+- IOS: Disable system button gestures on iOS 14
+- IOS: Prevent potential crash on controller connect - randomly would get a crash when connecting a game controller while RA was running
+- LAKKA: Add menu for time zone setting
+- LOGGING: RARCH_LOG_V checking for verbosity level is not necessary and can cause issues; removed said check.
+- LOGGING: Silence inappropriate cheatfile logging
+- IOS/MAC: Add CPU VFP unit detection for Darwin
+- MAC: Swallow 'escape' key being pressed - would previously make the game toggle between fullscreen and windowed
+- MAC: Intel and ARM64 timer change proposal.
+- MAC/ARM64: run_fast_mode disabled for 64 bits invalid instructions.
+- MAC/OPENGL: Fix codesigning issue
+- MAC/UNIVERSAL: Add TTS translation service support.
+- MENU: Add optional menu screensaver
+- MENU: Add search filter support to cheats and overlays file browser menus
+- MENU/FILEBROWSER: Enhanced 'Load Content' file browser search functionality
+- MENU/INPUT: Block accidental diagonals in menu navigation 
+- MENU/RGUI: Add option to disable menu transparency
+- MENU/RGUI: Fix display of 'Video > Scaling' menu when 'Lock Menu Aspect Ratio' is enabled
+- MENU/MATERIALUI: Add icon to 'Turbo Fire' menu entry
+- MENU/OZONE: Ozone Dracula theme
+- OPENDINGUX/BETA: Fix IPU scaling when running GBA-resolution content
+- OPENDINGUX/BETA: Add 50Hz support
+- OPENDINGUX: Enable 'SaveRAM Autosave Interval' by default
+- PATCHES: Added multi-softpatching support + OSD messages for patches
+- RHMAP: Track the complete string in rhmap
+- VITA: Align VM block size to 1MB - should fix one of the issues with gpSP
+- WINDOWS/GDI: Fix non-ASCII text rendering
+- XEGL: Fix mouse not working when using OpenGLES with X11
+
+# 1.9.1
+- 3DS: Graphics widgets support
+- 3DS: On error, only init gfx on salamander build. This prevents graphical issues if the gfx is already initialized.
+Which should always be the case if called from a running core
+- 3DS: Update error applet
+- 3DS: Enable online Core Updater
+- 3DS: Guard threading
+- 3DS: Allow sideways screen rotation
+- 3DS: Enable threading and add a threaded audio driver
+- ANDROID: Implementation of fullscreen over notch function (for Android 9.0 and up)
+- ANDROID: Add Play Store module support.
+- ANDROID: Add option to switch all installed cores to Play Store versions
+- AUDIO: Memalign audio buffers to 64 bytes. This is the most common cache line size, helps with performance. Also fixes issues with platforms like PSP that wrongly assume that malloc returns aligned buffers (to 16bytes). This recently broke the PSP builds
+- AUDIO/ALSA: Fix float format detection
+- AUDIO/JACK: Deinterleave in the process callback. This allows us to avoid the extra copy to the deinterleave buffer and lets us use only a single jack ringbuffer.
+- AUDIO/JACK: (Audio/JACK) Fix non-blocking write. Previously we would wait on the condition variable even in the non-blocking case. This improves fast-forward performance massively and brings JACK in line with other backends in that regard.
+- AUDIO/XAUDIO2: Fix threaded audio bugs with cores like Dinothawr
+- CONFIG: Add support for saving per-directory core options and deleting core option overrides
+- CONFIG: Enable saving of changed parameters when '#include' directives are used
+- CONFIG/DIRS: Enable configuration of the directories used for Favorites, History, Images, Music and Video playlists
+- CONFIG/REMAPS: Allow loading core remaps without content
+- CONFIG/OVERRIDES: Fix empty override paths when launching without content
+- CHEATS: Maximum search value corrections
+- CHEEVOS: Generic memory mapping using rcheevos
+- CHEEVOS: Ensure badge textures are released before video driver is deinitialized. Should fix crashes with slang shaders.
+- CHEEVOS: Include achievement runtime state in save states
+- CHEEVOS: Prevent hardcore toggle when emu-handled cheats are active
+- CHEEVOS: Add confirmation submenu to achievements hardcore toggle
+- CHEEVOS: Calculate leaderboard widget spacing based on video resolution
+- CHEEVOS: Show unsupported core message when viewing achievement list for unsupported core
+- CHEEVOS: Allow disabling leaderboard notifications and trackers separately
+- CHEEVOS: Add display widget for active leaderboards
+- CHEEVOS/CORE OPTIONS: Core options blacklist. Disables hardcore mode when certain core options are set.
+- CLI: Add option for quitting on close content
+- CONTEXT/DRIVER SWITCHING: Allow context switching from gl to glcore
+- CORE OPTIONS: Add option to reset all core options for current core/content
+- CORE OPTIONS: Add per-folder core options
+- CRT/SWITCHRES: Improvements
+- CRT/SWITCHRES: Low resolution switch bug fix - This allows resolutions lower that 32x224 like 256x224 to work
+- CORE DOWNLOADER: Enhanced core downloader search functionality
+- D3D10: Should now be able to use shaders with hardware-accelerated libretro cores
+- D3D11: Should now be able to use shaders with hardware-accelerated libretro cores
+- D3D11: Skip shader/stock blend when we don't have a texture. This happens if the core calls video_cb with the frame set to null on
+the first frame, and was causing black screens/driver resets. The ffmpeg core seems to do this.
+- D3D11: Fix shaders with scaled framebuffers
+- D3D11: Add flip model support - fallback to blit model for OSes where flip model is not supported (windows 7 and earlier). Will add a menu option later allowing the user to switch inbetween the two
+- D3D12: Should now be able to use shaders with hardware-accelerated libretro cores
+- D3D10/11/12: Increase sprite capacity, we need this so that the hardware rendered menu drivers doesn't glitch out
+- DRM: Fix race condition in drm_surface_set_aspect
+- DRM/KMS: add support for custom hdmi_timings / modes
+- DATABASE: Fix crash that could happen when selecting cursor
+- DATABASE/EXPLORE: Fix - Prevent segfault when accessing 'Explore' menu
+- EMSCRIPTEN: Only report back one screen pointer for rwebinput, fixes lockup when clicking on an overlay
+- FILEIO/PERFORMANCE: Only attempt to call dir_check_defaults once per runtime session
+- FILEIO/PERFORMANCE/3DS: Increase file buffer size and savestate chunk size. This seems to help with saving large savestates.
+- FONTS: Improve handling of Arabic and Persian text
+- FONTS/FREETYPE: Use fontconfig to select fonts if available
+- INPUT: Add hold mode for turbo fire 'Single Button'
+- INPUT MAPPING: Refresh bind list on device type change
+- INPUT MAPPING/REMAPPING: Minor bugfix - Remap file browsing starts navigation at input_remapping_directory even if the core-subdir (where saved files go) exists
+Having remaps for many different cores makes finding the active core files cumbersome, especially because remaps are not compatible between different cores (but maybe for cores emulating the same hardware)
+- IOS: Take out 'Core Downloader' from iOS 9/iOS 11 builds
+- IOS: IOSApp doesn't crash anymore when a file is shared to it
+- INPUT: Keyboard device mapper rework
+- INPUT: New input bind order scan/clear fix
+- INPUT: Duplicate key event blocking additions
+- INPUT: Prevent duplicate key events with hotkeys + keyboard device type
+- INPUT: Keyboard LED driver
+- INPUT/AUTOCONFIG: Allow controllers with no/empty names to work.
+- INPUT/GAME FOCUS: Add option to automatically enable 'game focus' mode when running/resuming content
+- INPUT/HOTKEYS: Hotkey for Close Content / Unload Core
+- INPUT/LIBCEC: Map libcec-daemon keys to RETROK
+- INPUT/X11: Enable keyboard input when mouse cursor is not inside the RetroArch window but window still has focus
+- INPUT/X11: Fix mouse input when mouse is grabbed
+- INPUT/UDEV/RUMBLE: Fix rumble.
+- INPUT/WINDOWS/DINPUT: Simultaneous shift sticky fix
+- INPUT/WINDOWS/DINPUT: Prevent Win-key from opening Start Menu
+- INPUT/WINDOWS/DINPUT: Option for disabling Windows hotkeys
+- INPUT/WINDOWS/DINPUT: Mouse grabbing/clipping with Alt-Tab
+- INPUT/WINDOWS/DINPUT: Mouse grab fixes
+- INPUT/WINDOWS/RAWINPUT: Key position fixes
+- INPUT/WINDOWS/RAWINPUT: Mouse grab fixes
+- INPUT/WINDOWS/RAWINPUT: Prevent outside window mouse clicks when grabbed
+- INPUT/WINDOWS/RAWINPUT: Option for disabling Windows hotkeys
+- INPUT MAPPING/REMAPPING: Major bugfix - Remap file having a different device type requires manual intervention after loading for the core to register the type properly
+- JSON: New faster json parser/writer library rjson
+- JSON/RJSON: Replace rapidjson parser/writer in discord-rpc with rjson
+- LIBRETRO: Add API extension for cores to query the number of active inputs provided by the frontend
+- LIBRETRO: Ensure RARCH_CTL_CORE_OPTIONS_LIST_GET returns false if no core options are available
+- LIBRETRO: Add API extension for overriding frontend audio latency
+- LIBRETRO: Add API extension for cores to monitor frontend audio buffer occupancy
+- LINUX: Also show /run/media or /run/media/$USER in drives list
+- LINUX: Adjust brightness according to the limit. Seems like some platforms feature non-standard maximums, but the variable is correclty exported for us to use
+- LOCALIZATION: Add Finnish language
+- LOGS/SHADER: Shader log spam reduction
+- LOGS/CONFIG: Config logging cleanup
+- LOGS/SAVESTATE: Config logging cleanup
+- MAC: Apple Silicon/Mac M1 support
+- MAC: Code signing/notarization
+- MAC: Fix a leak with NSTemporaryDirectory() on ARC (Automatic Reference Counting) code
+- MAC: Support bundle assets extraction on macOS
+- MAC: Universal Metal build for both ARM and Intel Macs
+- MAC/UNIVERSAL: Add CoreAudio3 audio driver for Metal Universal build
+- MAC/IOS: Only extract assets once on first install
+- MENU: Add 'L2 + R2' menu toggle gamepad combo
+- MENU: Menu text improvements; clarifications, consistency, text mistakes, 
+- MENU: Tweak menu scroll initial hold delays
+- MENU: Restrict menu acceleration to navigation buttons
+- MENU: Add 'Menu Driver' setting to 'User Interface'
+- MENU: Relocate 'Menu Scroll' settings.
+- MENU: Separate 'Turbo Fire' menu.
+- MENU: Dropdown menu for 'Custom Aspect Ratio' setting.
+- MENU: Reorder Mouse Index next to Device Index
+- MENU: Submenu for Device Index/Mouse Index
+- MENU: Reorganize User Interface menu
+- MENU: Add 'Remove DSP Plugin' menu entry
+- MENU: Hide 'Auto-Shader Delay' menu setting when shaders are unavailable
+- MENU/ANIMATIONS: Fix non-smooth text ticker + reduce line ticker code duplication
+- MENU/ANIMATIONS/OZONE: Add cursor wiggle animation
+- MENU/ANIMATIONS/OZONE: Implement wiggling for main menu when wrap-around is disabled
+- MENU/NOTIFICATIONS: On-Screen Notifications' menu clean-ups
+- MENU/NOTIFICATIONS: Add option to show/hide Refresh Rate notification
+- MENU/FILEBROWSER: Start auto-selecting last used path for more file browser menu entries
+- MENU/INPUT: Input port label adjustments
+- MENU/INPUT/XMB: Proper control port icons
+- MENU/INPUT/OZONE: Proper control port icons
+- MENU/QUICK MENU: Add remap clearing ability under Quick Menu controls
+- MENU/QUICK MENU: Cap 'State Slot' drop-down list to a maximum of 1000 (+Auto) entries
+- MENU: Customizable menu scroll hold delay.
+- MENU/DESKTOP: Fix mouse cursor limited by window range on F5 press
+- MENU/DESKTOP: Add simple shader option
+- MENU/DESKTOP/WINDOWS: Remove broken 'Update RetroArch' functionality for Windows. We want this to not only be system agnostic if we bring it back, but also work outside of the Qt desktop interface
+- MENU/OZONE: New Theme - Twilight Zone
+- MENU/RGUI: Add 3:2, 5:3 and 3:2/5:3 (centered) aspects
+- MENU/RGUI/TEXT RENDERING: Add Russian language text support
+- MENU/RGUI/TEXT RENDERING: Add support for CJK punctuation glyphs
+- MIDI/WINMM: Recover from MIDI messages not handled by the device
+- MIDI/WINMM: Fix winmm midi driver hanging on content closing
+- NETWORK: Add READ/WRITE_CORE_MEMORY network commands
+- NETWORK: Fix backwards condition in socket blocking behavior
+- NETWORK/NETPLAY: Attempt IPv4 when IPv6 fails
+- OGA/VIDEO: support for OGS
+- OGA: This keeps the tradition DRM driver along with the OGA one. The probe
+function skips the driver if the screen is non rotated to fall back to
+the regular DRM driver.
+- OGA: Fix messages from not disappearing
+- OGA: Implement RETRO_ENVIRONMENT_GET_CURRENT_SOFTWARE_FRAMEBUFFER. This is a faster rendering codepath for software rendered libretro cores that some libretro cores use right now. Video drivers in RetroArch have to explicitly implement this for this codepath to work at runtime.
+- OPENDINGUX: Add/Optimise rumble interface
+- OPENDINGUX: Fix frozen video when enabling fast forward
+- OPENDINGUX/SDL: OSD font clean-up
+- OPENDINGUX/SDL: Enable selection of image interpolation method when using 'sdl_dingux' gfx driver
+- OPENDINGUX/SDL: Enable integer scaling when using the 'sdl_dingux' gfx driver
+- OVERLAYS: Add option to scale overlays automatically (with aspect ratio correction)
+- OVERLAYS: Hide Overlay When Gamepad is Connected. Overlays will be hidden automatically when a gamepad is connected in port 1, and shown again when the gamepad is disconnected.
+- OVERLAYS: New default overlays for mobile (neo-retropad)
+- OVERLAYS: In addition to overlay scale, the user can now set an Overlay Aspect Adjustment factor. Most overlays are designed for 16:9 displays, which means they become stretched/ugly on modern wide aspect phones and suchlike. By changing the Overlay Aspect Adjustment factor, a user can scale the overlay width/height to achieve a uniform appearance regardless of display resolution.
+- OVERLAYS: Since scaling a gamepad overlay can result in buttons being squished too close together (or being pulled too far apart), the user can now adjust the effective spacing of the different 'halves' of an overlay via Overlay Horizontal Separation and Overlay Vertical Separation factors. Overlay Horizontal Separation divides the overlay in two vertically (left/right, at the centre point), and applies a spacing offset (positive or negative) between the UI elements on each side; Overlay Vertical Separation does the same, but the split is horizontal (top/bottom)
+- OVERLAYS/FIX: The Overlay X Offset and Overlay Y Offset options have been fixed, and now work correctly
+- OVERLAYS/FIX: All of the above options (and Overlay Scale) are configured and saved independently for landscape and portrait display orientations - so adjusting everything for a nice landscape layout won't break the portrait display
+- OVERLAYS/FIX: When using the Vulkan gfx driver, memory is leaked every time an overlay is freed
+- OVERLAYS/FIX: When threaded video is enabled, loading overlays with no images (i.e. utility-type overlays, where everything is hidden until the screen is touched) can generate segfaults due to improper usage of realloc()
+- OVERLAYS/FIX: When Show Inputs on Overlay is enabled, ASAN reports bit shift errors due to an incorrect range check when handling turbo inputs - essentially, there is no upper limit to the considered input id range, which means overlay hotkeys (menu toggle, etc.) are incorrectly treated as having turbo support, causing bit shifts using wildly inappropriate id indices
+- PLAYLISTS/PORTABLE: Fixed first load initialization
+- PS2: Added Multitap support (up to 8 players)
+- PS2: Fix for not recognized digital and other non-standard controllers
+- PS2: Fix Quitting from RA
+- PS2: Add Audio mixer
+- REWIND: Prevent 'Rewind Frames' from being set to '1' incorrectly on load content
+- RUNAHEAD: Add Run-Ahead Toggle hotkey with notifications
+- RBUF/ANIMATIONS: Simplify gfx_animation by switching from dynarray to rbuf
+- RBUF/CORE UPDATER: Replace static entries array with dynamic array via RBUF library
+- RBUF/M3U: Replace static entries array with dynamic array via RBUF library
+- SENSORS:  Android (crash-)fixes/improvements + add option to disable sensor input
+- SDL2/VIDEO: Get the SDL2 video driver to work in Wayland/KMS
+- SAVESTATES: Adding savestate garbage collector for autoincrement stavestates. As some issues indicate, there's an issue with
+the autoincrement save slot feature: slot index will increase and very old saves won't be deleted. This adds support to delete old save states with a user defined
+save state limit (global). Instead of wrapping around the slot counter it will simply delete the oldest save, since it is simpler. For now there's a limit of one deletion per save, which ensures a user cannot delete many saves by accident if they set the limit too low.
+- SAVESTATES/SAVEFILES: Ensure save file and playlist compression is disabled by default
+- SHADERS: Add option to remember last selected shader preset/shader pass directories
+- SHADERS: Use last selected shader preset directory when changing shaders via previous/next hotkeys
+- SHADERS: Remove Parameters line
+- SHADERS: Shaders fix for duplicate parameters loading bug
+- SHADERS: Fix Crash change num shader passes in UI
+- SHADERS/SLANG: Fix slang shaders with rotation
+- STREAMING/FFMPEG: Add Facebook Game Stream option (for embedded ffmpeg core-enabled RetroArch builds)
+- SWITCH: Fix input bind icons being off by one line
+- SWITCH: Fix audio issues
+- TLS/SSL: Add BearSSL support, as alternative to mbedTLS
+- VIDEO: AddVariable BFI (Black Frame Insertion)
+- VIDEO/DRM GO2: Dynamic resolution support
+- VIDEO FILTERS: Video filter optimisations
+- VIDEO FILTERS: Add several LCD-effect video filters
+- VIDEO FILTERS: Gameboy/Dot_Matrix video filters: Add XRGB8888 support
+- VIDEO FILTERS: Add Normal4x video filter
+- VIDEO FILTERS: Add 'Upscale_256x-320x240' video filter
+- VIDEO FILTERS: Add 'Upscale1.5x' video filter
+- VITA: Disable temporarily VitaGL
+- VITA: Fix bubble name
+- VITA: proper handling of boot params
+- VITA: Default menu scale 1.5x to improve readability
+- WIFI/LAKKA: Add a proper WiFi menu, with Enable/Disable & Disconnect options. This also allows WiFi passwords to be remembered. The underlying tool (connman) allows to store passswords (that's why it auto connects whenever you boot a Lakka device), so we expose this so that the user does not have to re-input the pass when connecting to a saved wifi.
+- WII/HID: Added HID support for HORI mini wired ps4 gamepad
+- WINDOWS: Add support for accelerators to main win32 message loop
+- WINDOWS: Add accelerators for Open (Ctrl+O) and Fullscreen (Alt+Enter)
+- WINDOWS: Fixes some file I/O failures on Windows when paths are longer than 260 characters.
+- WINDOWS: Fix crashing on startup on Windows when using Chinese Simplified language.
+- WINDOWS/XP: The OpenGL 1 video driver is now the default for maximum backwards compatibility upon first startup. It's of course always possible for the user to change this.
+- WINDOWS/MENUBAR: Load accelerators, Localize Win32 menu items to current language, and display shortcut keys
+- WINDOWS/MENUBAR: Add 'Reinit' to Menubar
+- WINDOWS/MSVC: Fix rewind crash on MSVC build when using SSE2
+- UWP: Don't default to XMB menu by default, default to Ozone instead
+- UWP/VFS: Use Win32 file APIs when possible - better file I/O performance
+- WIIU/FILEIO/PERFORMANCE: Faster startup times - remove the path_is_valid() call when loading textures
+- WIIU: Fix touchscreen mouse emulation
+
 # 1.9.0
 - 3DS: Fix sound crackling when paused
 - ANDROID/VIBRATION: Fixes "Vibrate on Key Press" having no effect on Android devices, which occurred because only the off time/strength was defined in what should have been a pair of off/on values
@@ -44,6 +306,7 @@
 - PLAYLISTS/DATABASE/EXPLORE: Show system icons in explore view
 - PS2: Improve FPS Limiter
 - RUNAHEAD: Prevent runahead from being disabled *permanently* when an error occurs
+- SCANNER: Add more region codes for GameCube/Wii game detection
 - SHADERS/SLANG: Increased Slang max Parameters, Textures & Passes
 - VIDEO FILTERS/BLARGG: Make Blargg_snes filter customizable
 - WINDOWS/RAWINPUT: Fix invalid calls to dinput_handle_message when input driver is not set to dinput
@@ -0,0 +1,66 @@
+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)
+* bool            (1 byte)
+
+[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.
+
+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;
+
+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.
+
+Example:
+
+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].
+
+Be mindful that heap allocations are slow compared to stack.
@@ -22,7 +22,7 @@ endif

 OBJ :=
 LIBS :=
-DEF_FLAGS :=
+DEF_FLAGS := -I.
 ASFLAGS :=
 DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
@@ -118,7 +118,7 @@ ifneq ($(CXX_BUILD), 1)
   CFLAGS += -D_GNU_SOURCE
 endif

-DEF_FLAGS += $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb
+DEF_FLAGS += $(INCLUDE_DIRS) -Ideps -Ideps/stb

 CFLAGS += $(DEF_FLAGS)
 CXXFLAGS += $(DEF_FLAGS) -D__STDC_CONSTANT_MACROS
@@ -130,6 +130,45 @@ endif
 ifneq ($(findstring Darwin,$(OS)),)
   OSX := 1
   LIBS += -framework AppKit
+   ARCHFLAGS=
+   MINVERFLAGS=
+   ifeq ($(shell uname -p),arm)
+      MINVERFLAGS = -mmacosx-version-min=10.15 -stdlib=libc++ # macOS  (Metal, ARM 64bit)
+      MINVERFLAGS += -DDONT_WANT_ARM_OPTIMIZATIONS
+   else ifeq ($(HAVE_METAL),1)
+      MINVERFLAGS = -mmacosx-version-min=10.13 -stdlib=libc++  # macOS  (Metal, x86 64bit)
+   else ifeq ($(shell uname -p),powerpc)
+      MINVERFLAGS = -mmacosx-version-min=10.5  # macOSX (PowerPC 32-bit)
+   else ifeq ($(shell uname -m),i386)
+      MINVERFLAGS = -mmacosx-version-min=10.6  # macOSX (OpenGL, x86 32bit)
+   else
+      MINVERFLAGS = -mmacosx-version-min=10.7 -stdlib=libc++ # macOSX (OpenGL, x86 64bit)
+   endif
+
+	# 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_OPTIMIZATIONS
+      ARCHFLAGS    = -arch arm64
+   else ifeq ($(ARCH),x86_64)
+      ifeq ($(HAVE_METAL),1)
+         MINVERFLAGS  = -mmacosx-version-min=10.13 -stdlib=libc++
+      else
+         MINVERFLAGS  = -mmacosx-version-min=10.7  -stdlib=libc++
+      endif
+      ARCHFLAGS       = -arch x86_64
+   else ifeq ($(ARCH),x86)
+      MINVERFLAGS     = -mmacosx-version-min=10.6
+      ARCHFLAGS       = -arch x86
+   else ifeq ($(ARCH),ppc)
+      MINVERFLAGS     = -mmacosx-version-min=10.5
+      ARCHFLAGS       = -arch ppc
+   endif
+   ifeq ($(BUILDBOT),1)
+      ARCHFLAGS       = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
+   endif
+   DEF_FLAGS += $(MINVERFLAGS) $(ARCHFLAGS)
+   LDFLAGS   += $(MINVERFLAGS) $(ARCHFLAGS)
 else
   OSX := 0
 endif
@@ -193,6 +232,7 @@ endif

 OBJ += frontend/frontend_driver.o \
       retroarch.o \
+       command.o \
       msg_hash.o \
       intl/msg_hash_us.o \
       $(LIBRETRO_COMM_DIR)/queues/task_queue.o \
@@ -235,6 +275,10 @@ OBJ += \
       $(LIBRETRO_COMM_DIR)/memmap/memalign.o \
       $(LIBRETRO_COMM_DIR)/file/nbio/nbio_stdio.o

+OBJ += \
+       $(LIBRETRO_COMM_DIR)/lists/linked_list.o \
+       $(LIBRETRO_COMM_DIR)/queues/generic_queue.o
+
 ifneq ($(findstring Linux,$(OS)),)
 	OBJ += $(LIBRETRO_COMM_DIR)/file/nbio/nbio_linux.o
 endif
@@ -256,8 +300,7 @@ OBJ += \
       $(LIBRETRO_COMM_DIR)/file/file_path.o \
       $(LIBRETRO_COMM_DIR)/file/file_path_io.o \
       file_path_special.o \
-       file_path_str.o \
-       $(LIBRETRO_COMM_DIR)/hash/rhash.o \
+       $(LIBRETRO_COMM_DIR)/hash/lrc_hash.o \
       input/common/input_hid_common.o \
       led/led_driver.o \
       gfx/video_coord_array.o \
@@ -273,11 +316,12 @@ OBJ += \

 ifeq ($(HAVE_REWIND), 1)
 DEFINES += -DHAVE_REWIND
-OBJ     += managers/state_manager.o
+OBJ     += state_manager.o
 endif

 OBJ += \
       gfx/drivers_font_renderer/bitmapfont.o \
+       gfx/drivers_font_renderer/bitmapfont_10x10.o \
       tasks/task_autodetect.o \
       input/input_autodetect_builtin.o \
       input/input_keymaps.o \
@@ -287,7 +331,7 @@ OBJ += \

 ifeq ($(HAVE_CHEATS), 1)
   DEFINES += -DHAVE_CHEATS
-   OBJ     += managers/cheat_manager.o
+   OBJ     += cheat_manager.o
 endif

 OBJ += \
@@ -398,7 +442,8 @@ ifeq ($(HAVE_LANGEXTRA), 1)
          intl/msg_hash_sk.o \
          intl/msg_hash_fa.o \
          intl/msg_hash_he.o \
-          intl/msg_hash_ast.o
+          intl/msg_hash_ast.o \
+          intl/msg_hash_fi.o
 endif

 ifneq ($(HAVE_GETOPT_LONG), 1)
@@ -446,40 +491,13 @@ endif

 ifeq ($(HAVE_QT), 1)
   OBJ += ui/drivers/ui_qt.o \
-          ui/drivers/qt/ui_qt_application.o \
-          ui/drivers/qt/ui_qt_window.o \
-          ui/drivers/qt/ui_qt_browser_window.o \
-          ui/drivers/qt/ui_qt_load_core_window.o \
-          ui/drivers/qt/ui_qt_msg_window.o \
          ui/drivers/qt/gridview.o \
-          ui/drivers/qt/coreoptionsdialog.o \
-          ui/drivers/qt/filedropwidget.o \
-          ui/drivers/qt/coreinfodialog.o \
-          ui/drivers/qt/playlistentrydialog.o \
-          ui/drivers/qt/viewoptionsdialog.o \
+          ui/drivers/qt/qt_dialogs.o \
+          ui/drivers/qt/qt_widgets.o \
          ui/drivers/qt/qt_playlist.o \
-          ui/drivers/qt/updateretroarch.o \
-          ui/drivers/qt/thumbnaildownload.o \
-          ui/drivers/qt/thumbnailpackdownload.o \
-          ui/drivers/qt/playlistthumbnaildownload.o
-    ifeq ($(HAVE_SHADERS_COMMON), 1)
-       OBJ += ui/drivers/qt/shaderparamsdialog.o
-    endif
+          ui/drivers/qt/qt_downloads.o
    ifeq ($(HAVE_MENU), 1)
-       OBJ += ui/drivers/qt/settingswidgets.o \
-              ui/drivers/qt/options/achievements.o \
-              ui/drivers/qt/options/audio.o \
-              ui/drivers/qt/options/generic.o \
-              ui/drivers/qt/options/input.o \
-              ui/drivers/qt/options/latency.o \
-              ui/drivers/qt/options/network.o \
-              ui/drivers/qt/options/osd.o \
-              ui/drivers/qt/options/playlists.o \
-              ui/drivers/qt/options/recording.o \
-              ui/drivers/qt/options/saving.o \
-              ui/drivers/qt/options/ui.o \
-              ui/drivers/qt/options/user.o \
-              ui/drivers/qt/options/video.o
+       OBJ += ui/drivers/qt/qt_options.o
    endif

   MOC_HEADERS += ui/drivers/ui_qt.h \
@@ -490,12 +508,12 @@ ifeq ($(HAVE_QT), 1)
                  ui/drivers/qt/coreinfodialog.h \
                  ui/drivers/qt/playlistentrydialog.h \
                  ui/drivers/qt/viewoptionsdialog.h
+   ifeq ($(HAVE_MENU), 1)
   ifeq ($(HAVE_SHADERS_COMMON), 1)
      MOC_HEADERS += ui/drivers/qt/shaderparamsdialog.h
   endif
-   ifeq ($(HAVE_MENU), 1)
      MOC_HEADERS += ui/drivers/qt/settingswidgets.h \
-                     ui/drivers/qt/options/options.h
+                     ui/drivers/qt/qt_options.h
   endif

   DEFINES += -DHAVE_MAIN
@@ -537,7 +555,113 @@ ifeq ($(HAVE_LIBRETRODB), 1)
   endif
 endif

-ifeq ($(HAVE_BUILTINMBEDTLS), 1)
+ifeq ($(HAVE_BUILTINBEARSSL), 1)
+   HAVE_SSL = 1
+   DEFINES += -DHAVE_SSL -DHAVE_BEARSSL
+
+   # these -Is are only needed for BearSSL itself
+   INCLUDE_DIRS += -Ideps/bearssl-0.6/src -Ideps/bearssl-0.6/inc
+   OBJS_BEAR = deps/bearssl-0.6/src/aead/ccm.o \
+               deps/bearssl-0.6/src/codec/ccopy.o \
+               deps/bearssl-0.6/src/codec/dec32be.o \
+               deps/bearssl-0.6/src/codec/dec32le.o \
+               deps/bearssl-0.6/src/codec/dec64be.o \
+               deps/bearssl-0.6/src/codec/enc32be.o \
+               deps/bearssl-0.6/src/codec/enc32le.o \
+               deps/bearssl-0.6/src/codec/enc64be.o \
+               deps/bearssl-0.6/src/ec/ec_all_m31.o \
+               deps/bearssl-0.6/src/ec/ec_c25519_m31.o \
+               deps/bearssl-0.6/src/ec/ecdsa_atr.o \
+               deps/bearssl-0.6/src/ec/ecdsa_i31_bits.o \
+               deps/bearssl-0.6/src/ec/ecdsa_i31_vrfy_asn1.o \
+               deps/bearssl-0.6/src/ec/ecdsa_i31_vrfy_raw.o \
+               deps/bearssl-0.6/src/ec/ec_p256_m31.o \
+               deps/bearssl-0.6/src/ec/ec_prime_i31.o \
+               deps/bearssl-0.6/src/ec/ec_secp256r1.o \
+               deps/bearssl-0.6/src/ec/ec_secp384r1.o \
+               deps/bearssl-0.6/src/ec/ec_secp521r1.o \
+               deps/bearssl-0.6/src/hash/ghash_ctmul64.o \
+               deps/bearssl-0.6/src/hash/ghash_pclmul.o \
+               deps/bearssl-0.6/src/hash/md5.o \
+               deps/bearssl-0.6/src/hash/multihash.o \
+               deps/bearssl-0.6/src/hash/sha1.o \
+               deps/bearssl-0.6/src/hash/sha2big.o \
+               deps/bearssl-0.6/src/hash/sha2small.o \
+               deps/bearssl-0.6/src/int/i31_add.o \
+               deps/bearssl-0.6/src/int/i31_bitlen.o \
+               deps/bearssl-0.6/src/int/i31_decmod.o \
+               deps/bearssl-0.6/src/int/i31_decode.o \
+               deps/bearssl-0.6/src/int/i31_decred.o \
+               deps/bearssl-0.6/src/int/i31_encode.o \
+               deps/bearssl-0.6/src/int/i31_fmont.o \
+               deps/bearssl-0.6/src/int/i31_iszero.o \
+               deps/bearssl-0.6/src/int/i31_modpow2.o \
+               deps/bearssl-0.6/src/int/i31_modpow.o \
+               deps/bearssl-0.6/src/int/i31_montmul.o \
+               deps/bearssl-0.6/src/int/i31_muladd.o \
+               deps/bearssl-0.6/src/int/i31_ninv31.o \
+               deps/bearssl-0.6/src/int/i31_rshift.o \
+               deps/bearssl-0.6/src/int/i31_sub.o \
+               deps/bearssl-0.6/src/int/i31_tmont.o \
+               deps/bearssl-0.6/src/int/i32_div32.o \
+               deps/bearssl-0.6/src/int/i62_modpow2.o \
+               deps/bearssl-0.6/src/mac/hmac_ct.o \
+               deps/bearssl-0.6/src/mac/hmac.o \
+               deps/bearssl-0.6/src/rand/hmac_drbg.o \
+               deps/bearssl-0.6/src/rand/sysrng.o \
+               deps/bearssl-0.6/src/rsa/rsa_default_pkcs1_vrfy.o \
+               deps/bearssl-0.6/src/rsa/rsa_default_pub.o \
+               deps/bearssl-0.6/src/rsa/rsa_i31_pkcs1_vrfy.o \
+               deps/bearssl-0.6/src/rsa/rsa_i31_pub.o \
+               deps/bearssl-0.6/src/rsa/rsa_i62_pkcs1_vrfy.o \
+               deps/bearssl-0.6/src/rsa/rsa_i62_pub.o \
+               deps/bearssl-0.6/src/rsa/rsa_pkcs1_sig_unpad.o \
+               deps/bearssl-0.6/src/ssl/prf_md5sha1.o \
+               deps/bearssl-0.6/src/ssl/prf.o \
+               deps/bearssl-0.6/src/ssl/prf_sha256.o \
+               deps/bearssl-0.6/src/ssl/prf_sha384.o \
+               deps/bearssl-0.6/src/ssl/ssl_client_default_rsapub.o \
+               deps/bearssl-0.6/src/ssl/ssl_client_full.o \
+               deps/bearssl-0.6/src/ssl/ssl_client.o \
+               deps/bearssl-0.6/src/ssl/ssl_engine_default_aescbc.o \
+               deps/bearssl-0.6/src/ssl/ssl_engine_default_aesccm.o \
+               deps/bearssl-0.6/src/ssl/ssl_engine_default_aesgcm.o \
+               deps/bearssl-0.6/src/ssl/ssl_engine_default_chapol.o \
+               deps/bearssl-0.6/src/ssl/ssl_engine_default_descbc.o \
+               deps/bearssl-0.6/src/ssl/ssl_engine_default_ecdsa.o \
+               deps/bearssl-0.6/src/ssl/ssl_engine_default_rsavrfy.o \
+               deps/bearssl-0.6/src/ssl/ssl_engine.o \
+               deps/bearssl-0.6/src/ssl/ssl_hs_client.o \
+               deps/bearssl-0.6/src/ssl/ssl_rec_cbc.o \
+               deps/bearssl-0.6/src/ssl/ssl_rec_ccm.o \
+               deps/bearssl-0.6/src/ssl/ssl_rec_chapol.o \
+               deps/bearssl-0.6/src/ssl/ssl_rec_gcm.o \
+               deps/bearssl-0.6/src/symcipher/aes_ct64_cbcdec.o \
+               deps/bearssl-0.6/src/symcipher/aes_ct64_cbcenc.o \
+               deps/bearssl-0.6/src/symcipher/aes_ct64_ctrcbc.o \
+               deps/bearssl-0.6/src/symcipher/aes_ct64_ctr.o \
+               deps/bearssl-0.6/src/symcipher/aes_ct64_dec.o \
+               deps/bearssl-0.6/src/symcipher/aes_ct64_enc.o \
+               deps/bearssl-0.6/src/symcipher/aes_ct64.o \
+               deps/bearssl-0.6/src/symcipher/aes_x86ni_cbcdec.o \
+               deps/bearssl-0.6/src/symcipher/aes_x86ni_cbcenc.o \
+               deps/bearssl-0.6/src/symcipher/aes_x86ni_ctrcbc.o \
+               deps/bearssl-0.6/src/symcipher/aes_x86ni_ctr.o \
+               deps/bearssl-0.6/src/symcipher/aes_x86ni.o \
+               deps/bearssl-0.6/src/symcipher/chacha20_ct.o \
+               deps/bearssl-0.6/src/symcipher/chacha20_sse2.o \
+               deps/bearssl-0.6/src/symcipher/des_ct_cbcdec.o \
+               deps/bearssl-0.6/src/symcipher/des_ct_cbcenc.o \
+               deps/bearssl-0.6/src/symcipher/des_ct.o \
+               deps/bearssl-0.6/src/symcipher/des_support.o \
+               deps/bearssl-0.6/src/symcipher/poly1305_ctmul.o \
+               deps/bearssl-0.6/src/symcipher/poly1305_ctmulq.o \
+               deps/bearssl-0.6/src/x509/x509_decoder.o \
+               deps/bearssl-0.6/src/x509/x509_minimal_full.o \
+               deps/bearssl-0.6/src/x509/x509_minimal.o \
+
+   OBJ += $(OBJS_BEAR)
+else ifeq ($(HAVE_BUILTINMBEDTLS), 1)
   HAVE_SSL = 1
   DEFINES += -DHAVE_SSL

@@ -615,7 +739,7 @@ ifeq ($(HAVE_BUILTINMBEDTLS), 1)
   OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
 else ifeq ($(HAVE_SSL), 1)
   DEFINES += -DHAVE_SSL
-   LIBS += $(MBEDTLS_LIBS) $(MBEDX509_LIBS) $(MBEDCRYPTO_LIBS)
+   LIBS += $(SYSTEMMBEDTLS_LIBS)
 endif

 # Miscellaneous
@@ -644,18 +768,22 @@ endif

 ifeq ($(HAVE_LAKKA), 1)
   OBJ += wifi/drivers/connmanctl.o
+   OBJ += misc/cpufreq/cpufreq.o
 endif

 # Audio

 ifeq ($(HAVE_COREAUDIO), 1)
+   DEFINES += -DHAVE_COREAUDIO
   OBJ += audio/drivers/coreaudio.o
   HAVE_COREAUDIO_LIBS = 1
 endif

 ifeq ($(HAVE_COREAUDIO3), 1)
+   DEFINES += -DHAVE_COREAUDIO3
   OBJ += audio/drivers/coreaudio3.o
   HAVE_COREAUDIO_LIBS = 1
+   LIBS += -framework AudioToolBox -framework AVFoundation
 endif

 ifeq ($(HAVE_COREAUDIO_LIBS), 1)
@@ -687,6 +815,9 @@ endif
 ifeq ($(TARGET), retroarch_3ds)
   OBJ += audio/drivers/ctr_csnd_audio.o \
          audio/drivers/ctr_dsp_audio.o
+ifeq ($(HAVE_THREADS), 1)
+   OBJ += audio/drivers/ctr_dsp_thread_audio.o
+endif
 endif

 ifeq ($(HAVE_ALSA), 1)
@@ -862,12 +993,14 @@ ifeq ($(HAVE_MENU), 1)
      OBJ += menu/drivers/materialui.o
      DEFINES += -DHAVE_MATERIALUI
      HAVE_ASSETS = 1
+      HAVE_MENU_SCREENSAVER = 1
   endif

   ifeq ($(HAVE_XMB), 1)
      OBJ += menu/drivers/xmb.o
      DEFINES += -DHAVE_XMB
      HAVE_ASSETS = 1
+      HAVE_MENU_SCREENSAVER = 1
   endif

   ifeq ($(HAVE_OZONE), 1)
@@ -879,12 +1012,17 @@ ifeq ($(HAVE_MENU), 1)
             menu/drivers/ozone/ozone_sidebar.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
 endif

 ifeq ($(HAVE_BLUETOOTH), 1)
@@ -906,7 +1044,6 @@ ifeq ($(HAVE_MENU_COMMON), 1)
          menu/cbs/menu_cbs_select.o \
          menu/cbs/menu_cbs_start.o \
          menu/cbs/menu_cbs_info.o \
-          menu/cbs/menu_cbs_refresh.o \
          menu/cbs/menu_cbs_left.o \
          menu/cbs/menu_cbs_right.o \
          menu/cbs/menu_cbs_deferred_push.o \
@@ -915,9 +1052,6 @@ ifeq ($(HAVE_MENU_COMMON), 1)
          menu/cbs/menu_cbs_label.o \
          menu/cbs/menu_cbs_sublabel.o \
          menu/cbs/menu_cbs_title.o \
-          menu/cbs/menu_cbs_up.o \
-          menu/cbs/menu_cbs_down.o \
-          menu/cbs/menu_cbs_contentlist_switch.o \
          menu/menu_displaylist.o
 endif

@@ -935,7 +1069,8 @@ ifeq ($(HAVE_GFX_WIDGETS), 1)
          gfx/widgets/gfx_widget_progress_message.o \
          gfx/widgets/gfx_widget_load_content_animation.o
   ifeq ($(HAVE_CHEEVOS), 1)
-       OBJ += gfx/widgets/gfx_widget_achievement_popup.o
+       OBJ += gfx/widgets/gfx_widget_achievement_popup.o \
+              gfx/widgets/gfx_widget_leaderboard_display.o
   endif
 endif

@@ -967,6 +1102,10 @@ ifeq ($(HAVE_FREETYPE), 1)
   OBJ += gfx/drivers_font_renderer/freetype.o
   LIBS += $(FREETYPE_LIBS)
   DEF_FLAGS += $(FREETYPE_CFLAGS)
+   ifeq ($(HAVE_FREETYPE), 1)
+      LIBS += $(FONTCONFIG_LIBS)
+      DEF_FLAGS += $(FONTCONFIG_CFLAGS)
+   endif
 endif

 ifeq ($(HAVE_THREADS), 1)
@@ -1076,6 +1215,10 @@ ifeq ($(TARGET), retroarch_orbis)
          frontend/drivers/platform_orbis.o
 endif

+ifeq ($(DINGUX), 1)
+   OBJ += dingux/dingux_utils.o
+endif
+
 ifeq ($(HAVE_WAYLAND), 1)
 OBJ += gfx/drivers_context/wayland_ctx.o \
        input/common/wayland_common.o \
@@ -1107,12 +1250,7 @@ ifeq ($(HAVE_DINPUT), 1)
   LIBS += -ldinput8 -lole32
   DEFINES += -DHAVE_DINPUT
   OBJ += input/drivers/dinput.o
-
-   ifeq ($(HAVE_XINPUT), 1)
-      OBJ += input/drivers_joypad/dinput_hybrid_joypad.o
-   else
-      OBJ += input/drivers_joypad/dinput_joypad.o
-   endif
+   OBJ += input/drivers_joypad/dinput_joypad.o
 endif

 ifeq ($(HAVE_XINPUT), 1)
@@ -1196,6 +1334,7 @@ ifeq ($(HAVE_HID), 1)
          input/connect/connect_psxadapter.o \
          input/connect/connect_ps3.o \
          input/connect/connect_ps4.o \
+          input/connect/connect_ps4_hori_mini.o \
          input/connect/connect_wii.o \
          input/connect/connect_retrode.o \
          input/connect/connect_nesusb.o \
@@ -1215,14 +1354,28 @@ ifeq ($(HAVE_WINRAWINPUT), 1)
 endif
 endif

+ifeq ($(HAVE_LIBSHAKE), 1)
+ifeq ($(OSX), 1)
+   DEFINES      += -DHAVE_LIBSHAKE
+   INCLUDE_DIRS += -I$(DEPS_DIR)/libShake/include
+   OBJ          += $(DEPS_DIR)/libShake/src/common/error.o \
+                   $(DEPS_DIR)/libShake/src/common/helpers.o \
+                   $(DEPS_DIR)/libShake/src/common/presets.o \
+                   $(DEPS_DIR)/libShake/src/osx/shake.o
+else ifeq ($(HAVE_UNIX), 1)
+   DEFINES      += -DHAVE_LIBSHAKE
+   INCLUDE_DIRS += -I$(DEPS_DIR)/libShake/include
+   OBJ          += $(DEPS_DIR)/libShake/src/common/error.o \
+                   $(DEPS_DIR)/libShake/src/common/helpers.o \
+                   $(DEPS_DIR)/libShake/src/common/presets.o \
+                   $(DEPS_DIR)/libShake/src/linux/shake.o
+endif
+endif
+
 # Companion UI

 ifneq ($(findstring Win32,$(OS)),)
-   OBJ += ui/drivers/ui_win32.o \
-          ui/drivers/win32/ui_win32_window.o \
-          ui/drivers/win32/ui_win32_browser_window.o \
-          ui/drivers/win32/ui_win32_msg_window.o \
-          ui/drivers/win32/ui_win32_application.o
+   OBJ += ui/drivers/ui_win32.o
 endif

 # Video
@@ -1231,11 +1384,10 @@ OBJ += gfx/drivers_context/gfx_null_ctx.o

 ifeq ($(HAVE_KMS), 1)
   HAVE_AND_WILL_USE_DRM = 1
+   OBJ += gfx/drivers_context/drm_ctx.o

 ifeq ($(HAVE_ODROIDGO2), 1)
   OBJ += gfx/drivers_context/drm_go2_ctx.o
-else
-   OBJ += gfx/drivers_context/drm_ctx.o
 endif
   DEF_FLAGS += $(GBM_CFLAGS) $(DRM_CFLAGS)
   LIBS += $(GBM_LIBS) $(DRM_LIBS)
@@ -1281,13 +1433,17 @@ ifeq ($(HAVE_PLAIN_DRM), 1)
 endif

 ifeq ($(HAVE_VITAGL), 1)
-   DEFINES += -DHAVE_OPENGL1
+   DEFINES += -DHAVE_OPENGL1 -DHAVE_VITAGL
   OBJ += gfx/drivers/gl1.o \
          gfx/drivers_font/gl1_raster_font.o \
          gfx/drivers_context/vita_ctx.o \
          gfx/drivers_display/gfx_display_gl1.o
 endif

+ifeq ($(HAVE_VITAGLES), 1)
+   OBJ += gfx/drivers_context/vita_ctx.o
+endif
+
 ifeq ($(HAVE_GL_CONTEXT), 1)
   ifeq ($(HAVE_GL_MODERN), 1)
      DEFINES += -DHAVE_OPENGL
@@ -1341,19 +1497,6 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
      endif
   endif

-   ifeq ($(HAVE_METAL), 1)
-      DEFINES += -DHAVE_METAL
-      OBJ += gfx/common/metal/Context.o \
-             gfx/common/metal/Filter.o \
-             gfx/common/metal/RendererCommon.o \
-             gfx/common/metal/View.o \
-             gfx/common/metal/TexturedView.o \
-             gfx/common/metal/MenuDisplay.o \
-             gfx/common/metal_common.o \
-             gfx/drivers/metal.o \
-             gfx/drivers_font/metal_raster_font.o \
-				 gfx/drivers_display/gfx_display_metal.o
-   endif

   ifeq ($(HAVE_MPV), 1)
      OBJ += cores/libretro-mpv/mpv-libretro.o
@@ -1378,7 +1521,6 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
      GL_LIBS := $(OPENGL_LIBS)
      ifeq ($(OSX), 1)
         GL_LIBS := -framework OpenGL
-         OBJ += gfx/drivers_context/cgl_ctx.o
      else ifneq ($(findstring Win32,$(OS)),)
         GL_LIBS := -lopengl32 -lgdi32 -lcomdlg32
    WANT_WGL=1
@@ -1388,6 +1530,19 @@ ifeq ($(HAVE_GL_CONTEXT), 1)

 endif

+ifeq ($(HAVE_METAL), 1)
+   DEFINES += -DHAVE_METAL
+   LIBS += -framework Metal -framework MetalKit
+   # Metal code relies on ARC (Automatic Reference Counting), enable it
+   DEF_FLAGS += -fobjc-arc
+   OBJ += \
+	  gfx/common/metal/metal_renderer.o \
+	  gfx/common/metal_common.o \
+	  gfx/drivers/metal.o \
+	  gfx/drivers_font/metal_raster_font.o \
+	  gfx/drivers_display/gfx_display_metal.o
+endif
+
 ifeq ($(HAVE_EGL), 1)
   DEFINES += -DHAVE_EGL
   DEF_FLAGS += $(EGL_CFLAGS)
@@ -1415,7 +1570,9 @@ else ifeq ($(HAVE_SDL), 1)
 else ifeq ($(HAVE_SDL_DINGUX), 1)
   HAVE_SDL_COMMON = 1
   DEF_FLAGS += -DHAVE_SDL -DHAVE_SDL_DINGUX
-   OBJ += gfx/drivers/sdl_dingux_gfx.o
+   OBJ += gfx/drivers/sdl_dingux_gfx.o \
+          input/drivers/sdl_dingux_input.o \
+          input/drivers_joypad/sdl_dingux_joypad.o
   DEF_FLAGS += $(SDL_DINGUX_CFLAGS)
   LIBS += $(SDL_DINGUX_LIBS)
 endif
@@ -1718,20 +1875,24 @@ ifeq ($(HAVE_7ZIP),1)
   INCLUDE_DIRS += -I$(DEPS_DIR)/7zip
   HAVE_COMPRESSION = 1
   DEFINES += -DHAVE_7ZIP -D_7ZIP_ST
-   7ZOBJ = $(DEPS_DIR)/7zip/7zIn.o \
-           $(DEPS_DIR)/7zip/Bra86.o \
-           $(DEPS_DIR)/7zip/7zFile.o \
-           $(DEPS_DIR)/7zip/7zStream.o \
+   7ZOBJ = $(DEPS_DIR)/7zip/7zArcIn.o \
+           $(DEPS_DIR)/7zip/7zBuf.o \
+           $(DEPS_DIR)/7zip/7zCrc.o \
+           $(DEPS_DIR)/7zip/7zCrcOpt.o \
+           $(DEPS_DIR)/7zip/7zDec.o \
+           $(DEPS_DIR)/7zip/CpuArch.o \
+           $(DEPS_DIR)/7zip/Delta.o \
           $(DEPS_DIR)/7zip/LzFind.o \
           $(DEPS_DIR)/7zip/LzmaDec.o \
-           $(DEPS_DIR)/7zip/LzmaEnc.o \
-           $(DEPS_DIR)/7zip/7zCrcOpt.o \
-           $(DEPS_DIR)/7zip/Bra.o \
-           $(DEPS_DIR)/7zip/7zDec.o \
-           $(DEPS_DIR)/7zip/Bcj2.o \
-           $(DEPS_DIR)/7zip/7zCrc.o \
           $(DEPS_DIR)/7zip/Lzma2Dec.o \
-           $(DEPS_DIR)/7zip/7zBuf.o
+           $(DEPS_DIR)/7zip/LzmaEnc.o \
+           $(DEPS_DIR)/7zip/Bra.o \
+           $(DEPS_DIR)/7zip/Bra86.o \
+           $(DEPS_DIR)/7zip/BraIA64.o \
+           $(DEPS_DIR)/7zip/Bcj2.o \
+           $(DEPS_DIR)/7zip/7zFile.o \
+           $(DEPS_DIR)/7zip/7zStream.o
+
   OBJ +=  $(LIBRETRO_COMM_DIR)/file/archive_file_7z.o \
           $(7ZOBJ)
 endif
@@ -1854,8 +2015,7 @@ ifeq ($(HAVE_RBMP), 1)
 endif

 OBJ += $(LIBRETRO_COMM_DIR)/formats/bmp/rbmp_encode.o \
-       $(LIBRETRO_COMM_DIR)/formats/json/jsonsax.o \
-       $(LIBRETRO_COMM_DIR)/formats/json/jsonsax_full.o \
+       $(LIBRETRO_COMM_DIR)/formats/json/rjson.o \
       $(LIBRETRO_COMM_DIR)/formats/image_transfer.o \
       $(LIBRETRO_COMM_DIR)/formats/m3u/m3u_file.o

@@ -1911,13 +2071,13 @@ ifeq ($(HAVE_NETWORKING), 1)
          tasks/task_netplay_find_content.o

   ifeq ($(HAVE_MENU_COMMON), 1)
-      OBJ +=  \
-             tasks/task_core_updater.o \
-             menu/menu_networking.o
+      OBJ += tasks/task_core_updater.o
   endif

-   ifeq ($(HAVE_SSL), 1)
-      OBJ += $(LIBRETRO_COMM_DIR)/net/net_socket_ssl.o
+   ifeq ($(HAVE_BUILTINBEARSSL), 1)
+      OBJ += $(LIBRETRO_COMM_DIR)/net/net_socket_ssl_bear.o
+   else ifeq ($(HAVE_SSL), 1)
+      OBJ += $(LIBRETRO_COMM_DIR)/net/net_socket_ssl_mbed.o
   endif

   ifneq ($(HAVE_SOCKET_LEGACY),1)
@@ -1935,14 +2095,9 @@ ifeq ($(HAVE_NETWORKING), 1)

   # Netplay
   DEFINES += -DHAVE_NETWORK_CMD
-   OBJ += network/netplay/netplay_delta.o \
-			 network/netplay/netplay_handshake.o \
-			 network/netplay/netplay_init.o \
+   OBJ += network/netplay/netplay_handshake.o \
 			 network/netplay/netplay_io.o \
-			 network/netplay/netplay_keyboard.o \
-			 network/netplay/netplay_sync.o \
 			 network/netplay/netplay_discovery.o \
-			 network/netplay/netplay_buf.o \
 			 network/netplay/netplay_room_parse.o

   # RetroAchievements
@@ -1952,9 +2107,8 @@ ifeq ($(HAVE_NETWORKING), 1)

      OBJ += cheevos/cheevos.o \
             cheevos/badges.o \
-             cheevos/fixup.o \
-             cheevos/parser.o \
-             cheevos/hash.o \
+             cheevos/cheevos_memory.o \
+             cheevos/cheevos_parser.o \
             $(LIBRETRO_COMM_DIR)/formats/cdfs/cdfs.o \
             deps/rcheevos/src/rcheevos/alloc.o \
             deps/rcheevos/src/rcheevos/compat.o \
@@ -2019,8 +2173,7 @@ ifeq ($(HAVE_NETWORKING), 1)
   ifeq ($(HAVE_DISCORD), 1)
      NEED_CXX_LINKER = 1
      DEFINES += -DHAVE_DISCORD
-      INCLUDE_DIRS += -Ideps/discord-rpc/include \
-							 -Ideps/discord-rpc/thirdparty/rapidjson-1.1.0/include/
+      INCLUDE_DIRS += -Ideps/discord-rpc/include

      ifneq ($(HAVE_THREADS), 1)
         DEFINES += -DDISCORD_DISABLE_IO_THREAD
@@ -2120,17 +2273,26 @@ ifeq ($(HAVE_COMPRESSION), 1)
   OBJ     += tasks/task_decompress.o
 endif

-ifeq ($(HAVE_COCOA),1)
-   DEFINES += -DHAVE_MAIN
+ifeq ($(HAVE_COCOA), 1)
+   HAVE_COCOA_COMMON = 1
+endif
+ifeq ($(HAVE_COCOA_METAL), 1)
+   HAVE_COCOA_COMMON = 1
+endif
+
+ifeq ($(HAVE_COCOA_COMMON),1)
+   DEFINES += -DHAVE_MAIN -DOSX
   OBJ += input/drivers/cocoa_input.o \
-          input/drivers_keyboard/keyboard_event_apple.o \
          ui/drivers/ui_cocoa.o \
-          ui/drivers/cocoa/ui_cocoa_window.o \
-          ui/drivers/cocoa/ui_cocoa_browser_window.o \
-          ui/drivers/cocoa/ui_cocoa_msg_window.o \
-          ui/drivers/cocoa/ui_cocoa_application.o \
-          ui/drivers/cocoa/cocoa_common.o \
-          gfx/drivers_context/cocoa_gl_ctx.o
+          ui/drivers/cocoa/cocoa_common.o
+          
+   ifeq ($(HAVE_OPENGL), 1)
+           DEFINES += -DGL_SILENCE_DEPRECATION	 
+	   OBJ += gfx/drivers_context/cocoa_gl_ctx.o
+   endif
+   ifeq ($(HAVE_VULKAN), 1)
+	   OBJ += gfx/drivers_context/cocoa_vk_ctx.o
+   endif
 endif

 ifneq ($(findstring DOS,$(OS)),)
@@ -2153,7 +2315,18 @@ ifeq ($(HAVE_STATIC_VIDEO_FILTERS), 1)
          gfx/video_filters/lq2x.o \
          gfx/video_filters/phosphor2x.o \
          gfx/video_filters/normal2x.o \
-          gfx/video_filters/scanline2x.o
+          gfx/video_filters/normal2x_width.o \
+          gfx/video_filters/normal2x_height.o \
+          gfx/video_filters/normal4x.o \
+          gfx/video_filters/scanline2x.o \
+          gfx/video_filters/grid2x.o \
+          gfx/video_filters/grid3x.o \
+          gfx/video_filters/gameboy3x.o \
+          gfx/video_filters/gameboy4x.o \
+          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
 endif

 ifeq ($(WANT_IOSUHAX), 1)
@@ -2194,6 +2367,10 @@ ifeq ($(HAVE_RPILED), 1)
   OBJ += led/drivers/led_rpi.o
 endif

+ifneq ($(findstring Win32,$(OS)),)
+   OBJ += led/drivers/led_win32_keyboard.o
+endif
+
 ifeq ($(HAVE_MATH_NEON), 1)
   DEFINES += -DHAVE_MATH_NEON
   INCLUDE_DIRS += -I$(DEPS_DIR)/math-neon/source
@@ -2201,17 +2378,20 @@ ifeq ($(HAVE_MATH_NEON), 1)
   OBJ += $(patsubst %.c,%.o,$(foreach dir,$(SOURCES), $(wildcard $(dir)/*.c)))
 endif

-ifeq ($(HAVE_VITAGL), 1)
-   INCLUDE_DIRS += -I$(DEPS_DIR)/vitaShaRK/source
-   SOURCES := $(DEPS_DIR)/vitaShaRK/source
+ifeq ($(HAVE_VITAGLES), 1)
+   DEFINES += -DHAVE_VITAGLES
+   INCLUDE_DIRS += -I$(DEPS_DIR)/Pigs-In-A-Blanket/include
+   SOURCES := $(DEPS_DIR)/Pigs-In-A-Blanket/src
   OBJ += $(patsubst %.c,%.o,$(foreach dir,$(SOURCES), $(wildcard $(dir)/*.c)))
 endif

-ifeq ($(HAVE_VITAGL), 1)
-   DEFINES += -DHAVE_VITAGL -DSTB_DXT_IMPLEMENTATION -DSKIP_ERROR_HANDLING -DHAVE_SHARK
-   INCLUDE_DIRS += -I$(DEPS_DIR)/vitaGL/source -I$(DEPS_DIR)/vitaShaRK/include
-   SOURCES := $(DEPS_DIR)/vitaGL/source $(DEPS_DIR)/vitaGL/source/utils
-   OBJ += $(patsubst %.c,%.o,$(foreach dir,$(SOURCES), $(wildcard $(dir)/*.c)))
+#####################################
+### Android Play Feature Delivery ###
+### (Play Store build core        ###
+###  downloader)                  ###
+#####################################
+ifeq ($(ANDROID), 1)
+   OBJ += play_feature_delivery/play_feature_delivery.o
 endif

 ##################################
@@ -2260,4 +2440,6 @@ ifeq ($(HAVE_ODROIDGO2), 1)
         $(DEPS_DIR)/libgo2/src/queue.o \
         gfx/drivers/oga_gfx.o
 endif
+
 ##################################
+
@@ -8,6 +8,7 @@ BUILD_3DSX              = 1
 BUILD_3DS               = 0
 BUILD_CIA               = 1
 LIBCTRU_NO_DEPRECATION  = 1
+USE_CTRULIB_2          ?= 0

 APP_TITLE            = RetroArch 3DS
 APP_DESCRIPTION      = RetroArch 3DS
@@ -35,8 +36,7 @@ OBJ += ctr/exec-3dsx/exec_cia.o \
 	ctr/exec-3dsx/exec_3dsx.o \
 	ctr/exec-3dsx/mini-hb-menu/launch.o \
 	ctr/exec-3dsx/mini-hb-menu/loaders/rosalina.o \
-	ctr/exec-3dsx/mini-hb-menu/loaders/hax2.o \
-	ctr/exec-3dsx/mini-hb-menu/loaders/ninjhax1.o
+	ctr/exec-3dsx/mini-hb-menu/loaders/hax2.o

 ifeq ($(APP_BIG_TEXT_SECTION), 1)
 	APP_USE_SVCHAX = 1
@@ -51,12 +51,16 @@ DEFINES :=
 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
-	DEFINES += -DHAVE_ZLIB -DHAVE_7ZIP -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA
-	DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DRC_DISABLE_LUA
+	DEFINES += -DHAVE_ZLIB -DHAVE_7ZIP -D_7ZIP_ST -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA
+	DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_CORES
+	#DEFINES += -DHAVE_UPDATE_ASSETS
 	DEFINES += -DHAVE_PATCH -DHAVE_RWAV
 	DEFINES += -DHAVE_SCREENSHOTS
 	DEFINES += -DHAVE_REWIND
-	#DEFINES += -DHAVE_SOCKET_LEGACY -DHAVE_THREADS
+	DEFINES += -DHAVE_THREADS
+	DEFINES += -DHAVE_GFX_WIDGETS
+	DEFINES += -DHAVE_OVERLAY
+	#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
 else
@@ -84,7 +88,7 @@ else
 	#HAVE_NETWORKING = 1
 	#HAVE_CHEEVOS = 1
 	#HAVE_SOCKET_LEGACY = 1
-	#HAVE_THREADS = 1
+	HAVE_THREADS = 1
 	#HAVE_SSL = 1
 	#HAVE_BUILTINMBEDTLS = 1

@@ -104,13 +108,32 @@ ifeq ($(strip $(CTRULIB)),)
 	CTRULIB = $(DEVKITPRO)/libctru
 endif

+ifeq ($(strip $(USE_CTRULIB_2)),1)
+	CFLAGS += -DUSE_CTRULIB_2
+endif
+
+ifeq ($(strip $(DEVKITTOOLS)),)
+	ifeq ($(strip $(USE_CTRULIB_2)),1)
+		DEVKITTOOLS = $(DEVKITPRO)/tools
+	else
+		DEVKITTOOLS = $(DEVKITARM)
+	endif
+endif
+
 APP_TITLE         := $(shell echo "$(APP_TITLE)" | cut -c1-128)
 APP_DESCRIPTION   := $(shell echo "$(APP_DESCRIPTION)" | cut -c1-256)
 APP_AUTHOR        := $(shell echo "$(APP_AUTHOR)" | cut -c1-128)
 APP_PRODUCT_CODE  := $(shell echo $(APP_PRODUCT_CODE) | cut -c1-16)
 APP_UNIQUE_ID     := $(shell echo $(APP_UNIQUE_ID) | cut -c1-7)

-MAKEROM_ARGS_COMMON = -rsf $(APP_RSF) -exefslogo -elf $(TARGET).elf -icon $(TARGET).icn -banner $(TARGET).bnr -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" -DAPP_UNIQUE_ID=$(APP_UNIQUE_ID) -DAPP_SYSTEM_MODE=$(APP_SYSTEM_MODE) -DAPP_SYSTEM_MODE_EXT=$(APP_SYSTEM_MODE_EXT)
+APP_VERSION_MAJOR := $(shell shuf -i 0-63 -n 1)
+APP_VERSION_MINOR := $(shell shuf -i 0-63 -n 1)
+APP_VERSION_MICRO := $(shell shuf -i 0-15 -n 1)
+
+MAKEROM_ARGS_COMMON = -rsf $(APP_RSF) -exefslogo -elf $(TARGET).elf -icon $(TARGET).icn -banner $(TARGET).bnr \
+	-DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" -DAPP_UNIQUE_ID=$(APP_UNIQUE_ID) \
+	-DAPP_SYSTEM_MODE=$(APP_SYSTEM_MODE) -DAPP_SYSTEM_MODE_EXT=$(APP_SYSTEM_MODE_EXT) \
+	-major "$(APP_VERSION_MAJOR)" -minor "$(APP_VERSION_MINOR)" -micro "$(APP_VERSION_MICRO)"

 INCDIRS := -I$(CTRULIB)/include
 LIBDIRS := -L. -L$(CTRULIB)/lib
@@ -225,13 +248,13 @@ else
 endif

 %.o: %.vsh %.gsh
-	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
-	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITTOOLS)/bin/picasso $^ -o $*.shbin
+	$(DEVKITTOOLS)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin

 %.o: %.vsh
-	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
-	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITTOOLS)/bin/picasso $^ -o $*.shbin
+	$(DEVKITTOOLS)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin

 %.o: %.cpp
@@ -251,8 +274,8 @@ endif

 %.vsh:

-$(TARGET).smdh: $(APP_ICON)
-	$(DEVKITARM)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
+$(TARGET).smdh: $(TARGET).elf $(APP_ICON)
+	$(DEVKITTOOLS)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@

 $(TARGET).3dsx: $(TARGET).elf
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
@@ -260,16 +283,16 @@ ifeq ($(APP_BIG_TEXT_SECTION), 1)
 else
 	rm -f $(TARGET).xml
 endif
-	$(DEVKITARM)/bin/3dsxtool $< $@ $(_3DSXFLAGS)
+	$(DEVKITTOOLS)/bin/3dsxtool $< $@ $(_3DSXFLAGS)

 $(TARGET).elf: ctr/3dsx_custom_crt0.o
 	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
 	$(NM) -CSn $@ > $(notdir $*.lst)

-$(TARGET).bnr: $(APP_BANNER) $(APP_AUDIO)
+$(TARGET).bnr: $(TARGET).elf $(APP_BANNER) $(APP_AUDIO)
 	$(BANNERTOOL) makebanner -i "$(APP_BANNER)" -a "$(APP_AUDIO)" -o $@

-$(TARGET).icn: $(APP_ICON)
+$(TARGET).icn: $(TARGET).elf $(APP_ICON)
 	$(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_TITLE)" -p "$(APP_AUTHOR)" -i $(APP_ICON) -o $@

 $(TARGET).3ds: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
@@ -5,6 +5,7 @@ DEBUG                   = 0
 BUILD_3DSX              = 1
 BUILD_3DS               = 0
 BUILD_CIA               = 1
+USE_CTRULIB_2          ?= 0

 APP_TITLE            = RetroArch 3DS
 APP_DESCRIPTION      = RetroArch 3DS
@@ -37,22 +38,32 @@ OBJ := ctr/ctr_system.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/vfs/vfs_implementation.o \
-		 libretro-common/hash/rhash.o \
+		 libretro-common/hash/lrc_hash.o \
 		 libretro-common/time/rtime.o \
-		 file_path_str.o \
 		 verbosity.o

 OBJ += ctr/exec-3dsx/exec_cia.o \
 	ctr/exec-3dsx/exec_3dsx.o \
 	ctr/exec-3dsx/mini-hb-menu/launch.o \
 	ctr/exec-3dsx/mini-hb-menu/loaders/rosalina.o \
-	ctr/exec-3dsx/mini-hb-menu/loaders/hax2.o \
-	ctr/exec-3dsx/mini-hb-menu/loaders/ninjhax1.o
+	ctr/exec-3dsx/mini-hb-menu/loaders/hax2.o

 ifeq ($(strip $(DEVKITPRO)),)
 	$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitpro")
 endif

+ifeq ($(strip $(USE_CTRULIB_2)),1)
+	CFLAGS += -DUSE_CTRULIB_2
+endif
+
+ifeq ($(strip $(DEVKITTOOLS)),)
+	ifeq ($(strip $(USE_CTRULIB_2)),1)
+		DEVKITTOOLS = $(DEVKITPRO)/tools
+	else
+		DEVKITTOOLS = $(DEVKITARM)
+	endif
+endif
+
 ifeq ($(strip $(CTRULIB)),)
 	CTRULIB = $(DEVKITPRO)/libctru
 endif
@@ -154,13 +165,13 @@ else
 endif

 %.o: %.vsh %.gsh
-	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
-	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITTOOLS)/bin/picasso $^ -o $*.shbin
+	$(DEVKITTOOLS)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin

 %.o: %.vsh
-	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
-	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITTOOLS)/bin/picasso $^ -o $*.shbin
+	$(DEVKITTOOLS)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin

 %.o: %.cpp
@@ -181,7 +192,7 @@ endif
 %.vsh:

 $(TARGET).smdh: $(APP_ICON)
-	$(DEVKITARM)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
+	$(DEVKITTOOLS)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@

 $(TARGET).3dsx: $(TARGET).elf
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
@@ -189,7 +200,7 @@ ifeq ($(APP_BIG_TEXT_SECTION), 1)
 else
 	rm -f $(TARGET).xml
 endif
-	$(DEVKITARM)/bin/3dsxtool $< $@ $(_3DSXFLAGS)
+	$(DEVKITTOOLS)/bin/3dsxtool $< $@ $(_3DSXFLAGS)

 $(TARGET).elf: ctr/3dsx_custom_crt0.o
 	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
@@ -1,9 +1,39 @@
-CC = /opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc-gcc
-CXX = /opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc-g++
+#########################
+## Toolchain variables ##
+#########################
+
+# Default toolchain directory
+TOOLCHAIN_DIR=/opt/gcw0-toolchain
+
+# All toolchain-related variables may be
+# overridden via the command line
+ifdef GCW0_CC
+CC                    = $(GCW0_CC)
+else
+CC                    = $(TOOLCHAIN_DIR)/usr/bin/mipsel-gcw0-linux-uclibc-gcc
+endif
+
+ifdef GCW0_CXX
+CXX                   = $(GCW0_CXX)
+else
+CXX                   = $(TOOLCHAIN_DIR)/usr/bin/mipsel-gcw0-linux-uclibc-g++
+endif
+
+GCW0_SDL_CONFIG      ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/sdl-config
+GCW0_FREETYPE_CONFIG ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/freetype-config
+GCW0_MK_SQUASH_FS    ?= $(TOOLCHAIN_DIR)/usr/bin/mksquashfs
+
+GCW0_INC_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include
+GCW0_LIB_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/lib
+
+#########################
+#########################
+
 PACKAGE_NAME = retroarch

 DEBUG ?= 0

+DINGUX = 1
 HAVE_SCREENSHOTS = 1
 HAVE_REWIND = 1
 HAVE_7ZIP = 1
@@ -19,7 +49,7 @@ HAVE_CC = 1
 HAVE_CC_RESAMPLER = 1
 HAVE_CHD = 1
 HAVE_CHEEVOS = 1
-HAVE_COMMAND = 1
+HAVE_COMMAND = 0
 HAVE_CXX = 1
 HAVE_DR_MP3 = 1
 HAVE_DYNAMIC = 1
@@ -57,7 +87,7 @@ HAVE_SHADERPIPELINE = 1
 HAVE_STB_FONT = 1
 HAVE_STB_IMAGE = 1
 HAVE_STB_VORBIS = 1
-HAVE_STDIN_CMD = 1
+HAVE_STDIN_CMD = 0
 HAVE_STRCASESTR = 1
 HAVE_THREADS = 1
 HAVE_TRANSLATE = 1
@@ -68,6 +98,7 @@ HAVE_ZLIB = 1
 HAVE_CONFIGFILE = 1
 HAVE_PATCH = 1
 HAVE_CHEATS = 1
+HAVE_LIBSHAKE = 1

 OS = Linux
 TARGET = retroarch
@@ -75,7 +106,9 @@ OPK_NAME = retroarch.opk

 OBJ :=
 LINK := $(CXX)
-DEF_FLAGS := -march=mips32 -mtune=mips32r2 -mhard-float -ffast-math -fomit-frame-pointer -fdata-sections
+DEF_FLAGS := -march=mips32 -mtune=mips32r2 -mhard-float -ffast-math -fomit-frame-pointer
+DEF_FLAGS += -mplt -mno-shared
+DEF_FLAGS += -ffunction-sections -fdata-sections
 DEF_FLAGS += -I. -Ideps -Ideps/stb -DDINGUX=1 -MMD
 DEF_FLAGS += -Wall -Wno-unused-variable
 DEF_FLAGS += -std=gnu99 -D_GNU_SOURCE
@@ -83,9 +116,9 @@ LIBS := -ldl -lz -lrt -lcrypto -lssl -ludev -pthread
 CFLAGS :=
 CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
 ASFLAGS :=
-LDFLAGS := -flto
-INCLUDE_DIRS = -I/opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include
-LIBRARY_DIRS = -L/opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/lib
+LDFLAGS := -flto -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 -DHAVE_OPENDINGUX_FBDEV=1
 DEFINES += -DHAVE_GETOPT_LONG=1 -DHAVE_STRCASESTR=1 -DHAVE_DYNAMIC=1
@@ -94,10 +127,10 @@ DEFINES += -DHAVE_ONLINE_UPDATER=1
 DEFINES += -DHAVE_UPDATE_ASSETS=1
 DEFINES += -DHAVE_UDEV=1

-SDL_DINGUX_CFLAGS := $(shell /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/sdl-config --cflags)
-SDL_DINGUX_LIBS := $(shell /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/sdl-config --libs)
-FREETYPE_CFLAGS := $(shell /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/freetype-config --cflags)
-FREETYPE_LIBS := $(shell /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/freetype-config --libs)
+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)
 AL_LIBS := -lopenal
 OPENGLES_CFLAGS := -DMESA_EGL_NO_X11_HEADERS
 OPENGLES_LIBS := -lGLESv2 -lEGL
@@ -127,8 +160,8 @@ RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))

 define DESKTOP_ENTRY
 [Desktop Entry]
-Name=retroarch
-Comment=Retroarch
+Name=RetroArch
+Comment=Frontend for emulators, game engines
 Exec=retroarch
 Terminal=false
 Type=Application
@@ -147,27 +180,27 @@ SYMBOL_MAP := -Wl,-Map=output.map

 $(TARGET): $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
-	$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
+	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)

 $(OBJDIR)/%.o: %.c
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo CC $<),)
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c -o $@ $<
+	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c -o $@ $<

 $(OBJDIR)/%.o: %.cpp
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
+	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<

 $(OBJDIR)/%.o: %.m
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo OBJC $<),)
-	$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<
+	$(Q)$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<

 $(OBJDIR)/%.o: %.S $(HEADERS)
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo AS $<),)
-	$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
+	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<

 clean:
 	rm -rf $(OBJDIR_BASE)
@@ -179,7 +212,7 @@ opk: $(TARGET)
 	echo "$$DESKTOP_ENTRY" > default.gcw0.desktop
 	rm -f $(OPK_NAME)
 	cp media/ico_src/icon32.png retroarch.png
-	mksquashfs retroarch default.gcw0.desktop retroarch.png $(OPK_NAME) -all-root -no-xattrs -noappend -no-exports
+	$(GCW0_MK_SQUASH_FS) retroarch default.gcw0.desktop retroarch.png $(OPK_NAME) -all-root -no-xattrs -noappend -no-exports
 	rm -f default.gcw0.desktop retroarch.png

 .PHONY: all clean opk
@@ -1,4 +1,10 @@
+ifeq ($(TARGET),)
+ifeq ($(LIBRETRO),)
 TARGET := retroarch.js
+else
+TARGET := $(LIBRETRO)_libretro.js
+endif
+endif

 EOPT = USE_ZLIB=1 # Emscripten specific options
 EOPTS = $(addprefix -s $(EMPTY), $(EOPT)) # Add '-s ' to each option
@@ -35,8 +41,19 @@ HAVE_STATIC_AUDIO_FILTERS = 1
 HAVE_STB_FONT = 1
 HAVE_CONFIGFILE = 1
 HAVE_CHEATS = 1
+HAVE_IBXM = 1

-MEMORY = 134217728
+ASYNC ?= 0
+ifeq ($(LIBRETRO), mupen64plus)
+   ASYNC = 1
+endif
+
+LTO ?= 0
+ifeq ($(LIBRETRO), tyrquake)
+   LTO = 0
+endif
+
+MEMORY ?= 134217728

 PRECISE_F32 = 1

@@ -116,7 +116,8 @@ else ifeq ($(platform), ps3-cobra)

 # NGC/Wii - libogc
 else ifeq ($(libogc_platform), 1)
-   EXTERNAL_LIBOGC=0
+   EXTERNAL_LIBOGC   ?= 0
+   GX_PTHREAD_LEGACY ?= 1
   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
   CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
   LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
@@ -148,6 +149,11 @@ else ifeq ($(libogc_platform), 1)

   endif

+   ifeq ($(GX_PTHREAD_LEGACY), 1)
+      CFLAGS   += -DGX_PTHREAD_LEGACY
+      CXXFLAGS += -DGX_PTHREAD_LEGACY
+   endif
+
   ifeq ($(platform), ngc)
      MACHDEP := -DHW_DOL -mogc
   else ifeq ($(platform), wii)
@@ -414,6 +420,7 @@ else ifeq ($(platform), windows_msvc2003_x86)
   HAVE_CONFIGFILE          := 1
   HAVE_PATCH               := 1
   HAVE_CHEATS              := 1
+   HAVE_GFX_WIDGETS         := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -422,6 +429,7 @@ else ifeq ($(platform), windows_msvc2003_x86)
   LD = link.exe

   PLATCFLAGS += -D_WIN32 -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -D__STDC_CONSTANT_MACROS -D_MBCS -D_VC80_UPGRADE=0x0710
+   PLATCFLAGS += -DHAVE_GFX_WIDGETS
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib

   PATH := $(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../../Vc7/bin"):$(PATH)
@@ -440,6 +448,7 @@ else ifeq ($(platform), windows_msvc2003_x86)
   endif
 else ifeq ($(platform), windows_msvc2005_x86)
   HAVE_GDI                 := 1
+   HAVE_REWIND              := 1
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
@@ -453,6 +462,7 @@ else ifeq ($(platform), windows_msvc2005_x86)
   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
+   HAVE_OZONE               := 1
   HAVE_STB_FONT            := 1
   HAVE_THREADS             := 1
   HAVE_LIBRETRODB          := 1
@@ -462,10 +472,17 @@ else ifeq ($(platform), windows_msvc2005_x86)
   HAVE_DYLIB               := 1
   HAVE_DYNAMIC             := 1
   HAVE_GRIFFIN_CPP         := 1
+   HAVE_RUNAHEAD            := 1
   HAVE_DIRECTX             ?= 1
+   HAVE_OPENGL              := 1
+   HAVE_OPENGL1             := 1
   HAVE_CONFIGFILE          := 1
   HAVE_PATCH               := 1
   HAVE_CHEATS              := 1
+   HAVE_DSP_FILTER          := 1
+   HAVE_VIDEO_FILTER        := 1
+   HAVE_FILTERS_BUILTIN     := 1
+   HAVE_GFX_WIDGETS         := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -473,16 +490,32 @@ else ifeq ($(platform), windows_msvc2005_x86)
   CXX = cl.exe
   LD = link.exe

-   PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE
-   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib msimg32.lib
+   PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS -D__SSE__
+   PLATCFLAGS += -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_OZONE -DHAVE_GFX_WIDGETS -DHAVE_CC_RESAMPLER
+   PLATCFLAGS += -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_CDROM
+   PLATCFLAGS += -bigobj
+
+   LDFLAGS += -MANIFEST shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib msimg32.lib

   PATH := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin"):$(PATH)
   PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE")
   INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/include")
   LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/lib")

+   WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\MicrosoftSDK\InstalledSDKs\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3" -v "Install Dir" | grep -o '[A-Z]:\\.*')
+
+   WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
+   WindowsSDKAtlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\atl")
+   WindowsSDKCrtIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\crt")
+   WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
+   WindowsSDKMfcIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\mfc")
+   WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib")
+
+   INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKAtlIncludeDir);$(WindowsSDKCrtIncludeDir);$(WindowsSDKGlIncludeDir);$(WindowsSDKMfcIncludeDir);libretro/msvc/msvc-2005
+   LIB := $(LIB);$(WindowsSDKLibDir)
+
   ifeq ($(HAVE_DIRECTX), 1)
-      PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND
+      PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D8
      DXSDK_DIR := $(DXSDK_DIR:\=)
      export INCLUDE := $(INCLUDE);$(INETSDK)\Include;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
      export LIB := $(LIB);$(INETSDK)\Lib;$(DXSDK_DIR)\Lib\x86
@@ -509,6 +542,7 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
+   HAVE_OZONE               := 1
   HAVE_STB_FONT            := 1
   HAVE_THREADS             := 1
   HAVE_LIBRETRODB          := 1
@@ -520,9 +554,15 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
   HAVE_GRIFFIN_CPP         := 1
   HAVE_RUNAHEAD            := 1
   HAVE_DIRECTX             ?= 1
+   HAVE_OPENGL              := 1
+   HAVE_OPENGL1             := 1
   HAVE_CONFIGFILE          := 1
   HAVE_PATCH               := 1
   HAVE_CHEATS              := 1
+   HAVE_DSP_FILTER          := 1
+   HAVE_VIDEO_FILTER        := 1
+   HAVE_FILTERS_BUILTIN     := 1
+   HAVE_GFX_WIDGETS         := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -531,8 +571,14 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
   LD = link.exe

   PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DWIN32 -DHAVE_CDROM
-   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib msimg32.lib
+   PLATCFLAGS += -D__i686__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS
+   PLATCFLAGS += -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA
+   PLATCFLAGS += -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_OZONE
+   PLATCFLAGS += -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DWIN32 -DHAVE_CDROM
+   PLATCFLAGS += -DHAVE_GFX_WIDGETS
+   PLATCFLAGS += -bigobj
+
+   LDFLAGS += -MANIFEST shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib msimg32.lib

   PlatformSuffix = $(subst windows_msvc2010_,,$(platform))

@@ -557,12 +603,12 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
   PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
   INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS100COMNTOOLS)../../VC/include")

-   WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -io '[A-Z]:\\.*')
   WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -io '[A-Z]:\\.*')
+   WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -io '[A-Z]:\\.*')
   WindowsSdkDir := $(WindowsSdkDir:\=)

   ifeq ($(HAVE_DIRECTX), 1)
-      PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D9 -DHAVE_XAUDIO -DHAVE_XINPUT
+      PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D8 -DHAVE_XAUDIO -DHAVE_XINPUT
      DXSDK_DIR := $(DXSDK_DIR:\=)
      export INCLUDE := $(INCLUDE);$(WindowsSdkDir)\Include;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
      export LIB := $(LIB);$(WindowsSdkDir)\$(PlatLib);$(DXSDK_DIR)\Lib\$(WinArch)
@@ -1056,7 +1102,7 @@ ifeq ($(HAVE_RUNAHEAD), 1)
 endif

 ifeq ($(HAVE_7ZIP), 1)
-   CFLAGS      += -DHAVE_7ZIP
+   CFLAGS      += -DHAVE_7ZIP -D_7ZIP_ST
 endif

 ifeq ($(HAVE_SCREENSHOTS), 1)
@@ -50,6 +50,7 @@ HAVE_STB_FONT = 1
 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

 # RetroArch libnx useful flags
 HAVE_THREADS = 1
@@ -122,7 +123,7 @@ APP_ICON := pkg/libnx/retroarch.jpg
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -mcpu=cortex-a57+crc+fp+simd

-CFLAGS := -g -Wall -O3 -ffast-math -ffunction-sections \
+CFLAGS := -g -Wall -O3 -fcommon -ffast-math -ffunction-sections \
          $(ARCH) $(DEFINES) $(INCLUDE_DIRS) -I$(LIBNX)/include -I$(PORTLIBS)/include/ -include $(LIBNX)/include/switch.h #$(shell $(PORTLIBS)/bin/freetype-config --cflags)

 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
@@ -0,0 +1,363 @@
+ROOT_DIR                  := .
+DEPS_DIR                  := $(ROOT_DIR)/deps
+DEBUG                     ?= 0
+HAVE_LOGGER                = 0
+HAVE_FILE_LOGGER           = 0
+HAVE_CC_RESAMPLER          = 1
+WHOLE_ARCHIVE_LINK         = 0
+BIG_STACK                  = 1
+PC_DEVELOPMENT_IP_ADDRESS  = 255.255.255.255
+PC_DEVELOPMENT_UDP_PORT    = 3490
+RARCH_CONSOLE              = 0
+USBGECKO                   = 0
+
+SPACE      :=
+SPACE      := $(SPACE) $(SPACE)
+BACKSLASH  :=
+BACKSLASH  := \$(BACKSLASH)
+filter_out1 = $(filter-out $(firstword $1),$1)
+filter_out2 = $(call filter_out1,$(call filter_out1,$1))
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -s),)
+   EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -s)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -s)),)
+   system_platform = win
+endif
+
+TARGET_NAME        := retroarch
+
+INCLUDE            :=
+LDFLAGS            :=
+LIBDIRS            :=
+
+ifeq ($(LIBRETRO), nxengine)
+   WHOLE_ARCHIVE_LINK = 1
+endif
+
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START     := -Wl,--whole-archive
+   WHOLE_END       := -Wl,--no-whole-archive
+endif
+
+LIBS               := $(WHOLE_START) -lretro_ngc $(WHOLE_END)
+
+libogc_platform    := 1
+
+EXTERNAL_LIBOGC   ?= 0
+GX_PTHREAD_LEGACY ?= 1
+CC                 = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+CXX                = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
+LD                 = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
+ELF2DOL            = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
+EXT_TARGET        := $(TARGET_NAME)_ngc.dol
+EXT_INTER_TARGET  := $(TARGET_NAME)_ngc.elf
+
+# Check whether ELF2DOL executable exists
+# (path has changed in more recent toolchains)
+ifeq ("$(wildcard $(ELF2DOL))","")
+   ELF2DOL = $(DEVKITPRO)/tools/bin/elf2dol$(EXE_EXT)
+endif
+
+INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Iwii/libogc/include
+
+ifeq ($(EXTERNAL_LIBOGC), 1)
+   CFLAGS   += -DEXTERNAL_LIBOGC
+   CXXFLAGS += -DEXTERNAL_LIBOGC
+   LIBDIRS += -L$(DEVKITPRO)/libogc/lib/cube
+else
+   CFLAGS   += -DINTERNAL_LIBOGC
+   CXXFLAGS += -DINTERNAL_LIBOGC
+   LIBDIRS += -Lwii/libogc/libs/cube
+endif
+
+ifeq ($(GX_PTHREAD_LEGACY), 1)
+   CFLAGS   += -DGX_PTHREAD_LEGACY
+   CXXFLAGS += -DGX_PTHREAD_LEGACY
+endif
+
+MACHDEP := -DHW_DOL -mogc
+
+LIBDIRS += -L.
+MACHDEP += -DGEKKO -mcpu=750 -meabi -mhard-float
+
+LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_TARGET)).map
+
+ifeq ($(BIG_STACK), 1)
+   LDFLAGS += -T bootstrap/gx/ogc.ld
+endif
+
+ifeq ($(EXTERNAL_LIBOGC), 1)
+   LIBS += -lfat
+endif
+
+ifeq ($(HAVE_LOGGER), 1)
+  LIBS += -lbba
+endif
+
+LIBS += -logc
+
+CFLAGS += -DGEKKO -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
+
+HAVE_RUNAHEAD            := 1
+HAVE_DSP_FILTER          := 1
+HAVE_VIDEO_FILTER        := 1
+HAVE_FILTERS_BUILTIN     := 1
+HAVE_THREADS             := 1
+HAVE_RPNG                := 1
+HAVE_RJPEG               := 1
+HAVE_RBMP                := 1
+HAVE_RTGA                := 1
+HAVE_IBXM                := 1
+HAVE_OVERLAY             := 1
+HAVE_VIDEO_LAYOUT        := 0
+HAVE_ZLIB                := 1
+HAVE_7ZIP                := 1
+HAVE_CONFIGFILE          := 1
+HAVE_PATCH               := 1
+HAVE_CHEATS              := 1
+HAVE_SCREENSHOTS         := 1
+HAVE_REWIND              := 1
+HAVE_AUDIOMIXER          := 1
+HAVE_RWAV                := 1
+RARCH_CONSOLE             = 1
+HAVE_CHEATS              := 1
+
+CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE)
+INCLUDE += -I./libretro-common/include \
+           -Ideps \
+           -Ideps/stb
+
+OBJ = griffin/griffin.o  $(PLATOBJS)
+
+ifeq ($(HAVE_GRIFFIN_CPP), 1)
+   OBJ += griffin/griffin_cpp.o
+endif
+
+ifeq ($(WANT_GLSLANG), 1)
+	OBJ += griffin/griffin_glslang.o
+endif
+
+ifeq ($(HAVE_LOGGER), 1)
+   CFLAGS      += -DHAVE_LOGGER
+   CFLAGS      += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+endif
+
+ifeq ($(HAVE_KERNEL_PRX), 1)
+   CFLAGS      += -DHAVE_KERNEL_PRX
+endif
+
+ifeq ($(HAVE_WIIUSB_HID), 1)
+   CFLAGS      += -DHAVE_WIIUSB_HID -DHAVE_HID
+endif
+
+ifeq ($(HAVE_LIBRETRODB), 1)
+   CFLAGS      += -DHAVE_LIBRETRODB
+endif
+
+ifeq ($(BIG_STACK),1)
+   CFLAGS      += -DBIG_STACK
+endif
+
+ifeq ($(HAVE_RJPEG), 1)
+   CFLAGS      += -DHAVE_RJPEG
+endif
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+   CFLAGS      += -DHAVE_FILE_LOGGER
+endif
+
+ifeq ($(HAVE_RARCH_EXEC), 1)
+   CFLAGS      += -DHAVE_RARCH_EXEC
+endif
+
+ifeq ($(HAVE_ZLIB), 1)
+   CFLAGS      += -DHAVE_ZLIB
+   CFLAGS      += -I./libretro-common/include/compat/zlib
+endif
+
+ifeq ($(HAVE_RPNG), 1)
+   CFLAGS      += -DHAVE_RPNG
+endif
+
+ifeq ($(HAVE_RBMP), 1)
+   CFLAGS      += -DHAVE_RBMP
+endif
+
+ifeq ($(HAVE_RTGA), 1)
+   CFLAGS      += -DHAVE_RTGA
+endif
+
+ifeq ($(HAVE_IMAGEVIEWER), 1)
+   CFLAGS      += -DHAVE_IMAGEVIEWER
+endif
+
+ifeq ($(HAVE_BSV_MOVIE), 1)
+   CFLAGS      += -DHAVE_BSV_MOVIE
+endif
+
+ifeq ($(HAVE_RUNAHEAD), 1)
+   CFLAGS      += -DHAVE_RUNAHEAD
+endif
+
+ifeq ($(HAVE_7ZIP), 1)
+   CFLAGS      += -DHAVE_7ZIP -D_7ZIP_ST
+endif
+
+ifeq ($(HAVE_SCREENSHOTS), 1)
+	CFLAGS      += -DHAVE_SCREENSHOTS
+endif
+
+ifeq ($(HAVE_REWIND), 1)
+	CFLAGS      += -DHAVE_REWIND
+endif
+
+ifeq ($(HAVE_AUDIOMIXER), 1)
+   CFLAGS      += -DHAVE_AUDIOMIXER
+endif
+
+ifeq ($(HAVE_RWAV), 1)
+   CFLAGS      += -DHAVE_RWAV
+endif
+
+ifeq ($(HAVE_OVERLAY), 1)
+   CFLAGS      += -DHAVE_OVERLAY
+endif
+
+ifeq ($(HAVE_VIDEO_LAYOUT), 1)
+   CFLAGS      += -DHAVE_VIDEO_LAYOUT
+endif
+
+ifeq ($(HAVE_NETWORKING), 1)
+   CFLAGS      += -DHAVE_NETWORKING
+endif
+
+ifeq ($(HAVE_NETPLAYDISCOVERY), 1)
+   CFLAGS      += -DHAVE_NETPLAYDISCOVERY
+endif
+
+ifeq ($(RARCH_CONSOLE), 1)
+   CFLAGS += -DRARCH_CONSOLE
+endif
+
+ifeq ($(RARCH_MOBILE), 1)
+   CFLAGS += -DRARCH_MOBILE
+endif
+
+CFLAGS += -std=gnu99 -DHAVE_RGUI -DHAVE_MENU -DHAVE_GRIFFIN=1 -Wno-char-subscripts -DRARCH_INTERNAL
+
+ifeq ($(HAVE_MATERIALUI), 1)
+   CFLAGS += -DHAVE_MATERIALUI
+endif
+
+ifeq ($(HAVE_XMB), 1)
+   CFLAGS += -DHAVE_XMB
+endif
+
+ifeq ($(HAVE_STB_FONT), 1)
+   CFLAGS += -DHAVE_STB_FONT
+endif
+
+ifeq ($(HAVE_LANGEXTRA), 1)
+   CFLAGS += -DHAVE_LANGEXTRA
+endif
+
+ifeq ($(HAVE_DSP_FILTER), 1)
+   CFLAGS += -DHAVE_DSP_FILTER
+endif
+
+ifeq ($(HAVE_VIDEO_FILTER), 1)
+   CFLAGS += -DHAVE_VIDEO_FILTER
+endif
+
+ifeq ($(HAVE_FILTERS_BUILTIN), 1)
+   CFLAGS += -DHAVE_FILTERS_BUILTIN
+endif
+
+ifeq ($(HAVE_THREADS), 1)
+   CFLAGS += -DHAVE_THREADS
+endif
+
+ifeq ($(HAVE_CONFIGFILE), 1)
+   CFLAGS += -DHAVE_CONFIGFILE
+endif
+
+ifeq ($(HAVE_PATCH), 1)
+   CFLAGS += -DHAVE_PATCH
+endif
+
+ifeq ($(HAVE_CHEATS), 1)
+	CFLAGS += -DHAVE_CHEATS
+endif
+
+ifeq ($(HAVE_RSOUND), 1)
+   CFLAGS += -DHAVE_RSOUND
+endif
+
+ifeq ($(HAVE_GETOPT_LONG), 1)
+   CFLAGS += -DHAVE_GETOPT_LONG=1
+endif
+
+ifeq ($(HAVE_DYLIB), 1)
+   CFLAGS += -DHAVE_DYLIB
+endif
+
+ifeq ($(HAVE_NETWORK_CMD), 1)
+   CFLAGS += -DHAVE_NETWORK_CMD
+endif
+
+ifeq ($(HAVE_COMMAND), 1)
+   CFLAGS += -DHAVE_COMMAND
+endif
+
+ifeq ($(HAVE_STDIN_CMD), 1)
+   CFLAGS += -DHAVE_STDIN_CMD
+endif
+
+ifeq ($(HAVE_DYNAMIC), 1)
+   CFLAGS += -DHAVE_DYNAMIC
+endif
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g -DDEBUG
+else
+   CFLAGS += -O3
+endif
+
+OBJOUT   = -o
+LINKOUT  = -o
+LINK = $(CXX)
+
+all: $(EXT_TARGET)
+
+%.dol: %.elf
+	$(ELF2DOL) $< $@
+
+$(EXT_INTER_TARGET): $(OBJ)
+	$(LINK) $(LINKOUT)$@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(PLATEXTRA) $(LIBS)
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
+
+%.o: %.cpp
+	$(CXX) $(CFLAGS) -c $(OBJOUT)$@ $<
+
+%.o: %.S
+	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
+
+%.binobj: %.bin
+	$(LD) -r -b binary $(OBJOUT)$@ $<
+
+clean:
+	rm -f $(EXT_TARGET)
+	rm -f $(EXT_INTER_TARGET)
+	rm -f $(OBJ)
+
+.PHONY: clean
+
+print-%:
+	@echo '$*=$($*)'
@@ -1,10 +1,8 @@
 BUILD_FOR_PCSX2    = 0
 DEBUG              = 0
-HAVE_LOGGER        = 0
-HAVE_FILE_LOGGER   = 0
 HAVE_THREADS       = 0
 MUTE_WARNINGS      = 1
-PS2_IP = 192.168.1.150
+PS2_IP = 192.168.1.10

 TARGET = retroarchps2-debug.elf
 TARGET_RELEASE = retroarchps2.elf
@@ -21,7 +19,7 @@ else
 endif

 ifeq ($(MUTE_WARNINGS), 1)
-   DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses
+   DISABLE_WARNINGS := -Wno-unused -Wno-format -Wno-format-truncation
 endif

 INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include
@@ -31,13 +29,13 @@ CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) -ffast-math -fsingle-precision-const
 ASFLAGS = $(CFLAGS)

 RARCH_DEFINES += -DPS2 -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DHAVE_RGUI
-RARCH_DEFINES += -DHAVE_ZLIB -DHAVE_NO_BUILTINZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
+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_DSP_FILTER
 RARCH_DEFINES += -DHAVE_VIDEO_FILTER

 LDFLAGS += -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ports/lib -L.
 # Lib cdvd is needed to get proper time
-LIBS += -lretro_ps2 -lpatches -lpoweroff -lgskit -ldmakit -laudsrv -lpadx -lmtap -lz -lcdvd -lelf-loader
+LIBS += -lretro_ps2 -lpatches -lgskit -ldmakit -laudsrv -lmtap -lpadx -lz -lcdvd -lelf-loader

 ifeq ($(BUILD_FOR_PCSX2), 1)
 RARCH_DEFINES += -DBUILD_FOR_PCSX2
@@ -47,20 +45,18 @@ ifeq ($(HAVE_THREADS), 1)
 RARCH_DEFINES += -DHAVE_THREADS
 endif

-ifeq ($(HAVE_FILE_LOGGER), 1)
-CFLAGS += -DHAVE_FILE_LOGGER
-endif
-
 CFLAGS += $(RARCH_DEFINES)

 # All the IRX objects
-EE_OBJS += $(IRX_DIR)/freemtap_irx.o $(IRX_DIR)/freepad_irx.o $(IRX_DIR)/freesio2_irx.o $(IRX_DIR)/iomanX_irx.o
-EE_OBJS += $(IRX_DIR)/fileXio_irx.o $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o $(IRX_DIR)/usbd_irx.o
-EE_OBJS += $(IRX_DIR)/usbhdfsd_irx.o $(IRX_DIR)/freesd_irx.o $(IRX_DIR)/audsrv_irx.o $(IRX_DIR)/poweroff_irx.o
+EE_OBJS += $(IRX_DIR)/sio2man_irx.o $ $(IRX_DIR)/iomanX_irx.o $(IRX_DIR)/fileXio_irx.o
+EE_OBJS += $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o
+EE_OBJS += $(IRX_DIR)/usbd_irx.o $(IRX_DIR)/usbhdfsd_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)/mtapman_irx.o $(IRX_DIR)/padman_irx.o

 # Missing objecst on the PS2SDK
-EE_OBJS += ps2/compat_files/ps2_devices.o 
+EE_OBJS += ps2/compat_files/ps2_devices.o

 EE_OBJS += griffin/griffin.o

@@ -1,6 +1,5 @@
 BUILD_FOR_PCSX2   = 0
 DEBUG             = 0
-HAVE_FILE_LOGGER  = 0
 MUTE_WARNINGS     = 1
 PS2_IP = 192.168.1.150

@@ -31,16 +30,12 @@ RARCH_DEFINES += -DPS2 -DIS_SALAMANDER -DRARCH_CONSOLE

 LIBDIR =
 LDFLAGS =
-LIBS = -lm -lelf-loader -lpatches -lpoweroff
+LIBS = -lelf-loader -lpatches

 ifeq ($(BUILD_FOR_PCSX2), 1)
 RARCH_DEFINES += -DBUILD_FOR_PCSX2
 endif

-ifeq ($(HAVE_FILE_LOGGER), 1)
-CFLAGS		+= -DHAVE_FILE_LOGGER
-endif
-
 CFLAGS += $(RARCH_DEFINES)

 EE_OBJS = frontend/frontend_salamander.o \
@@ -59,16 +54,15 @@ EE_OBJS = frontend/frontend_salamander.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/vfs/vfs_implementation.o \
-		 libretro-common/hash/rhash.o \
+		 libretro-common/hash/lrc_hash.o \
 		 libretro-common/time/rtime.o \
-		 file_path_str.o \
 		 verbosity.o \
 		 ps2/compat_files/ps2_devices.o 

 # Needed IRX objects
-EE_OBJS += $(IRX_DIR)/freesio2_irx.o $(IRX_DIR)/iomanX_irx.o $(IRX_DIR)/cdfs_irx.o
-EE_OBJS += $(IRX_DIR)/fileXio_irx.o $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o $(IRX_DIR)/usbd_irx.o
-EE_OBJS += $(IRX_DIR)/usbhdfsd_irx.o $(IRX_DIR)/freesd_irx.o $(IRX_DIR)/poweroff_irx.o
+EE_OBJS += $(IRX_DIR)/sio2man_irx.o $ $(IRX_DIR)/iomanX_irx.o $(IRX_DIR)/fileXio_irx.o 
+EE_OBJS += $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o $(IRX_DIR)/usbd_irx.o $(IRX_DIR)/usbhdfsd_irx.o
+EE_OBJS += $(IRX_DIR)/cdfs_irx.o

 EE_CFLAGS = $(CFLAGS)
 EE_CXXFLAGS = $(CFLAGS)
@@ -1,207 +0,0 @@
-include version.all
-
-#which compiler to build  with - GCC or SNC
-#set to GCC for debug builds for use with debugger
-CELL_BUILD_TOOLS	= SNC
-CELL_GPU_TYPE	   	= RSX
-CELL_PSGL_VERSION	= opt
-
-ASSETS_DIR  := media/assets
-
-# options
-DOWNLOAD_SHADERS	= 1
-STRIPPING_ENABLE	= 0
-DEBUG			      = 0
-HAVE_GCMGL	      = 0
-HAVE_LOGGER		   = 0
-HAVE_FREETYPE	   = 0
-WHOLE_ARCHIVE_LINK = 0
-
-CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001
-CONTENT_ID		= SSNE10000
-
-PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
-PC_DEVELOPMENT_UDP_PORT		= 3490
-
-CELL_MK_DIR		?= $(CELL_SDK)/samples/mk
-include $(CELL_MK_DIR)/sdk.makedef.mk
-
-PPU_TARGET		= retroarch_ps3.elf
-SALAMANDER_TARGET	= retroarch-salamander_ps3.elf
-
-EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
-CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF
-
-LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
-INCDIRS = -I. \
-			 -Idefines \
-			 -Ideps \
-			 -Ideps/stb \
-			 -Ideps/rcheevos/include \
-			 -Ilibretro-common/include \
-			 -Ilibretro-common/include/compat/zlib
-
-# system platform
-system_platform = unix
-ifeq ($(shell uname -a),)
-EXE_EXT = .exe
-   system_platform = win
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-   system_platform = osx
-else ifneq ($(findstring MINGW,$(shell uname -a)),)
-   system_platform = win
-endif
-
-PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
-ifeq ($(shell uname), Linux)
-PKG_FINALIZE         	= package_finalize
-MAKE_SELF_WC		= make_self_wc
-MAKE_SELF		= make_self_npdrm
-PYTHON2			= python2
-GIT			= git
-else
-PKG_FINALIZE         	= package_finalize.exe
-MAKE_SELF_WC		= make_self_wc.exe
-MAKE_SELF		= make_self_npdrm.exe
-PYTHON2			= python2.exe
-GIT			= git.exe
-endif
-
-PPU_SRCS		= griffin/griffin.c
-
-DEFINES += -DHAVE_VIDEO_LAYOUT
-DEFINES += -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DHAVE_GFX_WIDGETS -DHAVE_RGUI -DHAVE_XMB -DHAVE_OZONE -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD -DHAVE_DR_MP3 -DHAVE_DR_FLAC
-DEFINES += -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES
-
-ifeq ($(DEX_BUILD), 1)
-DEFINES += -DDEX_BUILD
-endif
-
-ifeq ($(CEX_BUILD), 1)
-DEFINES += -DCEX_BUILD
-endif
-
-ifeq ($(ODE_BUILD), 1)
-DEFINES += -DODE_BUILD
-endif
-
-ifeq ($(HAVE_GCMGL), 1)
-DEFINES			+= -DHAVE_GCMGL
-GL_LIBS			:= -L. -lrgl_ps3
-else
-GL_LIBS			:= -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc
-endif
-
-ifeq ($(HAVE_FREETYPE), 1)
-DEFINES			+= -DHAVE_FREETYPE
-FONT_LIBS		:= -lfontFT_stub -lfreetype_stub
-endif
-
-ifeq ($(CELL_BUILD_TOOLS), SNC)
-	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
-	PPU_CXX	= $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-else ifneq ($(system_platform), win)
-	PPU_CXX	= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
-	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
-	PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
-	PPU_CCLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
-endif
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-WHOLE_START := -Wl, --whole-archive
-WHOLE_END := -Wl, --no-whole-archive
-endif
-
-PPU_LDLIBS =  $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -lcgc -lgcm_cmdasm -lgcm_sys_stub -lresc_stub -lm -lio_stub -lfs_stub -lsysutil_stub -lsysutil_game_stub -lsysutil_screenshot_stub -lsysutil_np_stub -lpngdec_stub -lsysmodule_stub -laudio_stub -lnet_stub -lnetctl_stub -lpthread
-
-PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe
-
-DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LANGEXTRA -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_DSP_FILTER -DHAVE_VIDEO_FILTER
-
-#DEFINES += -DHAVE_IMAGEVIEWER
-
-ifeq ($(DEBUG), 1)
-   PPU_OPTIMIZE_LV	:= -O0 -g
-else
-   PPU_OPTIMIZE_LV	:= -O2 -g
-endif
-
-ifeq ($(HAVE_LOGGER), 1)
-DEFINES			+= -DHAVE_LOGGER
-endif
-
-PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
-PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
-
-EXIST_EBOOT_WILDCARD := $(wildcard $(EBOOT_PATH))
-EXIST_CORE_WILDCARD := $(wildcard $(CORE_PATH))
-
-EBOOT_EXISTS		= 1
-CORE_EXISTS		= 1
-
-ifneq ($(strip $(EXIST_EBOOT_WILDCARD)),)
-EBOOT_EXISTS		= 0
-endif
-
-ifneq ($(strip $(EXIST_CORE_WILDCARD)),)
-CORE_EXISTS		= 0
-endif
-
-include $(CELL_MK_DIR)/sdk.target.mk
-
-MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe
-MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe
-MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe
-
-.PHONY: create-npdrm-core create-core create-npdrm-salamander create-shaders clean-selfs create-salamander
-
-create-npdrm-core:
-	$(MAKE_FSELF_NPDRM) $(PPU_TARGET) $(CORE_PATH)
-
-create-core:
-	$(MAKE_SELF_WC) $(PPU_TARGET) $(CORE_PATH)
-
-create-npdrm-salamander:
-	$(MAKE_FSELF_NPDRM) $(SALAMANDER_TARGET) $(EBOOT_PATH)
-
-create-salamander:
-	$(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL)
-
-copy-media-files:
-	@cp -r $(ASSETS_DIR)/glui pkg/ps3/USRDIR/cores/assets
-	@cp -r $(ASSETS_DIR)/xmb  pkg/ps3/USRDIR/cores/assets
-
-create-shaders:
-	make -f Makefile.griffin platform=ps3 shaders-deploy
-
-pkg: $(PPU_TARGET)  create-shaders copy-media-files create-npdrm-salamander create-npdrm-core
-	$(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf pkg/ps3
-
-pkg-signed: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
-
-pkg-signed-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
-	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
-
-pkg-signed-cfw: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
-	$(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
-
-pkg-signed-cfw-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
-	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
-	$(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
-
-clean-selfs:
-ifeq ($(EBOOT_EXISTS),1)
-	@echo "WARNING: Couldn't find file to delete: [$(EBOOT_PATH)], skipping this step."
-else
-	rm $(EBOOT_PATH)
-endif
-ifeq ($(CORE_EXISTS),1)
-	@echo "WARNING: Couldn't find file to delete: [$(CORE_PATH)], skipping this step."
-else
-	rm $(CORE_PATH)
-endif
@@ -1,196 +0,0 @@
-include version.all
-
-#which compiler to build  with - GCC or SNC
-#set to GCC for debug builds for use with debugger
-CELL_BUILD_TOOLS	= GCC
-CELL_GPU_TYPE	   	= RSX
-CELL_PSGL_VERSION	= ultra-opt
-
-# options
-DOWNLOAD_SHADERS	= 1
-STRIPPING_ENABLE	= 0
-DEBUG			      = 0
-HAVE_GCMGL	      = 1
-HAVE_LOGGER		   = 0
-HAVE_FREETYPE	   = 0
-WHOLE_ARCHIVE_LINK = 0
-
-CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001
-CONTENT_ID		= SSNE10000
-
-PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
-PC_DEVELOPMENT_UDP_PORT		= 3490
-
-CELL_MK_DIR		?= $(CELL_SDK)/samples/mk
-include $(CELL_MK_DIR)/sdk.makedef.mk
-
-PPU_TARGET		= retroarch_ps3.elf
-SALAMANDER_TARGET	= retroarch-salamander_ps3.elf
-
-EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
-CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF
-
-LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
-INCDIRS = -I. -Idefines -Ideps -Ideps/stb
-
-# system platform
-system_platform = unix
-ifeq ($(shell uname -a),)
-EXE_EXT = .exe
-   system_platform = win
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-   system_platform = osx
-else ifneq ($(findstring MINGW,$(shell uname -a)),)
-   system_platform = win
-endif
-
-PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
-ifeq ($(shell uname), Linux)
-PKG_FINALIZE         	= package_finalize
-MAKE_SELF_WC		= make_self_wc
-MAKE_SELF		= make_self_npdrm
-PYTHON2			= python2
-GIT			= git
-else
-PKG_FINALIZE         	= package_finalize.exe
-MAKE_SELF_WC		= make_self_wc.exe
-MAKE_SELF		= make_self_npdrm.exe
-PYTHON2			= python2.exe
-GIT			= git.exe
-endif
-
-PPU_SRCS		= griffin/griffin.c
-
-DEFINES += -DHAVE_RGUI -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_MENU -DRARCH_INTERNAL
-
-ifeq ($(DEX_BUILD), 1)
-DEFINES += -DDEX_BUILD
-endif
-
-ifeq ($(CEX_BUILD), 1)
-DEFINES += -DCEX_BUILD
-endif
-
-ifeq ($(ODE_BUILD), 1)
-DEFINES += -DODE_BUILD
-endif
-
-ifeq ($(HAVE_GCMGL), 1)
-DEFINES			+= -DHAVE_GCMGL
-GL_LIBS			:= -L. -lrgl_ps3
-else
-GL_LIBS			:= -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc
-endif
-
-ifeq ($(HAVE_FREETYPE), 1)
-DEFINES			+= -DHAVE_FREETYPE
-FONT_LIBS		:= -lfontFT_stub -lfreetype_stub
-endif
-
-ifeq ($(CELL_BUILD_TOOLS), SNC)
-	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
-	PPU_CXX	= $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-else ifneq($(system_platform), win)
-	PPU_CXX	= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
-	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
-	PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
-	PPU_CCLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
-endif
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-WHOLE_START := -Wl, --whole-archive
-WHOLE_END := -Wl, --no-whole-archive
-endif
-
-PPU_LDLIBS =  $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -lcgc -lgcm_cmdasm -lgcm_sys_stub -lresc_stub -lm -lio_stub -lfs_stub -lsysutil_stub -lsysutil_game_stub -lsysutil_screenshot_stub -lsysutil_np_stub -lpngdec_stub -ljpgdec_stub -lsysmodule_stub -laudio_stub -lnet_stub -lnetctl_stub -lpthread
-
-PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe
-
-#DEFINES += -DHAVE_VIDEO_LAYOUT
-DEFINES += -DHAVE_THREADS -DHAVE_SCREENSHOTS -DHAVE_REWIND -DHAVE_PATCH -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_STB_VORBIS
-
-ifeq ($(DEBUG), 1)
-   PPU_OPTIMIZE_LV	:= -O0 -g
-else
-   PPU_OPTIMIZE_LV	:= -O3 -g
-endif
-
-ifeq ($(HAVE_LOGGER), 1)
-DEFINES			+= -DHAVE_LOGGER
-endif
-
-PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
-PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
-
-EXIST_EBOOT_WILDCARD := $(wildcard $(EBOOT_PATH))
-EXIST_CORE_WILDCARD := $(wildcard $(CORE_PATH))
-
-EBOOT_EXISTS		= 1
-CORE_EXISTS		= 1
-
-ifneq ($(strip $(EXIST_EBOOT_WILDCARD)),)
-EBOOT_EXISTS		= 0
-endif
-
-ifneq ($(strip $(EXIST_CORE_WILDCARD)),)
-CORE_EXISTS		= 0
-endif
-
-include $(CELL_MK_DIR)/sdk.target.mk
-
-MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe
-MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe
-MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe
-
-.PHONY: create-npdrm-core create-core create-npdrm-salamander create-shaders clean-selfs create-salamander
-
-create-npdrm-core:
-	$(MAKE_FSELF_NPDRM) $(PPU_TARGET) $(CORE_PATH)
-
-create-core:
-	$(MAKE_SELF_WC) $(PPU_TARGET) $(CORE_PATH)
-
-create-npdrm-salamander:
-	$(MAKE_FSELF_NPDRM) $(SALAMANDER_TARGET) $(EBOOT_PATH)
-
-create-salamander:
-	$(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL)
-
-copy-media-files:
-	@cp -r $(ASSETS_DIR)/glui pkg/ps3/USRDIR/cores/assets
-	@cp -r $(ASSETS_DIR)/xmb  pkg/ps3/USRDIR/cores/assets
-
-create-shaders:
-	make -f Makefile.shaders deploy-ps3
-
-pkg: $(PPU_TARGET)  create-shaders copy-media-files create-npdrm-salamander create-npdrm-core
-	$(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf pkg/ps3
-
-pkg-signed: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
-
-pkg-signed-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
-	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
-
-pkg-signed-cfw: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
-	$(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
-
-pkg-signed-cfw-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
-	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
-	$(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
-
-clean-selfs:
-ifeq ($(EBOOT_EXISTS),1)
-	@echo "WARNING: Couldn't find file to delete: [$(EBOOT_PATH)], skipping this step."
-else
-	rm $(EBOOT_PATH)
-endif
-ifeq ($(CORE_EXISTS),1)
-	@echo "WARNING: Couldn't find file to delete: [$(CORE_PATH)], skipping this step."
-else
-	rm $(CORE_PATH)
-endif
@@ -1,92 +0,0 @@
-CELL_BUILD_TOOLS	= GCC
-CELL_SDK		?= /usr/local/cell
-HAVE_LOGGER		= 0
-CELL_MK_DIR ?= $(CELL_SDK)/samples/mk
-
-include $(CELL_MK_DIR)/sdk.makedef.mk
-
-# system platform
-system_platform = unix
-ifeq ($(shell uname -a),)
-EXE_EXT = .exe
-   system_platform = win
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-   system_platform = osx
-else ifneq ($(findstring MINGW,$(shell uname -a)),)
-   system_platform = win
-endif
-
-ifeq ($(DEBUG), 1)
-	PPU_OPTIMIZE_LV := -O0 -g
-else
-	PPU_OPTIMIZE_LV := -O2 -DNDEBUG
-endif
-
-STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
-
-INCFLAGS    = -I. -Idefines -Ilibretro-common/include -Ilibretro-common/include/compat/zlib
-DEFINES     = -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
-
-ifeq ($(DEX_BUILD), 1)
-DEFINES += -DDEX_BUILD
-endif
-
-ifeq ($(CEX_BUILD), 1)
-DEFINES += -DCEX_BUILD
-endif
-
-ifeq ($(ODE_BUILD), 1)
-DEFINES += -DODE_BUILD
-endif
-
-PPU_CFLAGS	:= $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
-PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
-
-PPU_SRCS		= frontend/frontend_salamander.c \
-				  frontend/frontend_driver.c \
-				  frontend/drivers/platform_ps3.c \
-				  libretro-common/file/file_path.c \
-				  libretro-common/file/file_path_io.c \
-				  libretro-common/lists/dir_list.c \
-				  libretro-common/lists/string_list.c \
-				  libretro-common/file/retro_dirent.c \
-				  libretro-common/hash/rhash.c \
-				  libretro-common/string/stdstring.c \
-				  libretro-common/encodings/encoding_utf.c \
-				  libretro-common/compat/compat_strl.c \
-				  libretro-common/compat/compat_strcasestr.c \
-				  libretro-common/compat/fopen_utf8.c \
-				  libretro-common/streams/file_stream.c \
-				  libretro-common/vfs/vfs_implementation.c \
-				  libretro-common/file/config_file.c \
-				  libretro-common/time/rtime.c \
-				  file_path_str.c \
-				  verbosity.c
-
-ifeq ($(HAVE_LOGGER), 1)
-PPU_CFLAGS		+= -DHAVE_LOGGER
-PPU_SRCS		   += network/net_logger.c \
-						libretro-common/net/net_compat.c \
-						libretro-common/net/net_socket.c
-endif
-
-PPU_TARGET		= retroarch-salamander_ps3.elf
-
-ifeq ($(CELL_BUILD_TOOLS),SNC)
-	PPU_CFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1
-	PPU_CXXFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1
-	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
-	PPU_CLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
-	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-else
-	PPU_CFLAGS += -std=gnu99
-	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
-	PPU_CLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
-	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
-endif
-
-PPU_LDLIBS		+= -lm -lnet_stub -lnetctl_stub -lio_stub -lsysmodule_stub -lsysutil_stub -lsysutil_game_stub -lfs_stub -lsysutil_np_stub
-
-MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe
-
-include $(CELL_MK_DIR)/sdk.target.mk
@@ -27,13 +27,13 @@ ELF_TARGET := retroarch_psl1ght.elf
 SELF_TARGET := $(ELF_TARGET:.elf=.self)
 CORE_PATH		= pkg/psl1ght/pkg/USRDIR/cores/CORE.SELF

-INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude
+INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude -Idefines
 LIBDIRS += -L.

-MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__ -mcpu=cell
+MACHDEP := -D__PSL1GHT__ -mcpu=cell
 CFLAGS += -Wall $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP)
-LIBS := -lretro_psl1ght -laudio -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule  -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl
+LIBS := -lretro_psl1ght -laudio -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl -lsysfs

 # system platform
 system_platform = unix
@@ -30,7 +30,7 @@ EBOOT_PATH		= pkg/psl1ght/pkg/USRDIR/EBOOT.BIN
 INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude
 LIBDIRS += -L.

-MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__ -mcpu=cell -mhard-float -fmodulo-sched -ffunction-sections -fdata-sections
+MACHDEP := -D__PSL1GHT__ -mcpu=cell -mhard-float -fmodulo-sched -ffunction-sections -fdata-sections
 CFLAGS += -Wall $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP)
 LIBS :=  -lgcm_sys -lrsx -lsysutil -lio -lnet -lsysmodule -lrt -llv2 -lm
@@ -61,7 +61,7 @@ OBJ		= frontend/frontend_salamander.o \
 				  libretro-common/lists/dir_list.o \
 				  libretro-common/lists/string_list.o \
 				  libretro-common/file/retro_dirent.o \
-				  libretro-common/hash/rhash.o \
+				  libretro-common/hash/lrc_hash.o \
 				  libretro-common/string/stdstring.o \
 				  libretro-common/encodings/encoding_utf.o \
 				  libretro-common/compat/compat_strl.o \
@@ -70,9 +70,8 @@ OBJ		= frontend/frontend_salamander.o \
 				  libretro-common/streams/file_stream.o \
 				  libretro-common/vfs/vfs_implementation.o \
 				  libretro-common/file/config_file.o \
-				  libretro-common/time/rtime.c \
-				  file_path_str.o \
-				   verbosity.o
+				  libretro-common/time/rtime.o \
+				  verbosity.o

 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
@@ -2,8 +2,6 @@ BUILD_PRX          = 0
 PSP_LARGE_MEMORY   = 1
 DEBUG              = 0
 HAVE_KERNEL_PRX    = 1
-HAVE_LOGGER        = 0
-HAVE_FILE_LOGGER   = 0
 HAVE_THREADS       = 1
 BIG_STACK          = 0
 WHOLE_ARCHIVE_LINK = 0
@@ -25,7 +23,7 @@ INCDIR = deps deps/stb deps/7zip deps/pthreads deps/pthreads/platform/psp deps/p
 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 -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

 LIBDIR =
 LDFLAGS =
@@ -35,10 +33,6 @@ ifeq ($(HAVE_THREADS), 1)
 RARCH_DEFINES += -DHAVE_THREADS
 endif

-ifeq ($(HAVE_FILE_LOGGER), 1)
-CFLAGS += -DHAVE_FILE_LOGGER
-endif
-
 ifeq ($(HAVE_KERNEL_PRX), 1)
 CFLAGS += -DHAVE_KERNEL_PRX
 endif
@@ -1,6 +1,5 @@
 BUILD_PRX         = 0
 PSP_LARGE_MEMORY  = 1
-HAVE_FILE_LOGGER  = 0
 DEBUG             = 0

 TARGET = retroarchpsp_salamander
@@ -21,10 +20,6 @@ LIBDIR =
 LDFLAGS =
 LIBS = -lstdc++ -lm -lpsppower

-ifeq ($(HAVE_FILE_LOGGER), 1)
-CFLAGS		+= -DHAVE_FILE_LOGGER
-endif
-
 CFLAGS += $(RARCH_DEFINES)

 EXTRA_TARGETS   = EBOOT.PBP
@@ -48,9 +43,8 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/vfs/vfs_implementation.o \
-		 libretro-common/hash/rhash.o \
+		 libretro-common/hash/lrc_hash.o \
 		 libretro-common/time/rtime.o \
-		 file_path_str.o \
 		 verbosity.o \
 		 bootstrap/psp1/kernel_functions.o

@@ -0,0 +1,229 @@
+#########################
+## Toolchain variables ##
+#########################
+
+# Default toolchain directory
+TOOLCHAIN_DIR=/opt/gcw0-toolchain
+
+# All toolchain-related variables may be
+# overridden via the command line
+ifdef GCW0_CC
+CC                    = $(GCW0_CC)
+else
+CC                    = $(TOOLCHAIN_DIR)/usr/bin/mipsel-gcw0-linux-uclibc-gcc
+endif
+
+ifdef GCW0_CXX
+CXX                   = $(GCW0_CXX)
+else
+CXX                   = $(TOOLCHAIN_DIR)/usr/bin/mipsel-gcw0-linux-uclibc-g++
+endif
+
+ifdef GCW0_STRIP
+STRIP                 = $(GCW0_STRIP)
+else
+STRIP                 = $(TOOLCHAIN_DIR)/usr/bin/mipsel-gcw0-linux-uclibc-strip
+endif
+
+GCW0_SDL_CONFIG      ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/sdl-config
+GCW0_FREETYPE_CONFIG ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/freetype-config
+GCW0_MK_SQUASH_FS    ?= $(TOOLCHAIN_DIR)/usr/bin/mksquashfs
+
+GCW0_INC_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include
+GCW0_LIB_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/lib
+
+#########################
+#########################
+
+PACKAGE_NAME = retroarch
+
+DEBUG ?= 0
+
+DINGUX = 1
+HAVE_SCREENSHOTS = 0
+HAVE_REWIND = 1
+HAVE_7ZIP = 1
+HAVE_AL = 1
+# 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 = 1
+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 = 1
+HAVE_OVERLAY = 0
+HAVE_RBMP = 1
+HAVE_RJPEG = 1
+HAVE_RPILED = 0
+HAVE_RPNG = 1
+HAVE_RUNAHEAD = 1
+HAVE_SDL_DINGUX = 1
+HAVE_SHADERPIPELINE = 0
+HAVE_STB_FONT = 0
+HAVE_STB_IMAGE = 1
+HAVE_STB_VORBIS = 1
+HAVE_STDIN_CMD = 0
+HAVE_STRCASESTR = 1
+HAVE_THREADS = 1
+HAVE_UDEV = 1
+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 = 1
+
+OS = Linux
+TARGET = retroarch
+OPK_NAME = retroarch_rg350.opk
+
+OBJ :=
+LINK := $(CXX)
+DEF_FLAGS := -march=mips32 -mtune=mips32r2 -mhard-float -ffast-math -fomit-frame-pointer
+DEF_FLAGS += -mplt -mno-shared
+DEF_FLAGS += -ffunction-sections -fdata-sections
+DEF_FLAGS += -I. -Ideps -Ideps/stb -DDINGUX=1 -MMD
+DEF_FLAGS += -Wall -Wno-unused-variable
+DEF_FLAGS += -std=gnu99 -D_GNU_SOURCE -flto
+LIBS := -ldl -lz -lrt -ludev -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_AL=1
+DEFINES += -DHAVE_FILTERS_BUILTIN
+DEFINES += -DHAVE_UDEV=1
+
+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)
+AL_LIBS := -lopenal
+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))
+
+define DESKTOP_ENTRY
+[Desktop Entry]
+Name=RetroArch
+Comment=Frontend for emulators, game engines
+Exec=retroarch
+Terminal=false
+Type=Application
+StartupNotify=true
+Icon=retroarch
+Categories=emulators;
+X-OD-NeedsDownscaling=true
+endef
+export DESKTOP_ENTRY
+
+all: $(TARGET) opk
+
+-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)
+
+$(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
+	rm -rf $(OPK_NAME)
+
+opk: $(TARGET)
+	echo "$$DESKTOP_ENTRY" > default.gcw0.desktop
+	rm -f $(OPK_NAME)
+	cp media/ico_src/icon32.png retroarch.png
+	if [ $$STRIP_BIN -eq 1 ]; then $(STRIP) --strip-unneeded retroarch; fi
+	$(GCW0_MK_SQUASH_FS) retroarch default.gcw0.desktop retroarch.png $(OPK_NAME) -all-root -no-xattrs -noappend -no-exports
+	rm -f default.gcw0.desktop retroarch.png
+
+.PHONY: all clean opk
+
+print-%:
+	@echo '$*=$($*)'
@@ -0,0 +1,229 @@
+#########################
+## Toolchain variables ##
+#########################
+
+# Default toolchain directory
+TOOLCHAIN_DIR=/opt/gcw0-toolchain
+
+# All toolchain-related variables may be
+# overridden via the command line
+ifdef GCW0_CC
+CC                    = $(GCW0_CC)
+else
+CC                    = $(TOOLCHAIN_DIR)/usr/bin/mipsel-gcw0-linux-uclibc-gcc
+endif
+
+ifdef GCW0_CXX
+CXX                   = $(GCW0_CXX)
+else
+CXX                   = $(TOOLCHAIN_DIR)/usr/bin/mipsel-gcw0-linux-uclibc-g++
+endif
+
+ifdef GCW0_STRIP
+STRIP                 = $(GCW0_STRIP)
+else
+STRIP                 = $(TOOLCHAIN_DIR)/usr/bin/mipsel-gcw0-linux-uclibc-strip
+endif
+
+GCW0_SDL_CONFIG      ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/sdl-config
+GCW0_FREETYPE_CONFIG ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/freetype-config
+GCW0_MK_SQUASH_FS    ?= $(TOOLCHAIN_DIR)/usr/bin/mksquashfs
+
+GCW0_INC_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include
+GCW0_LIB_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/lib
+
+#########################
+#########################
+
+PACKAGE_NAME = retroarch
+
+DEBUG ?= 0
+
+DINGUX = 1
+DINGUX_BETA = 1
+HAVE_SCREENSHOTS = 0
+HAVE_REWIND = 1
+HAVE_7ZIP = 1
+HAVE_AL = 1
+# 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 = 1
+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 = 1
+HAVE_OVERLAY = 0
+HAVE_RBMP = 1
+HAVE_RJPEG = 1
+HAVE_RPILED = 0
+HAVE_RPNG = 1
+HAVE_RUNAHEAD = 1
+HAVE_SDL_DINGUX = 1
+HAVE_SHADERPIPELINE = 0
+HAVE_STB_FONT = 0
+HAVE_STB_IMAGE = 1
+HAVE_STB_VORBIS = 1
+HAVE_STDIN_CMD = 0
+HAVE_STRCASESTR = 1
+HAVE_THREADS = 1
+HAVE_UDEV = 1
+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 = 1
+
+OS = Linux
+TARGET = retroarch
+OPK_NAME = retroarch_rg350_odbeta.opk
+
+OBJ :=
+LINK := $(CXX)
+DEF_FLAGS := -mplt -mno-shared
+DEF_FLAGS += -ffunction-sections -fdata-sections
+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
+LIBS := -ldl -lz -lrt -ludev -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_AL=1
+DEFINES += -DHAVE_FILTERS_BUILTIN
+DEFINES += -DHAVE_UDEV=1
+
+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)
+AL_LIBS := -lopenal
+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))
+
+define DESKTOP_ENTRY
+[Desktop Entry]
+Name=RetroArch
+Comment=Frontend for emulators, game engines
+Exec=retroarch
+Terminal=false
+Type=Application
+StartupNotify=true
+Icon=retroarch
+Categories=emulators;
+X-OD-NeedsDownscaling=true
+endef
+export DESKTOP_ENTRY
+
+all: $(TARGET) opk
+
+-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)
+
+$(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
+	rm -rf $(OPK_NAME)
+
+opk: $(TARGET)
+	echo "$$DESKTOP_ENTRY" > default.gcw0.desktop
+	rm -f $(OPK_NAME)
+	cp media/ico_src/icon32.png retroarch.png
+	if [ $$STRIP_BIN -eq 1 ]; then $(STRIP) --strip-unneeded retroarch; fi
+	$(GCW0_MK_SQUASH_FS) retroarch default.gcw0.desktop retroarch.png $(OPK_NAME) -all-root -no-xattrs -noappend -no-exports
+	rm -f default.gcw0.desktop retroarch.png
+
+.PHONY: all clean opk
+
+print-%:
+	@echo '$*=$($*)'
@@ -40,6 +40,7 @@ else
 	HAVE_DYNAMIC = 1
 	HAVE_PATCH   = 1
 	HAVE_CHEATS  = 1
+	HAVE_IBXM = 1

 	include Makefile.common
 	CFLAGS += $(DEF_FLAGS)
@@ -12,6 +12,7 @@ PC_DEVELOPMENT_UDP_PORT	   =

 OBJ :=

+SCE_LIBC_SIZE := 4194304
 DEFINES := -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS
 INCDIRS :=

@@ -42,8 +43,20 @@ else
 	HAVE_RTGA		:= 1
 	HAVE_ZLIB		:= 1
 	HAVE_7ZIP		:= 1
-	HAVE_VITA2D		:= 1
-	HAVE_VITAGL		:= 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
+   else
+      HAVE_VITA2D		:= 1
+      HAVE_VITAGL		:= 0
+   endif
 	HAVE_NETWORKING		:= 1
 	HAVE_SOCKET_LEGACY	:= 1
 	HAVE_MENU		:= 1
@@ -95,11 +108,11 @@ AR      := $(PREFIX)ar
 OBJCOPY := $(PREFIX)objcopy
 STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
-LD      := $(CC)
+LD      := $(CXX)

 LIBDIRS := -L.

-ARCHFLAGS := -march=armv7-a -mfpu=neon -mfloat-abi=hard -DVITA
+ARCHFLAGS := -march=armv7-a -mfpu=neon -mfloat-abi=hard -DVITA -DSCE_LIBC_SIZE=$(SCE_LIBC_SIZE)
 CFLAGS    += $(ARCHFLAGS) -mword-relocations -fno-optimize-sibling-calls -O2

 ifeq ($(DEBUG), 1)
@@ -132,7 +145,15 @@ CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
 VITA_LIBS := -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub -lSceAppUtil_stub \
 	-lSceSysmodule_stub -lSceCtrl_stub -lSceHid_stub -lSceTouch_stub -lSceAudio_stub \
 	-lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub -lSceMotion_stub \
-	-lSceFiber_stub -lSceMotion_stub -lSceAppMgr_stub -lstdc++ -lpthread -lpng -lz -lSceShaccCg_stub
+	-lSceFiber_stub -lSceMotion_stub -lSceAppMgr_stub -lpthread -lpng -lz -lSceShaccCg_stub
+
+ifeq ($(HAVE_VITAGLES), 1)
+   VITA_LIBS += -llibScePiglet_stub -ltaihen_stub
+   FSELF_FLAGS := -ss
+else
+   VITA_LIBS += -lvitaGL -lvitashark
+   FSELF_FLAGS := -s
+endif

 LIBS	:= $(WHOLE_START) -lretro_vita $(WHOLE_END) $(VITA_LIBS) -lm -lc

@@ -165,13 +186,13 @@ all: $(TARGETS)

 %.depend: ;

-libSceShaccCg_stub.a: 
-	mkdir -p deps/vitaShaRK/SceShaccCg
-	vita-libs-gen deps/vitaShaRK/SceShaccCg.yml deps/vitaShaRK/SceShaccCg
-	make -C deps/vitaShaRK/SceShaccCg ARCH=arm-vita-eabi 
-	cp deps/vitaShaRK/SceShaccCg/libSceShaccCg_stub.a .
+liblibScePiglet_stub.a:
+	mkdir -p deps/Pigs-In-A-Blanket/piglet_stub/libScePiglet
+	vita-libs-gen deps/Pigs-In-A-Blanket/piglet_stub/nids.yml deps/Pigs-In-A-Blanket/piglet_stub/libScePiglet
+	make -C deps/Pigs-In-A-Blanket/piglet_stub/libScePiglet ARCH=arm-vita-eabi
+	cp deps/Pigs-In-A-Blanket/piglet_stub/libScePiglet/liblibScePiglet_stub.a .

-$(TARGET).elf: $(OBJ) libretro_vita.a libSceShaccCg_stub.a
+$(TARGET).elf: $(OBJ) libretro_vita.a liblibScePiglet_stub.a
 	$(LD) $(OBJ) $(LDFLAGS) $(LIBDIRS) $(LIBS) -o $@

 %.velf: %.elf
@@ -180,15 +201,15 @@ $(TARGET).elf: $(OBJ) libretro_vita.a libSceShaccCg_stub.a
 	vita-elf-create $< $@

 %.self: %.velf
-	vita-make-fself -c -s $< $@
+	vita-make-fself -c $(FSELF_FLAGS) $< $@

 %.vpk: %.self
 	vita-mksfoex -s TITLE_ID=$(VITA_TITLE_ID) "$(VITA_TITLE_NAME)" -d ATTRIBUTE2=12 param.sfo
 	vita-pack-vpk -s param.sfo -b $< $@

 clean:
-	rm -f $(OBJ) $(TARGET).elf $(TARGET).elf.unstripped.elf $(TARGET).velf $(TARGET).self param.sfo $(TARGET).vpk libSceShaccCg_stub.a
-	rm -rf  deps/vitaShaRK/SceShaccCg
+	rm -f $(OBJ) $(TARGET).elf $(TARGET).elf.unstripped.elf $(TARGET).velf $(TARGET).self param.sfo $(TARGET).vpk 
+	rm -rf  deps/Pigs-In-A-Blanket/piglet_stub/libScePiglet
 	rm -f $(OBJ:.o=.depend)

 # Useful for developers
@@ -48,15 +48,14 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/vfs/vfs_implementation.o \
-		 libretro-common/hash/rhash.o \
+		 libretro-common/hash/lrc_hash.o \
 		 libretro-common/time/rtime.o \
-		 file_path_str.o \
 		 verbosity.o

 all: $(TARGET).vpk

 %.vpk: eboot.bin
-	vita-mksfoex -s TITLE_ID=$(TITLE_ID) "$(TARGET)" -d ATTRIBUTE2=12 param.sfo
+	vita-mksfoex -s TITLE_ID=$(TITLE_ID) "RetroArch" -d ATTRIBUTE2=12 param.sfo
 	vita-pack-vpk -s param.sfo -b eboot.bin $@

 eboot.bin: $(TARGET).velf
@@ -0,0 +1,385 @@
+ROOT_DIR                  := .
+DEPS_DIR                  := $(ROOT_DIR)/deps
+DEBUG                     ?= 0
+HAVE_LOGGER                = 0
+HAVE_FILE_LOGGER           = 0
+HAVE_CC_RESAMPLER          = 1
+WHOLE_ARCHIVE_LINK         = 0
+BIG_STACK                  = 1
+PC_DEVELOPMENT_IP_ADDRESS  = 255.255.255.255
+PC_DEVELOPMENT_UDP_PORT    = 3490
+RARCH_CONSOLE              = 0
+USBGECKO                   = 0
+
+SPACE      :=
+SPACE      := $(SPACE) $(SPACE)
+BACKSLASH  :=
+BACKSLASH  := \$(BACKSLASH)
+filter_out1 = $(filter-out $(firstword $1),$1)
+filter_out2 = $(call filter_out1,$(call filter_out1,$1))
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -s),)
+   EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -s)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -s)),)
+   system_platform = win
+endif
+
+TARGET_NAME        := retroarch
+
+INCLUDE            :=
+LDFLAGS            :=
+LIBDIRS            :=
+
+ifeq ($(LIBRETRO), nxengine)
+   WHOLE_ARCHIVE_LINK = 1
+endif
+
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START     := -Wl,--whole-archive
+   WHOLE_END       := -Wl,--no-whole-archive
+endif
+
+LIBS               := $(WHOLE_START) -lretro_wii $(WHOLE_END)
+
+libogc_platform    := 1
+
+EXTERNAL_LIBOGC   ?= 0
+GX_PTHREAD_LEGACY ?= 1
+CC                 = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+CXX                = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
+LD                 = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
+ELF2DOL            = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
+EXT_TARGET        := $(TARGET_NAME)_wii.dol
+EXT_INTER_TARGET  := $(TARGET_NAME)_wii.elf
+
+# Check whether ELF2DOL executable exists
+# (path has changed in more recent toolchains)
+ifeq ("$(wildcard $(ELF2DOL))","")
+   ELF2DOL = $(DEVKITPRO)/tools/bin/elf2dol$(EXE_EXT)
+endif
+
+INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Iwii/libogc/include
+
+ifeq ($(EXTERNAL_LIBOGC), 1)
+   CFLAGS   += -DEXTERNAL_LIBOGC
+   CXXFLAGS += -DEXTERNAL_LIBOGC
+   LIBDIRS += -L$(DEVKITPRO)/libogc/lib/wii
+else
+   CFLAGS   += -DINTERNAL_LIBOGC
+   CXXFLAGS += -DINTERNAL_LIBOGC
+   LIBDIRS += -Lwii/libogc/libs/wii
+endif
+
+ifeq ($(GX_PTHREAD_LEGACY), 1)
+   CFLAGS   += -DGX_PTHREAD_LEGACY
+   CXXFLAGS += -DGX_PTHREAD_LEGACY
+endif
+
+MACHDEP := -DHW_RVL -mrvl
+
+LIBDIRS += -L.
+MACHDEP += -DGEKKO -mcpu=750 -meabi -mhard-float
+
+LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_TARGET)).map,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,strdup,-wrap,strndup,-wrap,malloc_usable_size
+
+ifeq ($(BIG_STACK), 1)
+   LDFLAGS += -T bootstrap/gx/rvl.ld
+endif
+
+ifeq ($(EXTERNAL_LIBOGC), 1)
+   LIBS += -lfat
+endif
+
+LIBS += -lwiiuse -lbte
+
+ifeq ($(USBGECKO), 1)
+  LIBS += -ldb
+endif
+
+LIBS += -logc
+
+CFLAGS += -DGEKKO -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
+
+HAVE_RUNAHEAD            := 1
+HAVE_DSP_FILTER          := 1
+HAVE_VIDEO_FILTER        := 1
+HAVE_FILTERS_BUILTIN     := 1
+HAVE_THREADS             := 1
+HAVE_RPNG                := 1
+HAVE_RJPEG               := 1
+HAVE_RBMP                := 1
+HAVE_RTGA                := 1
+HAVE_IBXM                := 1
+HAVE_OVERLAY             := 1
+HAVE_VIDEO_LAYOUT        := 0
+HAVE_ZLIB                := 1
+HAVE_7ZIP                := 1
+HAVE_CONFIGFILE          := 1
+HAVE_PATCH               := 1
+HAVE_CHEATS              := 1
+HAVE_SCREENSHOTS         := 1
+HAVE_REWIND              := 1
+HAVE_AUDIOMIXER          := 1
+HAVE_RWAV                := 1
+RARCH_CONSOLE             = 1
+
+#HAVE_LANGEXTRA          := 1
+HAVE_WIIUSB_HID          := 1
+HAVE_RARCH_EXEC          := 1
+HAVE_RSOUND              := 1
+
+APP_BOOTER_DIR = wii/app_booter
+PLATOBJS := $(APP_BOOTER_DIR)/app_booter.binobj
+
+ifeq ($(USBGECKO), 1)
+   CFLAGS += -DUSBGECKO
+endif
+
+HAVE_CHEATS              := 1
+
+CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE)
+INCLUDE += -I./libretro-common/include \
+           -Ideps \
+           -Ideps/stb
+
+OBJ = griffin/griffin.o  $(PLATOBJS)
+
+ifeq ($(HAVE_GRIFFIN_CPP), 1)
+   OBJ += griffin/griffin_cpp.o
+endif
+
+ifeq ($(WANT_GLSLANG), 1)
+	OBJ += griffin/griffin_glslang.o
+endif
+
+ifeq ($(HAVE_LOGGER), 1)
+   CFLAGS      += -DHAVE_LOGGER
+   CFLAGS      += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+endif
+
+CFLAGS      += -DHAVE_SOCKET_LEGACY
+
+ifeq ($(HAVE_KERNEL_PRX), 1)
+   CFLAGS      += -DHAVE_KERNEL_PRX
+endif
+
+ifeq ($(HAVE_WIIUSB_HID), 1)
+   CFLAGS      += -DHAVE_WIIUSB_HID -DHAVE_HID
+endif
+
+ifeq ($(HAVE_LIBRETRODB), 1)
+   CFLAGS      += -DHAVE_LIBRETRODB
+endif
+
+ifeq ($(BIG_STACK),1)
+   CFLAGS      += -DBIG_STACK
+endif
+
+ifeq ($(HAVE_RJPEG), 1)
+   CFLAGS      += -DHAVE_RJPEG
+endif
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+   CFLAGS      += -DHAVE_FILE_LOGGER
+endif
+
+ifeq ($(HAVE_RARCH_EXEC), 1)
+   CFLAGS      += -DHAVE_RARCH_EXEC
+endif
+
+ifeq ($(HAVE_ZLIB), 1)
+   CFLAGS      += -DHAVE_ZLIB
+   CFLAGS      += -I./libretro-common/include/compat/zlib
+endif
+
+ifeq ($(HAVE_RPNG), 1)
+   CFLAGS      += -DHAVE_RPNG
+endif
+
+ifeq ($(HAVE_RBMP), 1)
+   CFLAGS      += -DHAVE_RBMP
+endif
+
+ifeq ($(HAVE_RTGA), 1)
+   CFLAGS      += -DHAVE_RTGA
+endif
+
+ifeq ($(HAVE_IMAGEVIEWER), 1)
+   CFLAGS      += -DHAVE_IMAGEVIEWER
+endif
+
+ifeq ($(HAVE_BSV_MOVIE), 1)
+   CFLAGS      += -DHAVE_BSV_MOVIE
+endif
+
+ifeq ($(HAVE_RUNAHEAD), 1)
+   CFLAGS      += -DHAVE_RUNAHEAD
+endif
+
+ifeq ($(HAVE_7ZIP), 1)
+   CFLAGS      += -DHAVE_7ZIP -D_7ZIP_ST
+endif
+
+ifeq ($(HAVE_SCREENSHOTS), 1)
+	CFLAGS      += -DHAVE_SCREENSHOTS
+endif
+
+ifeq ($(HAVE_REWIND), 1)
+	CFLAGS      += -DHAVE_REWIND
+endif
+
+ifeq ($(HAVE_AUDIOMIXER), 1)
+   CFLAGS      += -DHAVE_AUDIOMIXER
+endif
+
+ifeq ($(HAVE_RWAV), 1)
+   CFLAGS      += -DHAVE_RWAV
+endif
+
+ifeq ($(HAVE_OVERLAY), 1)
+   CFLAGS      += -DHAVE_OVERLAY
+endif
+
+ifeq ($(HAVE_VIDEO_LAYOUT), 1)
+   CFLAGS      += -DHAVE_VIDEO_LAYOUT
+endif
+
+ifeq ($(HAVE_NETWORKING), 1)
+   CFLAGS      += -DHAVE_NETWORKING
+endif
+
+ifeq ($(HAVE_NETPLAYDISCOVERY), 1)
+   CFLAGS      += -DHAVE_NETPLAYDISCOVERY
+endif
+
+ifeq ($(RARCH_CONSOLE), 1)
+   CFLAGS += -DRARCH_CONSOLE
+endif
+
+ifeq ($(RARCH_MOBILE), 1)
+   CFLAGS += -DRARCH_MOBILE
+endif
+
+CFLAGS += -std=gnu99 -DHAVE_RGUI -DHAVE_MENU -DHAVE_GRIFFIN=1 -Wno-char-subscripts -DRARCH_INTERNAL
+
+ifeq ($(HAVE_MATERIALUI), 1)
+   CFLAGS += -DHAVE_MATERIALUI
+endif
+
+ifeq ($(HAVE_XMB), 1)
+   CFLAGS += -DHAVE_XMB
+endif
+
+ifeq ($(HAVE_STB_FONT), 1)
+   CFLAGS += -DHAVE_STB_FONT
+endif
+
+ifeq ($(HAVE_LANGEXTRA), 1)
+   CFLAGS += -DHAVE_LANGEXTRA
+endif
+
+ifeq ($(HAVE_DSP_FILTER), 1)
+   CFLAGS += -DHAVE_DSP_FILTER
+endif
+
+ifeq ($(HAVE_VIDEO_FILTER), 1)
+   CFLAGS += -DHAVE_VIDEO_FILTER
+endif
+
+ifeq ($(HAVE_FILTERS_BUILTIN), 1)
+   CFLAGS += -DHAVE_FILTERS_BUILTIN
+endif
+
+ifeq ($(HAVE_THREADS), 1)
+   CFLAGS += -DHAVE_THREADS
+endif
+
+ifeq ($(HAVE_CONFIGFILE), 1)
+   CFLAGS += -DHAVE_CONFIGFILE
+endif
+
+ifeq ($(HAVE_PATCH), 1)
+   CFLAGS += -DHAVE_PATCH
+endif
+
+ifeq ($(HAVE_CHEATS), 1)
+	CFLAGS += -DHAVE_CHEATS
+endif
+
+ifeq ($(HAVE_RSOUND), 1)
+   CFLAGS += -DHAVE_RSOUND
+endif
+
+ifeq ($(HAVE_GETOPT_LONG), 1)
+   CFLAGS += -DHAVE_GETOPT_LONG=1
+endif
+
+ifeq ($(HAVE_DYLIB), 1)
+   CFLAGS += -DHAVE_DYLIB
+endif
+
+ifeq ($(HAVE_NETWORK_CMD), 1)
+   CFLAGS += -DHAVE_NETWORK_CMD
+endif
+
+ifeq ($(HAVE_COMMAND), 1)
+   CFLAGS += -DHAVE_COMMAND
+endif
+
+ifeq ($(HAVE_STDIN_CMD), 1)
+   CFLAGS += -DHAVE_STDIN_CMD
+endif
+
+ifeq ($(HAVE_DYNAMIC), 1)
+   CFLAGS += -DHAVE_DYNAMIC
+endif
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g -DDEBUG
+else
+   CFLAGS += -O3
+endif
+
+OBJOUT   = -o
+LINKOUT  = -o
+LINK = $(CXX)
+
+all: $(EXT_TARGET)
+
+%.dol: %.elf
+	$(ELF2DOL) $< $@
+
+$(EXT_INTER_TARGET): $(OBJ)
+	$(LINK) $(LINKOUT)$@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(PLATEXTRA) $(LIBS)
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
+
+%.o: %.cpp
+	$(CXX) $(CFLAGS) -c $(OBJOUT)$@ $<
+
+%.o: %.S
+	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
+
+%.binobj: %.bin
+	$(LD) -r -b binary $(OBJOUT)$@ $<
+
+$(APP_BOOTER_DIR)/app_booter.bin:
+	export EXTERNAL_LIBOGC
+	$(MAKE) -C $(APP_BOOTER_DIR)
+
+clean:
+	rm -f $(EXT_TARGET)
+	rm -f $(EXT_INTER_TARGET)
+	rm -f $(OBJ)
+	$(MAKE) -C $(APP_BOOTER_DIR) clean
+
+.PHONY: clean
+
+print-%:
+	@echo '$*=$($*)'
@@ -3,10 +3,11 @@
 # Makefile for RetroArch Wii.
 ##

-DEBUG			= 0
-HAVE_LOGGER		= 0
-HAVE_FILE_LOGGER	= 0
-EXTERNAL_LIBOGC = 0
+DEBUG              = 0
+HAVE_LOGGER        = 0
+HAVE_FILE_LOGGER   = 0
+EXTERNAL_LIBOGC   ?= 0
+GX_PTHREAD_LEGACY ?= 1

 # system platform
 system_platform = unix
@@ -27,6 +28,12 @@ CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
 LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
 ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)

+# Check whether ELF2DOL executable exists
+# (path has changed in more recent toolchains)
+ifeq ("$(wildcard $(ELF2DOL))","")
+   ELF2DOL = $(DEVKITPRO)/tools/bin/elf2dol$(EXE_EXT)
+endif
+
 DOL_TARGET := retroarch-salamander_wii.dol
 ELF_TARGET := retroarch-salamander_wii.elf

@@ -39,6 +46,11 @@ INCLUDE += -Iwii/libogc/include
 LIBDIRS := -Lwii/libogc/libs/wii -L.
 endif

+ifeq ($(GX_PTHREAD_LEGACY), 1)
+   CFLAGS   += -DGX_PTHREAD_LEGACY
+   CXXFLAGS += -DGX_PTHREAD_LEGACY
+endif
+
 MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
@@ -57,7 +69,7 @@ OBJ = frontend/frontend_salamander.o \
 		frontend/drivers/platform_wii.o \
 		libretro-common/file/file_path.o \
 		libretro-common/file/file_path_io.o \
-		libretro-common/hash/rhash.o \
+		libretro-common/hash/lrc_hash.o \
 		libretro-common/string/stdstring.o \
 		libretro-common/lists/string_list.o \
 		libretro-common/lists/dir_list.o \
@@ -70,7 +82,6 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/compat/fopen_utf8.o \
 		libretro-common/file/config_file.o \
 		libretro-common/time/rtime.o \
-		file_path_str.o \
 		verbosity.o \
 		$(APP_BOOTER_DIR)/app_booter.binobj

@@ -128,6 +139,7 @@ $(ELF_TARGET): $(OBJ)
 	$(LD) -r -b binary -o $@ $<

 $(APP_BOOTER_DIR)/app_booter.bin:
+	export EXTERNAL_LIBOGC
 	$(MAKE) -C $(APP_BOOTER_DIR)

 pkg: all
@@ -66,9 +66,8 @@ ifeq ($(SALAMANDER_BUILD),1)
   OBJ += libretro-common/file/config_file.o
   OBJ += libretro-common/streams/file_stream.o
   OBJ += libretro-common/vfs/vfs_implementation.o
-   OBJ += libretro-common/hash/rhash.o
+   OBJ += libretro-common/hash/lrc_hash.o
   OBJ += libretro-common/time/rtime.o
-   OBJ += file_path_str.o
   OBJ += verbosity.o

 # $(SALAMANDER_BUILD),0
@@ -77,11 +77,11 @@ enum audio_mixer_state

 typedef struct audio_statistics
 {
+   unsigned samples;
   float average_buffer_saturation;
   float std_deviation_percentage;
   float close_to_underrun;
   float close_to_blocking;
-   unsigned samples;
 } audio_statistics_t;

 RETRO_END_DECLS
@@ -31,6 +31,16 @@ typedef struct audio_thread
   sthread_t *thread;
   slock_t *lock;
   scond_t *cond;
+   const char *device;
+   unsigned *new_rate;
+
+   int inited;
+
+   /* Initialization options. */
+   unsigned out_rate;
+   unsigned latency;
+   unsigned block_frames;
+
   bool alive;
   bool stopped;
   bool stopped_ack;
@@ -38,14 +48,6 @@ typedef struct audio_thread
   bool is_shutdown;
   bool use_float;

-   int inited;
-
-   /* Initialization options. */
-   const char *device;
-   unsigned *new_rate;
-   unsigned out_rate;
-   unsigned latency;
-   unsigned block_frames;
 } audio_thread_t;

 static void audio_thread_loop(void *data)
@@ -28,8 +28,8 @@ typedef struct alsa
 {
   snd_pcm_t *pcm;
   size_t buffer_size;
-   bool nonblock;
   unsigned int frame_bits;
+   bool nonblock;
   bool has_float;
   bool can_pause;
   bool is_paused;
@@ -83,12 +83,12 @@ static void *alsa_init(const char *device, unsigned rate, unsigned latency,
   if (snd_pcm_hw_params_malloc(&params) < 0)
      goto error;

-   alsa->has_float = find_float_format(alsa->pcm, params);
-   format = alsa->has_float ? SND_PCM_FORMAT_FLOAT : SND_PCM_FORMAT_S16;
-
   if (snd_pcm_hw_params_any(alsa->pcm, params) < 0)
      goto error;

+   alsa->has_float = find_float_format(alsa->pcm, params);
+   format = alsa->has_float ? SND_PCM_FORMAT_FLOAT : SND_PCM_FORMAT_S16;
+
   if (snd_pcm_hw_params_set_access(
            alsa->pcm, params, SND_PCM_ACCESS_RW_INTERLEAVED) < 0)
      goto error;
@@ -29,18 +29,18 @@
 typedef struct alsa
 {
   uint8_t **buffer;
+   snd_pcm_t *pcm;
   uint8_t *buffer_chunk;
   unsigned buffer_index;
   unsigned buffer_ptr;
   volatile unsigned buffered_blocks;

-   snd_pcm_t *pcm;
+   unsigned buf_size;
+   unsigned buf_count;
   bool nonblock;
   bool has_float;
   bool can_pause;
   bool is_paused;
-   unsigned buf_size;
-   unsigned buf_count;
 } alsa_qsa_t;

 typedef long snd_pcm_sframes_t;
@@ -33,20 +33,18 @@
 typedef struct alsa_thread
 {
   snd_pcm_t *pcm;
-   bool nonblock;
-   bool is_paused;
-   bool has_float;
-   volatile bool thread_dead;
-
-   size_t buffer_size;
-   size_t period_size;
-   snd_pcm_uframes_t period_frames;
-
   fifo_buffer_t *buffer;
   sthread_t *worker_thread;
   slock_t *fifo_lock;
   scond_t *cond;
   slock_t *cond_lock;
+   size_t buffer_size;
+   size_t period_size;
+   snd_pcm_uframes_t period_frames;
+   bool nonblock;
+   bool is_paused;
+   bool has_float;
+   volatile bool thread_dead;
 } alsa_thread_t;

 static void alsa_worker_thread(void *data)
@@ -175,10 +173,11 @@ static void *alsa_thread_init(const char *device,
   TRY_ALSA(snd_pcm_open(&alsa->pcm, alsa_dev, SND_PCM_STREAM_PLAYBACK, 0));

   TRY_ALSA(snd_pcm_hw_params_malloc(&params));
+   TRY_ALSA(snd_pcm_hw_params_any(alsa->pcm, params));
+
   alsa->has_float = alsathread_find_float_format(alsa->pcm, params);
   format = alsa->has_float ? SND_PCM_FORMAT_FLOAT : SND_PCM_FORMAT_S16;

-   TRY_ALSA(snd_pcm_hw_params_any(alsa->pcm, params));
   TRY_ALSA(snd_pcm_hw_params_set_access(
            alsa->pcm, params, SND_PCM_ACCESS_RW_INTERLEAVED));
   TRY_ALSA(snd_pcm_hw_params_set_format(alsa->pcm, params, format));
@@ -36,9 +36,9 @@ static void *audioio_init(const char *device, unsigned rate, unsigned latency,
      unsigned block_frames,
      unsigned *new_out_rate)
 {
-   int *fd = (int*)calloc(1, sizeof(int));
-   const char *audiodev = device ? device : DEFAULT_DEV;
   struct audio_info info;
+   const char *audiodev = device ? device : DEFAULT_DEV;
+   int              *fd = (int*)calloc(1, sizeof(int));

   if (!fd)
      return NULL;
@@ -38,18 +38,16 @@ typedef struct coreaudio
 {
   slock_t *lock;
   scond_t *cond;
-
 #if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
   ComponentInstance dev;
 #else
   AudioComponentInstance dev;
 #endif
+   fifo_buffer_t *buffer;
+   size_t buffer_size;
   bool dev_alive;
   bool is_paused;
-
-   fifo_buffer_t *buffer;
   bool nonblock;
-   size_t buffer_size;
 } coreaudio_t;

 #if TARGET_OS_IOS
@@ -23,6 +23,7 @@
 #include <memory.h>

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

 #pragma mark - ringbuffer

@@ -30,9 +31,9 @@ typedef struct ringbuffer
 {
   float *buffer;
   size_t cap;
-   atomic_int len;
   size_t write_ptr;
   size_t read_ptr;
+   atomic_int len;
 } ringbuffer_t;

 typedef ringbuffer_t * ringbuffer_h;
@@ -23,8 +23,8 @@

 typedef struct
 {
-   bool nonblock;
-   bool playing;
+   uint64_t cpu_ticks_last;
+
   int16_t* l;
   int16_t* r;

@@ -34,7 +34,8 @@ typedef struct
   uint32_t pos;

   uint32_t playpos;
-   uint64_t cpu_ticks_last;
+   bool nonblock;
+   bool playing;
 } ctr_csnd_audio_t;

 #define CTR_CSND_AUDIO_COUNT       (1u << 11u)
@@ -22,12 +22,11 @@

 typedef struct
 {
+   ndspWaveBuf dsp_buf; /* TODO/FIXME - find out alignment */
+   int channel;
+   uint32_t pos;
   bool nonblock;
   bool playing;
-   int channel;
-   ndspWaveBuf dsp_buf;
-
-   uint32_t pos;
 } ctr_dsp_audio_t;

 #define CTR_DSP_AUDIO_COUNT       (1u << 11u)
@@ -108,6 +107,15 @@ static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size)
      {
         do{
            svcSleepThread(100000);
+
+            /* Run aptMainLoop to update APT state if DSP state
+             * changed, this prevents a hang on sleep. */
+            if(!aptMainLoop())
+            {
+               command_event(CMD_EVENT_QUIT, NULL);
+               return true;
+            }
+
            sample_pos = ndspChnGetSamplePos(ctr->channel);
         }while (((sample_pos - (ctr->pos + (size >>2))) & CTR_DSP_AUDIO_COUNT_MASK) > (CTR_DSP_AUDIO_COUNT >> 1)
                 || (((ctr->pos - (CTR_DSP_AUDIO_COUNT >> 4) - sample_pos) & CTR_DSP_AUDIO_COUNT_MASK) > (CTR_DSP_AUDIO_COUNT >> 1)));
@@ -0,0 +1,339 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2020 - Justin Weiss
+ *
+ *  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/>.
+ */
+
+#include <3ds.h>
+#include <string.h>
+#include <malloc.h>
+#include <queues/fifo_queue.h>
+#include <rthreads/rthreads.h>
+
+#include "../../retroarch.h"
+#include "../../ctr/ctr_debug.h"
+
+typedef struct
+{
+   fifo_buffer_t* fifo;
+   size_t fifo_size;
+
+   slock_t* fifo_lock;
+   scond_t* fifo_avail;
+   scond_t* fifo_done;
+   sthread_t* thread;
+
+   volatile bool running;
+
+   bool nonblocking;
+   bool playing;
+   retro_time_t frame_time;
+   int channel;
+   ndspWaveBuf dsp_buf;
+
+   uint32_t pos;
+} ctr_dsp_thread_audio_t;
+
+// PCM16 stereo
+#define DSP_BYTES_TO_SAMPLES(bytes) (bytes / (2 * sizeof(uint16_t)))
+#define DSP_SAMPLES_TO_BYTES(samples) (samples * 2 * sizeof(uint16_t))
+
+static void ctr_dsp_audio_loop(void* data)
+{
+   uint32_t pos, buf_pos;
+   ctr_dsp_thread_audio_t *ctr  = (ctr_dsp_thread_audio_t*)data;
+
+   if (!ctr)
+      return;
+
+   while (1)
+   {
+      size_t buf_avail, avail, to_write;
+      slock_lock(ctr->fifo_lock);
+
+      do {
+         avail = FIFO_READ_AVAIL(ctr->fifo);
+
+         if (!avail) {
+            scond_wait(ctr->fifo_avail, ctr->fifo_lock);
+         }
+      } while (!avail && ctr->running);
+
+      slock_unlock(ctr->fifo_lock);
+
+      if (!ctr->running)
+         break;
+
+      pos = ctr->pos;
+      buf_pos = DSP_SAMPLES_TO_BYTES(ndspChnGetSamplePos(ctr->channel));
+
+      buf_avail = buf_pos >= pos ? buf_pos - pos : ctr->fifo_size - pos;
+      to_write = MIN(avail, buf_avail);
+
+      slock_lock(ctr->fifo_lock);
+
+      if (to_write > 0) {
+         fifo_read(ctr->fifo, ctr->dsp_buf.data_pcm8 + pos, to_write);
+         DSP_FlushDataCache(ctr->dsp_buf.data_pcm8 + pos, to_write);
+         scond_signal(ctr->fifo_done);
+      }
+
+      slock_unlock(ctr->fifo_lock);
+
+      if (buf_pos == pos) {
+         svcSleepThread(100000);
+      }
+
+      ctr->pos = (pos + to_write) % ctr->fifo_size;
+   }
+}
+
+static void ctr_dsp_thread_audio_free(void *data);
+
+static void *ctr_dsp_thread_audio_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
+{
+   ctr_dsp_thread_audio_t *ctr = NULL;
+
+   (void)device;
+   (void)rate;
+
+   if (ndspInit() < 0)
+      return NULL;
+
+   ctr = (ctr_dsp_thread_audio_t*)calloc(1, sizeof(ctr_dsp_thread_audio_t));
+
+   if (!ctr)
+      return NULL;
+
+   *new_rate    = 32728;
+
+   ctr->running = true;
+   ctr->channel = 0;
+
+   ndspSetOutputMode(NDSP_OUTPUT_STEREO);
+   ndspSetClippingMode(NDSP_CLIP_SOFT); /* ?? */
+   ndspSetOutputCount(2);
+   ndspChnReset(ctr->channel);
+   ndspChnSetFormat(ctr->channel, NDSP_FORMAT_STEREO_PCM16);
+   ndspChnSetInterp(ctr->channel, NDSP_INTERP_NONE);
+   ndspChnSetRate(ctr->channel, 32728.0f);
+   ndspChnWaveBufClear(ctr->channel);
+
+   ctr->fifo_size = DSP_SAMPLES_TO_BYTES((*new_rate * MAX(latency, 8)) / 1000);
+
+   ctr->dsp_buf.data_pcm16 = linearAlloc(ctr->fifo_size);
+   memset(ctr->dsp_buf.data_pcm16, 0, ctr->fifo_size);
+   DSP_FlushDataCache(ctr->dsp_buf.data_pcm16, ctr->fifo_size);
+
+   ctr->dsp_buf.looping = true;
+   ctr->dsp_buf.nsamples = DSP_BYTES_TO_SAMPLES(ctr->fifo_size);
+   ndspChnWaveBufAdd(ctr->channel, &ctr->dsp_buf);
+
+   ctr->fifo = fifo_new(ctr->fifo_size);
+
+   if (!(ctr->fifo_lock = slock_new()) ||
+       !(ctr->fifo_avail = scond_new()) ||
+       !(ctr->fifo_done = scond_new()) ||
+       !(ctr->thread = sthread_create(ctr_dsp_audio_loop, ctr)))
+   {
+      RARCH_LOG("[Audio]: thread creation failed.\n");
+      ctr->running = false;
+      ctr_dsp_thread_audio_free(ctr);
+      return NULL;
+   }
+
+   ctr->pos = 0;
+   ctr->playing = true;
+
+   ctr->frame_time = (retro_time_t)roundf(1000000 * 4481134.0 / (*new_rate * 8192.0));
+
+   ndspSetMasterVol(1.0);
+
+   return ctr;
+}
+
+static void ctr_dsp_thread_audio_free(void *data)
+{
+   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
+   if (!ctr)
+      return;
+
+   if (ctr->running)
+   {
+      ctr->running = false;
+      scond_signal(ctr->fifo_avail);
+   }
+
+   if (ctr->thread)
+      sthread_join(ctr->thread);
+
+   scond_free(ctr->fifo_avail);
+   scond_free(ctr->fifo_done);
+   slock_free(ctr->fifo_lock);
+
+   if (ctr->fifo)
+   {
+      fifo_free(ctr->fifo);
+      ctr->fifo = NULL;
+   }
+
+   ndspChnWaveBufClear(ctr->channel);
+
+   linearFree(ctr->dsp_buf.data_pcm16);
+
+   free(ctr);
+   ndspExit();
+   ctr = NULL;
+}
+
+static ssize_t ctr_dsp_thread_audio_write(void *data, const void *buf, size_t size)
+{
+   size_t avail, written;
+   ctr_dsp_thread_audio_t * ctr = (ctr_dsp_thread_audio_t*)data;
+
+   if (!ctr || !ctr->running)
+      return 0;
+
+   if (ctr->nonblocking)
+   {
+      slock_lock(ctr->fifo_lock);
+      avail = FIFO_WRITE_AVAIL(ctr->fifo);
+      written = MIN(avail, size);
+      if (written > 0)
+      {
+         fifo_write(ctr->fifo, buf, written);
+         scond_signal(ctr->fifo_avail);
+      }
+      slock_unlock(ctr->fifo_lock);
+   }
+   else
+   {
+      written = 0;
+      while (written < size && ctr->running)
+      {
+         slock_lock(ctr->fifo_lock);
+         avail = FIFO_WRITE_AVAIL(ctr->fifo);
+         if (avail == 0)
+         {
+            if (ctr->running)
+            {
+               /* Wait a maximum of one frame, skip the write if the thread is still busy */
+               if (!scond_wait_timeout(ctr->fifo_done, ctr->fifo_lock, ctr->frame_time)) {
+                  slock_unlock(ctr->fifo_lock);
+                  break;
+               }
+            }
+            slock_unlock(ctr->fifo_lock);
+         }
+         else
+         {
+            size_t write_amt = MIN(size - written, avail);
+            fifo_write(ctr->fifo, (const char*)buf + written, write_amt);
+            scond_signal(ctr->fifo_avail);
+            slock_unlock(ctr->fifo_lock);
+            written += write_amt;
+         }
+      }
+   }
+
+   return written;
+}
+
+static bool ctr_dsp_thread_audio_stop(void *data)
+{
+   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
+
+   if (!ctr)
+     return false;
+
+   ndspSetMasterVol(0.0);
+   ctr->playing = false;
+
+   return true;
+}
+
+static bool ctr_dsp_thread_audio_alive(void *data)
+{
+   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
+
+   if (!ctr)
+     return false;
+
+   return ctr->playing;
+}
+
+static bool ctr_dsp_thread_audio_start(void *data, bool is_shutdown)
+{
+   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
+
+   if (!ctr)
+     return false;
+
+   /* Prevents restarting audio when the menu
+    * is toggled off on shutdown */
+   if (is_shutdown)
+      return true;
+
+   ndspSetMasterVol(1.0);
+   ctr->playing = true;
+
+   return true;
+}
+
+static void ctr_dsp_thread_audio_set_nonblock_state(void *data, bool state)
+{
+   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
+   if (ctr)
+      ctr->nonblocking = state;
+}
+
+static bool ctr_dsp_thread_audio_use_float(void *data)
+{
+   (void)data;
+   return false;
+}
+
+static size_t ctr_dsp_thread_audio_write_avail(void *data)
+{
+   size_t val;
+   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
+
+   slock_lock(ctr->fifo_lock);
+   val = FIFO_WRITE_AVAIL(ctr->fifo);
+   slock_unlock(ctr->fifo_lock);
+
+   return val;
+}
+
+static size_t ctr_dsp_thread_audio_buffer_size(void *data)
+{
+   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
+   return ctr->fifo_size;
+}
+
+audio_driver_t audio_ctr_dsp_thread = {
+   ctr_dsp_thread_audio_init,
+   ctr_dsp_thread_audio_write,
+   ctr_dsp_thread_audio_stop,
+   ctr_dsp_thread_audio_start,
+   ctr_dsp_thread_audio_alive,
+   ctr_dsp_thread_audio_set_nonblock_state,
+   ctr_dsp_thread_audio_free,
+   ctr_dsp_thread_audio_use_float,
+   "dsp_thread",
+   NULL,
+   NULL,
+   ctr_dsp_thread_audio_write_avail,
+   ctr_dsp_thread_audio_buffer_size
+};
@@ -32,13 +32,11 @@

 typedef struct
 {
+   size_t write_ptr;
   uint32_t data[BLOCKS][CHUNK_FRAMES];
-
   volatile unsigned dma_busy;
   volatile unsigned dma_next;
   volatile unsigned dma_write;
-   size_t write_ptr;
-
   bool nonblock;
   bool is_paused;
 } gx_audio_t;
@@ -35,23 +35,44 @@ typedef struct jack
 {
   jack_client_t *client;
   jack_port_t *ports[2];
-   jack_ringbuffer_t *buffer[2];
-   volatile bool shutdown;
-   bool nonblock;
-   bool is_paused;
-
+   jack_ringbuffer_t *buffer;
 #ifdef HAVE_THREADS
   scond_t *cond;
   slock_t *cond_lock;
 #endif
   size_t buffer_size;
+   volatile bool shutdown;
+   bool nonblock;
+   bool is_paused;
 } jack_t;

+static size_t read_deinterleaved(float *dst[2], jack_nframes_t dst_offset,
+      jack_ringbuffer_data_t buf, jack_nframes_t nframes)
+{
+   int i;
+   jack_nframes_t j, frames_avail;
+   const float *src = (const float *)buf.buf;
+
+   if (nframes <= 0)
+      return 0;
+
+   frames_avail = FRAMES(buf.len);
+   nframes = nframes < frames_avail ? nframes : frames_avail;
+
+   for (j = 0; j < nframes; j++)
+      for (i = 0; i < 2; i++)
+         dst[i][dst_offset + j] = *src++;
+
+   return nframes;
+}
+
 static int process_cb(jack_nframes_t nframes, void *data)
 {
   int i;
-   jack_nframes_t avail[2], min_avail;
+   jack_nframes_t read = 0;
   jack_t *jd = (jack_t*)data;
+   jack_ringbuffer_data_t buf[2];
+   float *dst[2];

   if (nframes <= 0)
   {
@@ -61,23 +82,20 @@ static int process_cb(jack_nframes_t nframes, void *data)
      return 0;
   }

-   avail[0]  = jack_ringbuffer_read_space(jd->buffer[0]);
-   avail[1]  = jack_ringbuffer_read_space(jd->buffer[1]);
-   min_avail = ((avail[0] < avail[1]) ? avail[0] : avail[1]) / sizeof(jack_default_audio_sample_t);
+   for (i = 0; i < 2; i++)
+      dst[i] = (float *)jack_port_get_buffer(jd->ports[i], nframes);

-   if (min_avail > nframes)
-      min_avail = nframes;
+   jack_ringbuffer_get_read_vector(jd->buffer, buf);

   for (i = 0; i < 2; i++)
-   {
-      jack_nframes_t f;
-      jack_default_audio_sample_t *out = (jack_default_audio_sample_t*)jack_port_get_buffer(jd->ports[i], nframes);
+      read += read_deinterleaved(dst, read, buf[i], nframes - read);

-      jack_ringbuffer_read(jd->buffer[i], (char*)out, min_avail * sizeof(jack_default_audio_sample_t));
+   jack_ringbuffer_read_advance(jd->buffer, read * sizeof(float) * 2);
+
+   for (; read < nframes; read++)
+      for (i = 0; i < 2; i++)
+         dst[i][read] = 0.0f;

-      for (f = min_avail; f < nframes; f++)
-         out[f] = 0.0f;
-   }
 #ifdef HAVE_THREADS
   scond_signal(jd->cond);
 #endif
@@ -194,14 +212,12 @@ static void *ja_init(const char *device,
   jd->buffer_size = bufsize;

   RARCH_LOG("[JACK]: Internal buffer size: %d frames.\n", (int)(bufsize / sizeof(jack_default_audio_sample_t)));
-   for (i = 0; i < 2; i++)
+
+   jd->buffer = jack_ringbuffer_create(bufsize);
+   if (!jd->buffer)
   {
-      jd->buffer[i] = jack_ringbuffer_create(bufsize);
-      if (!jd->buffer[i])
-      {
-         RARCH_ERR("[JACK]: Failed to create buffers.\n");
-         goto error;
-      }
+      RARCH_ERR("[JACK]: Failed to create buffers.\n");
+      goto error;
   }

   parsed = parse_ports(dest_ports, jports);
@@ -236,65 +252,46 @@ error:
   return NULL;
 }

-static size_t write_buffer(jack_t *jd, const float *buf, size_t size)
+static ssize_t ja_write(void *data, const void *buf_, size_t size)
 {
-   int i;
-   size_t j, written = 0;
-   jack_default_audio_sample_t out_deinterleaved_buffer[2][AUDIO_CHUNK_SIZE_NONBLOCKING * AUDIO_MAX_RATIO];
-   size_t frames = FRAMES(size);
+   jack_t      *jd = (jack_t*)data;
+   const char *buf = (const char *)buf_;
+   size_t  written = 0;

-   /* Avoid buffer overflow if a DSP plugin generated a huge number of frames. */
-   if (frames > AUDIO_CHUNK_SIZE_NONBLOCKING * AUDIO_MAX_RATIO)
-      frames = AUDIO_CHUNK_SIZE_NONBLOCKING * AUDIO_MAX_RATIO;
-
-   for (i = 0; i < 2; i++)
-      for (j = 0; j < frames; j++)
-         out_deinterleaved_buffer[i][j] = buf[j * 2 + i];
-
-   while (written < frames)
+   while (size > 0)
   {
-      size_t avail[2], min_avail, write_frames;
+      size_t avail, to_write;
+
      if (jd->shutdown)
         return 0;

-      avail[0] = jack_ringbuffer_write_space(jd->buffer[0]);
-      avail[1] = jack_ringbuffer_write_space(jd->buffer[1]);
+      avail = jack_ringbuffer_write_space(jd->buffer);

-      min_avail = avail[0] < avail[1] ? avail[0] : avail[1];
-      min_avail /= sizeof(float);
+      to_write = size < avail ? size : avail;
+      /* make sure to only write multiples of the sample size */
+      to_write = (to_write / sizeof(float)) * sizeof(float);

-      write_frames = frames - written > min_avail ? min_avail : frames - written;
-
-      if (write_frames > 0)
+      if (to_write > 0)
      {
-         for (i = 0; i < 2; i++)
-         {
-            jack_ringbuffer_write(jd->buffer[i], (const char*)&out_deinterleaved_buffer[i][written],
-                  write_frames * sizeof(jack_default_audio_sample_t));
-         }
-         written += write_frames;
+         jack_ringbuffer_write(jd->buffer, buf, to_write);
+         buf     += to_write;
+         size    -= to_write;
+         written += to_write;
      }
-#ifdef HAVE_THREADS
-      else
+      else if (!jd->nonblock)
      {
+#ifdef HAVE_THREADS
         slock_lock(jd->cond_lock);
         scond_wait(jd->cond, jd->cond_lock);
         slock_unlock(jd->cond_lock);
-      }
 #endif
-
-      if (jd->nonblock)
+         continue;
+      }
+      else
         break;
   }

-   return written * sizeof(float) * 2;
-}
-
-static ssize_t ja_write(void *data, const void *buf, size_t size)
-{
-   jack_t *jd = (jack_t*)data;
-
-   return write_buffer(jd, (const float*)buf, size);
+   return written;
 }

 static bool ja_stop(void *data)
@@ -341,9 +338,8 @@ static void ja_free(void *data)
      jack_client_close(jd->client);
   }

-   for (i = 0; i < 2; i++)
-      if (jd->buffer[i])
-         jack_ringbuffer_free(jd->buffer[i]);
+   if (jd->buffer)
+      jack_ringbuffer_free(jd->buffer);

 #ifdef HAVE_THREADS
   if (jd->cond_lock)
@@ -363,7 +359,7 @@ static bool ja_use_float(void *data)
 static size_t ja_write_avail(void *data)
 {
   jack_t *jd = (jack_t*)data;
-   return jack_ringbuffer_write_space(jd->buffer[0]);
+   return jack_ringbuffer_write_space(jd->buffer);
 }

 static size_t ja_buffer_size(void *data)
@@ -43,17 +43,14 @@ typedef struct al
   ALuint source;
   ALuint *buffers;
   ALuint *res_buf;
-   size_t res_ptr;
-   ALenum format;
-   size_t num_buffers;
-   int rate;
-
-   uint8_t tmpbuf[BUFSIZE];
-   size_t tmpbuf_ptr;
-
   ALCdevice *handle;
   ALCcontext *ctx;
-
+   size_t res_ptr;
+   size_t num_buffers;
+   size_t tmpbuf_ptr;
+   int rate;
+   ALenum format;
+   uint8_t tmpbuf[BUFSIZE];
   bool nonblock;
   bool is_paused;
 } al_t;
@@ -37,9 +37,6 @@ typedef struct sl
 {
   uint8_t **buffer;
   uint8_t *buffer_chunk;
-   unsigned buffer_index;
-   unsigned buffer_ptr;
-   volatile unsigned buffered_blocks;

   SLObjectItf engine_object;
   SLEngineItf engine;
@@ -51,10 +48,13 @@ typedef struct sl

   slock_t *lock;
   scond_t *cond;
-   bool nonblock;
-   bool is_paused;
   unsigned buf_size;
   unsigned buf_count;
+   unsigned buffer_index;
+   unsigned buffer_ptr;
+   volatile unsigned buffered_blocks;
+   bool nonblock;
+   bool is_paused;
 } sl_t;

 static void opensl_callback(SLAndroidSimpleBufferQueueItf bq, void *ctx)
@@ -42,22 +42,27 @@
 #define DEFAULT_OSS_DEV "/dev/dsp"
 #endif

-static bool oss_is_paused = false;
+typedef struct oss_audio
+{
+   int fd;
+   bool is_paused;
+} oss_audio_t;

-static void *oss_init(const char *device, unsigned rate, unsigned latency,
+static void *oss_init(const char *device,
+      unsigned rate, unsigned latency,
      unsigned block_frames,
      unsigned *new_out_rate)
 {
   int frags, frag, channels, format, new_rate;
-   int              *fd   = (int*)calloc(1, sizeof(int));
+   oss_audio_t *ossaudio  = (oss_audio_t*)calloc(1, sizeof(oss_audio_t));
   const char *oss_device = device ? device : DEFAULT_OSS_DEV;

-   if (!fd)
+   if (!ossaudio)
      return NULL;

-   if ((*fd = open(oss_device, O_WRONLY)) < 0)
+   if ((ossaudio->fd = open(oss_device, O_WRONLY)) < 0)
   {
-      free(fd);
+      free(ossaudio);
      perror("open");
      return NULL;
   }
@@ -65,21 +70,21 @@ static void *oss_init(const char *device, unsigned rate, unsigned latency,
   frags = (latency * rate * 4) / (1000 * (1 << 10));
   frag  = (frags << 16) | 10;

-   if (ioctl(*fd, SNDCTL_DSP_SETFRAGMENT, &frag) < 0)
+   if (ioctl(ossaudio->fd, SNDCTL_DSP_SETFRAGMENT, &frag) < 0)
      RARCH_WARN("Cannot set fragment sizes. Latency might not be as expected ...\n");

   channels = 2;
   format   = is_little_endian() ? AFMT_S16_LE : AFMT_S16_BE;

-   if (ioctl(*fd, SNDCTL_DSP_CHANNELS, &channels) < 0)
+   if (ioctl(ossaudio->fd, SNDCTL_DSP_CHANNELS, &channels) < 0)
      goto error;

-   if (ioctl(*fd, SNDCTL_DSP_SETFMT, &format) < 0)
+   if (ioctl(ossaudio->fd, SNDCTL_DSP_SETFMT, &format) < 0)
      goto error;

   new_rate = rate;

-   if (ioctl(*fd, SNDCTL_DSP_SPEED, &new_rate) < 0)
+   if (ioctl(ossaudio->fd, SNDCTL_DSP_SPEED, &new_rate) < 0)
      goto error;

   if (new_rate != (int)rate)
@@ -88,11 +93,12 @@ static void *oss_init(const char *device, unsigned rate, unsigned latency,
      *new_out_rate = new_rate;
   }

-   return fd;
+   return ossaudio;

 error:
-   close(*fd);
-   free(fd);
+   close(ossaudio->fd);
+   if (ossaudio)
+      free(ossaudio);
   perror("ioctl");
   return NULL;
 }
@@ -100,14 +106,14 @@ error:
 static ssize_t oss_write(void *data, const void *buf, size_t size)
 {
   ssize_t ret;
-   int *fd = (int*)data;
+   oss_audio_t *ossaudio  = (oss_audio_t*)data;

   if (size == 0)
      return 0;

-   if ((ret = write(*fd, buf, size)) < 0)
+   if ((ret = write(ossaudio->fd, buf, size)) < 0)
   {
-      if (errno == EAGAIN && (fcntl(*fd, F_GETFL) & O_NONBLOCK))
+      if (errno == EAGAIN && (fcntl(ossaudio->fd, F_GETFL) & O_NONBLOCK))
         return 0;

      return -1;
@@ -118,58 +124,62 @@ static ssize_t oss_write(void *data, const void *buf, size_t size)

 static bool oss_stop(void *data)
 {
-   int *fd = (int*)data;
+   oss_audio_t *ossaudio  = (oss_audio_t*)data;

-   if (ioctl(*fd, SNDCTL_DSP_RESET, 0) < 0)
+   if (ioctl(ossaudio->fd, SNDCTL_DSP_RESET, 0) < 0)
      return false;

-   oss_is_paused = true;
+   ossaudio->is_paused = true;
   return true;
 }

 static bool oss_start(void *data, bool is_shutdown)
 {
-   (void)data;
-   oss_is_paused = false;
+   oss_audio_t *ossaudio  = (oss_audio_t*)data;
+   if (!ossaudio)
+      return false;
+   ossaudio->is_paused = false;
   return true;
 }

 static bool oss_alive(void *data)
 {
-   (void)data;
-   return !oss_is_paused;
+   oss_audio_t *ossaudio  = (oss_audio_t*)data;
+   return !ossaudio->is_paused;
 }

 static void oss_set_nonblock_state(void *data, bool state)
 {
   int rc;
-   int *fd = (int*)data;
+   oss_audio_t *ossaudio  = (oss_audio_t*)data;

   if (state)
-      rc = fcntl(*fd, F_SETFL, fcntl(*fd, F_GETFL) | O_NONBLOCK);
+      rc =  fcntl(ossaudio->fd, F_SETFL,
+            fcntl(ossaudio->fd, F_GETFL) | O_NONBLOCK);
   else
-      rc = fcntl(*fd, F_SETFL, fcntl(*fd, F_GETFL) & (~O_NONBLOCK));
+      rc =  fcntl(ossaudio->fd, F_SETFL,
+            fcntl(ossaudio->fd, F_GETFL) & (~O_NONBLOCK));
   if (rc != 0)
      RARCH_WARN("Could not set nonblocking on OSS file descriptor. Will not be able to fast-forward.\n");
 }

 static void oss_free(void *data)
 {
-   int *fd = (int*)data;
+   oss_audio_t *ossaudio  = (oss_audio_t*)data;

-   if (ioctl(*fd, SNDCTL_DSP_RESET, 0) < 0)
+   if (ioctl(ossaudio->fd, SNDCTL_DSP_RESET, 0) < 0)
      return;

-   close(*fd);
-   free(fd);
+   close(ossaudio->fd);
+   free(data);
 }

 static size_t oss_write_avail(void *data)
 {
   audio_buf_info info;
-   int *fd = (int*)data;
+   oss_audio_t *ossaudio  = (oss_audio_t*)data;

-   if (ioctl(*fd, SNDCTL_DSP_GETOSPACE, &info) < 0)
+   if (ioctl(ossaudio->fd, SNDCTL_DSP_GETOSPACE, &info) < 0)
   {
      RARCH_ERR("[OSS]: SNDCTL_DSP_GETOSPACE failed ...\n");
      return 0;
@@ -181,9 +191,9 @@ static size_t oss_write_avail(void *data)
 static size_t oss_buffer_size(void *data)
 {
   audio_buf_info info;
-   int *fd = (int*)data;
+   oss_audio_t *ossaudio  = (oss_audio_t*)data;

-   if (ioctl(*fd, SNDCTL_DSP_GETOSPACE, &info) < 0)
+   if (ioctl(ossaudio->fd, SNDCTL_DSP_GETOSPACE, &info) < 0)
   {
      RARCH_ERR("[OSS]: SNDCTL_DSP_GETOSPACE failed ...\n");
      return 1; /* Return something non-zero to avoid SIGFPE. */
@@ -15,7 +15,6 @@

 #include <stdint.h>
 #include <malloc.h>
-#include <stdio.h>
 #include <string.h>

 #include <kernel.h>
@@ -32,26 +31,17 @@ typedef struct ps2_audio
   /* TODO/FIXME - nonblock is not implemented */
   bool nonblock;
   bool running;
-
 } ps2_audio_t;

 static void audioConfigure(ps2_audio_t *ps2, unsigned rate)
 {
-   int err;
   struct audsrv_fmt_t format;

   format.bits     = AUDIO_BITS;
   format.freq     = rate;
   format.channels = AUDIO_CHANNELS;

-   err             = audsrv_set_format(&format);
-
-   if (err)
-   {
-      printf("set format returned %d\n", err);
-      printf("audsrv returned error string: %s\n", audsrv_get_error_string());
-   }
-
+   audsrv_set_format(&format);
   audsrv_set_volume(MAX_VOLUME);
 }

@@ -28,52 +28,52 @@

 typedef struct
 {
-   uint32_t audio_port;
-   bool nonblock;
-   bool started;
-   volatile bool quit_thread;
   fifo_buffer_t *buffer;
-
   sys_ppu_thread_t thread;
   sys_lwmutex_t lock;
   sys_lwmutex_t cond_lock;
   sys_lwcond_t cond;
+   uint32_t audio_port;
+   bool nonblock;
+   bool started;
+   volatile bool quit_thread;
 } ps3_audio_t;

+
 #ifdef __PSL1GHT__
 static void event_loop(void *data)
 #else
 static void event_loop(uint64_t data)
 #endif
 {
-   float out_tmp[CELL_AUDIO_BLOCK_SAMPLES * AUDIO_CHANNELS]
+   float out_tmp[AUDIO_BLOCK_SAMPLES * AUDIO_CHANNELS]
      __attribute__((aligned(16)));
   sys_event_queue_t id;
   sys_ipc_key_t key;
   sys_event_t event;
   ps3_audio_t *aud = (ps3_audio_t*)(uintptr_t)data;

-   cellAudioCreateNotifyEventQueue(&id, &key);
-   cellAudioSetNotifyEventQueue(key);
+   audioCreateNotifyEventQueue(&id, &key);
+   audioSetNotifyEventQueue(key);

   while (!aud->quit_thread)
   {
-      sys_event_queue_receive(id, &event, SYS_NO_TIMEOUT);
+      sysEventQueueReceive(id, &event, PS3_SYS_NO_TIMEOUT);

-      sys_lwmutex_lock(&aud->lock, SYS_NO_TIMEOUT);
+      sysLwMutexLock(&aud->lock, PS3_SYS_NO_TIMEOUT);
      if (FIFO_READ_AVAIL(aud->buffer) >= sizeof(out_tmp))
         fifo_read(aud->buffer, out_tmp, sizeof(out_tmp));
      else
         memset(out_tmp, 0, sizeof(out_tmp));
-      sys_lwmutex_unlock(&aud->lock);
-      sys_lwcond_signal(&aud->cond);
+      sysLwMutexUnlock(&aud->lock);
+      sysLwCondSignal(&aud->cond);

-      cellAudioAddData(aud->audio_port, out_tmp,
-            CELL_AUDIO_BLOCK_SAMPLES, 1.0);
+      audioAddData(aud->audio_port, out_tmp,
+            AUDIO_BLOCK_SAMPLES, 1.0);
   }

-   cellAudioRemoveNotifyEventQueue(key);
-   sys_ppu_thread_exit(0);
+   audioRemoveNotifyEventQueue(key);
+   sysThreadExit(0);
 }

 static void *ps3_audio_init(const char *device,
@@ -81,67 +81,63 @@ static void *ps3_audio_init(const char *device,
      unsigned block_frames,
      unsigned *new_rate)
 {
-   CellAudioPortParam params;
-   ps3_audio_t *data = calloc(1, sizeof(*data));
-   if (!data)
-      return NULL;
-
-   (void)latency;
-   (void)device;
-   (void)rate;
-
-   cellAudioInit();
-
-   params.numChannels = AUDIO_CHANNELS;
-   params.numBlocks   = AUDIO_BLOCKS;
-#if 0
-#ifdef HAVE_HEADSET
-   if(global->console.sound.mode == SOUND_MODE_HEADSET)
-      params.param_attrib = CELL_AUDIO_PORTATTR_OUT_SECONDARY;
-   else
-#endif
-#endif
-      params.param_attrib = 0;
-
-   if (cellAudioPortOpen(&params, &data->audio_port) != CELL_OK)
-   {
-      cellAudioQuit();
-      free(data);
-      return NULL;
-   }
-
-   data->buffer = fifo_new(CELL_AUDIO_BLOCK_SAMPLES *
-         AUDIO_CHANNELS * AUDIO_BLOCKS * sizeof(float));
-
+   audioPortParam params;
+   ps3_audio_t *data                 = NULL;
 #ifdef __PSL1GHT__
-   sys_lwmutex_attr_t lock_attr =
+   sys_lwmutex_attr_t lock_attr      =
   {SYS_LWMUTEX_ATTR_PROTOCOL, SYS_LWMUTEX_ATTR_RECURSIVE, "\0"};
   sys_lwmutex_attr_t cond_lock_attr =
   {SYS_LWMUTEX_ATTR_PROTOCOL, SYS_LWMUTEX_ATTR_RECURSIVE, "\0"};
-   sys_lwcond_attribute_t cond_attr = {"\0"};
+   sys_lwcond_attr_t cond_attr       = {"\0"};
 #else
-   sys_lwmutex_attribute_t lock_attr;
-   sys_lwmutex_attribute_t cond_lock_attr;
-   sys_lwcond_attribute_t cond_attr;
+   sys_lwmutex_attr_t lock_attr;
+   sys_lwmutex_attr_t cond_lock_attr;
+   sys_lwcond_attr_t cond_attr;

   sys_lwmutex_attribute_initialize(lock_attr);
   sys_lwmutex_attribute_initialize(cond_lock_attr);
   sys_lwcond_attribute_initialize(cond_attr);
 #endif

-   sys_lwmutex_create(&data->lock, &lock_attr);
-   sys_lwmutex_create(&data->cond_lock, &cond_lock_attr);
-   sys_lwcond_create(&data->cond, &data->cond_lock, &cond_attr);
+   data                              = calloc(1, sizeof(*data));
+   if (!data)
+      return NULL;

-   cellAudioPortStart(data->audio_port);
+   audioInit();
+
+   params.numChannels                = AUDIO_CHANNELS;
+   params.numBlocks                  = AUDIO_BLOCKS;
+   params.param_attrib               = 0;
+#if 0
+#ifdef HAVE_HEADSET
+   if(global->console.sound.mode == SOUND_MODE_HEADSET)
+      params.param_attrib            = CELL_AUDIO_PORTATTR_OUT_SECONDARY;
+#endif
+#endif
+
+   if (audioPortOpen(&params, &data->audio_port) != CELL_OK)
+   {
+      audioQuit();
+      free(data);
+      return NULL;
+   }
+
+   data->buffer = fifo_new(AUDIO_BLOCK_SAMPLES *
+         AUDIO_CHANNELS * AUDIO_BLOCKS * sizeof(float));
+
+   sysLwMutexCreate(&data->lock, &lock_attr);
+   sysLwMutexCreate(&data->cond_lock, &cond_lock_attr);
+   sysLwCondCreate(&data->cond, &data->cond_lock, &cond_attr);
+
+   audioPortStart(data->audio_port);
   data->started = true;
-   sys_ppu_thread_create(&data->thread, event_loop,
+   sysThreadCreate(&data->thread, event_loop,
 #ifdef __PSL1GHT__
   data,
 #else
   (uint64_t)data,
 #endif
-   1500, 0x1000, SYS_PPU_THREAD_CREATE_JOINABLE, (char*)"sound");
+   1500, 0x1000, SYS_THREAD_CREATE_JOINABLE, (char*)"sound");

   return data;
 }
@@ -157,11 +153,11 @@ static ssize_t ps3_audio_write(void *data, const void *buf, size_t size)
   }

   while (FIFO_WRITE_AVAIL(aud->buffer) < size)
-      sys_lwcond_wait(&aud->cond, 0);
+      sysLwCondWait(&aud->cond, 0);

-   sys_lwmutex_lock(&aud->lock, SYS_NO_TIMEOUT);
+   sysLwMutexLock(&aud->lock, PS3_SYS_NO_TIMEOUT);
   fifo_write(aud->buffer, buf, size);
-   sys_lwmutex_unlock(&aud->lock);
+   sysLwMutexUnlock(&aud->lock);

   return size;
 }
@@ -171,7 +167,7 @@ static bool ps3_audio_stop(void *data)
   ps3_audio_t *aud = data;
   if (aud->started)
   {
-      cellAudioPortStop(aud->audio_port);
+      audioPortStop(aud->audio_port);
      aud->started = false;
   }
   return true;
@@ -182,7 +178,7 @@ static bool ps3_audio_start(void *data, bool is_shutdown)
   ps3_audio_t *aud = data;
   if (!aud->started)
   {
-      cellAudioPortStart(aud->audio_port);
+      audioPortStart(aud->audio_port);
      aud->started = true;
   }
   return true;
@@ -210,29 +206,28 @@ static void ps3_audio_free(void *data)

   aud->quit_thread = true;
   ps3_audio_start(aud, false);
-   sys_ppu_thread_join(aud->thread, &val);
+   sysThreadJoin(aud->thread, &val);

   ps3_audio_stop(aud);
-   cellAudioPortClose(aud->audio_port);
-   cellAudioQuit();
+   audioPortClose(aud->audio_port);
+   audioQuit();
   fifo_free(aud->buffer);

-   sys_lwmutex_destroy(&aud->lock);
-   sys_lwmutex_destroy(&aud->cond_lock);
-   sys_lwcond_destroy(&aud->cond);
+   sysLwMutexDestroy(&aud->lock);
+   sysLwMutexDestroy(&aud->cond_lock);
+   sysLwCondDestroy(&aud->cond);

   free(data);
 }

 static bool ps3_audio_use_float(void *data)
 {
-   (void)data;
   return true;
 }

 static size_t ps3_audio_write_avail(void *data)
 {
-   (void)data;
+   /* TODO/FIXME - implement? */
   return 0;
 }

@@ -44,23 +44,23 @@

 typedef struct psp_audio
 {
-   bool nonblock;
-
   uint32_t* buffer;
   uint32_t* zeroBuffer;

-   SceUID thread;
-   int rate;
-
-   volatile bool running;
-   volatile uint16_t read_pos;
-   volatile uint16_t write_pos;
-
   sthread_t *worker_thread;
   slock_t *fifo_lock;
   scond_t *cond;
   slock_t *cond_lock;

+   SceUID thread;
+
+   int rate;
+
+   volatile uint16_t read_pos;
+   volatile uint16_t write_pos;
+
+   volatile bool running;
+   bool nonblock;
 } psp_audio_t;

 #define AUDIO_OUT_COUNT 512u
@@ -27,14 +27,14 @@
 typedef struct rsd
 {
   rsound_t *rd;
+
+   fifo_buffer_t *buffer;
+   slock_t *cond_lock;
+   scond_t *cond;
+
   bool nonblock;
   bool is_paused;
   volatile bool has_error;
-
-   fifo_buffer_t *buffer;
-
-   slock_t *cond_lock;
-   scond_t *cond;
 } rsd_t;

 static ssize_t rsound_audio_cb(void *data, size_t bytes, void *userdata)
@@ -30,76 +30,69 @@ void RWebAudioSetNonblockState(bool state);
 void RWebAudioFree(void);
 size_t RWebAudioWriteAvail(void);
 size_t RWebAudioBufferSize(void);
-static bool rwebaudio_is_paused;
+
+typedef struct rweb_audio
+{
+   bool is_paused;
+} rweb_audio_t;

 static void rwebaudio_free(void *data)
 {
   RWebAudioFree();
+   free(data);
 }

 static void *rwebaudio_init(const char *device, unsigned rate, unsigned latency,
      unsigned block_frames,
      unsigned *new_rate)
 {
-   void *data           = RWebAudioInit(latency);
-
-   (void)device;
-   (void)rate;
-
-   if (data)
+   rweb_audio_t *rwebaudio = (rweb_audio_t*)calloc(1, sizeof(rweb_audio_t));
+   if (!rwebaudio)
+      return NULL;
+   if (RWebAudioInit(latency) == 1)
      *new_rate         = RWebAudioSampleRate();
-   return data;
+   return rwebaudio;
 }

 static ssize_t rwebaudio_write(void *data, const void *buf, size_t size)
 {
-   (void)data;
   return RWebAudioWrite(buf, size);
 }

 static bool rwebaudio_stop(void *data)
 {
-   (void)data;
-   rwebaudio_is_paused = true;
+   rweb_audio_t *rwebaudio = (rweb_audio_t*)data;
+   if (!rwebaudio)
+      return false;
+   rwebaudio->is_paused = true;
   return RWebAudioStop();
 }

 static void rwebaudio_set_nonblock_state(void *data, bool state)
 {
-   (void)data;
   RWebAudioSetNonblockState(state);
 }

 static bool rwebaudio_alive(void *data)
 {
-   (void)data;
-   return !rwebaudio_is_paused;
+   rweb_audio_t *rwebaudio = (rweb_audio_t*)data;
+   if (!rwebaudio)
+      return false;
+   return !rwebaudio->is_paused;
 }

 static bool rwebaudio_start(void *data, bool is_shutdown)
 {
-   (void)data;
-   rwebaudio_is_paused = false;
+   rweb_audio_t *rwebaudio = (rweb_audio_t*)data;
+   if (!rwebaudio)
+      return false;
+   rwebaudio->is_paused = false;
   return RWebAudioStart();
 }

-static size_t rwebaudio_write_avail(void *data)
-{
-   (void)data;
-   return RWebAudioWriteAvail();
-}
-
-static size_t rwebaudio_buffer_size(void *data)
-{
-   (void)data;
-   return RWebAudioBufferSize();
-}
-
-   static bool rwebaudio_use_float(void *data)
-{
-   (void)data;
-   return true;
-}
+static size_t rwebaudio_write_avail(void *data) {return RWebAudioWriteAvail();}
+static size_t rwebaudio_buffer_size(void *data) {return RWebAudioBufferSize();}
+static bool rwebaudio_use_float(void *data) { return true; }

 audio_driver_t audio_rwebaudio = {
   rwebaudio_init,
@@ -33,14 +33,13 @@

 typedef struct sdl_audio
 {
-   bool nonblock;
-   bool is_paused;
-
 #ifdef HAVE_THREADS
   slock_t *lock;
   scond_t *cond;
 #endif
   fifo_buffer_t *buffer;
+   bool nonblock;
+   bool is_paused;
 } sdl_audio_t;

 static void sdl_audio_cb(void *data, Uint8 *stream, int len)
@@ -75,19 +74,24 @@ static void *sdl_audio_init(const char *device,
   int frames;
   size_t bufsize;
   SDL_AudioSpec out;
-   SDL_AudioSpec spec   = {0};
-   void            *tmp = NULL;
-   sdl_audio_t *sdl     = NULL;
+   SDL_AudioSpec spec           = {0};
+   void *tmp                    = NULL;
+   sdl_audio_t *sdl             = NULL;
+   uint32_t sdl_subsystem_flags = SDL_WasInit(0);

   (void)device;

-   if (SDL_WasInit(0) == 0)
+   /* Initialise audio subsystem, if required */
+   if (sdl_subsystem_flags == 0)
   {
      if (SDL_Init(SDL_INIT_AUDIO) < 0)
         return NULL;
   }
-   else if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
-      return NULL;
+   else if ((sdl_subsystem_flags & SDL_INIT_AUDIO) == 0)
+   {
+      if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
+         return NULL;
+   }

   sdl = (sdl_audio_t*)calloc(1, sizeof(*sdl));
   if (!sdl)
@@ -228,7 +232,6 @@ static void sdl_audio_free(void *data)
   sdl_audio_t *sdl = (sdl_audio_t*)data;

   SDL_CloseAudio();
-   SDL_QuitSubSystem(SDL_INIT_AUDIO);

   if (sdl)
   {
@@ -86,7 +86,7 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size)
      uint32_t num;
      if (switch_audio_ipc_output_get_released_buffer(swa, num) != 0)
      {
-         RARCH_LOG("Failed to get released buffer?\n");
+         RARCH_ERR("[Audio]: Failed to get released buffer?\n");
         return -1;
      }

@@ -1208,21 +1208,18 @@ static int pcm_mmap_begin(struct pcm *pcm, void **areas, unsigned int *offset,

 static int pcm_mmap_commit(struct pcm *pcm, unsigned int offset, unsigned int frames)
 {
-    int ret;
+   int ret;

-    /* not used */
-    (void) offset;
+   /* not used */
+   (void) offset;

-    /* update the application pointer in userspace and kernel */
-    pcm_mmap_appl_forward(pcm, frames);
-    ret = pcm_sync_ptr(pcm, 0);
-    if (ret != 0)
-    {
-        printf("%d\n", ret);
-        return ret;
-    }
+   /* update the application pointer in userspace and kernel */
+   pcm_mmap_appl_forward(pcm, frames);
+   ret = pcm_sync_ptr(pcm, 0);
+   if (ret != 0)
+      return ret;

-    return frames;
+   return frames;
 }

 static void pcm_mmap_appl_forward(struct pcm *pcm, int frames)
@@ -28,16 +28,16 @@

 typedef struct
 {
-   bool exclusive;
-   bool nonblock;
-   bool running;
-   size_t frame_size;     /* 4 or 8 only */
-   size_t engine_buffer_size;
   HANDLE write_event;
   IMMDevice          *device;
   IAudioClient       *client;
   IAudioRenderClient *renderer;
   fifo_buffer_t      *buffer; /* NULL in unbuffered shared mode */
+   size_t frame_size;          /* 4 or 8 only */
+   size_t engine_buffer_size;
+   bool exclusive;
+   bool nonblock;
+   bool running;
 } wasapi_t;

 static IMMDevice *wasapi_init_device(const char *id)
@@ -31,11 +31,10 @@ typedef struct
   AXMVoice* mvoice;
   uint16_t* buffer_l;
   uint16_t* buffer_r;
-   bool nonblock;
-
+   OSSpinLock spinlock;
   uint32_t pos;
   uint32_t written;
-   OSSpinLock spinlock;
+   bool nonblock;
 } ax_audio_t;

 /* 3072 samples main buffer, 64ms total */
@@ -60,9 +60,9 @@ typedef struct xaudio2 xaudio2_t;
 typedef struct
 {
   xaudio2_t *xa;
+   size_t bufsize;
   bool nonblock;
   bool is_paused;
-   size_t bufsize;
 } xa_t;

 /* Forward declarations */
@@ -180,6 +180,10 @@ static void xaudio2_free(xaudio2_t *handle)
 #else
   free(handle);
 #endif
+
+#if !defined(_XBOX) && !defined(__WINRT__)
+   CoUninitialize();
+#endif
 }

 static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
@@ -188,16 +192,28 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
   int32_t idx_found        = -1;
   WAVEFORMATEX wfx         = {0};
   struct string_list *list = NULL;
+   xaudio2_t *handle        = NULL;
+
+#if !defined(_XBOX) && !defined(__WINRT__)
+   if (FAILED(CoInitialize(NULL)))
+      goto error;
+#endif
+
 #if defined(__cplusplus) && !defined(CINTERFACE)
-   xaudio2_t *handle        = new xaudio2;
+   handle = new xaudio2;
 #else
-   xaudio2_t *handle        = (xaudio2_t*)calloc(1, sizeof(*handle));
+   handle = (xaudio2_t*)calloc(1, sizeof(*handle));
 #endif

   if (!handle)
+   {
+#if !defined(_XBOX) && !defined(__WINRT__)
+      CoUninitialize();
+#endif
      goto error;
+   }

-   list                     = (struct string_list*)xa_list_new(NULL);
+   list = (struct string_list*)xa_list_new(NULL);

 #if !defined(__cplusplus) || defined(CINTERFACE)
   handle->lpVtbl = &voice_vtable;
@@ -296,34 +312,34 @@ static void *xa_init(const char *device, unsigned rate, unsigned latency,
      unsigned *new_rate)
 {
   size_t bufsize;
-   xa_t *xa              = (xa_t*)calloc(1, sizeof(*xa));
+   xa_t *xa    = (xa_t*)calloc(1, sizeof(*xa));
+
   if (!xa)
      return NULL;

   if (latency < 8)
-      latency = 8; /* Do not allow shenanigans. */
-
-   bufsize = latency * rate / 1000;
-
-   RARCH_LOG("[XAudio2]: Requesting %u ms latency, using %d ms latency.\n",
-         latency, (int)bufsize * 1000 / rate);
+      latency  = 8; /* Do not allow shenanigans. */

+   bufsize     = latency * rate / 1000;
   xa->bufsize = bufsize * 2 * sizeof(float);

   xa->xa = xaudio2_new(rate, 2, xa->bufsize, device);
   if (!xa->xa)
   {
-      RARCH_ERR("Failed to init XAudio2.\n");
+      RARCH_ERR("[XAudio2] Failed to init driver.\n");
      free(xa);
      return NULL;
   }

+   RARCH_LOG("[XAudio2]: Requesting %u ms latency, using %d ms latency.\n",
+         latency, (int)bufsize * 1000 / rate);
+
   return xa;
 }

 static ssize_t xa_write(void *data, const void *buf, size_t size)
 {
-   unsigned bytes;
+   unsigned bytes        = size;
   xa_t *xa              = (xa_t*)data;
   xaudio2_t *handle     = xa->xa;
   const uint8_t *buffer = (const uint8_t*)buf;
@@ -335,11 +351,9 @@ static ssize_t xa_write(void *data, const void *buf, size_t size)
      if (avail == 0)
         return 0;
      if (avail < size)
-         size = avail;
+         bytes = size = avail;
   }

-   bytes = size;
-
   while (bytes)
   {
      unsigned need   = MIN(bytes, handle->bufsize - handle->bufptr);
@@ -29,6 +29,12 @@

 #include <audio/audio_resampler.h>

+#if (defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)) || defined(HAVE_NEON)
+#ifndef HAVE_ARM_NEON_OPTIMIZATIONS
+#define HAVE_ARM_NEON_OPTIMIZATIONS
+#endif
+#endif
+
 /* Since SSE and NEON don't provide support for trigonometric functions
 * we approximate those with polynoms
 *
@@ -49,10 +55,9 @@

 typedef struct rarch_CC_resampler
 {
-   audio_frame_float_t buffer[4];
-
-   float distance;
   void (*process)(void *re, struct resampler_data *data);
+   audio_frame_float_t buffer[4];
+   float distance;
 } rarch_CC_resampler_t;

 #ifdef _MIPS_ARCH_ALLEGREX
@@ -345,7 +350,7 @@ static void resampler_CC_upsample(void *re_, struct resampler_data *data)
   data->output_frames = outp - (audio_frame_float_t*)data->data_out;
 }

-#elif defined (__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
+#elif defined(HAVE_ARM_NEON_OPTIMIZATIONS)

 #define CC_RESAMPLER_IDENT "NEON"

@@ -357,13 +362,13 @@ size_t resampler_CC_upsample_neon  (float *outp, const float *inp,
 static void resampler_CC_downsample(void *re_, struct resampler_data *data)
 {
   data->output_frames = resampler_CC_downsample_neon(
-         data->data_out, data->data_in, re_, data->input_frames, data->ratio);
+         data->data_out, data->data_in, (struct rarch_CC_resampler*)re_, data->input_frames, data->ratio);
 }

 static void resampler_CC_upsample(void *re_, struct resampler_data *data)
 {
   data->output_frames = resampler_CC_upsample_neon(
-         data->data_out, data->data_in, re_, data->input_frames, data->ratio);
+         data->data_out, data->data_in, (struct rarch_CC_resampler*)re_, data->input_frames, data->ratio);
 }

 #else
@@ -31,16 +31,21 @@

 #include "drivers/rsound.h"

-#if defined(__CELLOS_LV2__)
+#ifdef __PS3__
+#ifdef __PSL1GHT__
+#include <sysmodule/sysmodule.h>
+#include <sys/systime.h>
+#include <net/net.h>
+#else
 #include <cell/sysmodule.h>
 #include <sys/timer.h>
 #include <sys/sys_time.h>
-
-/* Network headers */
 #include <netex/net.h>
 #include <netex/errno.h>
-#define NETWORK_COMPAT_HEADERS 1
-#elif defined(GEKKO)
+#endif
+#endif
+
+#if defined(GEKKO)
 #include <network.h>
 #else
 #define NETWORK_COMPAT_HEADERS 1
@@ -52,8 +57,12 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
-#ifdef __CELLOS_LV2__
+#ifdef __PS3__
+#ifdef __PSL1GHT__
+#include <net/poll.h>
+#else
 #include <sys/poll.h>
+#endif
 #else
 #include <poll.h>
 #endif
@@ -107,7 +116,7 @@ enum rsd_conn_type
 #define RSD_ERR(fmt, args...)
 #define RSD_DEBUG(fmt, args...)

-#if defined(__CELLOS_LV2__)
+#if defined(__PS3__)
 static int init_count = 0;
 #define pollfd_fd(x) x.fd
 #define net_send(a,b,c,d) send(a,b,c,d)
@@ -254,7 +263,7 @@ static int rsnd_connect_server( rsound_t *rd )

   /* Uses non-blocking IO since it performed more deterministic with poll()/send() */

-#ifdef __CELLOS_LV2__
+#ifdef __PS3__
   setsockopt(rd->conn.socket, SOL_SOCKET, SO_NBIO, &i, sizeof(int));
   setsockopt(rd->conn.ctl_socket, SOL_SOCKET, SO_NBIO, &i, sizeof(int));
 #else
@@ -700,11 +709,11 @@ static ssize_t rsnd_recv_chunk(int socket, void *buf, size_t size, int blocking)

 static int rsnd_poll(struct pollfd *fd, int numfd, int timeout)
 {
-   for(;;)
+   for (;;)
   {
-      if ( socketpoll(fd, numfd, timeout) < 0 )
+      if (socketpoll(fd, numfd, timeout) < 0)
      {
-         if ( errno == EINTR )
+         if (errno == EINTR)
            continue;

         perror("poll");
@@ -725,8 +734,8 @@ static int64_t rsnd_get_time_usec(void)
   if (!QueryPerformanceCounter(&count))
      return 0;
   return count.QuadPart * 1000000 / freq.QuadPart;
-#elif defined(__CELLOS_LV2__)
-   return sys_time_get_system_time();
+#elif defined(__PS3__)
+   return sysGetSystemTime();
 #elif defined(GEKKO)
   return ticks_to_microsecs(gettime());
 #elif defined(__MACH__) // OSX doesn't have clock_gettime ...
@@ -938,15 +947,15 @@ static int rsnd_close_ctl(rsound_t *rd)
   int index = 0;
   char buf[RSD_PROTO_MAXSIZE*2] = {0};

-   for(;;)
+   for (;;)
   {
-      if ( rsnd_poll(&fd, 1, 2000) < 0 )
+      if (rsnd_poll(&fd, 1, 2000) < 0)
         return -1;

-      if ( fd.revents & POLLHUP )
+      if (fd.revents & POLLHUP)
         break;

-      else if ( fd.revents & POLLIN )
+      if (fd.revents & POLLIN)
      {
         const char *subchar;

@@ -1102,7 +1111,7 @@ static void rsnd_thread ( void * thread_data )
   /* Two (;;) for loops! :3 Beware! */
   for (;;)
   {
-      for(;;)
+      for (;;)
      {
         _TEST_CANCEL();

@@ -1375,7 +1384,7 @@ int rsd_exec(rsound_t *rsound)

   rsnd_stop_thread(rsound);

-#if defined(__CELLOS_LV2__)
+#ifdef __PS3__
   int i = 0;
   setsockopt(rsound->conn.socket, SOL_SOCKET, SO_NBIO, &i, sizeof(int));
 #else
@@ -1567,11 +1576,11 @@ int rsd_init(rsound_t** rsound)
   rsd_set_param(*rsound, RSD_HOST, RSD_DEFAULT_HOST);
   rsd_set_param(*rsound, RSD_PORT, RSD_DEFAULT_PORT);

-#ifdef __CELLOS_LV2__
+#ifdef __PS3__
   if (init_count == 0)
   {
-      cellSysmoduleLoadModule(CELL_SYSMODULE_NET);
-      sys_net_initialize_network();
+      sysModuleLoad(SYSMODULE_NET);
+      netInitialize();
      init_count++;
   }
 #endif
@@ -4,7 +4,6 @@
 #include <psp2/kernel/sysmem.h>
 #include <psp2/kernel/threadmgr.h>

-#define RAM_THRESHOLD 0x1000000 // Memory left to the system for threads and other internal stuffs

 int _newlib_heap_memblock;
 unsigned _newlib_heap_size;
@@ -16,6 +15,8 @@ static int _newlib_vm_memblock;
 extern int _newlib_heap_size_user __attribute__((weak));
 extern int _newlib_vm_size_user __attribute__((weak));

+#define ALIGN(x, a)	(((x) + ((a) - 1)) & ~((a) - 1))
+
 void * _sbrk_r(struct _reent *reent, ptrdiff_t incr) {
 	if (sceKernelLockLwMutex((struct SceKernelLwMutexWork*)_newlib_sbrk_mutex, 1, 0) < 0)
 		goto fail;
@@ -37,8 +38,8 @@ void _init_vita_heap(void) {

 	int _newlib_vm_size = 0;
 	if (&_newlib_vm_size_user != NULL) {
-		_newlib_vm_size = _newlib_vm_size_user;
-	  _newlib_vm_memblock = sceKernelAllocMemBlockForVM("code", _newlib_vm_size_user);
+	  _newlib_vm_size = ALIGN(_newlib_vm_size_user, 0x100000);
+	  _newlib_vm_memblock = sceKernelAllocMemBlockForVM("code", _newlib_vm_size);

 	  if (_newlib_vm_memblock < 0){
 	    //sceClibPrintf("sceKernelAllocMemBlockForVM failed\n");
@@ -58,6 +59,8 @@ void _init_vita_heap(void) {
 	info.size = sizeof(SceKernelFreeMemorySizeInfo);
 	sceKernelGetFreeMemorySize(&info);

+   printf("sceKernelGetFreeMemorySize %x\n", info.size_user);
+
 	if (&_newlib_heap_size_user != NULL) {
 		_newlib_heap_size = _newlib_heap_size_user;
 	}else{
@@ -1,229 +0,0 @@
-// This provides support for __getreent() as well as implementation of our thread-related wrappers
-
-#include <reent.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <vitasdk/utils.h>
-#include <psp2/kernel/threadmgr.h>
-
-#define MAX_THREADS 256
-
-typedef struct reent_for_thread {
-	int thread_id;
-	int needs_reclaim;
-	void *tls_data_ext;
-	void *pthread_data_ext;
-	struct _reent reent;
-} reent_for_thread;
-
-static reent_for_thread reent_list[MAX_THREADS];
-static int _newlib_reent_mutex;
-static struct _reent _newlib_global_reent;
-
-#define TLS_REENT_THID_PTR(thid)	sceKernelGetThreadTLSAddr(thid, 0x88)
-#define TLS_REENT_PTR				sceKernelGetTLSAddr(0x88)
-
-#define list_entry(ptr, type, member) \
-	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
-
-int __vita_delete_thread_reent(int thid)
-{
-	struct reent_for_thread *for_thread;
-
-	// We only need to cleanup if reent is allocated, i.e. if it's on our TLS
-	// We also don't need to clean up the global reent
-	struct _reent **on_tls = NULL;
-
-	if (thid == 0)
-		on_tls = TLS_REENT_PTR;
-	else
-		on_tls = TLS_REENT_THID_PTR(thid);
-
-	if (!*on_tls || *on_tls == &_newlib_global_reent)
-		return 0;
-
-	for_thread = list_entry(*on_tls, struct reent_for_thread, reent);
-
-	// Remove from TLS
-	*on_tls = 0;
-
-	// Set thread id to zero, which means the reent is free
-	for_thread->thread_id = 0;
-
-	// We can't reclaim it here, will be done later in __getreent
-	for_thread->needs_reclaim = 1;
-
-	return 1;
-}
-
-int vitasdk_delete_thread_reent(int thid)
-{
-	int res = 0;
-	// Lock the list because we'll be modifying it
-	sceKernelLockMutex(_newlib_reent_mutex, 1, NULL);
-
-	res = __vita_delete_thread_reent(thid);
-
-	sceKernelUnlockMutex(_newlib_reent_mutex, 1);
-	return res;
-}
-
-int _exit_thread_common(int exit_status, int (*exit_func)(int)) {
-	int res = 0;
-	int ret = 0;
-	int thid = sceKernelGetThreadId();
-
-	// Lock the list because we'll be modifying it
-	sceKernelLockMutex(_newlib_reent_mutex, 1, NULL);
-
-	res = __vita_delete_thread_reent(0);
-
-	ret = exit_func(exit_status);
-
-	if (res)
-	{
-		struct _reent **on_tls = TLS_REENT_PTR;
-		struct reent_for_thread *for_thread = list_entry(*on_tls, struct reent_for_thread, reent);
-
-		for_thread->thread_id = thid;
-
-		// And put it back on TLS
-		*on_tls = &for_thread->reent;
-	}
-
-	sceKernelUnlockMutex(_newlib_reent_mutex, 1);
-	return ret;
-}
-
-int vita_exit_thread(int exit_status) {
-	return _exit_thread_common(exit_status, sceKernelExitThread);
-}
-
-int vita_exit_delete_thread(int exit_status) {
-	return _exit_thread_common(exit_status, sceKernelExitDeleteThread);
-}
-
-static inline void __vita_clean_reent(void)
-{
-	int i;
-	SceKernelThreadInfo info;
-
-	for (i = 0; i < MAX_THREADS; ++i)
-	{
-		info.size = sizeof(SceKernelThreadInfo);
-
-		if (sceKernelGetThreadInfo(reent_list[i].thread_id, &info) < 0)
-		{
-			reent_list[i].thread_id = 0;
-			reent_list[i].needs_reclaim = 1;
-		}
-	}
-}
-
-static inline struct reent_for_thread *__vita_allocate_reent(void)
-{
-	int i;
-	struct reent_for_thread *free_reent = 0;
-
-	for (i = 0; i < MAX_THREADS; ++i)
-		if (reent_list[i].thread_id == 0) {
-			free_reent = &reent_list[i];
-			break;
-		}
-
-	return free_reent;
-}
-
-struct _reent *__getreent_for_thread(int thid) {
-	struct reent_for_thread *free_reent = 0;
-	struct _reent *returned_reent = 0;
-
-	// A pointer to our reent should be on the TLS
-	struct _reent **on_tls = NULL;
-
-	if (thid == 0)
-		on_tls = TLS_REENT_PTR;
-	else
-		on_tls = TLS_REENT_THID_PTR(thid);
-
-	if (*on_tls) {
-		return *on_tls;
-	}
-
-  	sceKernelLockMutex(_newlib_reent_mutex, 1, 0);
-
-	// If it's not on the TLS this means the thread doesn't have a reent allocated yet
-	// We allocate one and put a pointer to it on the TLS
-	free_reent = __vita_allocate_reent();
-
-	if (!free_reent) {
-		// clean any hanging thread references
-		__vita_clean_reent();
-
-		free_reent = __vita_allocate_reent();
-
-		if (!free_reent) {
-			// we've exhausted all our resources
-			__builtin_trap();
-		}
-	} else {
-		// First, check if it needs to be cleaned up (if it came from another thread)
-		if (free_reent->needs_reclaim) {
-			_reclaim_reent(&free_reent->reent);
-			free_reent->needs_reclaim = 0;
-		}
-
-		memset(free_reent, 0, sizeof(struct reent_for_thread));
-
-		// Set it up
-		if(thid==0){
-			thid = sceKernelGetThreadId();
-		}
-		free_reent->thread_id = thid;
-		_REENT_INIT_PTR(&free_reent->reent);
-		returned_reent = &free_reent->reent;
-	}
-
-	// Put it on TLS for faster access time
-	*on_tls = returned_reent;
-
-	sceKernelUnlockMutex(_newlib_reent_mutex, 1);
-	return returned_reent;
-}
-
-struct _reent *__getreent(void) {
-	return  __getreent_for_thread(0);
-}
-
-void *vitasdk_get_tls_data(SceUID thid)
-{
-	struct reent_for_thread *for_thread;
-	struct _reent *reent = __getreent_for_thread(thid);
-
-	for_thread = list_entry(reent, struct reent_for_thread, reent);
-	return &for_thread->tls_data_ext;
-}
-
-void *vitasdk_get_pthread_data(SceUID thid)
-{
-	struct reent_for_thread *for_thread;
-	struct _reent *reent = __getreent_for_thread(thid);
-
-	for_thread = list_entry(reent, struct reent_for_thread, reent);
-	return &for_thread->pthread_data_ext;
-}
-
-// Called from _start to set up the main thread reentrancy structure
-void _init_vita_reent(void) {
-	memset(reent_list, 0, sizeof(reent_list));
-	_newlib_reent_mutex = sceKernelCreateMutex("reent list access mutex", 0, 0, 0);
-	reent_list[0].thread_id = sceKernelGetThreadId();
-	_REENT_INIT_PTR(&reent_list[0].reent);
-	*(struct _reent **)(TLS_REENT_PTR) = &reent_list[0].reent;
-	_REENT_INIT_PTR(&_newlib_global_reent);
-}
-
-void _free_vita_reent(void) {
-	sceKernelDeleteMutex(_newlib_reent_mutex);
-}
@@ -29,25 +29,25 @@
 #include <features/features_cpu.h>

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

 #ifdef HAVE_MENU
-#include "../menu/menu_driver.h"
+#include "menu/menu_driver.h"
 #endif

 #ifdef HAVE_CHEEVOS
-#include "../cheevos/cheevos.h"
+#include "cheevos/cheevos.h"
 #endif

 #include "cheat_manager.h"

-#include "../msg_hash.h"
-#include "../configuration.h"
-#include "../retroarch.h"
-#include "../dynamic.h"
-#include "../core.h"
-#include "../verbosity.h"
+#include "msg_hash.h"
+#include "configuration.h"
+#include "retroarch.h"
+#include "dynamic.h"
+#include "core.h"
+#include "verbosity.h"

 /* TODO/FIXME - public global variables */
 cheat_manager_t cheat_manager_state;
@@ -108,11 +108,8 @@ void cheat_manager_apply_cheats(void)
   }

 #ifdef HAVE_CHEEVOS
-   if (idx != 0)
-      if (     rcheevos_hardcore_active 
-            && rcheevos_loaded 
-            && !rcheevos_hardcore_paused)
-         cheat_manager_pause_cheevos();
+   if (idx != 0 && rcheevos_hardcore_active())
+      cheat_manager_pause_cheevos();
 #endif
 }

@@ -143,7 +140,6 @@ bool cheat_manager_save(
 {
   bool ret;
   unsigned i;
-   char buf[PATH_MAX_LENGTH];
   char cheats_file[PATH_MAX_LENGTH];
   config_file_t *conf         = NULL;
   cheat_manager_t *cheat_st   = &cheat_manager_state;
@@ -167,7 +163,7 @@ bool cheat_manager_save(
      (char*)"cheat%u_repeat_add_to_address"
   };

-   buf[0] = cheats_file[0] = '\0';
+   cheats_file[0] = '\0';

   if (!cheat_st->cheats || cheat_st->size == 0)
      return false;
@@ -175,11 +171,10 @@ bool cheat_manager_save(
   if (!cheat_database)
      strlcpy(cheats_file, path, sizeof(cheats_file));
   else
-   {
-      fill_pathname_join(buf, cheat_database, path, sizeof(buf));
-
-      fill_pathname_noext(cheats_file, buf, ".cht", sizeof(cheats_file));
-   }
+      fill_pathname_join_concat(cheats_file,
+            cheat_database, path,
+            ".cht",
+            sizeof(cheats_file));

   if (!overwrite)
      conf = config_file_new_from_path_to_string(cheats_file);
@@ -626,7 +621,7 @@ void cheat_manager_toggle_index(bool apply_cheats_after_toggle,
      return;

   cheat_st->cheats[i].state = !cheat_st->cheats[i].state;
-   cheat_manager_update(&cheat_manager_state, i);
+   cheat_manager_update(cheat_st, i);

   if (apply_cheats_after_toggle)
      cheat_manager_apply_cheats();
@@ -640,7 +635,7 @@ void cheat_manager_toggle(void)

   cheat_st->cheats[cheat_st->ptr].state ^= true;
   cheat_manager_apply_cheats();
-   cheat_manager_update(&cheat_manager_state, cheat_st->ptr);
+   cheat_manager_update(cheat_st, cheat_st->ptr);
 }

 void cheat_manager_index_next(void)
@@ -650,7 +645,7 @@ void cheat_manager_index_next(void)
      return;

   cheat_st->ptr = (cheat_st->ptr + 1) % cheat_st->size;
-   cheat_manager_update(&cheat_manager_state, cheat_st->ptr);
+   cheat_manager_update(cheat_st, cheat_st->ptr);
 }

 void cheat_manager_index_prev(void)
@@ -664,7 +659,7 @@ void cheat_manager_index_prev(void)
   else
      cheat_st->ptr--;

-   cheat_manager_update(&cheat_manager_state, cheat_st->ptr);
+   cheat_manager_update(cheat_st, cheat_st->ptr);
 }

 const char *cheat_manager_get_code(unsigned i)
@@ -708,7 +703,7 @@ static bool cheat_manager_get_game_specific_filename(
      return false;

   core_name = system_info.library_name;
-   game_name = path_basename(global->name.cheatfile);
+   game_name = path_basename_nocompression(global->name.cheatfile);

   if (string_is_empty(path_cheat_database) ||
         string_is_empty(core_name) ||
@@ -742,8 +737,8 @@ void cheat_manager_load_game_specific_cheats(const char *path_cheat_database)
            path_cheat_database,
            false))
   {
-      RARCH_LOG("[Cheats]: Load game-specific cheatfile: %s\n", cheat_file);
-      cheat_manager_load(cheat_file, true);
+      if (cheat_manager_load(cheat_file, true))
+         RARCH_LOG("[Cheats]: Load game-specific cheatfile: %s\n", cheat_file);
   }
 }

@@ -756,8 +751,8 @@ void cheat_manager_save_game_specific_cheats(const char *path_cheat_database)
            path_cheat_database,
            true))
   {
-      RARCH_LOG("[Cheats]: Save game-specific cheatfile: %s\n", cheat_file);
-      cheat_manager_save(cheat_file, NULL, true);
+      if (cheat_manager_save(cheat_file, NULL, true))
+         RARCH_LOG("[Cheats]: Save game-specific cheatfile: %s\n", cheat_file);
   }
 }

@@ -1178,6 +1173,12 @@ int cheat_manager_search_eqminus(rarch_setting_t *setting, size_t idx, bool wrap
   return cheat_manager_search(CHEAT_SEARCH_TYPE_EQMINUS);
 }

+unsigned cheat_manager_get_state_search_size(unsigned search_size)
+{
+   uint32_t n[] = {1,3,15,255,0x0000ffff,0xffffffff};
+   return n[search_size];
+}
+
 bool cheat_manager_add_new_code(unsigned int memory_search_size, unsigned int address, unsigned int address_mask,
      bool big_endian, unsigned int value)
 {
@@ -1568,11 +1569,8 @@ void cheat_manager_apply_retro_cheats(void)
   }

 #ifdef HAVE_CHEEVOS
-   if (cheat_applied)
-      if (     rcheevos_hardcore_active 
-            && rcheevos_loaded 
-            && !rcheevos_hardcore_paused)
-         cheat_manager_pause_cheevos();
+   if (cheat_applied && rcheevos_hardcore_active())
+      cheat_manager_pause_cheevos();
 #endif
 }

@@ -86,10 +86,14 @@ enum cheat_rumble_type

 struct item_cheat
 {
-   unsigned int idx;
+   /* Clock value for when rumbling should stop */
+   retro_time_t rumble_primary_end_time; 
+   retro_time_t rumble_secondary_end_time; 
+
   char *desc;
-   bool state;
   char *code;
+
+   unsigned int idx;
   unsigned int handler;
   /* Number of bits = 2^memory_search_size
    * 0=1, 1=2, 2=4, 3=8, 4=16, 5=32
@@ -119,19 +123,16 @@ struct item_cheat
    * 1 : 11110000
    */
   unsigned int address_mask;
-   /* Whether to apply the cheat based on big-endian console memory or not */
-   bool big_endian;
   unsigned int rumble_type;
   unsigned int rumble_value;
   unsigned int rumble_prev_value;
   unsigned int rumble_initialized;
-   unsigned int rumble_port; /* 0-15 for specific port, anything else means "all ports" */
+   /* 0-15 for specific port, anything else means "all ports" */
+   unsigned int rumble_port; 
   unsigned int rumble_primary_strength; /* 0-65535 */
   unsigned int rumble_primary_duration; /* in milliseconds */
-   retro_time_t rumble_primary_end_time; /* clock value for when rumbling should stop */
   unsigned int rumble_secondary_strength; /* 0-65535 */
   unsigned int rumble_secondary_duration; /* in milliseconds */
-   retro_time_t rumble_secondary_end_time; /* clock value for when rumbling should stop */

   /*
    * The repeat_ variables allow for a single cheat code to affect multiple memory addresses.
@@ -149,22 +150,28 @@ struct item_cheat
   unsigned int repeat_add_to_value;
   unsigned int repeat_add_to_address;

+   bool state;
+   /* Whether to apply the cheat based on big-endian console memory or not */
+   bool big_endian;
 };

 struct cheat_manager
 {
+   struct item_cheat working_cheat; /* retro_time_t alignment */
   struct item_cheat *cheats;
-   unsigned ptr;
-   unsigned size;
-   unsigned buf_size;
-   unsigned total_memory_size;
   uint8_t *curr_memory_buf;
   uint8_t *prev_memory_buf;
   uint8_t *matches;
   uint8_t **memory_buf_list;
   unsigned *memory_size_list;
+   unsigned int delete_state;
+   unsigned int loading_cheat_size;
+   unsigned int loading_cheat_offset;
+   unsigned ptr;
+   unsigned size;
+   unsigned buf_size;
+   unsigned total_memory_size;
   unsigned num_memory_buffers;
-   struct item_cheat working_cheat;
   unsigned match_idx;
   unsigned match_action;
   unsigned search_bit_size;
@@ -173,15 +180,12 @@ struct cheat_manager
   unsigned search_eqplus_value;
   unsigned search_eqminus_value;
   unsigned num_matches;
-   bool  big_endian;
-   bool  memory_initialized;
-   bool  memory_search_initialized;
-   unsigned int delete_state;
   unsigned browse_address;
   char working_desc[CHEAT_DESC_SCRATCH_SIZE];
   char working_code[CHEAT_CODE_SCRATCH_SIZE];
-   unsigned int loading_cheat_size;
-   unsigned int loading_cheat_offset;
+   bool  big_endian;
+   bool  memory_initialized;
+   bool  memory_search_initialized;
 };

 typedef struct cheat_manager cheat_manager_t;
@@ -260,6 +264,8 @@ int cheat_manager_search_eqplus(rarch_setting_t *setting, size_t idx, bool wrapa

 int cheat_manager_search_eqminus(rarch_setting_t *setting, size_t idx, bool wraparound);

+unsigned cheat_manager_get_state_search_size(unsigned search_size);
+
 int cheat_manager_add_matches(const char *path,
      const char *label, unsigned type, size_t idx, size_t entry_idx);

@@ -36,7 +36,8 @@ void cheevos_reset_menu_badges(void)
         video_driver_texture_unload(&cheevos_badge_menu_texture_list[index]);
   }

-   memset(&cheevos_badge_menu_texture_list, 0, sizeof(cheevos_badge_menu_texture_list));
+   memset(&cheevos_badge_menu_texture_list, 0,
+         sizeof(cheevos_badge_menu_texture_list));
 }

 void cheevos_set_menu_badge(int index, const char *badge, bool locked)
@@ -49,7 +50,8 @@ void cheevos_set_menu_badge(int index, const char *badge, bool locked)
   if (!settings || !settings->bools.cheevos_badges_enable)
      cheevos_badge_menu_texture_list[index] = 0;
   else
-      cheevos_badge_menu_texture_list[index] = cheevos_get_badge_texture(badge, locked);
+      cheevos_badge_menu_texture_list[index] = 
+         cheevos_get_badge_texture(badge, locked);
 }

 uintptr_t cheevos_get_menu_badge_texture(int index)
@@ -71,13 +73,14 @@ uintptr_t cheevos_get_badge_texture(const char *badge, bool locked)
   if (!badge)
      return 0;

+   fullpath[0]   = badge_file[0] = '\0';
+
   strlcpy(badge_file, badge, sizeof(badge_file));
   if (locked)
      strlcat(badge_file, "_lock", sizeof(badge_file));
-   strlcat(badge_file, ".png", sizeof(badge_file));
+   strlcat(badge_file, FILE_PATH_PNG_EXTENSION, sizeof(badge_file));

-   fill_pathname_application_special(fullpath,
-      PATH_MAX_LENGTH * sizeof(char),
+   fill_pathname_application_special(fullpath, sizeof(fullpath),
      APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES);

   if (!gfx_display_reset_textures_list(badge_file, fullpath,
@@ -37,23 +37,33 @@ typedef struct rcheevos_ctx_desc
 enum
 {
   RCHEEVOS_ACTIVE_SOFTCORE = 1 << 0,
-   RCHEEVOS_ACTIVE_HARDCORE = 1 << 1
+   RCHEEVOS_ACTIVE_HARDCORE = 1 << 1,
+   RCHEEVOS_ACTIVE_UNOFFICIAL = 1 << 2
 };

 bool rcheevos_load(const void *data);
+size_t rcheevos_get_serialize_size(void);
+bool rcheevos_get_serialized_data(void* buffer);
+bool rcheevos_set_serialized_data(void* buffer);

-void rcheevos_reset_game(void);
+void rcheevos_reset_game(bool widgets_ready);

-void rcheevos_populate_menu(void *data);
+void rcheevos_populate_menu(void* data);
+void rcheevos_populate_hardcore_pause_menu(void* data);
 void rcheevos_get_achievement_state(unsigned index, char* buffer, size_t buffer_size);

 bool rcheevos_get_description(rcheevos_ctx_desc_t *desc);

-void rcheevos_pause_hardcore();
+void rcheevos_pause_hardcore(void);

 bool rcheevos_unload(void);

-bool rcheevos_toggle_hardcore_mode(void);
+void rcheevos_hardcore_enabled_changed(void);
+void rcheevos_toggle_hardcore_paused(void);
+
+void rcheevos_validate_config_settings(void);
+
+void rcheevos_leaderboards_enabled_changed(void);

 void rcheevos_test(void);

@@ -61,16 +71,13 @@ void rcheevos_set_support_cheevos(bool state);

 bool rcheevos_get_support_cheevos(void);

-int rcheevos_get_console(void);
-
 const char* rcheevos_get_hash(void);

 const char *rcheevos_get_richpresence(void);

-extern bool rcheevos_loaded;
-extern bool rcheevos_hardcore_active;
-extern bool rcheevos_hardcore_paused;
-extern bool rcheevos_state_loaded_flag;
+uint8_t* rcheevos_patch_address(unsigned address);
+
+bool rcheevos_hardcore_active(void);

 RETRO_END_DECLS

@@ -0,0 +1,352 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2016 - 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/>.
+ */
+
+#include "cheevos_memory.h"
+
+#include "util.h"
+
+#include "../retroarch.h"
+#include "../verbosity.h"
+
+#include "../deps/rcheevos/include/rcheevos.h"
+
+#include <stdio.h>
+
+uint8_t* rcheevos_memory_find(
+      const rcheevos_memory_regions_t* regions, unsigned address)
+{
+   unsigned i;
+
+   for (i = 0; i < regions->count; ++i)
+   {
+      const size_t size = regions->size[i];
+      if (address < size)
+      {
+         if (regions->data[i] == NULL)
+            break;
+
+         return &regions->data[i][address];
+      }
+
+      address -= size;
+   }
+
+   return NULL;
+}
+
+static const char* rcheevos_memory_type(int type)
+{
+   switch (type)
+   {
+      case RC_MEMORY_TYPE_SAVE_RAM:
+         return "SRAM";
+      case RC_MEMORY_TYPE_VIDEO_RAM:
+         return "VRAM";
+      case RC_MEMORY_TYPE_UNUSED:
+         return "UNUSED";
+      default:
+         break;
+   }
+
+   return "SYSTEM RAM";
+}
+
+static void rcheevos_memory_register_region(rcheevos_memory_regions_t* regions,
+   int type, uint8_t* data, size_t size, const char* description)
+{
+   if (size == 0)
+      return;
+
+   if (regions->count == MAX_MEMORY_REGIONS)
+   {
+      CHEEVOS_LOG(RCHEEVOS_TAG "Too many memory memory regions to register\n");
+      return;
+   }
+
+   if (!data && regions->count > 0 && !regions->data[regions->count - 1])
+   {
+      /* extend null region */
+      regions->size[regions->count - 1] += size;
+   }
+   else if (data && regions->count > 0 &&
+      data == (regions->data[regions->count - 1] + regions->size[regions->count - 1]))
+   {
+      /* extend non-null region */
+      regions->size[regions->count - 1] += size;
+   }
+   else
+   {
+      /* create new region */
+      regions->data[regions->count] = data;
+      regions->size[regions->count] = size;
+      ++regions->count;
+   }
+
+   regions->total_size += size;
+
+   CHEEVOS_LOG(RCHEEVOS_TAG "Registered 0x%04X bytes of %s at $%06X (%s)\n", (unsigned)size,
+      rcheevos_memory_type(type), (unsigned)(regions->total_size - size), description);
+}
+
+static void rcheevos_memory_init_without_regions(
+      rcheevos_memory_regions_t* regions)
+{
+   /* no regions specified, assume system RAM followed by save RAM */
+   char description[64];
+   retro_ctx_memory_info_t meminfo;
+
+   snprintf(description, sizeof(description), "offset 0x%06x", 0);
+
+   meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
+   core_get_memory(&meminfo);
+   rcheevos_memory_register_region(regions, RC_MEMORY_TYPE_SYSTEM_RAM, (uint8_t*)meminfo.data, meminfo.size, description);
+
+   meminfo.id = RETRO_MEMORY_SAVE_RAM;
+   core_get_memory(&meminfo);
+   rcheevos_memory_register_region(regions, RC_MEMORY_TYPE_SAVE_RAM, (uint8_t*)meminfo.data, meminfo.size, description);
+}
+
+static const rarch_memory_descriptor_t* rcheevos_memory_get_descriptor(const rarch_memory_map_t* mmap, unsigned real_address)
+{
+   const rarch_memory_descriptor_t* desc = mmap->descriptors;
+   const rarch_memory_descriptor_t* end = desc + mmap->num_descriptors;
+
+   if (mmap->num_descriptors == 0)
+      return NULL;
+
+   for (; desc < end; desc++)
+   {
+      if (desc->core.select == 0)
+      {
+         /* if select is 0, attempt to explcitly match the address */
+         if (real_address >= desc->core.start && real_address < desc->core.start + desc->core.len)
+            return desc;
+      }
+      else
+      {
+         /* otherwise, attempt to match the address by matching the select bits */
+         if (((desc->core.start ^ real_address) & desc->core.select) == 0)
+         {
+            /* sanity check - make sure the descriptor is large enough to hold the target address */
+            if (real_address - desc->core.start < desc->core.len)
+               return desc;
+         }
+      }
+   }
+
+   return NULL;
+}
+
+void rcheevos_memory_init_from_memory_map(rcheevos_memory_regions_t* regions, const rarch_memory_map_t* mmap, const rc_memory_regions_t* console_regions)
+{
+   char description[64];
+   unsigned i;
+   uint8_t* region_start;
+   uint8_t* desc_start;
+   size_t desc_size;
+   size_t offset;
+
+   for (i = 0; i < console_regions->num_regions; ++i)
+   {
+      const rc_memory_region_t* console_region = &console_regions->region[i];
+      size_t console_region_size = console_region->end_address - console_region->start_address + 1;
+      unsigned real_address = console_region->real_address;
+
+      while (console_region_size > 0)
+      {
+         const rarch_memory_descriptor_t* desc = rcheevos_memory_get_descriptor(mmap, real_address);
+         if (!desc)
+         {
+            if (console_region->type != RC_MEMORY_TYPE_UNUSED)
+            {
+               CHEEVOS_LOG(RCHEEVOS_TAG "Could not map region starting at $%06X\n",
+                  real_address - console_region->real_address + console_region->start_address);
+            }
+
+            rcheevos_memory_register_region(regions, console_region->type, NULL, console_region_size, "null filler");
+            break;
+         }
+
+         offset = real_address - desc->core.start;
+         snprintf(description, sizeof(description),
+               "descriptor %u, offset 0x%06X",
+               (int)(desc - mmap->descriptors) + 1, (int)offset);
+
+         if (desc->core.ptr)
+         {
+            desc_start   = (uint8_t*)desc->core.ptr + desc->core.offset;
+            region_start = desc_start + offset;
+         }
+         else
+            region_start = NULL;
+
+         desc_size       = desc->core.len - offset;
+
+         if (console_region_size > desc_size)
+         {
+            if (desc_size == 0)
+            {
+               if (console_region->type != RC_MEMORY_TYPE_UNUSED)
+               {
+                  CHEEVOS_LOG(RCHEEVOS_TAG "Could not map region starting at $%06X\n",
+                     real_address - console_region->real_address + console_region->start_address);
+               }
+
+               rcheevos_memory_register_region(regions, console_region->type, NULL, console_region_size, "null filler");
+               console_region_size = 0;
+            }
+            else
+            {
+               rcheevos_memory_register_region(regions, console_region->type, region_start, desc_size, description);
+               console_region_size -= desc_size;
+               real_address += desc_size;
+            }
+         }
+         else
+         {
+            rcheevos_memory_register_region(regions, console_region->type, region_start, console_region_size, description);
+            console_region_size = 0;
+         }
+      }
+   }
+}
+
+static unsigned rcheevos_memory_console_region_to_ram_type(int region_type)
+{
+   switch (region_type)
+   {
+      case RC_MEMORY_TYPE_SAVE_RAM:
+         return RETRO_MEMORY_SAVE_RAM;
+      case RC_MEMORY_TYPE_VIDEO_RAM:
+         return RETRO_MEMORY_VIDEO_RAM;
+      default:
+         break;
+   }
+
+   return RETRO_MEMORY_SYSTEM_RAM;
+}
+
+static void rcheevos_memory_init_from_unmapped_memory(rcheevos_memory_regions_t* regions, const rc_memory_regions_t* console_regions, int console)
+{
+   char description[64];
+   unsigned i;
+
+   for (i = 0; i < console_regions->num_regions; ++i)
+   {
+      size_t offset;
+      unsigned j;
+      retro_ctx_memory_info_t meminfo;
+      const rc_memory_region_t* console_region = &console_regions->region[i];
+      const size_t console_region_size         = 
+         console_region->end_address - console_region->start_address + 1;
+      unsigned base_address                    = 0;
+
+      meminfo.id                               = rcheevos_memory_console_region_to_ram_type(console_region->type);
+
+      for (j = 0; j <= i; ++j)
+      {
+         const rc_memory_region_t* console_region2 = &console_regions->region[j];
+         if (rcheevos_memory_console_region_to_ram_type(
+                  console_region2->type) == meminfo.id)
+         {
+            base_address = console_region2->start_address;
+            break;
+         }
+      }
+      offset = console_region->start_address - base_address;
+
+      core_get_memory(&meminfo);
+
+      if (offset < meminfo.size)
+      {
+         meminfo.size -= offset;
+
+         if (meminfo.data)
+         {
+            snprintf(description, sizeof(description),
+                  "offset 0x%06X", (int)offset);
+            meminfo.data = (uint8_t*)meminfo.data + offset;
+         }
+         else
+            snprintf(description, sizeof(description), "null filler");
+      }
+      else
+      {
+         if (console_region->type != RC_MEMORY_TYPE_UNUSED)
+         {
+            CHEEVOS_LOG(RCHEEVOS_TAG "Could not map region starting at $%06X\n", console_region->start_address);
+         }
+
+         meminfo.data = NULL;
+         meminfo.size = 0;
+      }
+
+      if (console_region_size > meminfo.size)
+      {
+         /* want more than what is available, take what we can and null fill the rest */
+         rcheevos_memory_register_region(regions, console_region->type, (uint8_t*)meminfo.data, meminfo.size, description);
+         rcheevos_memory_register_region(regions, console_region->type, NULL, console_region_size - meminfo.size, "null filler");
+      }
+      else
+      {
+         /* only take as much as we need */
+         rcheevos_memory_register_region(regions, console_region->type, (uint8_t*)meminfo.data, console_region_size, description);
+      }
+   }
+}
+
+void rcheevos_memory_destroy(rcheevos_memory_regions_t* regions)
+{
+   memset(regions, 0, sizeof(*regions));
+}
+
+bool rcheevos_memory_init(rcheevos_memory_regions_t* regions, int console)
+{
+   unsigned i;
+   const rc_memory_regions_t* console_regions = rc_console_memory_regions(console);
+   rcheevos_memory_regions_t new_regions;
+   bool has_valid_region = false;
+
+   if (!regions)
+      return false;
+
+   memset(&new_regions, 0, sizeof(new_regions));
+
+   if (console_regions == NULL || console_regions->num_regions == 0)
+   {
+      rcheevos_memory_init_without_regions(&new_regions);
+   }
+   else
+   {
+      rarch_system_info_t* system = runloop_get_system_info();
+      if (system->mmaps.num_descriptors != 0)
+         rcheevos_memory_init_from_memory_map(&new_regions, &system->mmaps, console_regions);
+      else
+         rcheevos_memory_init_from_unmapped_memory(&new_regions, console_regions, console);
+   }
+
+   /* determine if any valid regions were found */
+   for (i = 0; i < new_regions.count; i++)
+   {
+      if (new_regions.data[i])
+      {
+         has_valid_region = true;
+         break;
+      }
+   }
+
+   memcpy(regions, &new_regions, sizeof(*regions));
+   return has_valid_region;
+}
@@ -12,36 +12,32 @@
 *  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_FIXUP_H
-#define __RARCH_CHEEVOS_FIXUP_H
+#ifndef __RARCH_CHEEVOS_MEMORY_H
+#define __RARCH_CHEEVOS_MEMORY_H

 #include <stdint.h>
+#include <stdlib.h>
 #include <boolean.h>

 #include <retro_common_api.h>

 RETRO_BEGIN_DECLS

-typedef struct
-{
-   unsigned address;
-   const uint8_t* location;
-} rcheevos_fixup_t;
+#define MAX_MEMORY_REGIONS 32

 typedef struct
 {
-   rcheevos_fixup_t* elements;
-   unsigned capacity, count;
-   bool dirty;
-} rcheevos_fixups_t;
+   uint8_t* data[MAX_MEMORY_REGIONS];
+   size_t size[MAX_MEMORY_REGIONS];
+   size_t total_size;
+   unsigned count;
+} rcheevos_memory_regions_t;

-void rcheevos_fixup_init(rcheevos_fixups_t* fixups);
-void rcheevos_fixup_destroy(rcheevos_fixups_t* fixups);
+bool rcheevos_memory_init(rcheevos_memory_regions_t* regions, int console);
+void rcheevos_memory_destroy(rcheevos_memory_regions_t* regions);

-const uint8_t* rcheevos_fixup_find(rcheevos_fixups_t* fixups, unsigned address, int console);
-
-const uint8_t* rcheevos_patch_address(unsigned address, int console);
+uint8_t* rcheevos_memory_find(const rcheevos_memory_regions_t* regions,
+      unsigned address);

 RETRO_END_DECLS

@@ -1,13 +1,14 @@
-#include "parser.h"
+#include "cheevos_parser.h"

-#include "hash.h"
 #include "util.h"

 #include <encodings/utf.h>
-#include <formats/jsonsax.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
@@ -30,114 +31,118 @@
 #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
 *****************************************************************************/

-typedef struct
+static uint32_t rcheevos_djb2(const char* str, size_t length)
 {
-   unsigned    key_hash;
-   int         is_key;
-   const char* value;
-   size_t      length;
-} rcheevos_getvalueud_t;
+   const unsigned char* aux = (const unsigned char*)str;
+   uint32_t            hash = 5381;

-static int rcheevos_getvalue_key(void* userdata,
+   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 0;
+   return true;
 }

-static int rcheevos_getvalue_string(void* userdata,
+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)
+   if (ud->is_key && ud->length > length)
   {
-      ud->value  = string;
-      ud->length = length;
-      ud->is_key = 0;
+      strlcpy(ud->value, string, ud->length);
+      ud->is_key = 2;
+      return false;
   }

-   return 0;
+   return true;
 }

-static int rcheevos_getvalue_boolean(void* userdata, int istrue)
+static bool rcheevos_getvalue_boolean(void* userdata, bool istrue)
 {
   rcheevos_getvalueud_t* ud = (rcheevos_getvalueud_t*)userdata;

   if (ud->is_key)
   {
-      if (istrue)
+      if (istrue && ud->length > 4)
      {
-         ud->value  = "true";
-         ud->length = 4;
+         strlcpy(ud->value, "true", ud->length);
+         ud->is_key = 2;
+         return false;
      }
-      else
+      if (!istrue && ud->length > 5)
      {
-         ud->value  = "false";
-         ud->length = 5;
+         strlcpy(ud->value, "false", ud->length);
+         ud->is_key = 2;
+         return false;
      }
-
-      ud->is_key    = 0;
   }

-   return 0;
+   return true;
 }

-static int rcheevos_getvalue_null(void* userdata)
+static bool rcheevos_getvalue_null(void* userdata)
 {
   rcheevos_getvalueud_t* ud = (rcheevos_getvalueud_t*)userdata;

-   if (ud->is_key )
+   if (ud->is_key && ud->length > 4)
   {
-      ud->value = "null";
-      ud->length = 4;
-      ud->is_key = 0;
+      strlcpy(ud->value, "null", ud->length);
+      ud->is_key = 2;
+      return false;
   }

-   return 0;
+   return true;
 }

 static int rcheevos_get_value(const char* json, unsigned key_hash,
      char* value, size_t length)
 {
-   static const jsonsax_handlers_t handlers =
-   {
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      rcheevos_getvalue_key,
-      NULL,
-      rcheevos_getvalue_string,
-      rcheevos_getvalue_string, /* number */
-      rcheevos_getvalue_boolean,
-      rcheevos_getvalue_null
-   };
-
   rcheevos_getvalueud_t ud;

   ud.key_hash = key_hash;
   ud.is_key   = 0;
-   ud.value    = NULL;
-   ud.length   = 0;
+   ud.value    = value;
+   ud.length   = length;
   *value      = 0;

-   if ((jsonsax_parse(json, &handlers, (void*)&ud) == JSONSAX_OK)
-         && ud.value && ud.length < length)
-   {
-      strlcpy(value, ud.value, ud.length + 1);
-      return 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 -1;
+   return (ud.is_key == 2 ? 0 : -1);
 }

 /*****************************************************************************
@@ -174,16 +179,16 @@ typedef struct
   unsigned lboard_count;
 } rcheevos_countud_t;

-static int rcheevos_count_end_array(void* userdata)
+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 0;
+   return true;
 }

-static int rcheevos_count_key(void* userdata,
+static bool rcheevos_count_key(void* userdata,
      const char* name, size_t length)
 {
   rcheevos_countud_t* ud = (rcheevos_countud_t*)userdata;
@@ -197,10 +202,10 @@ static int rcheevos_count_key(void* userdata,
   else if (ud->field_hash == CHEEVOS_JSON_KEY_ERROR)
      ud->has_error  = 1;

-   return 0;
+   return true;
 }

-static int rcheevos_count_number(void* userdata,
+static bool rcheevos_count_number(void* userdata,
      const char* number, size_t length)
 {
   rcheevos_countud_t* ud = (rcheevos_countud_t*)userdata;
@@ -217,30 +222,14 @@ static int rcheevos_count_number(void* userdata,
   else if (ud->in_lboards && ud->field_hash == CHEEVOS_JSON_KEY_ID)
      ud->lboard_count++;

-   return 0;
+   return true;
 }

-static int rcheevos_count_cheevos(const char* json,
+static bool rcheevos_count_cheevos(const char* json,
      unsigned* core_count, unsigned* unofficial_count,
      unsigned* lboard_count, int* has_error)
 {
-   static const jsonsax_handlers_t handlers =
-   {
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      rcheevos_count_end_array,
-      rcheevos_count_key,
-      NULL,
-      NULL,
-      rcheevos_count_number,
-      NULL,
-      NULL
-   };
-
-   int res;
+   bool res;
   rcheevos_countud_t ud;
   ud.in_cheevos       = 0;
   ud.in_lboards       = 0;
@@ -249,7 +238,14 @@ static int rcheevos_count_cheevos(const char* json,
   ud.unofficial_count = 0;
   ud.lboard_count     = 0;

-   res                 = jsonsax_parse(json, &handlers, (void*)&ud);
+
+   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;
@@ -263,163 +259,92 @@ static int rcheevos_count_cheevos(const char* json,
 Parses the cheevos in the JSON
 *****************************************************************************/

-typedef struct
-{
-   const char* string;
-   size_t      length;
-} rcheevos_field_t;
-
 typedef struct
 {
   int      in_cheevos;
   int      in_lboards;
-   int      is_game_id;
-   int      is_title;
-   int      is_console_id;
-   int      is_richpresence;
+   int      lboard_had_id;
   unsigned core_count;
   unsigned unofficial_count;
   unsigned lboard_count;

-   rcheevos_field_t* field;
-   rcheevos_field_t  id, memaddr, title, desc, points, author;
-   rcheevos_field_t  modified, created, badge, flags, format;
+   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 char* rcheevos_unescape_string(const char* string, size_t length)
-{
-   const char* end = string + length;
-   char* buffer    = (char*)malloc(length + 1);
-   char* buffer_it = buffer;
-
-   if (buffer == NULL)
-      return NULL;
-
-   while (string < end)
-   {
-      if (*string == '\\')
-      {
-         char escaped_char = string[1];
-         switch (escaped_char)
-         {
-            case 'r': /* Ignore carriage return */
-               string += 2;
-               break;
-
-            case 'n': /* Accept newlines */
-               *buffer_it++ = '\n';
-               string += 2;
-               break;
-
-            case 'u': /* Accept UTF-16 unicode characters */
-            {
-#define MAX_SEQUENCES 16
-               uint16_t  utf16[MAX_SEQUENCES];
-               char      utf8[MAX_SEQUENCES * 4];
-               uint8_t   i, j;
-
-               for (i = 1; i < MAX_SEQUENCES - 1; i++)
-                  if (strncmp((string + 6 * i), "\\u", 2))
-                     break;
-
-               /* Get escaped hex values and add them to the string */
-               for (j = 0; j < i; j++)
-               {
-                  char temp[5];
-
-                  string   += 2;
-                  memcpy(temp, string, 4);
-                  temp[4]   = '\0';
-                  utf16[j]  = string_hex_to_unsigned(temp);
-                  string   += 4;
-               }
-               utf16[j] = 0;
-
-               if (utf16_to_char_string(utf16, utf8, sizeof(utf8)))
-               {
-                  size_t utf8_len = strlen(utf8);
-                  memcpy(buffer_it, utf8, utf8_len);
-                  buffer_it += utf8_len;
-               }
-            }
-            break;
-
-            default:
-               *buffer_it++ = escaped_char;
-               string += 2;
-               break;
-         }
-      }
-      else
-         *buffer_it++ = *string++;
-   }
-   *buffer_it = '\0';
-
-   return buffer;
-}
-
-static int rcheevos_new_cheevo(rcheevos_readud_t* ud)
+static bool rcheevos_new_cheevo(rcheevos_readud_t* ud)
 {
   rcheevos_racheevo_t* cheevo = NULL;
-   unsigned flags             = (unsigned)strtol(ud->flags.string, NULL, 10);

-   if (flags == 3)
+   if (ud->cheevo_flags == 3)
      cheevo = ud->patchdata->core + ud->core_count++;
-   else if (flags == 5)
+   else if (ud->cheevo_flags == 5)
      cheevo = ud->patchdata->unofficial + ud->unofficial_count++;
-   else
-      return 0;
+   ud->cheevo_flags = 0;

-   cheevo->title       = rcheevos_unescape_string(ud->title.string, ud->title.length);
-   cheevo->description = rcheevos_unescape_string(ud->desc.string, ud->desc.length);
-   cheevo->badge       = rcheevos_unescape_string(ud->badge.string, ud->badge.length);
-   cheevo->memaddr     = rcheevos_unescape_string(ud->memaddr.string, ud->memaddr.length);
-   cheevo->points      = (unsigned)strtol(ud->points.string, NULL, 10);
-   cheevo->id          = (unsigned)strtol(ud->id.string, NULL, 10);
-
-   if (   !cheevo->title
-       || !cheevo->description
-       || !cheevo->badge
-       || !cheevo->memaddr)
+   if (!cheevo
+       || !ud->cheevo.title
+       || !ud->cheevo.description
+       || !ud->cheevo.badge
+       || !ud->cheevo.memaddr)
   {
-      CHEEVOS_FREE(cheevo->title);
-      CHEEVOS_FREE(cheevo->description);
-      CHEEVOS_FREE(cheevo->badge);
-      CHEEVOS_FREE(cheevo->memaddr);
-      return -1;
+      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);
   }

-   return 0;
+   *cheevo = ud->cheevo;
+   memset(&ud->cheevo, 0, sizeof(ud->cheevo));
+
+   return true;
 }

-static int rcheevos_new_lboard(rcheevos_readud_t* ud)
+static bool rcheevos_new_lboard(rcheevos_readud_t* ud)
 {
-   rcheevos_ralboard_t* lboard = ud->patchdata->lboards + ud->lboard_count++;
+   rcheevos_ralboard_t* lboard = NULL;

-   lboard->title       = rcheevos_unescape_string(ud->title.string, ud->title.length);
-   lboard->description = rcheevos_unescape_string(ud->desc.string, ud->desc.length);
-   lboard->format      = rcheevos_unescape_string(ud->format.string, ud->format.length);
-   lboard->mem         = rcheevos_unescape_string(ud->memaddr.string, ud->memaddr.length);
-   lboard->id          = (unsigned)strtol(ud->id.string, NULL, 10);
+   if (ud->lboard_had_id)
+      lboard = ud->patchdata->lboards + ud->lboard_count++;
+   ud->lboard_had_id = 0;

-   if (   !lboard->title
-       || !lboard->description
-       || !lboard->format
-       || !lboard->mem)
+   if (!lboard
+       || !ud->lboard.title
+       || !ud->lboard.description
+       || !ud->lboard.mem)
   {
-      CHEEVOS_FREE(lboard->title);
-      CHEEVOS_FREE(lboard->description);
-      CHEEVOS_FREE(lboard->format);
-      CHEEVOS_FREE(lboard->mem);
-      return -1;
+      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);
   }

-   return 0;
+   *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 int rcheevos_read_end_object(void* userdata)
+static bool rcheevos_read_end_object(void* userdata)
 {
   rcheevos_readud_t* ud = (rcheevos_readud_t*)userdata;

@@ -429,26 +354,26 @@ static int rcheevos_read_end_object(void* userdata)
   if (ud->in_lboards)
      return rcheevos_new_lboard(ud);

-   return 0;
+   return true;
 }

-static int rcheevos_read_end_array(void* userdata)
+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 0;
+   return true;
 }

-static int rcheevos_read_key(void* userdata,
+static bool rcheevos_read_key(void* userdata,
      const char* name, size_t length)
 {
   rcheevos_readud_t* ud = (rcheevos_readud_t*)userdata;

-   int common           = ud->in_cheevos || ud->in_lboards;
   uint32_t hash        = rcheevos_djb2(name, length);
-   ud->field            = NULL;
+   ud->field_unsigned   = NULL;
+   ud->field_string     = NULL;

   switch (hash)
   {
@@ -459,145 +384,121 @@ static int rcheevos_read_key(void* userdata,
         ud->in_lboards = 1;
         break;
      case CHEEVOS_JSON_KEY_CONSOLE_ID:
-         ud->is_console_id = 1;
+         ud->field_unsigned = &ud->patchdata->console_id;
         break;
      case CHEEVOS_JSON_KEY_RICHPRESENCE:
-         ud->is_richpresence = 1;
+         ud->field_string = (const char**)&ud->patchdata->richpresence_script;
         break;
      case CHEEVOS_JSON_KEY_ID:
-         if (common)
-            ud->field = &ud->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->is_game_id = 1;
+            ud->field_unsigned = &ud->patchdata->game_id;
         break;
      case CHEEVOS_JSON_KEY_MEMADDR:
         if (ud->in_cheevos)
-            ud->field = &ud->memaddr;
+            ud->field_string = &ud->cheevo.memaddr;
         break;
      case CHEEVOS_JSON_KEY_MEM:
         if (ud->in_lboards)
-            ud->field = &ud->memaddr;
+            ud->field_string = &ud->lboard.mem;
         break;
      case CHEEVOS_JSON_KEY_TITLE:
-         if (common)
-            ud->field = &ud->title;
+         if (ud->in_cheevos)
+            ud->field_string = &ud->cheevo.title;
+         else if (ud->in_lboards)
+            ud->field_string = &ud->lboard.title;
         else
-            ud->is_title = 1;
+            ud->field_string = (const char**)&ud->patchdata->title;
         break;
      case CHEEVOS_JSON_KEY_DESCRIPTION:
-         if (common)
-            ud->field = &ud->desc;
+         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 = &ud->points;
+            ud->field_unsigned = &ud->cheevo.points;
         break;
+      /* UNUSED
      case CHEEVOS_JSON_KEY_AUTHOR:
         if (ud->in_cheevos)
-            ud->field = &ud->author;
+            ud->field_string = &ud->cheevo.author;
         break;
      case CHEEVOS_JSON_KEY_MODIFIED:
         if (ud->in_cheevos)
-            ud->field = &ud->modified;
+            ud->field_string = &ud->cheevo.modified;
         break;
      case CHEEVOS_JSON_KEY_CREATED:
         if (ud->in_cheevos)
-            ud->field = &ud->created;
-         break;
+            ud->field_string = &ud->cheevo.created;
+         break; */
      case CHEEVOS_JSON_KEY_BADGENAME:
         if (ud->in_cheevos)
-            ud->field = &ud->badge;
+            ud->field_string = &ud->cheevo.badge;
         break;
      case CHEEVOS_JSON_KEY_FLAGS:
         if (ud->in_cheevos)
-            ud->field = &ud->flags;
+            ud->field_unsigned = &ud->cheevo_flags;
         break;
      case CHEEVOS_JSON_KEY_FORMAT:
         if (ud->in_lboards)
-            ud->field = &ud->format;
+            ud->field_string = &ud->lboard_format;
         break;
      default:
         break;
   }

-   return 0;
+   return true;
 }

-static int rcheevos_read_string(void* userdata,
+static bool rcheevos_read_string(void* userdata,
      const char* string, size_t length)
 {
   rcheevos_readud_t* ud = (rcheevos_readud_t*)userdata;

-   if (ud->field)
+   if (ud->field_string)
   {
-      ud->field->string = string;
-      ud->field->length = length;
-   }
-   else if (ud->is_title)
-   {
-      ud->patchdata->title = rcheevos_unescape_string(string, length);
-      ud->is_title = 0;
-   }
-   else if (ud->is_richpresence)
-   {
-      ud->patchdata->richpresence_script = rcheevos_unescape_string(string, length);
-      ud->is_richpresence = 0;
+      if (*ud->field_string)
+         CHEEVOS_FREE((*ud->field_string));
+      *ud->field_string = strdup(string);
+      ud->field_string = NULL;
   }

-   return 0;
+   return true;
 }

-static int rcheevos_read_number(void* userdata,
+static bool rcheevos_read_number(void* userdata,
      const char* number, size_t length)
 {
   rcheevos_readud_t* ud = (rcheevos_readud_t*)userdata;

-   if (ud->field)
+   if (ud->field_unsigned)
   {
-      ud->field->string = number;
-      ud->field->length = length;
-   }
-   else if (ud->is_game_id)
-   {
-      ud->patchdata->game_id = (unsigned)strtol(number, NULL, 10);
-      ud->is_game_id         = 0;
-   }
-   else if (ud->is_console_id)
-   {
-      ud->patchdata->console_id = (unsigned)strtol(number, NULL, 10);
-      ud->is_console_id         = 0;
+      *ud->field_unsigned = (unsigned)strtol(number, NULL, 10);
+      ud->field_unsigned = NULL;
   }

-   return 0;
+   return true;
 }

 int rcheevos_get_patchdata(const char* json, rcheevos_rapatchdata_t* patchdata)
 {
-   static const jsonsax_handlers_t handlers =
-   {
-      NULL,
-      NULL,
-      NULL,
-      rcheevos_read_end_object,
-      NULL,
-      rcheevos_read_end_array,
-      rcheevos_read_key,
-      NULL,
-      rcheevos_read_string,
-      rcheevos_read_number,
-      NULL,
-      NULL
-   };
-
   rcheevos_readud_t ud;
-   int res;
+   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 != JSONSAX_OK || has_error)
+   if (!res || has_error)
      return -1;

   /* Allocate the achievements. */
@@ -626,19 +527,27 @@ int rcheevos_get_patchdata(const char* json, rcheevos_rapatchdata_t* patchdata)
   patchdata->title = NULL;

   /* Load the achievements. */
-   ud.in_cheevos       = 0;
-   ud.in_lboards       = 0;
-   ud.is_game_id       = 0;
-   ud.is_title         = 0;
-   ud.is_console_id    = 0;
-   ud.is_richpresence  = 0;
-   ud.field            = NULL;
-   ud.core_count       = 0;
-   ud.unofficial_count = 0;
-   ud.lboard_count     = 0;
+   memset(&ud, 0, sizeof(ud));
   ud.patchdata        = patchdata;

-   if (jsonsax_parse(json, &handlers, (void*)&ud) != JSONSAX_OK)
+   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;
@@ -683,7 +592,6 @@ void rcheevos_free_patchdata(rcheevos_rapatchdata_t* patchdata)
   {
      CHEEVOS_FREE(lboard->title);
      CHEEVOS_FREE(lboard->description);
-      CHEEVOS_FREE(lboard->format);
      CHEEVOS_FREE(lboard->mem);
   }

@@ -698,6 +606,8 @@ void rcheevos_free_patchdata(rcheevos_rapatchdata_t* patchdata)
   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;
@@ -714,15 +624,23 @@ typedef struct
   void* userdata;
 } rcheevos_deactivate_t;

-static int rcheevos_deactivate_index(void* userdata, unsigned int index)
+static bool rcheevos_deactivate_elements_begin(void* userdata)
 {
   rcheevos_deactivate_t* ud = (rcheevos_deactivate_t*)userdata;

   ud->is_element           = 1;
-   return 0;
+   return true;
 }

-static int rcheevos_deactivate_number(void* userdata,
+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;
@@ -730,40 +648,30 @@ static int rcheevos_deactivate_number(void* userdata,

   if (ud->is_element)
   {
-      ud->is_element = 0;
      id             = (unsigned)strtol(number, NULL, 10);

      ud->unlock_cb(id, ud->userdata);
   }

-   return 0;
+   return true;
 }

 void rcheevos_deactivate_unlocks(const char* json, rcheevos_unlock_cb_t unlock_cb, void* userdata)
 {
-   static const jsonsax_handlers_t handlers =
-   {
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      rcheevos_deactivate_index,
-      NULL,
-      rcheevos_deactivate_number,
-      NULL,
-      NULL
-   };
-
   rcheevos_deactivate_t ud;

   ud.is_element = 0;
   ud.unlock_cb  = unlock_cb;
   ud.userdata   = userdata;

-   jsonsax_parse(json, &handlers, (void*)&ud);
+   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);
 }

 /*****************************************************************************
@@ -24,33 +24,36 @@

 RETRO_BEGIN_DECLS

-typedef struct {
+typedef struct
+{
  const char* title;
  const char* description;
  const char* badge;
  const char* memaddr;
  unsigned points;
  unsigned id;
+  unsigned active;
 } rcheevos_racheevo_t;

-typedef struct {
+typedef struct
+{
  const char* title;
  const char* description;
-  const char* format;
  const char* mem;
  unsigned id;
+  unsigned format;
 } rcheevos_ralboard_t;

-typedef struct {
-   unsigned game_id;
-   unsigned console_id;
+typedef struct
+{
   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;
@@ -1,314 +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/>.
- */
-
-#include "fixup.h"
-#include "cheevos.h"
-#include "util.h"
-
-#include "../retroarch.h"
-#include "../core.h"
-
-#include "../deps/rcheevos/include/rcheevos.h"
-#include "../deps/rcheevos/include/rconsoles.h"
-
-static int rcheevos_cmpaddr(const void* e1, const void* e2)
-{
-   const rcheevos_fixup_t* f1 = (const rcheevos_fixup_t*)e1;
-   const rcheevos_fixup_t* f2 = (const rcheevos_fixup_t*)e2;
-
-   if (f1->address < f2->address)
-      return -1;
-   else if (f1->address > f2->address)
-      return 1;
-   return 0;
-}
-
-static size_t rcheevos_var_reduce(size_t addr, size_t mask)
-{
-   while (mask)
-   {
-      size_t tmp = (mask - 1) & ~mask;
-      addr       = (addr & tmp) | ((addr >> 1) & ~tmp);
-      mask       = (mask & (mask - 1)) >> 1;
-   }
-
-   return addr;
-}
-
-static size_t rcheevos_var_highest_bit(size_t n)
-{
-   n |= n >>  1;
-   n |= n >>  2;
-   n |= n >>  4;
-   n |= n >>  8;
-   n |= n >> 16;
-
-   return n ^ (n >> 1);
-}
-
-void rcheevos_fixup_init(rcheevos_fixups_t* fixups)
-{
-   fixups->elements = NULL;
-   fixups->capacity = fixups->count = 0;
-   fixups->dirty    = false;
-}
-
-void rcheevos_fixup_destroy(rcheevos_fixups_t* fixups)
-{
-   CHEEVOS_FREE(fixups->elements);
-   rcheevos_fixup_init(fixups);
-}
-
-const uint8_t* rcheevos_fixup_find(
-      rcheevos_fixups_t* fixups, unsigned address, int console)
-{
-   rcheevos_fixup_t key;
-   rcheevos_fixup_t* found;
-   const uint8_t* location;
-
-   if (fixups->dirty)
-   {
-      qsort(fixups->elements, fixups->count,
-            sizeof(rcheevos_fixup_t), rcheevos_cmpaddr);
-      fixups->dirty = false;
-   }
-
-   key.address = address;
-   found       = (rcheevos_fixup_t*)bsearch(&key,
-         fixups->elements, fixups->count,
-         sizeof(rcheevos_fixup_t), rcheevos_cmpaddr);
-
-   if (found)
-      return found->location;
-
-   if (fixups->count == fixups->capacity)
-   {
-      unsigned new_capacity = fixups->capacity == 0 ? 16 : fixups->capacity * 2;
-      rcheevos_fixup_t* new_elements = (rcheevos_fixup_t*)
-         realloc(fixups->elements, new_capacity * sizeof(rcheevos_fixup_t));
-
-      if (!new_elements)
-         return NULL;
-
-      fixups->elements = new_elements;
-      fixups->capacity = new_capacity;
-   }
-
-   fixups->elements[fixups->count].address    = address;
-   fixups->elements[fixups->count++].location = location =
-      rcheevos_patch_address(address, console);
-   fixups->dirty                              = true;
-
-   return location;
-}
-
-const uint8_t* rcheevos_patch_address(unsigned address, int console)
-{
-   rarch_system_info_t* system = runloop_get_system_info();
-   const void* pointer         = NULL;
-   unsigned original_address   = address;
-
-   switch (console)
-   {
-      case RC_CONSOLE_NINTENDO:
-         if (address >= 0x0800 && address < 0x2000)
-         {
-            /* Address in the mirrorred RAM, 
-             * adjust to real RAM. */
-            CHEEVOS_LOG(RCHEEVOS_TAG "NES memory address in mirrorred RAM %X, adjusted to %X\n", address, address & 0x07ff);
-            address &= 0x07ff;
-         }
-         break;
-      case RC_CONSOLE_GAMEBOY_COLOR:
-         if (address >= 0xe000 && address <= 0xfdff)
-         {
-            /* Address in the echo RAM, adjust to real RAM. */
-            CHEEVOS_LOG(RCHEEVOS_TAG "GBC memory address in echo RAM %X, adjusted to %X\n", address, address - 0x2000);
-            address -= 0x2000;
-         }
-         break;
-      default:
-         break;
-   }
-
-   if (system->mmaps.num_descriptors != 0)
-   {
-      /* We have memory descriptors, use it. */
-      const rarch_memory_descriptor_t* desc = NULL;
-      const rarch_memory_descriptor_t* end  = NULL;
-
-      /* Patch the address to correctly map it to the mmaps. */
-      switch (console)
-      {
-         case RC_CONSOLE_GAMEBOY_ADVANCE:
-            if (address < 0x8000)
-            {
-               /* Internal RAM. */
-               CHEEVOS_LOG(RCHEEVOS_TAG "GBA memory address %X adjusted to %X\n", address, address + 0x3000000);
-               address += 0x3000000;
-            }
-            else
-            {
-               /* Work RAM. */
-               CHEEVOS_LOG(RCHEEVOS_TAG "GBA memory address %X adjusted to %X\n", address, address + 0x2000000 - 0x8000);
-               address += 0x2000000 - 0x8000;
-            }
-            break;
-         case RC_CONSOLE_PC_ENGINE:
-            if (address < 0x002000)
-            {
-               /* RAM. */
-               CHEEVOS_LOG(RCHEEVOS_TAG "PCE memory address %X adjusted to %X\n", address, address + 0x1f0000);
-               address += 0x1f0000;
-            }
-            else if (address < 0x012000)
-            {
-               /* CD-ROM RAM. */
-               CHEEVOS_LOG(RCHEEVOS_TAG "PCE memory address %X adjusted to %X\n", address, address + 0x100000 - 0x002000);
-               address += 0x100000 - 0x002000;
-            }
-            else if (address < 0x042000)
-            {
-               /* Super System Card RAM. */
-               CHEEVOS_LOG(RCHEEVOS_TAG "PCE memory address %X adjusted to %X\n", address, address + 0x0d0000 - 0x012000);
-               address += 0x0d0000 - 0x012000;
-            }
-            else
-            {
-               /* CD-ROM battery backed RAM. */
-               CHEEVOS_LOG(RCHEEVOS_TAG "PCE memory address %X adjusted to %X\n", address, address + 0x1ee000 - 0x042000);
-               address += 0x1ee000 - 0x042000;
-            }
-            break;
-         case RC_CONSOLE_SUPER_NINTENDO:
-            if (address < 0x020000)
-            {
-               /* Work RAM. */
-               CHEEVOS_LOG(RCHEEVOS_TAG "SNES memory address %X adjusted to %X\n", address, address + 0x7e0000);
-               address += 0x7e0000;
-            }
-            else
-            {
-               /* Save RAM. */
-               CHEEVOS_LOG(RCHEEVOS_TAG "SNES memory address %X adjusted to %X\n", address, address + 0x006000 - 0x020000);
-               address += 0x006000 - 0x020000;
-            }
-            break;
-         case RC_CONSOLE_SEGA_CD:
-            if (address < 0x010000)
-            {
-               /* Work RAM. */
-               address += 0xFF0000;
-               CHEEVOS_LOG(RCHEEVOS_TAG "Sega CD memory address %X adjusted to %X\n", original_address, address);
-            }
-            else
-            {
-               /* CD-ROM peripheral RAM - exposed at virtual address to avoid banking */
-               address += 0x80020000 - 0x010000;
-               CHEEVOS_LOG(RCHEEVOS_TAG "Sega CD memory address %X adjusted to %X\n", original_address, address);
-            }
-            break;
-         default:
-            break;
-      }
-
-      desc = system->mmaps.descriptors;
-      end  = desc + system->mmaps.num_descriptors;
-
-      for (; desc < end; desc++)
-      {
-         if (((desc->core.start ^ address) & desc->core.select) == 0)
-         {
-            pointer = desc->core.ptr;
-            address -= desc->core.start;
-
-            if (desc->disconnect_mask)
-               address = (unsigned)rcheevos_var_reduce(
-                     address & desc->disconnect_mask, desc->core.disconnect);
-
-            if (address >= desc->core.len)
-               address -= rcheevos_var_highest_bit(address);
-
-            address += desc->core.offset;
-
-            CHEEVOS_LOG(RCHEEVOS_TAG "address %X set to descriptor %d at offset %X\n", original_address,
-                  (int)((desc - system->mmaps.descriptors) + 1), address);
-            break;
-         }
-      }
-   }
-   else if (console == RC_CONSOLE_GAMEBOY_ADVANCE)
-   {
-      /* The RetroAchievements implementation of memory access 
-       * for GBA puts the save RAM first,
-       * so the default looping behavior below is backwards. 
-       *
-       * If the core doesn't expose a
-       * memory map, say it isn't supported.
-       */
-       pointer = NULL;
-   }
-   else
-   {
-      unsigned i;
-
-      for (i = 0; i < 4; i++)
-      {
-         retro_ctx_memory_info_t meminfo;
-
-         switch (i)
-         {
-            case 0:
-               meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
-               break;
-            case 1:
-               meminfo.id = RETRO_MEMORY_SAVE_RAM;
-               break;
-            case 2:
-               meminfo.id = RETRO_MEMORY_VIDEO_RAM;
-               break;
-            case 3:
-               meminfo.id = RETRO_MEMORY_RTC;
-               break;
-         }
-
-         core_get_memory(&meminfo);
-
-         if (address < meminfo.size)
-         {
-            pointer = meminfo.data;
-            break;
-         }
-
-         /**
-          * HACK Subtract the correct amount of bytes to 
-          * reach the save RAM as its size is not always 
-          * set correctly in the core.
-          */
-         if (i == 0 && console == RC_CONSOLE_NINTENDO)
-            address -= 0x6000;
-         else
-            address -= meminfo.size;
-      }
-   }
-
-   if (!pointer)
-   {
-      CHEEVOS_LOG(RCHEEVOS_TAG "address %X not supported\n", original_address);
-      return NULL;
-   }
-
-   return (const uint8_t*)pointer + address;
-}
@@ -1,12 +0,0 @@
-#include "hash.h"
-
-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;
-}
@@ -1,30 +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_HASH_H
-#define __RARCH_CHEEVOS_HASH_H
-
-#include <stdint.h>
-#include <stddef.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-uint32_t rcheevos_djb2(const char* str, size_t length);
-
-RETRO_END_DECLS
-
-#endif
@@ -0,0 +1,535 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2021      - David G.F.
+ *
+ *  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/>.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#ifdef HAVE_NETWORKING
+#include <net/net_compat.h>
+#include <net/net_socket.h>
+#endif
+#include <streams/stdin_stream.h>
+#include <string/stdstring.h>
+
+#include "verbosity.h"
+#include "command.h"
+
+#define CMD_BUF_SIZE           4096
+
+#if defined(HAVE_COMMAND)
+
+/* Generic command parse utilities */
+
+static bool command_get_arg(const char *tok,
+      const char **arg, unsigned *index)
+{
+   unsigned i;
+
+   for (i = 0; i < ARRAY_SIZE(map); i++)
+   {
+      if (string_is_equal(tok, map[i].str))
+      {
+         if (arg)
+            *arg = NULL;
+
+         if (index)
+            *index = i;
+
+         return true;
+      }
+   }
+
+   for (i = 0; i < ARRAY_SIZE(action_map); i++)
+   {
+      const char *str = strstr(tok, action_map[i].str);
+      if (str == tok)
+      {
+         const char *argument = str + strlen(action_map[i].str);
+         if (*argument != ' ' && *argument != '\0')
+            return false;
+
+         if (arg)
+            *arg = argument + 1;
+
+         if (index)
+            *index = i;
+
+         return true;
+      }
+   }
+
+   return false;
+}
+
+static void command_parse_sub_msg(command_t *handle, const char *tok)
+{
+   const char *arg = NULL;
+   unsigned index  = 0;
+
+   if (command_get_arg(tok, &arg, &index))
+   {
+      if (arg)
+      {
+         if (!action_map[index].action(handle, arg))
+            RARCH_ERR("Command \"%s\" failed.\n", arg);
+      }
+      else
+         handle->state[map[index].id] = true;
+   }
+   else
+      RARCH_WARN("%s \"%s\" %s.\n",
+            msg_hash_to_str(MSG_UNRECOGNIZED_COMMAND),
+            tok,
+            msg_hash_to_str(MSG_RECEIVED));
+}
+
+static void command_parse_msg(
+      command_t *handle, char *buf)
+{
+   char     *save  = NULL;
+   const char *tok = strtok_r(buf, "\n", &save);
+
+   while (tok)
+   {
+      command_parse_sub_msg(handle, tok);
+      tok = strtok_r(NULL, "\n", &save);
+   }
+}
+
+#if defined(HAVE_NETWORK_CMD)
+typedef struct
+{
+   /* Network socket FD */
+   int net_fd;
+   /* Source address for the command received */
+   struct sockaddr_storage cmd_source;
+   /* Size of the previous structure in use */
+   socklen_t cmd_source_len;
+} command_network_t;
+
+static void network_command_reply(
+      command_t *cmd,
+      const char * data, size_t len)
+{
+   command_network_t *netcmd = (command_network_t*)cmd->userptr;
+   /* Respond (fire and forget since it's UDP) */
+   sendto(netcmd->net_fd, data, len, 0,
+      (struct sockaddr*)&netcmd->cmd_source, netcmd->cmd_source_len);
+}
+
+static void network_command_free(command_t *handle)
+{
+   command_network_t *netcmd = (command_network_t*)handle->userptr;
+
+   if (netcmd->net_fd >= 0)
+      socket_close(netcmd->net_fd);
+
+   free(netcmd);
+   free(handle);
+}
+
+static void command_network_poll(command_t *handle)
+{
+   fd_set fds;
+   struct timeval       tmp_tv = {0};
+   command_network_t   *netcmd = (command_network_t*)handle->userptr;
+
+   if (netcmd->net_fd < 0)
+      return;
+
+   FD_ZERO(&fds);
+   FD_SET(netcmd->net_fd, &fds);
+
+   if (socket_select(netcmd->net_fd + 1, &fds, NULL, NULL, &tmp_tv) <= 0)
+      return;
+
+   if (!FD_ISSET(netcmd->net_fd, &fds))
+      return;
+
+   for (;;)
+   {
+      ssize_t ret;
+      char buf[1024];
+
+      buf[0] = '\0';
+      netcmd->cmd_source_len = sizeof(struct sockaddr_storage);
+      ret  = recvfrom(netcmd->net_fd, buf, sizeof(buf) - 1, 0,
+            (struct sockaddr*)&netcmd->cmd_source,
+            &netcmd->cmd_source_len);
+
+      if (ret <= 0)
+         break;
+
+      buf[ret] = '\0';
+
+      command_parse_msg(handle, buf);
+   }
+}
+
+command_t* command_network_new(uint16_t port)
+{
+   struct addrinfo     *res  = NULL;
+   command_t            *cmd = (command_t*)calloc(1, sizeof(command_t));
+   command_network_t *netcmd = (command_network_t*)calloc(
+                                   1, sizeof(command_network_t));
+   int fd                    = socket_init(
+         (void**)&res, port, NULL, SOCKET_TYPE_DATAGRAM);
+
+   RARCH_LOG("%s %hu.\n",
+         msg_hash_to_str(MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT),
+         (unsigned short)port);
+
+   if (fd < 0)
+      goto error;
+
+   netcmd->net_fd = fd;
+   cmd->userptr   = netcmd;
+   cmd->poll      = command_network_poll;
+   cmd->replier   = network_command_reply;
+   cmd->destroy   = network_command_free;
+
+   if (!socket_nonblock(netcmd->net_fd))
+      goto error;
+
+   if (!socket_bind(netcmd->net_fd, (void*)res))
+   {
+      RARCH_ERR("%s.\n",
+            msg_hash_to_str(MSG_FAILED_TO_BIND_SOCKET));
+      goto error;
+   }
+
+   freeaddrinfo_retro(res);
+   return cmd;
+
+error:
+   if (res)
+      freeaddrinfo_retro(res);
+   free(netcmd);
+   free(cmd);
+   return NULL;
+}
+#endif
+
+
+#if defined(HAVE_STDIN_CMD)
+typedef struct
+{
+   /* Buffer and pointer for stdin reads */
+   size_t stdin_buf_ptr;
+   char stdin_buf[CMD_BUF_SIZE];
+} command_stdin_t;
+
+static void stdin_command_reply(
+      command_t *cmd,
+      const char * data, size_t len)
+{
+   /* Just write to stdout! */
+   fwrite(data, 1, len, stdout);
+}
+
+static void stdin_command_free(command_t *handle)
+{
+   free(handle->userptr);
+   free(handle);
+}
+
+static void command_stdin_poll(command_t *handle)
+{
+   ptrdiff_t msg_len;
+   char        *last_newline = NULL;
+   command_stdin_t *stdincmd = (command_stdin_t*)handle->userptr;
+   ssize_t               ret = read_stdin(
+         stdincmd->stdin_buf + stdincmd->stdin_buf_ptr,
+         CMD_BUF_SIZE - stdincmd->stdin_buf_ptr - 1);
+
+   if (ret == 0)
+      return;
+
+   stdincmd->stdin_buf_ptr                      += ret;
+   stdincmd->stdin_buf[stdincmd->stdin_buf_ptr]  = '\0';
+
+   last_newline = strrchr(stdincmd->stdin_buf, '\n');
+
+   if (!last_newline)
+   {
+      /* We're receiving bogus data in pipe
+       * (no terminating newline), flush out the buffer. */
+      if (stdincmd->stdin_buf_ptr + 1 >= CMD_BUF_SIZE)
+      {
+         stdincmd->stdin_buf_ptr = 0;
+         stdincmd->stdin_buf[0]  = '\0';
+      }
+
+      return;
+   }
+
+   *last_newline++ = '\0';
+   msg_len         = last_newline - stdincmd->stdin_buf;
+
+   command_parse_msg(handle, stdincmd->stdin_buf);
+
+   memmove(stdincmd->stdin_buf, last_newline,
+         stdincmd->stdin_buf_ptr - msg_len);
+   stdincmd->stdin_buf_ptr -= msg_len;
+}
+
+command_t* command_stdin_new(void)
+{
+   command_t *cmd;
+   command_stdin_t *stdincmd;
+
+#ifndef _WIN32
+#ifdef HAVE_NETWORKING
+   if (!socket_nonblock(STDIN_FILENO))
+      return NULL;
+#endif
+#endif
+
+   cmd          = (command_t*)calloc(1, sizeof(command_t));
+   stdincmd     = (command_stdin_t*)calloc(1, sizeof(command_stdin_t));
+   cmd->userptr = stdincmd;
+   cmd->poll    = command_stdin_poll;
+   cmd->replier = stdin_command_reply;
+   cmd->destroy = stdin_command_free;
+
+   return cmd;
+}
+#endif
+
+#if defined(HAVE_LAKKA)
+#include <sys/un.h>
+#define MAX_USER_CONNECTIONS  4
+typedef struct
+{
+   /* File descriptor for the domain socket */
+   int sfd;
+   /* Client sockets */
+   int userfd[MAX_USER_CONNECTIONS];
+   /* Last received user socket */
+   int last_fd;
+} command_uds_t;
+
+static void uds_command_reply(
+      command_t *cmd,
+      const char * data, size_t len)
+{
+   command_uds_t *subcmd = (command_uds_t*)cmd->userptr;
+   write(subcmd->last_fd, data, len);
+}
+
+static void uds_command_free(command_t *handle)
+{
+   int i;
+   command_uds_t *udscmd = (command_uds_t*)handle->userptr;
+
+   for (i = 0; i < MAX_USER_CONNECTIONS; i++)
+      if (udscmd->userfd[i] >= 0)
+         socket_close(udscmd->userfd[i]);
+   socket_close(udscmd->sfd);
+
+   free(handle->userptr);
+   free(handle);
+}
+
+static void command_uds_poll(command_t *handle)
+{
+   int i;
+   fd_set fds;
+   command_uds_t *udscmd       = (command_uds_t*)handle->userptr;
+   int maxfd                   = udscmd->sfd;
+   struct timeval       tmp_tv = {0};
+
+   if (udscmd->sfd < 0)
+      return;
+
+   FD_ZERO(&fds);
+   FD_SET(udscmd->sfd, &fds);
+
+   for (i = 0; i < MAX_USER_CONNECTIONS; i++)
+   {
+      if (udscmd->userfd[i] >= 0)
+      {
+         maxfd = MAX(udscmd->userfd[i], maxfd);
+         FD_SET(udscmd->userfd[i], &fds);
+      }
+   }
+
+   if (socket_select(maxfd + 1, &fds, NULL, NULL, &tmp_tv) <= 0)
+      return;
+
+   /* Read data from clients and process commands */
+   for (i = 0; i < MAX_USER_CONNECTIONS; i++)
+   {
+      if (udscmd->userfd[i] >= 0 && FD_ISSET(udscmd->userfd[i], &fds))
+      {
+         while (1)
+         {
+            char buf[2048];
+            ssize_t ret = recv(udscmd->userfd[i], buf, sizeof(buf) - 1, 0);
+
+            if (ret < 0)
+               break;   /* no more data */
+            if (!ret)
+            {
+               socket_close(udscmd->userfd[i]);
+               udscmd->userfd[i] = -1;
+               break;
+            }
+
+            buf[ret] = 0;
+            udscmd->last_fd = udscmd->userfd[i];
+            command_parse_msg(handle, buf);
+         }
+      }
+   }
+
+   if (FD_ISSET(udscmd->sfd, &fds))
+   {
+      /* Accepts new connections from clients */
+      int cfd = accept(udscmd->sfd, NULL, NULL);
+      if (cfd >= 0) {
+         if (!socket_nonblock(cfd))
+            socket_close(cfd);
+         else {
+            for (i = 0; i < MAX_USER_CONNECTIONS; i++)
+               if (udscmd->userfd[i] < 0)
+               {
+                  udscmd->userfd[i] = cfd;
+                  break;
+               }
+         }
+      }
+   }
+}
+
+command_t* command_uds_new(void)
+{
+   int i;
+   command_t *cmd;
+   command_uds_t *subcmd;
+   struct sockaddr_un addr;
+   const char   *sp = "retroarch/cmd";
+   socklen_t addrsz = offsetof(struct sockaddr_un, sun_path) + strlen(sp) + 1;
+   int           fd = socket(AF_UNIX, SOCK_STREAM, 0);
+   if (fd < 0)
+      return NULL;
+
+   /* use an abstract socket for simplicity */
+   memset(&addr, 0, sizeof(addr));
+   addr.sun_family = AF_UNIX;
+   strcpy(&addr.sun_path[1], sp);
+
+   if (bind(fd, (struct sockaddr*)&addr, addrsz) < 0 ||
+       listen(fd, MAX_USER_CONNECTIONS) < 0)
+   {
+      socket_close(fd);
+      return NULL;
+   }
+
+   if (!socket_nonblock(fd))
+   {
+      socket_close(fd);
+      return NULL;
+   }
+
+   cmd             = (command_t*)calloc(1, sizeof(command_t));
+   subcmd          = (command_uds_t*)calloc(1, sizeof(command_uds_t));
+   subcmd->sfd     = fd;
+   subcmd->last_fd = -1;
+   for (i = 0; i < MAX_USER_CONNECTIONS; i++)
+      subcmd->userfd[i] = -1;
+
+   cmd->userptr = subcmd;
+   cmd->poll    = command_uds_poll;
+   cmd->replier = uds_command_reply;
+   cmd->destroy = uds_command_free;
+
+   return cmd;
+}
+#endif
+
+
+/* Routines used to invoke retroarch command ... */
+
+#ifdef HAVE_NETWORK_CMD
+static bool command_verify(const char *cmd)
+{
+   unsigned i;
+
+   if (command_get_arg(cmd, NULL, NULL))
+      return true;
+
+   RARCH_ERR("Command \"%s\" is not recognized by the program.\n", cmd);
+   RARCH_ERR("\tValid commands:\n");
+   for (i = 0; i < ARRAY_SIZE(map); i++)
+      RARCH_ERR("\t\t%s\n", map[i].str);
+
+   for (i = 0; i < ARRAY_SIZE(action_map); i++)
+      RARCH_ERR("\t\t%s %s\n", action_map[i].str, action_map[i].arg_desc);
+
+   return false;
+}
+
+bool command_network_send(const char *cmd_)
+{
+   char *command        = NULL;
+   char *save           = NULL;
+   const char *cmd      = NULL;
+
+   if (!network_init())
+      return false;
+
+   if (!(command = strdup(cmd_)))
+      return false;
+
+   cmd                  = strtok_r(command, ";", &save);
+   if (cmd)
+   {
+      uint16_t port     = DEFAULT_NETWORK_CMD_PORT;
+      const char *port_ = NULL;
+      const char *host  = strtok_r(NULL, ";", &save);
+      if (host)
+         port_          = strtok_r(NULL, ";", &save);
+      else
+      {
+#ifdef _WIN32
+         host = "127.0.0.1";
+#else
+         host = "localhost";
+#endif
+      }
+
+      if (port_)
+         port = strtoul(port_, NULL, 0);
+
+      RARCH_LOG("%s: \"%s\" to %s:%hu\n",
+            msg_hash_to_str(MSG_SENDING_COMMAND),
+            cmd, host, (unsigned short)port);
+
+      if (command_verify(cmd) && udp_send_packet(host, port, cmd))
+      {
+         free(command);
+         return true;
+      }
+   }
+
+   free(command);
+   return false;
+}
+#endif
+
+#endif
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2016 - Daniel De Matteis
- *  Copyright (C) 2016-2019 - Brad Parker
+ *  Copyright (C) 2021      - David G.F.
 *
 *  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-
@@ -23,19 +23,45 @@
 #include <boolean.h>
 #include <retro_common_api.h>

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

 RETRO_BEGIN_DECLS

-typedef struct command command_t;
+#define MAX_CMD_DRIVERS              3
+#define DEFAULT_NETWORK_CMD_PORT 55355

-typedef struct command_handle
+struct cmd_map
 {
-   command_t *handle;
+   const char *str;
   unsigned id;
-} command_handle_t;
+};
+
+struct command_handler;
+
+typedef void (*command_poller_t)(struct command_handler *cmd);
+typedef void (*command_replier_t)(struct command_handler *cmd, const char * data, size_t len);
+typedef void (*command_destructor_t)(struct command_handler *cmd);
+
+struct command_handler
+{
+   /* Interface to poll the driver */
+   command_poller_t poll;
+   /* Interface to reply */
+   command_replier_t replier;
+   /* Interface to delete the underlying command */
+   command_destructor_t destroy;
+   /* Underlying command storage */
+   void *userptr;
+   /* State received */
+   bool state[RARCH_BIND_LIST_END];
+};
+
+typedef struct command_handler command_t;

 enum event_command
 {
@@ -48,6 +74,7 @@ enum event_command
   CMD_EVENT_LOAD_CORE,
   CMD_EVENT_LOAD_CORE_PERSIST,
   CMD_EVENT_UNLOAD_CORE,
+   CMD_EVENT_CLOSE_CONTENT,
   CMD_EVENT_LOAD_STATE,
   /* Swaps the current state with what's on the undo load buffer */
   CMD_EVENT_UNDO_LOAD_STATE,
@@ -173,7 +200,6 @@ enum event_command
   CMD_EVENT_AUDIO_REINIT,
   /* Resizes windowed scale. Will reinitialize video driver. */
   CMD_EVENT_RESIZE_WINDOWED_SCALE,
-   CMD_EVENT_LOG_FILE_DEINIT,
   /* Toggles disk eject. */
   CMD_EVENT_DISK_EJECT_TOGGLE,
   /* Cycle to next disk. */
@@ -203,6 +229,7 @@ enum event_command
   CMD_EVENT_OSK_TOGGLE,
   CMD_EVENT_RECORDING_TOGGLE,
   CMD_EVENT_STREAMING_TOGGLE,
+   CMD_EVENT_RUNAHEAD_TOGGLE,
   CMD_EVENT_AI_SERVICE_TOGGLE,
   CMD_EVENT_BSV_RECORDING_TOGGLE,
   CMD_EVENT_SHADER_NEXT,
@@ -211,9 +238,25 @@ enum event_command
   CMD_EVENT_CHEAT_INDEX_MINUS,
   CMD_EVENT_CHEAT_TOGGLE,
   CMD_EVENT_AI_SERVICE_CALL,
-   CMD_EVENT_SAVE_FILES
+   CMD_EVENT_SAVE_FILES,
+   CMD_EVENT_CONTROLLER_INIT
 };

+typedef struct command_handle
+{
+   command_t *handle;
+   unsigned id;
+} command_handle_t;
+
+enum cmd_source_t
+{
+   CMD_NONE = 0,
+   CMD_STDIN,
+   CMD_NETWORK
+};
+
+struct rarch_state;
+
 /**
 * command_event:
 * @cmd                  : Command index.
@@ -224,6 +267,107 @@ enum event_command
 **/
 bool command_event(enum event_command action, void *data);

+/* Constructors for the supported drivers */
+command_t* command_network_new(uint16_t port);
+command_t* command_stdin_new(void);
+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 */
+#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
+bool command_set_shader(command_t *cmd, const char *arg);
+#endif
+#if defined(HAVE_COMMAND)
+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);
+bool command_show_osd_msg(command_t *cmd, const char* arg);
+#ifdef HAVE_CHEEVOS
+bool command_read_ram(command_t *cmd, const char *arg);
+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;
+};
+
+static const struct cmd_action_map action_map[] = {
+#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
+   { "SET_SHADER",       command_set_shader,       "<shader path>" },
+#endif
+   { "VERSION",          command_version,          "No argument"},
+   { "GET_STATUS",       command_get_status,       "No argument" },
+   { "GET_CONFIG_PARAM", command_get_config_param, "<param name>" },
+   { "SHOW_MSG",         command_show_osd_msg,     "No argument" },
+#if defined(HAVE_CHEEVOS)
+   /* These functions use achievement addresses and only work if a game with achievements is
+    * loaded. READ_CORE_MEMORY and WRITE_CORE_MEMORY are preferred and use system addresses. */
+   { "READ_CORE_RAM",    command_read_ram,         "<address> <number of bytes>" },
+   { "WRITE_CORE_RAM",   command_write_ram,        "<address> <byte1> <byte2> ..." },
+#endif
+   { "READ_CORE_MEMORY", command_read_memory,      "<address> <number of bytes>" },
+   { "WRITE_CORE_MEMORY",command_write_memory,     "<address> <byte1> <byte2> ..." },
+};
+
+static const struct cmd_map map[] = {
+   { "FAST_FORWARD",           RARCH_FAST_FORWARD_KEY },
+   { "FAST_FORWARD_HOLD",      RARCH_FAST_FORWARD_HOLD_KEY },
+   { "SLOWMOTION",             RARCH_SLOWMOTION_KEY },
+   { "SLOWMOTION_HOLD",        RARCH_SLOWMOTION_HOLD_KEY },
+   { "LOAD_STATE",             RARCH_LOAD_STATE_KEY },
+   { "SAVE_STATE",             RARCH_SAVE_STATE_KEY },
+   { "FULLSCREEN_TOGGLE",      RARCH_FULLSCREEN_TOGGLE_KEY },
+   { "CLOSE_CONTENT",          RARCH_CLOSE_CONTENT_KEY },
+   { "QUIT",                   RARCH_QUIT_KEY },
+   { "STATE_SLOT_PLUS",        RARCH_STATE_SLOT_PLUS },
+   { "STATE_SLOT_MINUS",       RARCH_STATE_SLOT_MINUS },
+   { "REWIND",                 RARCH_REWIND },
+   { "BSV_RECORD_TOGGLE",      RARCH_BSV_RECORD_TOGGLE },
+   { "PAUSE_TOGGLE",           RARCH_PAUSE_TOGGLE },
+   { "FRAMEADVANCE",           RARCH_FRAMEADVANCE },
+   { "RESET",                  RARCH_RESET },
+   { "SHADER_NEXT",            RARCH_SHADER_NEXT },
+   { "SHADER_PREV",            RARCH_SHADER_PREV },
+   { "CHEAT_INDEX_PLUS",       RARCH_CHEAT_INDEX_PLUS },
+   { "CHEAT_INDEX_MINUS",      RARCH_CHEAT_INDEX_MINUS },
+   { "CHEAT_TOGGLE",           RARCH_CHEAT_TOGGLE },
+   { "SCREENSHOT",             RARCH_SCREENSHOT },
+   { "MUTE",                   RARCH_MUTE },
+   { "OSK",                    RARCH_OSK },
+   { "FPS_TOGGLE",             RARCH_FPS_TOGGLE },
+   { "SEND_DEBUG_INFO",        RARCH_SEND_DEBUG_INFO },
+   { "NETPLAY_HOST_TOGGLE",    RARCH_NETPLAY_HOST_TOGGLE },
+   { "NETPLAY_GAME_WATCH",     RARCH_NETPLAY_GAME_WATCH },
+   { "VOLUME_UP",              RARCH_VOLUME_UP },
+   { "VOLUME_DOWN",            RARCH_VOLUME_DOWN },
+   { "OVERLAY_NEXT",           RARCH_OVERLAY_NEXT },
+   { "DISK_EJECT_TOGGLE",      RARCH_DISK_EJECT_TOGGLE },
+   { "DISK_NEXT",              RARCH_DISK_NEXT },
+   { "DISK_PREV",              RARCH_DISK_PREV },
+   { "GRAB_MOUSE_TOGGLE",      RARCH_GRAB_MOUSE_TOGGLE },
+   { "UI_COMPANION_TOGGLE",    RARCH_UI_COMPANION_TOGGLE },
+   { "GAME_FOCUS_TOGGLE",      RARCH_GAME_FOCUS_TOGGLE },
+   { "MENU_TOGGLE",            RARCH_MENU_TOGGLE },
+   { "RECORDING_TOGGLE",       RARCH_RECORDING_TOGGLE },
+   { "STREAMING_TOGGLE",       RARCH_STREAMING_TOGGLE },
+   { "RUNAHEAD_TOGGLE",        RARCH_RUNAHEAD_TOGGLE },
+   { "MENU_UP",                RETRO_DEVICE_ID_JOYPAD_UP },
+   { "MENU_DOWN",              RETRO_DEVICE_ID_JOYPAD_DOWN },
+   { "MENU_LEFT",              RETRO_DEVICE_ID_JOYPAD_LEFT },
+   { "MENU_RIGHT",             RETRO_DEVICE_ID_JOYPAD_RIGHT },
+   { "MENU_A",                 RETRO_DEVICE_ID_JOYPAD_A },
+   { "MENU_B",                 RETRO_DEVICE_ID_JOYPAD_B },
+   { "AI_SERVICE",             RARCH_AI_SERVICE },
+};
+#endif
+
 RETRO_END_DECLS

 #endif
@@ -37,6 +37,17 @@
 #include "gfx/common/ctr_common.h"
 #endif

+/* Required for OpenDingux IPU filter + refresh
+ * rate settings */
+#if defined(DINGUX)
+#include "dingux/dingux_utils.h"
+#endif
+
+/* Required for menu screensaver animation */
+#if defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)
+#include "menu/menu_screensaver.h"
+#endif
+
 #if defined(HW_RVL)
 #define MAX_GAMMA_SETTING 30
 #elif defined(GEKKO)
@@ -45,7 +56,7 @@
 #define MAX_GAMMA_SETTING 1
 #endif

-#if defined(XENON) || defined(_XBOX360) || defined(__CELLOS_LV2__)
+#if defined(XENON) || defined(_XBOX360) || defined(__PSL1GHT__) || defined(__PS3__)
 #define DEFAULT_ASPECT_RATIO 1.7778f
 #elif defined(_XBOX1) || defined(GEKKO) || defined(ANDROID)
 #define DEFAULT_ASPECT_RATIO 1.3333f
@@ -57,6 +68,8 @@
 #define DEFAULT_MOUSE_SCALE 1
 #endif

+#define DEFAULT_TOUCH_SCALE 1
+
 #if defined(RARCH_MOBILE) || defined(HAVE_LIBNX) || defined(__WINRT__)
 #define DEFAULT_POINTER_ENABLE true
 #else
@@ -67,7 +80,7 @@
 * we need to extract to a user-writable directory on first boot.
 *
 * Examples include: Android, iOS/OSX) */
-#if defined(ANDROID) || defined(IOS)
+#if defined(ANDROID) || defined(__APPLE__)
 #define DEFAULT_BUNDLE_ASSETS_EXTRACT_ENABLE true
 #else
 #define DEFAULT_BUNDLE_ASSETS_EXTRACT_ENABLE false
@@ -129,6 +142,8 @@
 *   thumbnails of different sizes */
 #define DEFAULT_MATERIALUI_THUMBNAIL_BACKGROUND_ENABLE true

+#define DEFAULT_SCREEN_BRIGHTNESS 100
+
 #define DEFAULT_CRT_SWITCH_RESOLUTION CRT_SWITCH_NONE

 #define DEFAULT_CRT_SWITCH_RESOLUTION_SUPER 2560
@@ -141,6 +156,8 @@

 #define DEFAULT_PLAYLIST_ENTRY_RENAME true

+#define DEFAULT_WIFI_ENABLE true
+
 #define DEFAULT_ACCESSIBILITY_ENABLE false

 #define DEFAULT_ACCESSIBILITY_NARRATOR_SPEECH_SPEED 5
@@ -177,8 +194,9 @@

 /* To start in Fullscreen, or not. */

-#ifdef HAVE_STEAM
-/* Start in fullscreen mode for Steam build */
+#if defined(HAVE_STEAM) || defined(DINGUX)
+/* Start in fullscreen mode for Steam and
+ * Dingux builds */
 #define DEFAULT_FULLSCREEN true
 #else
 #define DEFAULT_FULLSCREEN false
@@ -199,8 +217,16 @@

 /* Fullscreen resolution. A value of 0 uses the desktop
 * resolution. */
+#if defined(DINGUX)
+#define DEFAULT_FULLSCREEN_X 320
+#define DEFAULT_FULLSCREEN_Y 240
+#else
 #define DEFAULT_FULLSCREEN_X 0
 #define DEFAULT_FULLSCREEN_Y 0
+#endif
+
+/* Force 4k resolution */
+#define DEFAULT_FORCE_RESOLUTION false

 /* Number of threads to use for video recording */
 #define DEFAULT_VIDEO_RECORD_THREADS 2
@@ -220,6 +246,15 @@
 #endif
 #define DEFAULT_CHECK_FIRMWARE_BEFORE_LOADING false

+/* Specifies whether to cache core info
+ * into a single (compressed) file for improved
+ * load times on platforms with slow IO */
+#if defined(RARCH_CONSOLE)
+#define DEFAULT_CORE_INFO_CACHE_ENABLE true
+#else
+#define DEFAULT_CORE_INFO_CACHE_ENABLE false
+#endif
+
 /* Specifies whether to 'reload' (fork and quit)
 * RetroArch when launching content with the
 * currently loaded core
@@ -259,12 +294,13 @@
 */
 #define DEFAULT_FRAME_DELAY 0

-/* Inserts a black frame inbetween frames.
- * Useful for 120 Hz monitors who want to play 60 Hz material with eliminated
- * ghosting. video_refresh_rate should still be configured as if it
- * is a 60 Hz monitor (divide refresh rate by 2).
+/* Inserts black frame(s) inbetween frames.
+ * Useful for Higher Hz monitors (set to multiples of 60 Hz) who want to play 60 Hz 
+ * material with eliminated  ghosting. video_refresh_rate should still be configured
+ * as if it is a 60 Hz monitor (divide refresh rate by multiple of 60 Hz).
 */
-#define DEFAULT_BLACK_FRAME_INSERTION false
+#define DEFAULT_BLACK_FRAME_INSERTION 0
+

 /* Uses a custom swap interval for VSync.
 * Set this to effectively halve monitor refresh rate.
@@ -308,7 +344,7 @@
 #endif

 /* Smooths picture. */
-#if defined(_3DS) || defined(GEKKO) || defined(HW_RVL) || defined(PSP) || defined(VITA) || defined(SN_TARGET_PSP2) || defined(PS2) || defined(_XBOX)
+#if defined(_3DS) || defined(GEKKO) || defined(HW_RVL) || defined(PSP) || defined(VITA) || defined(SN_TARGET_PSP2) || defined(PS2) || defined(_XBOX) || defined(DINGUX)
 #define DEFAULT_VIDEO_SMOOTH true
 #else
 #define DEFAULT_VIDEO_SMOOTH false
@@ -320,6 +356,10 @@
 /* On resize and fullscreen, rendering area will stay 4:3 */
 #define DEFAULT_FORCE_ASPECT true

+/* Only applies to Android 9.0 (API 28) and up */
+/* Choose if the screen will be able to write around the notch or not */
+#define DEFAULT_NOTCH_WRITE_OVER_ENABLE false
+
 /* Enable use of shaders. */
 #ifdef RARCH_CONSOLE
 #define DEFAULT_SHADER_ENABLE true
@@ -327,6 +367,10 @@
 #define DEFAULT_SHADER_ENABLE false
 #endif

+/* When presets are saved they will be saved using the #reference 
+ * directive by default */
+#define DEFAULT_VIDEO_SHADER_PRESET_SAVE_REFERENCE_ENABLE true
+
 #define DEFAULT_SHADER_DELAY 0

 /* Only scale in integer steps.
@@ -340,7 +384,7 @@
 /* 1:1 PAR */
 #define DEFAULT_ASPECT_RATIO_AUTO false

-#if defined(__CELLOS_LV2) || defined(_XBOX360)
+#if defined(_XBOX360) || defined(__PS3__)
 #define DEFAULT_ASPECT_RATIO_IDX ASPECT_RATIO_16_9
 #elif defined(PSP) || defined(_3DS) || defined(HAVE_LIBNX) || defined(VITA)
 #define DEFAULT_ASPECT_RATIO_IDX ASPECT_RATIO_CORE
@@ -350,12 +394,34 @@
 #define DEFAULT_ASPECT_RATIO_IDX ASPECT_RATIO_CORE
 #endif

+#if defined(DINGUX)
+/* Enables aspect ratio correction (1:1 PAR) when
+ * using the IPU hardware scaler in Dingux devices */
+#define DEFAULT_DINGUX_IPU_KEEP_ASPECT true
+/* Sets image filtering method when using the
+ * IPU hardware scaler in Dingux devices */
+#define DEFAULT_DINGUX_IPU_FILTER_TYPE DINGUX_IPU_FILTER_BICUBIC
+#if defined(DINGUX_BETA)
+/* Sets refresh rate of integral LCD panel
+ * in Dingux devices */
+#define DEFAULT_DINGUX_REFRESH_RATE DINGUX_REFRESH_RATE_60HZ
+#endif
+#endif
+
 /* Save configuration file on exit. */
 #define DEFAULT_CONFIG_SAVE_ON_EXIT true

 #define DEFAULT_SHOW_HIDDEN_FILES false

+/* Initialise file browser with the last used start directory */
+#define DEFAULT_USE_LAST_START_DIRECTORY false
+
 #define DEFAULT_OVERLAY_HIDE_IN_MENU true
+
+/* Automatically disable overlays when a
+ * controller is connected in port 1 */
+#define DEFAULT_OVERLAY_HIDE_WHEN_GAMEPAD_CONNECTED false
+
 #define DEFAULT_OVERLAY_SHOW_MOUSE_CURSOR true

 #define DEFAULT_DISPLAY_KEYBOARD_OVERLAY false
@@ -366,12 +432,32 @@
 #define DEFAULT_INPUT_OVERLAY_OPACITY 0.7f
 #endif

+#define DEFAULT_INPUT_OVERLAY_SCALE_LANDSCAPE 1.0f
+#define DEFAULT_INPUT_OVERLAY_ASPECT_ADJUST_LANDSCAPE 0.0f
+#define DEFAULT_INPUT_OVERLAY_X_SEPARATION_LANDSCAPE 0.0f
+#define DEFAULT_INPUT_OVERLAY_Y_SEPARATION_LANDSCAPE 0.0f
+#define DEFAULT_INPUT_OVERLAY_X_OFFSET_LANDSCAPE 0.0f
+#define DEFAULT_INPUT_OVERLAY_Y_OFFSET_LANDSCAPE 0.0f
+
+#define DEFAULT_INPUT_OVERLAY_SCALE_PORTRAIT 1.0f
+#define DEFAULT_INPUT_OVERLAY_ASPECT_ADJUST_PORTRAIT 0.0f
+#define DEFAULT_INPUT_OVERLAY_X_SEPARATION_PORTRAIT 0.0f
+#define DEFAULT_INPUT_OVERLAY_Y_SEPARATION_PORTRAIT 0.0f
+#define DEFAULT_INPUT_OVERLAY_X_OFFSET_PORTRAIT 0.0f
+#define DEFAULT_INPUT_OVERLAY_Y_OFFSET_PORTRAIT 0.0f
+
 #if defined(RARCH_MOBILE)
 #define DEFAULT_OVERLAY_AUTO_ROTATE true
 #else
 #define DEFAULT_OVERLAY_AUTO_ROTATE false
 #endif

+#if defined(RARCH_MOBILE)
+#define DEFAULT_INPUT_OVERLAY_AUTO_SCALE true
+#else
+#define DEFAULT_INPUT_OVERLAY_AUTO_SCALE false
+#endif
+
 #include "runtime_file.h"
 #ifdef HAVE_MENU
 #include "menu/menu_driver.h"
@@ -409,6 +495,8 @@

 #define DEFAULT_SETTINGS_SHOW_LOGGING true

+#define DEFAULT_SETTINGS_SHOW_FILE_BROWSER true
+
 #define DEFAULT_SETTINGS_SHOW_FRAME_THROTTLE true

 #define DEFAULT_SETTINGS_SHOW_RECORDING true
@@ -419,6 +507,8 @@

 #define DEFAULT_SETTINGS_SHOW_AI_SERVICE true

+#define DEFAULT_SETTINGS_SHOW_ACCESSIBILITY true
+
 #define DEFAULT_SETTINGS_SHOW_POWER_MANAGEMENT true

 #define DEFAULT_SETTINGS_SHOW_ACHIEVEMENTS true
@@ -482,18 +572,20 @@ static const bool menu_show_quit_retroarch     = true;
 static const bool menu_show_restart_retroarch  = true;
 static const bool menu_show_reboot             = true;
 static const bool menu_show_shutdown           = true;
-#if defined(HAVE_LAKKA) || defined(VITA) || defined(_3DS)
+#if defined(HAVE_LAKKA) || defined(VITA)
 static const bool menu_show_core_updater       = false;
 #else
 static const bool menu_show_core_updater       = true;
 #endif
 static const bool menu_show_legacy_thumbnail_updater = false;
-static const bool menu_show_sublabels          = true;
+static const bool menu_show_sublabels                = true;
+static const bool menu_dynamic_wallpaper_enable      = true;
+static const bool menu_scroll_fast                   = false;

-static const bool menu_scroll_fast             = false;
+#define DEFAULT_MENU_SCROLL_DELAY 256

-#define DEFAULT_MENU_TICKER_TYPE                 (TICKER_TYPE_LOOP)
-static const float menu_ticker_speed           = 2.0f;
+#define DEFAULT_MENU_TICKER_TYPE (TICKER_TYPE_LOOP)
+static const float menu_ticker_speed        = 2.0f;

 #define DEFAULT_MENU_TICKER_SMOOTH true

@@ -505,6 +597,21 @@ static const bool menu_savestate_resume     = false;

 #define DEFAULT_MENU_INSERT_DISK_RESUME true

+#define DEFAULT_QUIT_ON_CLOSE_CONTENT QUIT_ON_CLOSE_CONTENT_DISABLED
+
+/* While the menu is active, supported drivers
+ * will display a screensaver after SCREENSAVER_TIMEOUT
+ * seconds of inactivity. A timeout of zero disables
+ * the screensaver */
+#define DEFAULT_MENU_SCREENSAVER_TIMEOUT 0
+
+#if defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)
+/* When menu screensaver is enabled, specifies
+ * animation effect and animation speed */
+#define DEFAULT_MENU_SCREENSAVER_ANIMATION MENU_SCREENSAVER_BLANK
+#define DEFAULT_MENU_SCREENSAVER_ANIMATION_SPEED 1.0f
+#endif
+
 static const bool content_show_settings     = true;
 static const bool content_show_favorites    = true;
 #ifdef HAVE_IMAGEVIEWER
@@ -536,6 +643,8 @@ static const bool content_show_playlists    = true;
 #endif

 #ifdef HAVE_XMB
+#define DEFAULT_XMB_ANIMATION 0
+
 static const unsigned xmb_alpha_factor      = 75;
 static const unsigned menu_font_color_red   = 255;
 static const unsigned menu_font_color_green = 255;
@@ -572,6 +681,7 @@ static const float menu_header_opacity = 1.000;
 #define DEFAULT_SHOW_ADVANCED_SETTINGS false

 #define DEFAULT_RGUI_COLOR_THEME RGUI_THEME_CLASSIC_GREEN
+#define DEFAULT_RGUI_TRANSPARENCY true

 static const bool rgui_inline_thumbnails = false;
 static const bool rgui_swap_thumbnails = false;
@@ -584,6 +694,7 @@ static const unsigned rgui_aspect_lock = RGUI_ASPECT_RATIO_LOCK_NONE;
 static const bool rgui_shadows = false;
 static const unsigned rgui_particle_effect = RGUI_PARTICLE_EFFECT_NONE;
 #define DEFAULT_RGUI_PARTICLE_EFFECT_SPEED 1.0f
+#define DEFAULT_RGUI_PARTICLE_EFFECT_SCREENSAVER true
 static const bool rgui_extended_ascii = false;
 #define DEFAULT_RGUI_SWITCH_ICONS true
 #endif
@@ -605,24 +716,27 @@ static const bool default_auto_shaders_enable = true;

 static const bool default_sort_savefiles_enable = false;
 static const bool default_sort_savestates_enable = false;
+static const bool default_sort_savefiles_by_content_enable = false;
+static const bool default_sort_savestates_by_content_enable = false;
+static const bool default_sort_screenshots_by_content_enable = false;

 static const bool default_savestates_in_content_dir = false;
 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(__CELLOS_LV2__) || defined(_XBOX1) || defined(_XBOX360) || defined(DINGUX)
-static const unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L3_R3;
+#if defined(_XBOX1) || defined(__PS3__) || defined(_XBOX360) || defined(DINGUX)
+#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_TOGGLE_L3_R3
 #elif defined(PS2) || defined(PSP)
-static const unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_HOLD_START;
+#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_TOGGLE_HOLD_START
 #elif defined(VITA)
-static const unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L1_R1_START_SELECT;
+#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_TOGGLE_L1_R1_START_SELECT
 #elif defined(SWITCH) || defined(ORBIS)
-static const unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_START_SELECT;
+#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_TOGGLE_START_SELECT
 #elif TARGET_OS_TV
-static const unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_DOWN_Y_L_R;
+#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_TOGGLE_DOWN_Y_L_R
 #else
-static const unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_NONE;
+#define DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO INPUT_TOGGLE_NONE
 #endif

 #if defined(VITA)
@@ -684,6 +798,10 @@ static const float message_bgcolor_opacity = 1.0f;
 /* Watch shader files for changes and auto-apply as necessary. */
 #define DEFAULT_VIDEO_SHADER_WATCH_FILES false

+/* Initialise file browser with last used directory
+ * when selecting shader presets/passes via the menu */
+#define DEFAULT_VIDEO_SHADER_REMEMBER_LAST_DIR false
+
 /* Screenshots named automatically. */
 #define DEFAULT_AUTO_SCREENSHOT_FILENAME true

@@ -756,16 +874,14 @@ static const bool audio_enable_menu_bgm    = false;
 #define DEFAULT_NOTIFICATION_SHOW_AUTOCONFIG true
 #endif

-#if defined(HAVE_SCREENSHOTS)
-#define DEFAULT_NOTIFICATION_SHOW_SCREENSHOT_TAKEN true
-#else
-#define DEFAULT_NOTIFICATION_SHOW_SCREENSHOT_TAKEN false
-#endif
-
 /* Display a notification when cheats are being
 * applied */
 #define DEFAULT_NOTIFICATION_SHOW_CHEATS_APPLIED true

+/* Display a notification when applying an
+ * IPS/BPS/UPS patch file */
+#define DEFAULT_NOTIFICATION_SHOW_PATCH_APPLIED true
+
 /* Display a notification when loading an
 * input remap file */
 #define DEFAULT_NOTIFICATION_SHOW_REMAP_LOAD true
@@ -782,6 +898,7 @@ static const bool audio_enable_menu_bgm    = false;
 * content */
 #define DEFAULT_NOTIFICATION_SHOW_FAST_FORWARD true

+#if defined(HAVE_SCREENSHOTS)
 /*Display a notification when taking a screenshot*/
 #define DEFAULT_NOTIFICATION_SHOW_SCREENSHOT true

@@ -791,6 +908,17 @@ static const bool audio_enable_menu_bgm    = false;
 /* Display a white flashing effect with the desired 
 * duration when taking a screenshot*/
 #define DEFAULT_NOTIFICATION_SHOW_SCREENSHOT_FLASH 0
+#endif
+
+/* Display a notification when setting the refresh rate*/
+#if defined(_3DS) || (defined(DINGUX) && defined(DINGUX_BETA))
+/* 3DS and OpenDingux Beta devices set refresh rate
+ * on gfx driver init - set default notification
+ * state to 'false' in order to avoid OSD log spam */
+#define DEFAULT_NOTIFICATION_SHOW_REFRESH_RATE false
+#else
+#define DEFAULT_NOTIFICATION_SHOW_REFRESH_RATE true
+#endif

 /* Output samplerate. */
 #ifdef GEKKO
@@ -898,7 +1026,7 @@ static const bool audio_enable_menu_bgm    = false;

 /* Saves non-volatile SRAM at a regular interval.
 * It is measured in seconds. A value of 0 disables autosave. */
-#if defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(__x86_64__) || defined(_M_X64) || defined(_WIN32) || defined(OSX) || defined(ANDROID) || defined(IOS)
+#if defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(__x86_64__) || defined(_M_X64) || defined(_WIN32) || defined(OSX) || defined(ANDROID) || defined(IOS) || defined(DINGUX)
 /* Flush to file every 10 seconds on modern platforms by default */
 #define DEFAULT_AUTOSAVE_INTERVAL 10
 #else
@@ -951,6 +1079,15 @@ static const unsigned netplay_share_analog = RARCH_NETPLAY_SHARE_ANALOG_NO_PREFE
 * to the highest existing value. */
 static const bool savestate_auto_index = false;

+/* Specifies the maximum number of savestates to keep
+ * when savestate auto index is enabled
+ * > When limit is exceeded, savestate with the lowest
+ *   index will be deleted automatically when creating
+ *   a new savestate
+ * > Setting value to zero disables the limit (no
+ *   savestates will be deleted in this case) */
+#define DEFAULT_SAVESTATE_MAX_KEEP 0
+
 /* Automatically saves a savestate at the end of RetroArch's lifetime.
 * The path is $SRAM_PATH.auto.
 * RetroArch will automatically load any savestate with this path on
@@ -962,11 +1099,7 @@ static const bool savestate_thumbnail_enable = false;

 /* When creating save (srm) files, compress
 * written data */
-#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
-#define DEFAULT_SAVE_FILE_COMPRESSION true
-#else
 #define DEFAULT_SAVE_FILE_COMPRESSION false
-#endif

 /* When creating save state files, compress
 * written data */
@@ -1019,7 +1152,7 @@ static const uint16_t network_remote_base_port = 55400;
 * a new one) */
 #define DEFAULT_CORE_UPDATER_AUTO_BACKUP_HISTORY_SIZE 1

-#if defined(ANDROID) || defined(IOS)
+#if defined(ANDROID) || defined(__APPLE__)
 #define DEFAULT_NETWORK_ON_DEMAND_THUMBNAILS true
 #else
 #define DEFAULT_NETWORK_ON_DEMAND_THUMBNAILS false
@@ -1039,11 +1172,7 @@ static const int default_content_favorites_size = 200;
 #define DEFAULT_PLAYLIST_USE_OLD_FORMAT false

 /* When creating/updating playlists, compress written data */
-#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
-#define DEFAULT_PLAYLIST_COMPRESSION true
-#else
 #define DEFAULT_PLAYLIST_COMPRESSION false
-#endif

 #ifdef HAVE_MENU
 /* Specify when to display 'core name' inline on playlist entries */
@@ -1077,7 +1206,11 @@ static const int default_content_favorites_size = 200;

 /* Default scale factor for non-frambuffer-based display
 * drivers and display widgets */
+#if defined(VITA)
+#define DEFAULT_MENU_SCALE_FACTOR 1.5f
+#else
 #define DEFAULT_MENU_SCALE_FACTOR 1.0f
+#endif
 /* Specifies whether display widgets should be scaled
 * automatically using the default menu scale factor */
 #define DEFAULT_MENU_WIDGET_SCALE_AUTO true
@@ -1122,13 +1255,31 @@ static const unsigned turbo_default_btn   = RETRO_DEVICE_ID_JOYPAD_B;
 * gamepads, plug-and-play style. */
 static const bool input_autodetect_enable = true;

+/* Enables accelerometer/gyroscope/illuminance
+ * sensor input, if supported */
+#if defined(ANDROID)
+/* Hardware sensors cause substantial battery
+ * drain on Android... */
+#define DEFAULT_INPUT_SENSORS_ENABLE false
+#else
+#define DEFAULT_INPUT_SENSORS_ENABLE true
+#endif
+
+/* Automatically enable game focus when running or
+ * resuming content */
+#define DEFAULT_INPUT_AUTO_GAME_FOCUS AUTO_GAME_FOCUS_OFF
+
 /* Show the input descriptors set by the core instead
 * of the default ones. */
 static const bool input_descriptor_label_show = true;

 static const bool input_descriptor_hide_unbound = false;

+#if defined(DINGUX)
+static const unsigned input_max_users = 1;
+#else
 static const unsigned input_max_users = 5;
+#endif

 static const unsigned input_poll_type_behavior = 2;

@@ -1183,7 +1334,7 @@ static const bool ui_companion_toggle = false;

 #define DEFAULT_UI_MENUBAR_ENABLE true

-#if defined(__QNX__) || defined(_XBOX1) || defined(_XBOX360) || defined(__CELLOS_LV2__) || (defined(__MACH__) && defined(IOS)) || defined(ANDROID) || defined(WIIU) || defined(HAVE_NEON) || defined(GEKKO) || defined(__ARM_NEON__)
+#if defined(__QNX__) || defined(_XBOX1) || defined(_XBOX360) || (defined(__MACH__) && defined(IOS)) || defined(ANDROID) || defined(WIIU) || defined(HAVE_NEON) || defined(GEKKO) || defined(__ARM_NEON__) || defined(__PS3__)
 static const enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWER;
 #elif defined(PSP) || defined(_3DS) || defined(VITA) || defined(PS2) || defined(DINGUX)
 static const enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWEST;
@@ -1204,6 +1355,12 @@ static const bool sustained_performance_mode = false;
 static const bool vibrate_on_keypress        = false;
 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
+#endif
+
 #ifdef HAVE_VULKAN
 #define DEFAULT_VULKAN_GPU_INDEX 0
 #endif
@@ -1245,6 +1402,8 @@ static const bool enable_device_vibration    = false;
 #define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/x86_64/latest/"
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__)
 #define DEFAULT_BUILDBOT_SERVER_URL "http://bot.libretro.com/nightly/apple/osx/x86/latest/"
+#elif defined(__aarch64__)
+#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/arm64/latest/"
 #else
 #define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/ppc/latest/"
 #endif
@@ -1302,12 +1461,8 @@ static const bool enable_device_vibration    = false;
 #define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/"
 #elif defined(HAVE_LIBNX)
 #define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/switch/libnx/latest/"
-#elif defined(__CELLOS_LV2__) && defined(DEX_BUILD)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/dex-ps3/"
-#elif defined(__CELLOS_LV2__) && defined(CEX_BUILD)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/cex-ps3/"
-#elif defined(__CELLOS_LV2__) && defined(ODE_BUILD)
-#define DEFAULT_BUILDBOT_SERVER_URL "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/ode-ps3/"
+#elif defined(_3DS)
+#define DEFAULT_BUILDBOT_SERVER_URL envIsHomebrew() ? "http://buildbot.libretro.com/nightly/nintendo/3ds/latest/3dsx/" : "http://buildbot.libretro.com/nightly/nintendo/3ds/latest/cia/"
 #else
 #define DEFAULT_BUILDBOT_SERVER_URL ""
 #endif
@@ -350,6 +350,12 @@
 #define SUPPORTS_CORETEXT false
 #endif

+#ifdef HAVE_CHECK
+#define SUPPORTS_CHECK true
+#else
+#define SUPPORTS_CHECK false
+#endif
+
 #if !defined(_WIN32) && !defined(GLOBAL_CONFIG_DIR)
 #if defined(__HAIKU__)
 #define GLOBAL_CONFIG_DIR "/system/settings"
@@ -29,6 +29,10 @@
 #include "input/input_defines.h"
 #include "led/led_defines.h"

+#ifdef HAVE_LAKKA
+#include "lakka.h"
+#endif
+
 #define configuration_set_float(settings, var, newvar) \
 { \
   settings->modified = true; \
@@ -78,6 +82,399 @@ RETRO_BEGIN_DECLS

 typedef struct settings
 {
+   struct
+   {
+      size_t placeholder;
+      size_t rewind_buffer_size;
+   } sizes;
+
+   video_viewport_t video_viewport_custom; /* int alignment */
+
+   struct
+   {
+      int placeholder;
+      int netplay_check_frames;
+      int location_update_interval_ms;
+      int location_update_interval_distance;
+      int state_slot;
+      int audio_wasapi_sh_buffer_length;
+      int crt_switch_center_adjust;
+      int crt_switch_porch_adjust;
+#ifdef HAVE_VULKAN
+      int vulkan_gpu_index;
+#endif
+#ifdef HAVE_D3D10
+      int d3d10_gpu_index;
+#endif
+#ifdef HAVE_D3D11
+      int d3d11_gpu_index;
+#endif
+#ifdef HAVE_D3D12
+      int d3d12_gpu_index;
+#endif
+      int content_favorites_size;
+   } ints;
+
+   struct
+   {
+      unsigned placeholder;
+
+      unsigned input_split_joycon[MAX_USERS];
+      unsigned input_joypad_map[MAX_USERS];
+      unsigned input_device[MAX_USERS];
+      unsigned input_mouse_index[MAX_USERS];
+      /* Set by autoconfiguration in joypad_autoconfig_dir.
+       * Does not override main binds. */
+      unsigned input_libretro_device[MAX_USERS];
+      unsigned input_analog_dpad_mode[MAX_USERS];
+
+      unsigned input_keymapper_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
+
+      unsigned input_remap_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
+
+      unsigned led_map[MAX_LEDS];
+
+      unsigned audio_out_rate;
+      unsigned audio_block_frames;
+      unsigned audio_latency;
+
+      unsigned fps_update_interval;
+      unsigned memory_update_interval;
+
+      unsigned input_block_timeout;
+
+      unsigned audio_resampler_quality;
+
+      unsigned input_turbo_period;
+      unsigned input_turbo_duty_cycle;
+      unsigned input_turbo_mode;
+      unsigned input_turbo_default_button;
+
+      unsigned input_bind_timeout;
+      unsigned input_bind_hold;
+#ifdef GEKKO
+      unsigned input_mouse_scale;
+#endif
+      unsigned input_touch_scale;
+      unsigned input_hotkey_block_delay;
+      unsigned input_menu_toggle_gamepad_combo;
+      unsigned input_keyboard_gamepad_mapping_type;
+      unsigned input_poll_type_behavior;
+      unsigned input_dingux_rumble_gain;
+      unsigned input_auto_game_focus;
+
+      unsigned netplay_port;
+      unsigned netplay_input_latency_frames_min;
+      unsigned netplay_input_latency_frames_range;
+      unsigned netplay_share_digital;
+      unsigned netplay_share_analog;
+      unsigned bundle_assets_extract_version_current;
+      unsigned bundle_assets_extract_last_version;
+      unsigned content_history_size;
+      unsigned frontend_log_level;
+      unsigned libretro_log_level;
+      unsigned rewind_granularity;
+      unsigned rewind_buffer_size_step;
+      unsigned autosave_interval;
+      unsigned savestate_max_keep;
+      unsigned network_cmd_port;
+      unsigned network_remote_base_port;
+      unsigned keymapper_port;
+      unsigned video_window_opacity;
+      unsigned crt_switch_resolution;
+      unsigned crt_switch_resolution_super;
+      unsigned screen_brightness;
+      unsigned video_monitor_index;
+      unsigned video_fullscreen_x;
+      unsigned video_fullscreen_y;
+      unsigned video_max_swapchain_images;
+      unsigned video_swap_interval;
+      unsigned video_hard_sync_frames;
+      unsigned video_frame_delay;
+      unsigned video_viwidth;
+      unsigned video_aspect_ratio_idx;
+      unsigned video_rotation;
+      unsigned screen_orientation;
+      unsigned video_msg_bgcolor_red;
+      unsigned video_msg_bgcolor_green;
+      unsigned video_msg_bgcolor_blue;
+      unsigned video_stream_port;
+      unsigned video_record_quality;
+      unsigned video_stream_quality;
+      unsigned video_record_scale_factor;
+      unsigned video_stream_scale_factor;
+      unsigned video_3ds_display_mode;
+      unsigned video_dingux_ipu_filter_type;
+      unsigned video_dingux_refresh_rate;
+#ifdef HAVE_VIDEO_LAYOUT
+      unsigned video_layout_selected_view;
+#endif
+#ifdef GEKKO
+      unsigned video_overscan_correction_top;
+      unsigned video_overscan_correction_bottom;
+#endif
+      unsigned video_shader_delay;
+#ifdef HAVE_SCREENSHOTS
+      unsigned notification_show_screenshot_duration;
+      unsigned notification_show_screenshot_flash;
+#endif
+
+      /* Accessibility */
+      unsigned accessibility_narrator_speech_speed;
+
+      unsigned menu_timedate_style;
+      unsigned menu_timedate_date_separator;
+      unsigned gfx_thumbnails;
+      unsigned menu_left_thumbnails;
+      unsigned gfx_thumbnail_upscale_threshold;
+      unsigned menu_rgui_thumbnail_downscaler;
+      unsigned menu_rgui_thumbnail_delay;
+      unsigned menu_rgui_color_theme;
+      unsigned menu_xmb_animation_opening_main_menu;
+      unsigned menu_xmb_animation_horizontal_highlight;
+      unsigned menu_xmb_animation_move_up_down;
+      unsigned menu_xmb_layout;
+      unsigned menu_xmb_shader_pipeline;
+      unsigned menu_xmb_alpha_factor;
+      unsigned menu_xmb_theme;
+      unsigned menu_xmb_color_theme;
+      unsigned menu_xmb_thumbnail_scale_factor;
+      unsigned menu_materialui_color_theme;
+      unsigned menu_materialui_transition_animation;
+      unsigned menu_materialui_thumbnail_view_portrait;
+      unsigned menu_materialui_thumbnail_view_landscape;
+      unsigned menu_materialui_landscape_layout_optimization;
+      unsigned menu_ozone_color_theme;
+      unsigned menu_font_color_red;
+      unsigned menu_font_color_green;
+      unsigned menu_font_color_blue;
+      unsigned menu_rgui_internal_upscale_level;
+      unsigned menu_rgui_aspect_ratio;
+      unsigned menu_rgui_aspect_ratio_lock;
+      unsigned menu_rgui_particle_effect;
+      unsigned menu_ticker_type;
+      unsigned menu_scroll_delay;
+      unsigned menu_content_show_add_entry;
+      unsigned menu_screensaver_timeout;
+      unsigned menu_screensaver_animation;
+
+      unsigned playlist_entry_remove_enable;
+      unsigned playlist_show_inline_core_name;
+      unsigned playlist_sublabel_runtime_type;
+      unsigned playlist_sublabel_last_played_style;
+
+      unsigned camera_width;
+      unsigned camera_height;
+
+      unsigned input_overlay_show_physical_inputs_port;
+
+      unsigned run_ahead_frames;
+
+      unsigned midi_volume;
+      unsigned streaming_mode;
+
+      unsigned window_position_x;
+      unsigned window_position_y;
+      unsigned window_position_width;
+      unsigned window_position_height;
+
+      unsigned video_record_threads;
+
+      unsigned libnx_overclock;
+      unsigned ai_service_mode;
+      unsigned ai_service_target_lang;
+      unsigned ai_service_source_lang;
+
+      unsigned core_updater_auto_backup_history_size;
+      unsigned video_black_frame_insertion;
+      unsigned quit_on_close_content;
+
+#ifdef HAVE_LAKKA
+      unsigned cpu_scaling_mode;
+      unsigned cpu_min_freq;
+      unsigned cpu_max_freq;
+#endif
+   } uints;
+
+   struct
+   {
+      float placeholder;
+      float video_scale;
+      float video_aspect_ratio;
+      float video_refresh_rate;
+      float crt_video_refresh_rate;
+      float video_font_size;
+      float video_msg_pos_x;
+      float video_msg_pos_y;
+      float video_msg_color_r;
+      float video_msg_color_g;
+      float video_msg_color_b;
+      float video_msg_bgcolor_opacity;
+
+      float menu_scale_factor;
+      float menu_widget_scale_factor;
+      float menu_widget_scale_factor_windowed;
+      float menu_wallpaper_opacity;
+      float menu_framebuffer_opacity;
+      float menu_footer_opacity;
+      float menu_header_opacity;
+      float menu_ticker_speed;
+      float menu_rgui_particle_effect_speed;
+      float menu_screensaver_animation_speed;
+
+      float audio_max_timing_skew;
+      float audio_volume; /* dB scale. */
+      float audio_mixer_volume; /* dB scale. */
+
+      float input_overlay_opacity;
+
+      float input_overlay_scale_landscape;
+      float input_overlay_aspect_adjust_landscape;
+      float input_overlay_x_separation_landscape;
+      float input_overlay_y_separation_landscape;
+      float input_overlay_x_offset_landscape;
+      float input_overlay_y_offset_landscape;
+
+      float input_overlay_scale_portrait;
+      float input_overlay_aspect_adjust_portrait;
+      float input_overlay_x_separation_portrait;
+      float input_overlay_y_separation_portrait;
+      float input_overlay_x_offset_portrait;
+      float input_overlay_y_offset_portrait;
+
+      float slowmotion_ratio;
+      float fastforward_ratio;
+      float input_analog_deadzone;
+      float input_analog_sensitivity;
+   } floats;
+
+   struct
+   {
+      char placeholder;
+
+      char video_driver[32];
+      char record_driver[32];
+      char camera_driver[32];
+      char bluetooth_driver[32];
+      char wifi_driver[32];
+      char led_driver[32];
+      char location_driver[32];
+      char menu_driver[32];
+      char cheevos_username[32];
+      char cheevos_password[256];
+      char cheevos_token[32];
+      char cheevos_leaderboards_enable[32];
+      char video_context_driver[32];
+      char audio_driver[32];
+      char audio_resampler[32];
+      char input_driver[32];
+      char input_joypad_driver[32];
+      char midi_driver[32];
+      char midi_input[32];
+      char midi_output[32];
+
+      char input_keyboard_layout[64];
+
+      char audio_device[255];
+      char camera_device[255];
+      char netplay_mitm_server[255];
+
+      char translation_service_url[2048];
+
+      char bundle_assets_src[PATH_MAX_LENGTH];
+      char bundle_assets_dst[PATH_MAX_LENGTH];
+      char bundle_assets_dst_subdir[PATH_MAX_LENGTH];
+      char youtube_stream_key[PATH_MAX_LENGTH];
+      char twitch_stream_key[PATH_MAX_LENGTH];
+      char facebook_stream_key[PATH_MAX_LENGTH];
+      char discord_app_id[PATH_MAX_LENGTH];
+      char ai_service_url[PATH_MAX_LENGTH];
+
+      char crt_switch_timings[255];
+#ifdef HAVE_LAKKA
+      char timezone[TIMEZONE_LENGTH];
+      char cpu_main_gov[32];
+      char cpu_menu_gov[32];
+#endif
+   } arrays;
+
+   struct
+   {
+      char placeholder;
+
+      char username[32];
+
+      char netplay_password[128];
+      char netplay_spectate_password[128];
+
+      char netplay_server[255];
+      char network_buildbot_url[255];
+      char network_buildbot_assets_url[255];
+
+      char browse_url[4096];
+
+      char path_stream_url[8192];
+
+      char path_menu_xmb_font[PATH_MAX_LENGTH];
+      char menu_content_show_settings_password[PATH_MAX_LENGTH];
+      char kiosk_mode_password[PATH_MAX_LENGTH];
+      char path_cheat_database[PATH_MAX_LENGTH];
+      char path_content_database[PATH_MAX_LENGTH];
+      char path_overlay[PATH_MAX_LENGTH];
+#ifdef HAVE_VIDEO_LAYOUT
+      char path_video_layout[PATH_MAX_LENGTH];
+#endif
+      char path_record_config[PATH_MAX_LENGTH];
+      char path_stream_config[PATH_MAX_LENGTH];
+      char path_menu_wallpaper[PATH_MAX_LENGTH];
+      char path_audio_dsp_plugin[PATH_MAX_LENGTH];
+      char path_softfilter_plugin[PATH_MAX_LENGTH];
+      char path_core_options[PATH_MAX_LENGTH];
+      char path_content_favorites[PATH_MAX_LENGTH];
+      char path_content_history[PATH_MAX_LENGTH];
+      char path_content_image_history[PATH_MAX_LENGTH];
+      char path_content_music_history[PATH_MAX_LENGTH];
+      char path_content_video_history[PATH_MAX_LENGTH];
+      char path_libretro_info[PATH_MAX_LENGTH];
+      char path_cheat_settings[PATH_MAX_LENGTH];
+      char path_font[PATH_MAX_LENGTH];
+      char path_rgui_theme_preset[PATH_MAX_LENGTH];
+
+      char directory_audio_filter[PATH_MAX_LENGTH];
+      char directory_autoconfig[PATH_MAX_LENGTH];
+      char directory_video_filter[PATH_MAX_LENGTH];
+      char directory_video_shader[PATH_MAX_LENGTH];
+      char directory_libretro[PATH_MAX_LENGTH];
+      char directory_cursor[PATH_MAX_LENGTH];
+      char directory_input_remapping[PATH_MAX_LENGTH];
+      char directory_overlay[PATH_MAX_LENGTH];
+#ifdef HAVE_VIDEO_LAYOUT
+      char directory_video_layout[PATH_MAX_LENGTH];
+#endif
+      char directory_resampler[PATH_MAX_LENGTH];
+      char directory_screenshot[PATH_MAX_LENGTH];
+      char directory_system[PATH_MAX_LENGTH];
+      char directory_cache[PATH_MAX_LENGTH];
+      char directory_playlist[PATH_MAX_LENGTH];
+      char directory_content_favorites[PATH_MAX_LENGTH];
+      char directory_content_history[PATH_MAX_LENGTH];
+      char directory_content_image_history[PATH_MAX_LENGTH];
+      char directory_content_music_history[PATH_MAX_LENGTH];
+      char directory_content_video_history[PATH_MAX_LENGTH];
+      char directory_runtime_log[PATH_MAX_LENGTH];
+      char directory_core_assets[PATH_MAX_LENGTH];
+      char directory_assets[PATH_MAX_LENGTH];
+      char directory_dynamic_wallpapers[PATH_MAX_LENGTH];
+      char directory_thumbnails[PATH_MAX_LENGTH];
+      char directory_menu_config[PATH_MAX_LENGTH];
+      char directory_menu_content[PATH_MAX_LENGTH];
+      char streaming_title[PATH_MAX_LENGTH];
+
+      char log_dir[PATH_MAX_LENGTH];
+   } paths;
+
+   bool modified;
+
   struct
   {
      bool placeholder;
@@ -88,16 +485,18 @@ typedef struct settings
      bool video_vsync;
      bool video_adaptive_vsync;
      bool video_hard_sync;
-      bool video_black_frame_insertion;
      bool video_vfilter;
      bool video_smooth;
      bool video_ctx_scaling;
      bool video_force_aspect;
      bool video_crop_overscan;
      bool video_aspect_ratio_auto;
+      bool video_dingux_ipu_keep_aspect;
      bool video_scale_integer;
      bool video_shader_enable;
      bool video_shader_watch_files;
+      bool video_shader_remember_last_dir;
+      bool video_shader_preset_save_reference_enable;
      bool video_threaded;
      bool video_font_enable;
      bool video_disable_composition;
@@ -113,9 +512,11 @@ typedef struct settings
      bool video_memory_show;
      bool video_msg_bgcolor_enable;
      bool video_3ds_lcd_bottom;
+      bool video_notch_write_over_enable;
 #ifdef HAVE_VIDEO_LAYOUT
      bool video_layout_enable;
 #endif
+      bool video_force_resolution;

      /* Accessibility */
      bool accessibility_enable;
@@ -136,12 +537,15 @@ typedef struct settings
      /* Input */
      bool input_remap_binds_enable;
      bool input_autodetect_enable;
+      bool input_sensors_enable;
      bool input_overlay_enable;
      bool input_overlay_enable_autopreferred;
      bool input_overlay_hide_in_menu;
+      bool input_overlay_hide_when_gamepad_connected;
      bool input_overlay_show_physical_inputs;
      bool input_overlay_show_mouse_cursor;
      bool input_overlay_auto_rotate;
+      bool input_overlay_auto_scale;
      bool input_descriptor_label_show;
      bool input_descriptor_hide_unbound;
      bool input_menu_swap_ok_cancel_buttons;
@@ -149,6 +553,9 @@ typedef struct settings
      bool input_backtouch_toggle;
      bool input_small_keyboard_enable;
      bool input_keyboard_gamepad_enable;
+#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
+      bool input_nowinkey_enable;
+#endif

      /* Frame time counter */
      bool frame_time_counter_reset_after_fastforwarding;
@@ -161,11 +568,15 @@ typedef struct settings
      bool menu_show_load_content_animation;
      bool notification_show_autoconfig;
      bool notification_show_cheats_applied;
+      bool notification_show_patch_applied;
      bool notification_show_remap_load;
      bool notification_show_config_override_load;
      bool notification_show_set_initial_disk;
      bool notification_show_fast_forward;
+#ifdef HAVE_SCREENSHOTS
      bool notification_show_screenshot;
+#endif
+      bool notification_show_refresh_rate;
      bool menu_widget_scale_auto;
      bool menu_show_start_screen;
      bool menu_pause_libretro;
@@ -216,11 +627,13 @@ typedef struct settings
      bool menu_rgui_border_filler_thickness_enable;
      bool menu_rgui_border_filler_enable;
      bool menu_rgui_full_width_layout;
+      bool menu_rgui_transparency;
      bool menu_rgui_shadows;
      bool menu_rgui_inline_thumbnails;
      bool menu_rgui_swap_thumbnails;
      bool menu_rgui_extended_ascii;
      bool menu_rgui_switch_icons;
+      bool menu_rgui_particle_effect_screensaver;
      bool menu_xmb_shadows_enable;
      bool menu_xmb_vertical_thumbnails;
      bool menu_content_show_settings;
@@ -246,11 +659,13 @@ typedef struct settings
      bool settings_show_configuration;
      bool settings_show_saving;
      bool settings_show_logging;
+      bool settings_show_file_browser;
      bool settings_show_frame_throttle;
      bool settings_show_recording;
      bool settings_show_onscreen_display;
      bool settings_show_user_interface;
      bool settings_show_ai_service;
+      bool settings_show_accessibility;
      bool settings_show_power_management;
      bool settings_show_achievements;
      bool settings_show_network;
@@ -311,7 +726,6 @@ typedef struct settings
      bool cheevos_enable;
      bool cheevos_test_unofficial;
      bool cheevos_hardcore_mode_enable;
-      bool cheevos_leaderboards_enable;
      bool cheevos_richpresence_enable;
      bool cheevos_badges_enable;
      bool cheevos_verbose_enable;
@@ -327,6 +741,7 @@ typedef struct settings

      /* WiFi */
      bool wifi_allow;
+      bool wifi_enabled;

      /* Location */
      bool location_allow;
@@ -371,6 +786,7 @@ typedef struct settings
      bool network_remote_enable_user[MAX_USERS];
      bool load_dummy_on_core_shutdown;
      bool check_firmware_before_loading;
+      bool core_info_cache_enable;
 #ifndef HAVE_DYNAMIC
      bool always_reload_core_on_run_content;
 #endif
@@ -383,8 +799,12 @@ typedef struct settings

      bool sort_savefiles_enable;
      bool sort_savestates_enable;
+      bool sort_savefiles_by_content_enable;
+      bool sort_savestates_by_content_enable;
+      bool sort_screenshots_by_content_enable;
      bool config_save_on_exit;
      bool show_hidden_files;
+      bool use_last_start_directory;

      bool savefiles_in_content_dir;
      bool savestates_in_content_dir;
@@ -426,353 +846,6 @@ typedef struct settings
      bool ai_service_pause;
   } bools;

-   struct
-   {
-      float placeholder;
-      float video_scale;
-      float video_aspect_ratio;
-      float video_refresh_rate;
-      float crt_video_refresh_rate;
-      float video_font_size;
-      float video_msg_pos_x;
-      float video_msg_pos_y;
-      float video_msg_color_r;
-      float video_msg_color_g;
-      float video_msg_color_b;
-      float video_msg_bgcolor_opacity;
-
-      float menu_scale_factor;
-      float menu_widget_scale_factor;
-      float menu_widget_scale_factor_windowed;
-      float menu_wallpaper_opacity;
-      float menu_framebuffer_opacity;
-      float menu_footer_opacity;
-      float menu_header_opacity;
-      float menu_ticker_speed;
-      float menu_rgui_particle_effect_speed;
-
-      float audio_max_timing_skew;
-      float audio_volume; /* dB scale. */
-      float audio_mixer_volume; /* dB scale. */
-
-      float input_overlay_opacity;
-      float input_overlay_scale;
-      float input_overlay_center_x;
-      float input_overlay_center_y;
-
-      float slowmotion_ratio;
-      float fastforward_ratio;
-      float input_analog_deadzone;
-      float input_analog_sensitivity;
-   } floats;
-
-   struct
-   {
-      int placeholder;
-      int netplay_check_frames;
-      int location_update_interval_ms;
-      int location_update_interval_distance;
-      int state_slot;
-      int audio_wasapi_sh_buffer_length;
-      int crt_switch_center_adjust;
-      int crt_switch_porch_adjust;
-#ifdef HAVE_VULKAN
-      int vulkan_gpu_index;
-#endif
-#ifdef HAVE_D3D10
-      int d3d10_gpu_index;
-#endif
-#ifdef HAVE_D3D11
-      int d3d11_gpu_index;
-#endif
-#ifdef HAVE_D3D12
-      int d3d12_gpu_index;
-#endif
-      int content_favorites_size;
-   } ints;
-
-   struct
-   {
-      unsigned placeholder;
-      unsigned audio_out_rate;
-      unsigned audio_block_frames;
-      unsigned audio_latency;
-
-      unsigned fps_update_interval;
-      unsigned memory_update_interval;
-
-      unsigned input_block_timeout;
-
-      unsigned audio_resampler_quality;
-
-      unsigned input_turbo_period;
-      unsigned input_turbo_duty_cycle;
-      unsigned input_turbo_mode;
-      unsigned input_turbo_default_button;
-
-      unsigned input_bind_timeout;
-      unsigned input_bind_hold;
-#ifdef GEKKO
-      unsigned input_mouse_scale;
-#endif
-      unsigned input_hotkey_block_delay;
-      unsigned input_menu_toggle_gamepad_combo;
-      unsigned input_keyboard_gamepad_mapping_type;
-      unsigned input_poll_type_behavior;
-      unsigned netplay_port;
-      unsigned netplay_input_latency_frames_min;
-      unsigned netplay_input_latency_frames_range;
-      unsigned netplay_share_digital;
-      unsigned netplay_share_analog;
-      unsigned bundle_assets_extract_version_current;
-      unsigned bundle_assets_extract_last_version;
-      unsigned content_history_size;
-      unsigned frontend_log_level;
-      unsigned libretro_log_level;
-      unsigned rewind_granularity;
-      unsigned rewind_buffer_size_step;
-      unsigned autosave_interval;
-      unsigned network_cmd_port;
-      unsigned network_remote_base_port;
-      unsigned keymapper_port;
-      unsigned video_window_opacity;
-      unsigned crt_switch_resolution;
-      unsigned crt_switch_resolution_super;
-      unsigned video_monitor_index;
-      unsigned video_fullscreen_x;
-      unsigned video_fullscreen_y;
-      unsigned video_max_swapchain_images;
-      unsigned video_swap_interval;
-      unsigned video_hard_sync_frames;
-      unsigned video_frame_delay;
-      unsigned video_viwidth;
-      unsigned video_aspect_ratio_idx;
-      unsigned video_rotation;
-      unsigned screen_orientation;
-      unsigned video_msg_bgcolor_red;
-      unsigned video_msg_bgcolor_green;
-      unsigned video_msg_bgcolor_blue;
-      unsigned video_stream_port;
-      unsigned video_record_quality;
-      unsigned video_stream_quality;
-      unsigned video_record_scale_factor;
-      unsigned video_stream_scale_factor;
-      unsigned video_3ds_display_mode;
-#ifdef HAVE_VIDEO_LAYOUT
-      unsigned video_layout_selected_view;
-#endif
-#ifdef GEKKO
-      unsigned video_overscan_correction_top;
-      unsigned video_overscan_correction_bottom;
-#endif
-      unsigned video_shader_delay;
-      unsigned notification_show_screenshot_duration;
-      unsigned notification_show_screenshot_flash;
-
-      /* Accessibility */
-      unsigned accessibility_narrator_speech_speed;
-
-      unsigned menu_timedate_style;
-      unsigned menu_timedate_date_separator;
-      unsigned gfx_thumbnails;
-      unsigned menu_left_thumbnails;
-      unsigned gfx_thumbnail_upscale_threshold;
-      unsigned menu_rgui_thumbnail_downscaler;
-      unsigned menu_rgui_thumbnail_delay;
-      unsigned menu_rgui_color_theme;
-      unsigned menu_xmb_animation_opening_main_menu;
-      unsigned menu_xmb_animation_horizontal_highlight;
-      unsigned menu_xmb_animation_move_up_down;
-      unsigned menu_xmb_layout;
-      unsigned menu_xmb_shader_pipeline;
-      unsigned menu_xmb_alpha_factor;
-      unsigned menu_xmb_theme;
-      unsigned menu_xmb_color_theme;
-      unsigned menu_xmb_thumbnail_scale_factor;
-      unsigned menu_materialui_color_theme;
-      unsigned menu_materialui_transition_animation;
-      unsigned menu_materialui_thumbnail_view_portrait;
-      unsigned menu_materialui_thumbnail_view_landscape;
-      unsigned menu_materialui_landscape_layout_optimization;
-      unsigned menu_ozone_color_theme;
-      unsigned menu_font_color_red;
-      unsigned menu_font_color_green;
-      unsigned menu_font_color_blue;
-      unsigned menu_rgui_internal_upscale_level;
-      unsigned menu_rgui_aspect_ratio;
-      unsigned menu_rgui_aspect_ratio_lock;
-      unsigned menu_rgui_particle_effect;
-      unsigned menu_ticker_type;
-      unsigned menu_content_show_add_entry;
-
-      unsigned playlist_entry_remove_enable;
-      unsigned playlist_show_inline_core_name;
-      unsigned playlist_sublabel_runtime_type;
-      unsigned playlist_sublabel_last_played_style;
-
-      unsigned camera_width;
-      unsigned camera_height;
-
-      unsigned input_overlay_show_physical_inputs_port;
-
-      unsigned input_split_joycon[MAX_USERS];
-      unsigned input_joypad_map[MAX_USERS];
-      unsigned input_device[MAX_USERS];
-      unsigned input_mouse_index[MAX_USERS];
-      /* Set by autoconfiguration in joypad_autoconfig_dir.
-       * Does not override main binds. */
-      unsigned input_libretro_device[MAX_USERS];
-      unsigned input_analog_dpad_mode[MAX_USERS];
-
-      unsigned input_keymapper_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
-
-      unsigned input_remap_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
-
-      unsigned led_map[MAX_LEDS];
-
-      unsigned run_ahead_frames;
-
-      unsigned midi_volume;
-      unsigned streaming_mode;
-
-      unsigned window_position_x;
-      unsigned window_position_y;
-      unsigned window_position_width;
-      unsigned window_position_height;
-
-      unsigned video_record_threads;
-
-      unsigned libnx_overclock;
-      unsigned ai_service_mode;
-      unsigned ai_service_target_lang;
-      unsigned ai_service_source_lang;
-
-      unsigned core_updater_auto_backup_history_size;
-   } uints;
-
-   struct
-   {
-      size_t placeholder;
-      size_t rewind_buffer_size;
-   } sizes;
-
-   struct
-   {
-      char placeholder;
-
-      char video_driver[32];
-      char record_driver[32];
-      char camera_driver[32];
-      char bluetooth_driver[32];
-      char wifi_driver[32];
-      char led_driver[32];
-      char location_driver[32];
-      char menu_driver[32];
-      char cheevos_username[32];
-      char cheevos_password[32];
-      char cheevos_token[32];
-      char video_context_driver[32];
-      char audio_driver[32];
-      char audio_resampler[32];
-      char input_driver[32];
-      char input_joypad_driver[32];
-      char midi_driver[32];
-      char midi_input[32];
-      char midi_output[32];
-
-      char input_keyboard_layout[64];
-
-      char audio_device[255];
-      char camera_device[255];
-      char netplay_mitm_server[255];
-
-      char translation_service_url[2048];
-
-      char bundle_assets_src[PATH_MAX_LENGTH];
-      char bundle_assets_dst[PATH_MAX_LENGTH];
-      char bundle_assets_dst_subdir[PATH_MAX_LENGTH];
-      char youtube_stream_key[PATH_MAX_LENGTH];
-      char twitch_stream_key[PATH_MAX_LENGTH];
-      char discord_app_id[PATH_MAX_LENGTH];
-      char ai_service_url[PATH_MAX_LENGTH];
-   } arrays;
-
-   struct
-   {
-      char placeholder;
-
-      char username[32];
-
-      char netplay_password[128];
-      char netplay_spectate_password[128];
-
-      char netplay_server[255];
-      char network_buildbot_url[255];
-      char network_buildbot_assets_url[255];
-
-      char browse_url[4096];
-
-      char path_stream_url[8192];
-
-      char path_menu_xmb_font[PATH_MAX_LENGTH];
-      char menu_content_show_settings_password[PATH_MAX_LENGTH];
-      char kiosk_mode_password[PATH_MAX_LENGTH];
-      char path_cheat_database[PATH_MAX_LENGTH];
-      char path_content_database[PATH_MAX_LENGTH];
-      char path_overlay[PATH_MAX_LENGTH];
-#ifdef HAVE_VIDEO_LAYOUT
-      char path_video_layout[PATH_MAX_LENGTH];
-#endif
-      char path_record_config[PATH_MAX_LENGTH];
-      char path_stream_config[PATH_MAX_LENGTH];
-      char path_menu_wallpaper[PATH_MAX_LENGTH];
-      char path_audio_dsp_plugin[PATH_MAX_LENGTH];
-      char path_softfilter_plugin[PATH_MAX_LENGTH];
-      char path_core_options[PATH_MAX_LENGTH];
-      char path_content_history[PATH_MAX_LENGTH];
-      char path_content_favorites[PATH_MAX_LENGTH];
-      char path_content_music_history[PATH_MAX_LENGTH];
-      char path_content_image_history[PATH_MAX_LENGTH];
-      char path_content_video_history[PATH_MAX_LENGTH];
-      char path_libretro_info[PATH_MAX_LENGTH];
-      char path_cheat_settings[PATH_MAX_LENGTH];
-      char path_font[PATH_MAX_LENGTH];
-      char path_rgui_theme_preset[PATH_MAX_LENGTH];
-
-      char directory_audio_filter[PATH_MAX_LENGTH];
-      char directory_autoconfig[PATH_MAX_LENGTH];
-      char directory_video_filter[PATH_MAX_LENGTH];
-      char directory_video_shader[PATH_MAX_LENGTH];
-      char directory_content_history[PATH_MAX_LENGTH];
-      char directory_content_favorites[PATH_MAX_LENGTH];
-      char directory_libretro[PATH_MAX_LENGTH];
-      char directory_cursor[PATH_MAX_LENGTH];
-      char directory_input_remapping[PATH_MAX_LENGTH];
-      char directory_overlay[PATH_MAX_LENGTH];
-#ifdef HAVE_VIDEO_LAYOUT
-      char directory_video_layout[PATH_MAX_LENGTH];
-#endif
-      char directory_resampler[PATH_MAX_LENGTH];
-      char directory_screenshot[PATH_MAX_LENGTH];
-      char directory_system[PATH_MAX_LENGTH];
-      char directory_cache[PATH_MAX_LENGTH];
-      char directory_playlist[PATH_MAX_LENGTH];
-      char directory_runtime_log[PATH_MAX_LENGTH];
-      char directory_core_assets[PATH_MAX_LENGTH];
-      char directory_assets[PATH_MAX_LENGTH];
-      char directory_dynamic_wallpapers[PATH_MAX_LENGTH];
-      char directory_thumbnails[PATH_MAX_LENGTH];
-      char directory_menu_config[PATH_MAX_LENGTH];
-      char directory_menu_content[PATH_MAX_LENGTH];
-      char streaming_title[PATH_MAX_LENGTH];
-
-      char log_dir[PATH_MAX_LENGTH];
-   } paths;
-
-   bool modified;
-
-   video_viewport_t video_viewport_custom;
-
 } settings_t;

 /**
@@ -944,8 +1017,23 @@ void config_set_defaults(void *data);

 void config_load(void *data);

+#if !defined(HAVE_DYNAMIC)
+/* Salamander config file contains a single
+ * entry (libretro_path), which is linked to
+ * RARCH_PATH_CORE
+ * > Used to select which core to load
+ *   when launching a salamander build */
+void config_load_file_salamander(void);
+void config_save_file_salamander(void);
+#endif
+
 settings_t *config_get_ptr(void);

+#ifdef HAVE_LAKKA
+const char *config_get_all_timezones(void);
+void config_set_timezone(char *timezone);
+#endif
+
 RETRO_END_DECLS

 #endif
@@ -33,10 +33,10 @@ RETRO_BEGIN_DECLS

 typedef struct content_ctx_info
 {
-   int argc;                       /* Argument count. */
   char **argv;                    /* Argument variable list. */
   void *args;                     /* Arguments passed from callee */
   environment_get_t environ_get;  /* Function passed for environment_get function */
+   int argc;                       /* Argument count. */
 } content_ctx_info_t;

 /* Load a RAM state from disk to memory. */
@@ -51,6 +51,15 @@ bool content_load_state(const char* path, bool load_to_backup_buffer, bool autol
 /* Save a state from memory to disk. */
 bool content_save_state(const char *path, bool save_to_disk, bool autosave);

+/* Gets the number of bytes required to serialize the state. */
+size_t content_get_serialized_size(void);
+
+/* Serializes the current state. buffer must be at least content_get_serialized_size bytes */
+bool content_serialize_state(void* buffer, size_t buffer_size);
+
+/* Deserializes the current state. */
+bool content_deserialize_state(const void* serialized_data, size_t serialized_size);
+
 /* Waits for any in-progress save state tasks to finish */
 void content_wait_for_save_state_task(void);

@@ -45,7 +45,7 @@ enum

 typedef struct rarch_memory_descriptor
 {
-   struct retro_memory_descriptor core;
+   struct retro_memory_descriptor core;        /* uint64_t alignment */
   size_t disconnect_mask;
 } rarch_memory_descriptor_t;

@@ -57,33 +57,26 @@ typedef struct rarch_memory_map

 typedef struct rarch_system_info
 {
-   struct retro_system_info info;
-
-   unsigned rotation;
-   unsigned performance_level;
-   bool load_no_content;
-
+   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];
-   char valid_extensions[255];
-
-   bool supports_vfs;
-
-   disk_control_interface_t disk_control;
-   struct retro_location_callback location_cb;
-
   struct
   {
      struct retro_subsystem_info *data;
      unsigned size;
   } subsystem;
-
   struct
   {
      struct retro_controller_info *data;
      unsigned size;
   } ports;
-
-   rarch_memory_map_t mmaps;
+   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
@@ -93,9 +86,9 @@ typedef struct retro_ctx_input_state_info

 typedef struct retro_ctx_cheat_info
 {
+   const char *code;
   unsigned index;
   bool enabled;
-   const char *code;
 } retro_ctx_cheat_info_t;

 typedef struct retro_ctx_api_info
@@ -154,8 +147,6 @@ typedef struct retro_callbacks
   retro_input_poll_t poll_cb;
 } retro_callbacks_t;

-bool core_set_default_callbacks(struct retro_callbacks *cbs);
-
 #ifdef HAVE_REWIND
 bool core_set_rewind_callbacks(void);
 #endif
@@ -34,9 +34,9 @@
 /* Holds all entries in a core backup list */
 struct core_backup_list
 {
+   core_backup_list_entry_t *entries;
   size_t size;
   size_t capacity;
-   core_backup_list_entry_t *entries;
 };

 /*********************/
@@ -163,11 +163,12 @@ bool core_backup_get_backup_path(
         (unsigned)time_info.tm_sec,
         crc,
         (unsigned)backup_mode,
-         file_path_str(FILE_PATH_CORE_BACKUP_EXTENSION));
+         FILE_PATH_CORE_BACKUP_EXTENSION);

   if ((n < 0) || (n >= 128))
      n = 0; /* Silence GCC warnings... */

+   (void)n;
   /* Build final path */
   fill_pathname_join(backup_path, backup_dir,
         backup_filename, len);
@@ -199,7 +200,7 @@ enum core_backup_type core_backup_get_backup_type(const char *backup_path)

   /* Check if this is an archived backup */
   if (string_is_equal_noncase(backup_ext,
-         file_path_str(FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT)))
+         FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT))
   {
      const char *backup_filename = NULL;
      const char *src_ext         = NULL;
@@ -516,7 +517,7 @@ core_backup_list_t *core_backup_list_init(
   /* Get backup file list */
   dir_list = dir_list_new(
         backup_dir,
-         file_path_str(FILE_PATH_CORE_BACKUP_EXTENSION),
+         FILE_PATH_CORE_BACKUP_EXTENSION,
         false, /* include_dirs */
         false, /* include_hidden */
         false, /* include_compressed */
@@ -742,7 +743,7 @@ bool core_backup_list_get_entry_timestamp_str(

   if ((n < 0) || (n >= 32))
      n = 0; /* Silence GCC warnings... */
-
+   (void)n;
   return true;
 }

@@ -762,6 +763,6 @@ bool core_backup_list_get_entry_crc_str(

   if ((n < 0) || (n >= 32))
      n = 0; /* Silence GCC warnings... */
-
+   (void)n;
   return true;
 }
@@ -72,7 +72,7 @@ typedef struct
 typedef struct
 {
   char *backup_path;
-   core_backup_list_date_t date;
+   core_backup_list_date_t date;       /* unsigned alignment */
   uint32_t crc;
   enum core_backup_mode backup_mode;
 } core_backup_list_entry_t;
@@ -25,6 +25,14 @@

 RETRO_BEGIN_DECLS

+enum core_info_list_qsort_type
+{
+   CORE_INFO_LIST_SORT_PATH = 0,
+   CORE_INFO_LIST_SORT_DISPLAY_NAME,
+   CORE_INFO_LIST_SORT_CORE_NAME,
+   CORE_INFO_LIST_SORT_SYSTEM_NAME
+};
+
 typedef struct
 {
   char *path;
@@ -37,30 +45,19 @@ typedef struct

 /* Simple container/convenience struct for
 * holding the 'id' of a core file
- * > 'id' is the filename without extension or
+ * > 'str' is the filename without extension or
 *   platform-specific suffix
- * > 'id' is used for core info searches - enables
- *   matching regardless of core file base path,
- *   and is platform-independent (e.g. an Android
- *   core file will be correctly identified on Linux)
- * > 'len' is used to cache the length of 'str', for
- *   improved performance when performing string
- *   comparisons */
+ * > 'hash' is a hash key used for efficient core
+ *   list searches */
 typedef struct
 {
   char *str;
-   size_t len;
+   uint32_t hash;
 } core_file_id_t;

 typedef struct
 {
-   bool supports_no_game;
-   bool database_match_archive_member;
-   bool is_experimental;
-   bool is_locked;
-   size_t firmware_count;
   char *path;
-   void *config_data;
   char *display_name;
   char *display_version;
   char *core_name;
@@ -85,25 +82,32 @@ typedef struct
   struct string_list *licenses_list;
   struct string_list *required_hw_api_list;
   core_info_firmware_t *firmware;
-   core_file_id_t core_file_id;
-   void *userdata;
+   core_file_id_t core_file_id; /* ptr alignment */
+   size_t firmware_count;
+   bool has_info;
+   bool supports_no_game;
+   bool database_match_archive_member;
+   bool is_experimental;
+   bool is_locked;
+   bool is_installed;
 } core_info_t;

 /* A subset of core_info parameters required for
 * core updater tasks */
 typedef struct
 {
-   bool is_experimental;
   char *display_name;
   char *description;
   char *licenses;
+   bool is_experimental;
 } core_updater_info_t;

 typedef struct
 {
   core_info_t *list;
-   size_t count;
   char *all_ext;
+   size_t count;
+   size_t info_count;
 } core_info_list_t;

 typedef struct core_info_ctx_firmware
@@ -115,20 +119,6 @@ typedef struct core_info_ctx_firmware
   } directory;
 } core_info_ctx_firmware_t;

-typedef struct core_info_ctx_find
-{
-   core_info_t *inf;
-   const char *path;
-} core_info_ctx_find_t;
-
-enum core_info_list_qsort_type
-{
-   CORE_INFO_LIST_SORT_PATH = 0,
-   CORE_INFO_LIST_SORT_DISPLAY_NAME,
-   CORE_INFO_LIST_SORT_CORE_NAME,
-   CORE_INFO_LIST_SORT_SYSTEM_NAME
-};
-
 struct core_info_state
 {
 #ifdef HAVE_COMPRESSION
@@ -141,30 +131,21 @@ struct core_info_state

 typedef struct core_info_state core_info_state_t;

-size_t core_info_list_num_info_files(core_info_list_t *list);
-
 /* Non-reentrant, does not allocate. Returns pointer to internal state. */
 void core_info_list_get_supported_cores(core_info_list_t *list,
      const char *path, const core_info_t **infos, size_t *num_infos);

 bool core_info_list_get_display_name(core_info_list_t *list,
-      const char *path, char *s, size_t len);
-
-bool core_info_get_display_name(const char *path, char *s, size_t len);
+      const char *core_path, char *s, size_t len);

 /* Returns core_info parameters required for
 * core updater tasks, read from specified file.
 * Returned core_updater_info_t object must be
 * freed using core_info_free_core_updater_info().
 * Returns NULL if 'path' is invalid. */
-core_updater_info_t *core_info_get_core_updater_info(const char *path);
+core_updater_info_t *core_info_get_core_updater_info(const char *info_path);
 void core_info_free_core_updater_info(core_updater_info_t *info);

-void core_info_get_name(const char *path, char *s, size_t len,
-      const char *path_info, const char *dir_cores,
-      const char *exts, bool show_hidden_files,
-      bool get_display_name);
-
 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);
@@ -176,29 +157,30 @@ bool core_info_get_current_core(core_info_t **core);
 void core_info_deinit_list(void);

 bool core_info_init_list(const char *path_info, const char *dir_cores,
-      const char *exts, bool show_hidden_files);
+      const char *exts, bool show_hidden_files, bool enable_cache);

 bool core_info_get_list(core_info_list_t **core);

+/* Returns number of installed cores */
+size_t core_info_count(void);
+
 bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info,
      bool *set_missing_bios);

-bool core_info_find(core_info_ctx_find_t *info);
+bool core_info_find(const char *core_path,
+      core_info_t **core_info);

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

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

 bool core_info_database_match_archive_member(const char *database_path);

-bool core_info_unsupported_content_path(const char *path);
-
 void core_info_qsort(core_info_list_t *core_info_list, enum core_info_list_qsort_type qsort_type);

 bool core_info_list_get_info(core_info_list_t *core_info_list,
-      core_info_t *out_info, const char *path);
+      core_info_t *out_info, const char *core_path);

 bool core_info_hw_api_supported(core_info_t *info);

@@ -220,7 +202,13 @@ 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);
+bool core_info_core_file_id_is_equal(const char *core_path_a, const char *core_path_b);
+
+/* When called, generates a temporary file
+ * that will force an info cache refresh the
+ * next time that core info is initialised with
+ * caching enabled */
+bool core_info_cache_force_refresh(const char *path_info);

 RETRO_END_DECLS

@@ -23,7 +23,7 @@
 #include <retro_common_api.h>
 #include <lists/string_list.h>

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

 RETRO_BEGIN_DECLS

@@ -24,6 +24,7 @@
 #include <string/stdstring.h>
 #include <lists/string_list.h>
 #include <net/net_http.h>
+#include <array/rbuf.h>
 #include <retro_miscellaneous.h>

 #include "file_path_special.h"
@@ -34,9 +35,8 @@
 /* Holds all entries in a core updater list */
 struct core_updater_list
 {
-   size_t size;
-   size_t capacity;
   core_updater_list_entry_t *entries;
+   enum core_updater_list_type type;
 };

 /* Cached ('global') core updater list */
@@ -99,34 +99,18 @@ static void core_updater_list_free_entry(core_updater_list_entry_t *entry)
 /* Creates a new, empty core updater list.
 * Returns a handle to a new core_updater_list_t object
 * on success, otherwise returns NULL. */
-core_updater_list_t *core_updater_list_init(size_t max_size)
+core_updater_list_t *core_updater_list_init(void)
 {
-   core_updater_list_t *core_list     = NULL;
-   core_updater_list_entry_t *entries = NULL;
-
-   /* Sanity check */
-   if (max_size < 1)
-      return NULL;
-
   /* Create core updater list */
-   core_list = (core_updater_list_t*)malloc(sizeof(*core_list));
+   core_updater_list_t *core_list = (core_updater_list_t*)
+         malloc(sizeof(*core_list));

   if (!core_list)
      return NULL;

-   /* Create entries array */
-   entries = (core_updater_list_entry_t*)calloc(max_size, sizeof(*entries));
-
-   if (!entries)
-   {
-      free(core_list);
-      return NULL;
-   }
-
-   /* Initial configuration */
-   core_list->size     = 0;
-   core_list->capacity = max_size;
-   core_list->entries  = entries;
+   /* Initialise members */
+   core_list->entries = NULL;
+   core_list->type    = CORE_UPDATER_LIST_TYPE_UNKNOWN;

   return core_list;
 }
@@ -135,41 +119,29 @@ core_updater_list_t *core_updater_list_init(size_t max_size)
 * updater list */
 void core_updater_list_reset(core_updater_list_t *core_list)
 {
-   size_t i;
-
   if (!core_list)
      return;

-   for (i = 0; i < core_list->size; i++)
+   if (core_list->entries)
   {
-      core_updater_list_entry_t *entry = &core_list->entries[i];
+      size_t i;

-      if (entry)
-         core_updater_list_free_entry(entry);
+      for (i = 0; i < RBUF_LEN(core_list->entries); i++)
+         core_updater_list_free_entry(&core_list->entries[i]);
+
+      RBUF_FREE(core_list->entries);
   }

-   core_list->size = 0;
+   core_list->type = CORE_UPDATER_LIST_TYPE_UNKNOWN;
 }

 /* Frees specified core updater list */
 void core_updater_list_free(core_updater_list_t *core_list)
 {
-   size_t i;
-
   if (!core_list)
      return;

-   for (i = 0; i < core_list->size; i++)
-   {
-      core_updater_list_entry_t *entry = &core_list->entries[i];
-
-      if (entry)
-         core_updater_list_free_entry(entry);
-   }
-
-   free(core_list->entries);
-   core_list->entries = NULL;
-
+   core_updater_list_reset(core_list);
   free(core_list);
 }

@@ -180,7 +152,7 @@ void core_updater_list_free(core_updater_list_t *core_list)
 /* Creates a new, empty cached core updater list
 * (i.e. 'global' list).
 * Returns false in the event of an error. */
-bool core_updater_list_init_cached(size_t max_size)
+bool core_updater_list_init_cached(void)
 {
   /* Free any existing cached core updater list */
   if (core_list_cached)
@@ -189,7 +161,7 @@ bool core_updater_list_init_cached(size_t max_size)
      core_list_cached = NULL;
   }

-   core_list_cached = core_updater_list_init(max_size);
+   core_list_cached = core_updater_list_init();

   if (!core_list_cached)
      return false;
@@ -223,17 +195,18 @@ size_t core_updater_list_size(core_updater_list_t *core_list)
   if (!core_list)
      return 0;

-   return core_list->size;
+   return RBUF_LEN(core_list->entries);
 }

-/* Returns maximum allowed number of entries in core
- * updater list */
-size_t core_updater_list_capacity(core_updater_list_t *core_list)
+/* Returns 'type' (core delivery method) of
+ * specified core updater list */
+enum core_updater_list_type core_updater_list_get_type(
+      core_updater_list_t *core_list)
 {
   if (!core_list)
-      return 0;
+      return CORE_UPDATER_LIST_TYPE_UNKNOWN;

-   return core_list->capacity;
+   return core_list->type;
 }

 /* Fetches core updater list entry corresponding
@@ -247,11 +220,10 @@ bool core_updater_list_get_index(
   if (!core_list || !entry)
      return false;

-   if (idx >= core_list->size)
+   if (idx >= RBUF_LEN(core_list->entries))
      return false;

-   if (entry)
-      *entry = &core_list->entries[idx];
+   *entry = &core_list->entries[idx];

   return true;
 }
@@ -264,16 +236,19 @@ bool core_updater_list_get_filename(
      const char *remote_filename,
      const core_updater_list_entry_t **entry)
 {
+   size_t num_entries;
   size_t i;

-   if (!core_list || string_is_empty(remote_filename))
+   if (!core_list || !entry || string_is_empty(remote_filename))
      return false;

-   if (core_list->size < 1)
+   num_entries = RBUF_LEN(core_list->entries);
+
+   if (num_entries < 1)
      return false;

   /* Search for specified filename */
-   for (i = 0; i < core_list->size; i++)
+   for (i = 0; i < num_entries; i++)
   {
      core_updater_list_entry_t *current_entry = &core_list->entries[i];

@@ -282,9 +257,7 @@ bool core_updater_list_get_filename(

      if (string_is_equal(remote_filename, current_entry->remote_filename))
      {
-         if (entry)
-            *entry = current_entry;
-
+         *entry = current_entry;
         return true;
      }
   }
@@ -300,6 +273,8 @@ bool core_updater_list_get_core(
      const char *local_core_path,
      const core_updater_list_entry_t **entry)
 {
+   bool resolve_symlinks;
+   size_t num_entries;
   size_t i;
   char real_core_path[PATH_MAX_LENGTH];

@@ -308,18 +283,27 @@ bool core_updater_list_get_core(
   if (!core_list || !entry || string_is_empty(local_core_path))
      return false;

-   if (core_list->size < 1)
+   num_entries = RBUF_LEN(core_list->entries);
+
+   if (num_entries < 1)
      return false;

   /* Resolve absolute pathname of local_core_path */
   strlcpy(real_core_path, local_core_path, sizeof(real_core_path));
-   path_resolve_realpath(real_core_path, sizeof(real_core_path), true);
+   /* Can't resolve symlinks when dealing with cores
+    * installed via play feature delivery, because the
+    * source files have non-standard file names (which
+    * will not be recognised by regular core handling
+    * routines) */
+   resolve_symlinks = (core_list->type != CORE_UPDATER_LIST_TYPE_PFD);
+   path_resolve_realpath(real_core_path, sizeof(real_core_path),
+         resolve_symlinks);

   if (string_is_empty(real_core_path))
      return false;

   /* Search for specified core */
-   for (i = 0; i < core_list->size; i++)
+   for (i = 0; i < num_entries; i++)
   {
      core_updater_list_entry_t *current_entry = &core_list->entries[i];

@@ -334,9 +318,7 @@ bool core_updater_list_get_core(
      if (string_is_equal(real_core_path, current_entry->local_core_path))
      {
 #endif
-         if (entry)
-            *entry = current_entry;
-
+         *entry = current_entry;
         return true;
      }
   }
@@ -353,36 +335,33 @@ bool core_updater_list_get_core(
 static bool core_updater_list_set_date(
      core_updater_list_entry_t *entry, const char *date_str)
 {
-   struct string_list *date_list = NULL;
+   struct string_list date_list = {0};

   if (!entry || string_is_empty(date_str))
      goto error;

   /* Split date string into component values */
-   date_list = string_split(date_str, "-");
-
-   if (!date_list)
-      goto error;
+   string_list_initialize(&date_list);
+   if (!string_split_noalloc(&date_list, date_str, "-"))
+         goto error;

   /* Date string must have 3 values:
    * [year] [month] [day] */
-   if (date_list->size < 3)
+   if (date_list.size < 3)
      goto error;

   /* Convert date string values */
-   entry->date.year  = string_to_unsigned(date_list->elems[0].data);
-   entry->date.month = string_to_unsigned(date_list->elems[1].data);
-   entry->date.day   = string_to_unsigned(date_list->elems[2].data);
+   entry->date.year  = string_to_unsigned(date_list.elems[0].data);
+   entry->date.month = string_to_unsigned(date_list.elems[1].data);
+   entry->date.day   = string_to_unsigned(date_list.elems[2].data);

   /* Clean up */
-   string_list_free(date_list);
+   string_list_deinitialize(&date_list);

   return true;

 error:
-
-   if (date_list)
-      string_list_free(date_list);
+   string_list_deinitialize(&date_list);

   return false;
 }
@@ -415,24 +394,34 @@ static bool core_updater_list_set_paths(
      const char *path_dir_libretro,
      const char *path_libretro_info,
      const char *network_buildbot_url,
-      const char *filename_str)
+      const char *filename_str,
+      enum core_updater_list_type list_type)
 {
   char *last_underscore                  = NULL;
   char *tmp_url                          = NULL;
+   bool is_archive                        = true;
+   /* Can't resolve symlinks when dealing with cores
+    * installed via play feature delivery, because the
+    * source files have non-standard file names (which
+    * will not be recognised by regular core handling
+    * routines) */
+   bool resolve_symlinks                  = (list_type != CORE_UPDATER_LIST_TYPE_PFD);
   char remote_core_path[PATH_MAX_LENGTH];
   char local_core_path[PATH_MAX_LENGTH];
   char local_info_path[PATH_MAX_LENGTH];
-   bool is_archive;

   remote_core_path[0] = '\0';
   local_core_path[0]  = '\0';
   local_info_path[0]  = '\0';

-   if (!entry || string_is_empty(filename_str))
+   if (!entry ||
+       string_is_empty(filename_str) ||
+       string_is_empty(path_dir_libretro) ||
+       string_is_empty(path_libretro_info))
      return false;

-   if (string_is_empty(path_dir_libretro) ||
-       string_is_empty(path_libretro_info) ||
+   /* Only buildbot cores require the buildbot URL */
+   if ((list_type == CORE_UPDATER_LIST_TYPE_BUILDBOT) &&
       string_is_empty(network_buildbot_url))
      return false;

@@ -448,20 +437,24 @@ static bool core_updater_list_set_paths(

   entry->remote_filename = strdup(filename_str);

-   /* remote_core_path */
-   fill_pathname_join(
-         remote_core_path,
-         network_buildbot_url,
-         filename_str,
-         sizeof(remote_core_path));
+   /* remote_core_path
+    * > Leave blank if this is not a buildbot core */
+   if (list_type == CORE_UPDATER_LIST_TYPE_BUILDBOT)
+   {
+      fill_pathname_join(
+            remote_core_path,
+            network_buildbot_url,
+            filename_str,
+            sizeof(remote_core_path));

-   /* > Apply proper URL encoding (messy...) */
-   tmp_url = strdup(remote_core_path);
-   remote_core_path[0] = '\0';
-   net_http_urlencode_full(
-         remote_core_path, tmp_url, sizeof(remote_core_path));
-   if (tmp_url)
-      free(tmp_url);
+      /* > Apply proper URL encoding (messy...) */
+      tmp_url = strdup(remote_core_path);
+      remote_core_path[0] = '\0';
+      net_http_urlencode_full(
+            remote_core_path, tmp_url, sizeof(remote_core_path));
+      if (tmp_url)
+         free(tmp_url);
+   }

   if (entry->remote_core_path)
   {
@@ -481,7 +474,8 @@ static bool core_updater_list_set_paths(
   if (is_archive)
      path_remove_extension(local_core_path);

-   path_resolve_realpath(local_core_path, sizeof(local_core_path), true);
+   path_resolve_realpath(local_core_path, sizeof(local_core_path),
+         resolve_symlinks);

   if (entry->local_core_path)
   {
@@ -515,7 +509,7 @@ static bool core_updater_list_set_paths(
   /* > Add proper file extension */
   strlcat(
         local_info_path,
-         file_path_str(FILE_PATH_CORE_INFO_EXTENSION),
+         FILE_PATH_CORE_INFO_EXTENSION,
         sizeof(local_info_path));

   if (entry->local_info_path)
@@ -627,22 +621,25 @@ static bool core_updater_list_push_entry(
      core_updater_list_t *core_list, core_updater_list_entry_t *entry)
 {
   core_updater_list_entry_t *list_entry = NULL;
+   size_t num_entries;

   if (!core_list || !entry)
      return false;

-   /* Ensure there is enough space for the new entry */
-   if (core_list->capacity <= core_list->size)
+   /* Get current number of list entries */
+   num_entries = RBUF_LEN(core_list->entries);
+
+   /* Attempt to allocate memory for new entry */
+   if (!RBUF_TRYFIT(core_list->entries, num_entries + 1))
      return false;

-   /* Get handle of new entry inside list */
-   list_entry = &core_list->entries[core_list->size];
+   /* Allocation successful - increment array size */
+   RBUF_RESIZE(core_list->entries, num_entries + 1);

-   if (!list_entry)
-      return false;
-
-   /* Ensure list entry is empty */
-   core_updater_list_free_entry(list_entry);
+   /* Get handle of new entry at end of list, and
+    * zero-initialise members */
+   list_entry = &core_list->entries[num_entries];
+   memset(list_entry, 0, sizeof(*list_entry));

   /* Assign paths */
   list_entry->remote_filename  = entry->remote_filename;
@@ -662,9 +659,6 @@ static bool core_updater_list_push_entry(
   /* Copy date */
   memcpy(&list_entry->date, &entry->date, sizeof(core_updater_list_date_t));

-   /* Increment list size */
-   core_list->size++;
-
   return true;
 }

@@ -678,10 +672,11 @@ static void core_updater_list_add_entry(
      const char *network_buildbot_url,
      struct string_list *network_core_entry_list)
 {
-   const char *date_str             = NULL;
-   const char *crc_str              = NULL;
-   const char *filename_str         = NULL;
-   core_updater_list_entry_t entry  = {0};
+   const char *date_str                          = NULL;
+   const char *crc_str                           = NULL;
+   const char *filename_str                      = NULL;
+   const core_updater_list_entry_t *search_entry = NULL;
+   core_updater_list_entry_t entry               = {0};

   if (!core_list || !network_core_entry_list)
      goto error;
@@ -704,7 +699,8 @@ static void core_updater_list_add_entry(
   /* Check whether core file is already included
    * in the list (this is *not* an error condition,
    * it just means we can skip the current listing) */
-   if (core_updater_list_get_filename(core_list, filename_str, NULL))
+   if (core_updater_list_get_filename(core_list,
+         filename_str, &search_entry))
      goto error;

   /* Parse individual listing strings */
@@ -719,7 +715,8 @@ static void core_updater_list_add_entry(
            path_dir_libretro,
            path_libretro_info,
            network_buildbot_url,
-            filename_str))
+            filename_str,
+            CORE_UPDATER_LIST_TYPE_BUILDBOT))
      goto error;

   if (!core_updater_list_set_core_info(
@@ -742,7 +739,8 @@ error:
    *   (could be the case that the network buffer
    *    wasn't large enough to cache the entire
    *    string, so the last line was truncated)
-    * - The core updater list struct is at capacity
+    * - We had insufficient memory to allocate a new
+    *   entry in the core updater list
    * In either case, the current entry is discarded
    * and we move on to the next one
    * (network transfers are fishy business, so we
@@ -768,18 +766,21 @@ static int core_updater_list_qsort_func(
 /* Sorts core updater list into alphabetical order */
 static void core_updater_list_qsort(core_updater_list_t *core_list)
 {
+   size_t num_entries;
+
   if (!core_list)
      return;

-   if (core_list->size < 2)
+   num_entries = RBUF_LEN(core_list->entries);
+
+   if (num_entries < 2)
      return;

   qsort(
-         core_list->entries,
-         core_list->size,
+         core_list->entries, num_entries,
         sizeof(core_updater_list_entry_t),
         (int (*)(const void *, const void *))
-         core_updater_list_qsort_func);
+               core_updater_list_qsort_func);
 }

 /* Reads the contents of a buildbot core list
@@ -793,10 +794,9 @@ bool core_updater_list_parse_network_data(
      const char *network_buildbot_url,
      const char *data, size_t len)
 {
-   struct string_list *network_core_list       = NULL;
-   struct string_list *network_core_entry_list = NULL;
-   char *data_buf                              = NULL;
   size_t i;
+   char *data_buf                       = NULL;
+   struct string_list network_core_list = {0};

   /* Sanity check */
   if (!core_list || string_is_empty(data) || (len < 1))
@@ -817,12 +817,11 @@ bool core_updater_list_parse_network_data(
   data_buf[len] = '\0';

   /* Split network listing request into lines */
-   network_core_list = string_split(data_buf, "\n");
-
-   if (!network_core_list)
+   string_list_initialize(&network_core_list);
+   if (!string_split_noalloc(&network_core_list, data_buf, "\n"))
      goto error;

-   if (network_core_list->size < 1)
+   if (network_core_list.size < 1)
      goto error;

   /* Temporary data buffer is no longer required */
@@ -830,15 +829,17 @@ bool core_updater_list_parse_network_data(
   data_buf = NULL;

   /* Loop over lines */
-   for (i = 0; i < network_core_list->size; i++)
+   for (i = 0; i < network_core_list.size; i++)
   {
-      const char *line = network_core_list->elems[i].data;
+      struct string_list network_core_entry_list  = {0};
+      const char *line = network_core_list.elems[i].data;

      if (string_is_empty(line))
         continue;

+      string_list_initialize(&network_core_entry_list);
      /* Split line into listings info components */
-      network_core_entry_list = string_split(line, " ");
+      string_split_noalloc(&network_core_entry_list, line, " ");

      /* Parse listings info and add to core updater
       * list */
@@ -847,35 +848,143 @@ bool core_updater_list_parse_network_data(
            path_dir_libretro,
            path_libretro_info,
            network_buildbot_url,
-            network_core_entry_list);
+            &network_core_entry_list);

      /* Clean up */
-      string_list_free(network_core_entry_list);
-      network_core_entry_list = NULL;
+      string_list_deinitialize(&network_core_entry_list);
   }

   /* Sanity check */
-   if (core_list->size < 1)
+   if (RBUF_LEN(core_list->entries) < 1)
      goto error;

   /* Clean up */
-   string_list_free(network_core_list);
+   string_list_deinitialize(&network_core_list);

   /* Sort completed list */
   core_updater_list_qsort(core_list);

+   /* Set list type */
+   core_list->type = CORE_UPDATER_LIST_TYPE_BUILDBOT;
+
   return true;

 error:
-
-   if (network_core_list)
-      string_list_free(network_core_list);
-
-   if (network_core_entry_list)
-      string_list_free(network_core_entry_list);
+   string_list_deinitialize(&network_core_list);

   if (data_buf)
      free(data_buf);

   return false;
 }
+
+/* Parses a single play feature delivery core
+ * listing and adds it to the specified core
+ * updater list */
+static void core_updater_list_add_pfd_entry(
+      core_updater_list_t *core_list,
+      const char *path_dir_libretro,
+      const char *path_libretro_info,
+      const char *filename_str)
+{
+   const core_updater_list_entry_t *search_entry = NULL;
+   core_updater_list_entry_t entry               = {0};
+
+   if (!core_list || string_is_empty(filename_str))
+      goto error;
+
+   /* Check whether core file is already included
+    * in the list (this is *not* an error condition,
+    * it just means we can skip the current listing) */
+   if (core_updater_list_get_filename(core_list,
+         filename_str, &search_entry))
+      goto error;
+
+   /* Note: Play feature delivery cores have no
+    * timestamp or CRC info - leave these fields
+    * zero initialised */
+
+   /* Populate entry fields */
+   if (!core_updater_list_set_paths(
+            &entry,
+            path_dir_libretro,
+            path_libretro_info,
+            NULL,
+            filename_str,
+            CORE_UPDATER_LIST_TYPE_PFD))
+      goto error;
+
+   if (!core_updater_list_set_core_info(
+         &entry,
+         entry.local_info_path,
+         filename_str))
+      goto error;
+
+   /* Add entry to list */
+   if (!core_updater_list_push_entry(core_list, &entry))
+      goto error;
+
+   return;
+
+error:
+   /* This is not a *fatal* error - it just
+    * means one of the following:
+    * - The core listing entry obtained from the
+    *   play feature delivery interface is broken
+    *   somehow
+    * - We had insufficient memory to allocate a new
+    *   entry in the core updater list
+    * In either case, the current entry is discarded
+    * and we move on to the next one */
+   core_updater_list_free_entry(&entry);
+}
+
+/* Reads the list of cores currently available
+ * via play feature delivery (PFD) into the
+ * specified core_updater_list_t object.
+ * Returns false in the event of an error. */
+bool core_updater_list_parse_pfd_data(
+      core_updater_list_t *core_list,
+      const char *path_dir_libretro,
+      const char *path_libretro_info,
+      const struct string_list *pfd_cores)
+{
+   size_t i;
+
+   /* Sanity check */
+   if (!core_list || !pfd_cores || (pfd_cores->size < 1))
+      return false;
+
+   /* We're populating a list 'from scratch' - remove
+    * any existing entries */
+   core_updater_list_reset(core_list);
+
+   /* Loop over play feature delivery core list */
+   for (i = 0; i < pfd_cores->size; i++)
+   {
+      const char *filename_str = pfd_cores->elems[i].data;
+
+      if (string_is_empty(filename_str))
+         continue;
+
+      /* Parse core file name and add to core
+       * updater list */
+      core_updater_list_add_pfd_entry(
+            core_list,
+            path_dir_libretro,
+            path_libretro_info,
+            filename_str);
+   }
+
+   /* Sanity check */
+   if (RBUF_LEN(core_list->entries) < 1)
+      return false;
+
+   /* Sort completed list */
+   core_updater_list_qsort(core_list);
+
+   /* Set list type */
+   core_list->type = CORE_UPDATER_LIST_TYPE_PFD;
+
+   return true;
+}
@@ -32,9 +32,17 @@

 RETRO_BEGIN_DECLS

-/* Default maximum number of entries in
- * a core updater list */
-#define CORE_UPDATER_LIST_SIZE 9999
+/* Defines all possible 'types' of core
+ * updater list - corresponds to core
+ * delivery method:
+ * > Buildbot
+ * > Play feature delivery (PFD) */
+enum core_updater_list_type
+{
+   CORE_UPDATER_LIST_TYPE_UNKNOWN = 0,
+   CORE_UPDATER_LIST_TYPE_BUILDBOT,
+   CORE_UPDATER_LIST_TYPE_PFD
+};

 /* Holds all date info for a core file
 * on the buildbot */
@@ -56,9 +64,9 @@ typedef struct
   char *display_name;
   char *description;
   struct string_list *licenses_list;
-   bool is_experimental;
+   core_updater_list_date_t date;   /* unsigned alignment */
   uint32_t crc;
-   core_updater_list_date_t date;
+   bool is_experimental;
 } core_updater_list_entry_t;

 /* Prevent direct access to core_updater_list_t
@@ -69,11 +77,10 @@ typedef struct core_updater_list core_updater_list_t;
 /* Initialisation / De-Initialisation */
 /**************************************/

-/* Creates a new, empty core updater list with a
- * maximum number of 'max_size' entries.
+/* Creates a new, empty core updater list.
 * Returns a handle to a new core_updater_list_t object
 * on success, otherwise returns NULL. */
-core_updater_list_t *core_updater_list_init(size_t max_size);
+core_updater_list_t *core_updater_list_init(void);

 /* Resets (removes all entries of) specified core
 * updater list */
@@ -89,7 +96,7 @@ void core_updater_list_free(core_updater_list_t *core_list);
 /* Creates a new, empty cached core updater list
 * (i.e. 'global' list).
 * Returns false in the event of an error. */
-bool core_updater_list_init_cached(size_t max_size);
+bool core_updater_list_init_cached(void);

 /* Fetches cached core updater list */
 core_updater_list_t *core_updater_list_get_cached(void);
@@ -104,9 +111,10 @@ void core_updater_list_free_cached(void);
 /* Returns number of entries in core updater list */
 size_t core_updater_list_size(core_updater_list_t *core_list);

-/* Returns maximum allowed number of entries in core
- * updater list */
-size_t core_updater_list_capacity(core_updater_list_t *core_list);
+/* Returns 'type' (core delivery method) of
+ * specified core updater list */
+enum core_updater_list_type core_updater_list_get_type(
+      core_updater_list_t *core_list);

 /* Fetches core updater list entry corresponding
 * to the specified entry index.
@@ -147,6 +155,16 @@ bool core_updater_list_parse_network_data(
      const char *network_buildbot_url,
      const char *data, size_t len);

+/* Reads the list of cores currently available
+ * via play feature delivery (PFD) into the
+ * specified core_updater_list_t object.
+ * Returns false in the event of an error. */
+bool core_updater_list_parse_pfd_data(
+      core_updater_list_t *core_list,
+      const char *path_dir_libretro,
+      const char *path_libretro_info,
+      const struct string_list *pfd_cores);
+
 RETRO_END_DECLS

 #endif
@@ -193,10 +193,9 @@ static GLint mix_loc;

 static struct
 {
+   double interpolate_fps;
   unsigned width;
   unsigned height;
-
-   double interpolate_fps;
   unsigned sample_rate;

   float aspect;
@@ -19,14 +19,14 @@ enum kbStatus

 struct video_buffer
 {
+   int64_t head;
+   int64_t tail;
   video_decoder_context_t *buffer;
   enum kbStatus *status;
-   size_t capacity;
   slock_t *lock;
   scond_t *open_cond;
   scond_t *finished_cond;
-   int64_t head;
-   int64_t tail;
+   size_t capacity;
 };

 video_buffer_t *video_buffer_create(
@@ -43,7 +43,6 @@ RETRO_BEGIN_DECLS
 */
 struct video_decoder_context
 {
-   int index;
   int64_t pts;
   struct SwsContext *sws;
   AVFrame *source;
@@ -55,6 +54,7 @@ struct video_decoder_context
   ASS_Track *ass_track_active;
 #endif
   uint8_t *frame_buf;
+   int index;
 };
 typedef struct video_decoder_context video_decoder_context_t;

@@ -8,6 +8,7 @@
 extern "C" {
 #endif
 void wait_for_input(void);
+void error_and_quit(const char* errorStr);
 void dump_result_value(Result val);
 #ifdef __cplusplus
 }
@@ -201,8 +201,7 @@ void* linearMemAlign(size_t size, size_t alignment)
 void* linearAlloc(size_t size)
 {
 #if 0
-   extern PrintConsole* currentConsole;
-   if(currentConsole->consoleInitialised)
+   if(ctrConsole && ctrConsole->consoleInitialised)
   {
      printf("linearAlloc : 0x%08X\n", size);
      DEBUG_HOLD();
@@ -141,9 +141,12 @@ void* _sbrk_r(struct _reent *ptr, ptrdiff_t incr)

   __heap_size += diff;

-   if (diff < 0)
-      svcControlMemory(&tmp, __heapBase + __heap_size,
-            0x0, -diff, MEMOP_FREE, MEMPERM_READ | MEMPERM_WRITE);
+   while (diff < 0) {
+      int size = -diff < 0x100000 ? -diff : 0x100000;
+      diff += size;
+      svcControlMemory(&tmp, __heapBase + __heap_size - diff,
+            0x0, size, MEMOP_FREE, 0);
+   }

   sbrk_top += incr;

@@ -44,7 +44,9 @@ typedef struct
   bool isNew3DS;
   u32 kernel_fcram_mapping_offset;

+#ifndef USE_CTRULIB_2
   Handle arbiter;
+#endif
   volatile u32 alloc_address;
   volatile u32 alloc_size;
   u8* flush_buffer;
@@ -263,7 +265,9 @@ static void do_memchunkhax2(void)

   svcCloseHandle(mch2.dummy_threads_lock);

+#ifndef USE_CTRULIB_2
   mch2.arbiter        = __sync_get_arbiter();
+#endif

   svcControlMemory(&linear_buffer, 0, 0, 0x1000,
         MEMOP_ALLOC_LINEAR, MEMPERM_READ | MEMPERM_WRITE);
@@ -327,9 +331,14 @@ static void do_memchunkhax2(void)
         (ThreadFunc)alloc_thread_entry, (u32)&mch2,
         mch2.threads[MCH2_THREAD_COUNT_MAX - 1].stack_top, 0x3F, 1);

+#ifdef USE_CTRULIB_2
+   while ((u32) syncArbitrateAddress((s32 *)mch2.alloc_address,
+            ARBITRATION_WAIT_IF_LESS_THAN_TIMEOUT, 0) == 0xD9001814);
+#else
   while ((u32) svcArbitrateAddress(mch2.arbiter, mch2.alloc_address,
            ARBITRATION_WAIT_IF_LESS_THAN_TIMEOUT, 0,
            0) == 0xD9001814);
+#endif

   GX_TextureCopy((void*)linear_buffer, 0, (void*)dst_memchunk, 0, 16, 8);
   memcpy(flush_buffer, flush_buffer + 0x4000, 0x4000);
@@ -21,6 +21,8 @@ u32 __heapBase;
 u32 __stack_bottom;
 u32 __stack_size_extra;

+u32 __saved_stack;
+
 extern u32 __linear_heap_size_hbl;
 extern u32 __heap_size_hbl;
 extern void* __service_ptr;
@@ -74,6 +76,11 @@ void __system_allocateHeaps(void)
   /* Allocate the linear heap */
   svcControlMemory(&__linear_heap, 0x0, 0x0, __linear_heap_size, MEMOP_ALLOC_LINEAR, MEMPERM_READ | MEMPERM_WRITE);

+#ifdef USE_CTRULIB_2
+   /* Mappable allocator init */
+   mappableInit(OS_MAP_AREA_BEGIN, OS_MAP_AREA_END);
+#endif
+
   /* Set up newlib heap */
   fake_heap_end = (char*)0x13F00000;
 }
@@ -102,15 +109,26 @@ extern char** __system_argv;
 void __attribute__((noreturn)) __libctru_exit(int rc)
 {
   u32 tmp = 0;
+   int size = 0;

   if (__system_argv)
      free(__system_argv);

   /* Unmap the linear heap */
-   svcControlMemory(&tmp, __linear_heap, 0x0, __linear_heap_size, MEMOP_FREE, 0x0);
+   /* Do this 1MB at a time to avoid kernel panics, see https://github.com/LumaTeam/Luma3DS/issues/1504 */
+   while (__linear_heap_size > 0) {
+      size = __linear_heap_size < 0x100000 ? __linear_heap_size : 0x100000;
+      __linear_heap_size -= size;
+      svcControlMemory(&tmp, __linear_heap + __linear_heap_size, 0x0, size, MEMOP_FREE, 0x0);
+   }

   /* Unmap the application heap */
-   svcControlMemory(&tmp, __heapBase, 0x0, __heap_size, MEMOP_FREE, 0x0);
+   /* Do this 1MB at a time to avoid kernel panics */
+   while (__heap_size > 0) {
+      size = __heap_size < 0x100000 ? __heap_size : 0x100000;
+      __heap_size -= size;
+      svcControlMemory(&tmp, __heapBase + __heap_size, 0x0, size, MEMOP_FREE, 0x0);
+   }

   if (__stack_size_extra)
      svcControlMemory(&tmp, __stack_bottom, 0x0, __stack_size_extra, MEMOP_FREE, 0x0);
@@ -240,6 +258,9 @@ void __system_initArgv(void)

 void initSystem(void (*retAddr)(void))
 {
+   register u32 sp_val __asm__("sp");
+   __saved_stack = sp_val;
+
   __libctru_init(retAddr);
   __appInit();
   __system_initArgv();
@@ -250,6 +271,7 @@ void __attribute__((noreturn)) __ctru_exit(int rc)
 {
   __libc_fini_array();
   __appExit();
+   asm ("mov sp, %[saved_stack] \n\t" : : [saved_stack] "r"  (__saved_stack) : "sp");
   __libctru_exit(rc);
 }

@@ -300,6 +322,20 @@ void wait_for_input(void)
   }
 }

+void error_and_quit(const char* errorStr)
+{
+   errorConf error;
+#ifdef IS_SALAMANDER
+   gfxInitDefault();
+#endif
+   errorInit(&error, ERROR_TEXT, CFG_LANGUAGE_EN);
+   errorText(&error, errorStr);
+   errorDisp(&error);
+
+   gfxExit();
+   exit(0);
+}
+
 long sysconf(int name)
 {
   switch (name)