Qt: add fallback path for older versions

2026-11-08 17:28:49 -10:00 · 2018-09-17 23:12:08 -04:00
6344 changed files with 454335 additions and 1182316 deletions
@@ -1,4 +1,4 @@
-# EditorConfig: https://EditorConfig.org
+# EditorConfig: http://EditorConfig.org

 # Top-most EditorConfig file
 root = true
@@ -15,11 +15,6 @@ charset = utf-8
 indent_style = space
 indent_size = 3

-# 2 space indentation
-[*.{json,xml,yaml,yml}]
-indent_style = space
-indent_size = 2
-
 # Tab indentation
 [Makefile*]
 indent_style = tab
@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: [libretro]
-patreon: libretro
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # Replace with a single custom sponsorship URL
@@ -2,34 +2,34 @@
 - Only RetroArch bugs should be filed here. Not core bugs or game bugs
 - This is not a forum or a help section, this is strictly developer oriented

-## Description
-
-[Description of the bug]
-
-### Expected behavior
-
-[What you expected to happen]
-
-### Actual behavior
-
-[What is actually happening]
-
-### Steps to reproduce the bug
-
-1. [First step]
-2. [Second step]
-3. [and so on...]
-
-### Bisect Results
-
-[Try to bisect and tell us when this started happening]
-
-### Version/Commit
-You can find this information under Information/System Information
-
- RetroArch: [version/commit]
-
-### Environment information
+## Description
+
+[Description of the bug]
+
+### Expected behavior
+
+[What you expected to happen]
+
+### Actual behavior
+
+[What is actually happening]
+
+### Steps to reproduce the bug
+
+1. [First step]
+2. [Second step]
+3. [and so on...]
+
+### Bisect Results

+[Try to bisect and tell us when this started happening]
+
+### Version/Commit
+You can find this information under Information/System Information
+
+- RetroArch: [version/commit]
+
+### Environment information
+
 - OS: [The operating system you're running]
- Compiler: [In case you are running local builds]
+- Compiler: [In case you are running local builds]
@@ -4,6 +4,7 @@
 2. If you are sending several unrelated fixes or features, use a branch and a separate pull request for each
 3. If possible try squashing everything in a single commit. This is particularly beneficial in the case of feature merges since it allows easy bisecting when a problem arises

+
 ## Description

 [Description of the pull request, detail any issues you are fixing or any features you are implementing]
@@ -1,31 +0,0 @@
-# Upload sources to Crowdin for translation
-
-name: Crowdin Workflow
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - 'intl/*_us.h'
-      - 'intl/*_us.json'
-
-jobs:
-  sync:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Setup Python
-        uses: actions/setup-python@v2
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Crowdin Sync
-        shell: bash
-        env:
-          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
-        run: |
-          cd intl
-          python3 crowdin_sync.py "$CROWDIN_API_KEY"
@@ -8,14 +8,9 @@
 *.dol
 *.map
 *.swp
-*.cache
-*.gcda
-*.gcno
 .tmp
 .tmp.c
 .tmp.cxx
-.moc.h
-.moc.cpp
 config.log
 /.project
 /.externalToolBuilders/
@@ -36,7 +31,6 @@ Release
 ipch
 *.user
 /bootstrap/gx/wii/app_booter/app_booter.bin
-/wii/app_booter/app_booter.bin
 *.zip
 RetroArch-w32/
 RetroArch-w64/
@@ -59,6 +53,7 @@ DerivedData
 apple/tmp
 apple/*.mobileprovision
 apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
+menu/driverspzarch.c
 /Cg/
 /GL/
 /SDL/
@@ -66,12 +61,12 @@ apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
 /freetype2/
 /ft2build.h
 /iconv.h
+/libxml2/
 /phoenix/
 /python/
 /rsound.h
 .pc
 /media/shaders_glsl/
-/media/shaders_slang/
 /obj-w32/
 .cproject
 .settings
@@ -79,32 +74,6 @@ libretro-super
 run.sh
 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
-shaders/shaders_cg
-shaders/shaders_glsl
-shaders/shaders_slang
-
-# Qt Creator
-*.cflags
-*.cxxflags
-*.creator*
-*.config
-*.files
-*.includes

 # Wii U
 *.depend
@@ -116,6 +85,7 @@ wiiu/wut/elf2rpl/elf2rpl
 /pkg/wiiu/rpx
 /wiiu-devel.properties

+
 # 3ds
 /.lst
 *.3dsx
@@ -140,10 +110,6 @@ wiiu/wut/elf2rpl/elf2rpl
 /pkg/android/phoenix/bin/
 /pkg/android/phoenix/gen/
 /pkg/android/phoenix/local.properties
-/pkg/android/phoenix/gradle.properties
-/pkg/android/phoenix/.gradle
-/pkg/android/phoenix/.externalNativeBuild
-/pkg/android/phoenix/build

 # Cloned by libretro-fetch.sh
 /media/assets/
@@ -153,6 +119,7 @@ wiiu/wut/elf2rpl/elf2rpl
 /media/libretrodb/

 pkg/apple/iOS/build/
+pkg/apple/iOS/modules/
 pkg/apple/build/
 ui/drivers/qt/moc_*
 ui/drivers/moc_*
@@ -196,30 +163,3 @@ retroarch_switch.lst
 retroarch_switch.nacp
 retroarch_switch.nro
 retroarch_switch.nso
-
-# PS2
-ps2/irx/*.c
-*.irx
-
-# Wayland
-gfx/common/wayland/idle-inhibit-unstable-v1.c
-gfx/common/wayland/idle-inhibit-unstable-v1.h
-gfx/common/wayland/xdg-shell-unstable-v6.c
-gfx/common/wayland/xdg-shell-unstable-v6.h
-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
-*.wo
-*.elf
-*.self
-*.vpk
@@ -1,933 +0,0 @@
-image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-amd64-ubuntu:latest
-
-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:
-    - "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-rs90-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_rs90_odbeta.opk
-    - ${MEDIA_PATH}
-    expire_in: 10 min
-  dependencies: []
-  script:
-    - "make -j$NUMPROC -f Makefile.rs90"
-    - "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
@@ -1,178 +1,75 @@
-# This setting is to prevent travis to launch duplicate builds on PRs
-branches:
-  only:
-    - master
-    - /^v.*$/
-
 # Use 'generic' to be able to override CC/CXX for clang
 language: generic

-# Use a release with a longer normal LTS
-dist: xenial
-
 matrix:
  include:
    - compiler: mingw-x86
-      addons: true
-      env: CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: mingw-x86
-      addons: true
-      env: C89_BUILD=1 CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: mingw-x86
-      addons: true
-      env: CXX_BUILD=1 CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: mingw-x64
-      addons: true
-      env: CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: mingw-x64
-      addons: true
-      env: C89_BUILD=1 CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: mingw-x64
-      addons: true
-      env: CXX_BUILD=1 CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: gcc
-      env: CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: CC="gcc-8 --sysroot=/" CXX="g++-8 --sysroot=/"
-    - compiler: gcc
-      env: C89_BUILD=1 CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: CXX_BUILD=1 CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: DISABLE_MENU=1 CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: DISABLE_NETWORKING=1 CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: DISABLE_OVERLAY=1 CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: DISABLE_CDROM=1 CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: DISABLE_VIDEO_LAYOUT=1 CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: DISABLE_THREADS=1 CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: DISABLE_AUDIOMIXER=1 CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: ENABLE_GLES=1 CC=gcc-8 CXX=g++-8
-    - compiler: gcc
-      env: ENABLE_GLES=1 ENABLE_GLES3=1 CC=gcc-8 CXX=g++-8
-    - compiler: clang
-      env: CC=clang-6.0 CXX=clang++-6.0
-    - compiler: clang
-      env: C89_BUILD=1 CC=clang-6.0 CXX=clang++-6.0
-    - compiler: clang
-      env: CXX_BUILD=1 CC=clang-6.0 CXX=clang++-6.0
-    - os: osx
-      env: CC=clang CXX=clang++
-    - name: OSX OpenGL Make
-      os: osx
-      osx_image: xcode11.2
+      addons:
+        apt:
+          packages:
+            - g++-mingw-w64-i686
+            - mingw-w64-i686-dev
      script:
-        - ./configure --enable-opengl --disable-metal
-        - make
-    - language: android
-      # Android builds are only supported on Trusty
-      dist: trusty
-      android:
-        components:
-          - tools
-          - build-tools-29.0.3
-          - android-29
-      install:
-        - echo y | sdkmanager "ndk-bundle"
-      before_script:
-        - export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle
+        - CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501" ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
+    - compiler: mingw-x64
+      addons:
+        apt:
+          packages:
+            - g++-mingw-w64-x86-64
+            - mingw-w64-x86-64-dev
      script:
-        - cd pkg/android/phoenix
-        - ./gradlew assembleNormalRelease
-
-jobs:
-  allow_failure:
+        - CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501" ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
+    - compiler: gcc
+    - compiler: clang
+      addons:
+        # Install a more recent clang than the default
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.8
+          packages:
+            - clang-3.8
+      env: COMPILER_NAME=clang-3.8 CXX=clang++-3.8 CC=clang-3.8
    - os: osx
-
-before_install:
-  - |
-     if [[ "$CC" =~ ^gcc-8.* ]]; then
-       # Install a more recent gcc than the default
-       sudo apt-get install -y g++-8
-     elif [ "$CC" = clang-6.0 ]; then
-       # Install a more recent clang than the default
-       sudo apt-get install -y clang-6.0
-     elif [ "$CROSS_COMPILE" = i686-w64-mingw32- ]; then
-       sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
-     elif [ "$CROSS_COMPILE" = x86_64-w64-mingw32- ]; then
-       sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
-     fi
-
-before_script:
-  - |
-     if [ -n "$CROSS_COMPILE" ]; then
-       ARGS="$ARGS --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12"
-     fi
-  - |
-     if [ -n "$DISABLE_MENU" ]; then
-       ARGS="$ARGS --disable-menu"
-     fi
-  - |
-     if [ -n "$DISABLE_OVERLAY" ]; then
-       ARGS="$ARGS --disable-overlay"
-     fi
-  - |
-     if [ -n "$DISABLE_NETWORKING" ]; then
-       ARGS="$ARGS --disable-networking"
-     fi
-  - |
-     if [ -n "$DISABLE_CDROM" ]; then
-       ARGS="$ARGS --disable-cdrom"
-     fi
-  - |
-     if [ -n "$DISABLE_VIDEO_LAYOUT" ]; then
-       ARGS="$ARGS --disable-video_layout"
-     fi
-  - |
-     if [ -n "$DISABLE_THREADS" ]; then
-       ARGS="$ARGS --disable-threads --disable-glslang"
-     fi
-  - |
-     if [ -n "$DISABLE_AUDIOMIXER" ]; then
-       ARGS="$ARGS --disable-audiomixer"
-     fi
-  - |
-     if [ -n "$ENABLE_GLES" ]; then
-       ARGS="$ARGS --enable-opengles"
-     fi
-  - |
-     if [ -n "$ENABLE_GLES3" ]; then
-       ARGS="$ARGS --enable-opengles3"
-     fi
-  - echo "Configure arguments = $ARGS"
+      osx_image: xcode7.3
+      script:
+          - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
+    - os: osx
+      osx_image: xcode9.3
+      script:
+        - cd ~/
+        - brew install --force-bottle qt5
+        - git clone --depth=50 https://github.com/libretro/libretro-super
+        - cd libretro-super/travis
+        - ./build-retroarch-metal.sh
+      deploy:
+        skip_cleanup: true
+        provider: script
+        script: cd ../retroarch; bash travis_metal_deploy.sh
+        on:
+          branch: master

 script:
-  - ./configure $ARGS
-  - |
-     if [ -n "$C89_BUILD" ]; then
-       make C89_BUILD=1
-     elif [ -n "$CXX_BUILD" ]; then
-       make CXX_BUILD=1
-     else
-       make
-     fi
+  - ./configure
+  - make

 env:
  global:
-   - ARGS=""
   - MAKEFLAGS="-j2"
   - secure: "qc91ReC3OlzSh2gFaSH6TYzC2qIQvgA2AZff6J13eaH8xijAhuMzttZ0rMQJ0DWCIhPeUb0kIzVyaGoe4MwPALzpw1C1AznIWiZJ53HN+hWCOcS/af7YVPk6HPySnwqrS+Wv3AIIvIKFV2mxv21F/JbT/N+pArlRrp904Xj+KPo="
 addons:
  apt:
    packages:
-      - libsdl2-dev
+      - curl
+      - pkg-config
+      - libglu1-mesa-dev
+      - freeglut3-dev
+      - mesa-common-dev
+      - libsdl1.2-dev
+      - libsdl-image1.2-dev
+      - libsdl-mixer1.2-dev
+      - libsdl-ttf2.0-dev
      - libusb-1.0-0-dev
-      - qtbase5-dev
-      - qtdeclarative5-dev
-    sources:
-      - ubuntu-toolchain-r-test
-      - llvm-toolchain-xenial
  coverity_scan:
    project:
      name: "RetroArch"
@@ -182,4 +79,4 @@ addons:
    build_command:   "make"
    branch_pattern: coverity_scan
 notifications:
-  email: true
+  email: false
@@ -1,155 +1,128 @@
 {
-   "configurations": [
-      {
-         "name": "Mac",
-         "includePath": [
-            "/usr/include",
-            "/usr/local/include",
-            "${workspaceRoot}",
-            "${workspaceRoot}/libretro-common/include"
-         ],
-         "defines": [],
-         "intelliSenseMode": "clang-x64",
-         "browse": {
-            "path": [
-               "/usr/include",
-               "/usr/local/include",
-               "${workspaceRoot}"
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}",
+                "${workspaceRoot}/libretro-common/include"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         },
-         "macFrameworkPath": [
-            "/System/Library/Frameworks",
-            "/Library/Frameworks"
-         ]
-      },
-      {
-         "name": "Linux",
-         "includePath": [
-            "/usr/include",
-            "/usr/local/include",
-            "${workspaceRoot}",
-            "${workspaceFolder}/libretro-common/include",
-            "${workspaceRoot}/libretro-common/include"
-         ],
-         "defines": [],
-         "intelliSenseMode": "clang-x64",
-         "browse": {
-            "path": [
-               "/usr/include",
-               "/usr/local/include",
-               "${workspaceRoot}"
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "macFrameworkPath": [
+                "/System/Library/Frameworks",
+                "/Library/Frameworks"
+            ]
+        },
+        {
+            "name": "Linux",
+            "includePath": [
+                "/usr/include",
+                "/usr/local/include",
+                "${workspaceRoot}"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         }
-      },
-      {
-         "name": "Win32",
-         "includePath": [
-            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
-            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
-            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-            "${workspaceRoot}",
-            "${workspaceFolder}/libretro-common/include"
-         ],
-         "defines": [
-            "_DEBUG",
-            "UNICODE"
-         ],
-         "intelliSenseMode": "msvc-x64",
-         "browse": {
-            "path": [
-               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
-               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
-               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-               "${workspaceRoot}"
+            "defines": [],
+            "intelliSenseMode": "clang-x64",
+            "browse": {
+                "path": [
+                    "/usr/include",
+                    "/usr/local/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+            "name": "Win32",
+            "includePath": [
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
+                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
+                "${workspaceRoot}"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         },
-         "cStandard": "c11",
-         "cppStandard": "c++17"
-      },
-      {
-         "name": "msys2-mingw32",
-         "includePath": [
-            "C:/msys64/mingw32/include",
-            "C:/msys64/mingw32/i686-w64-mingw32/include",
-            "${workspaceRoot}/libretro-common/include",
-            "${workspaceRoot}/include",
-            "${workspaceRoot}"
-         ],
-         "defines": [
-            "_DEBUG",
-            "UNICODE"
-         ],
-         "intelliSenseMode": "msvc-x64",
-         "browse": {
-            "path": [
-               "C:/msys64/mingw32/include",
-               "C:/msys64/mingw32/i686-w64-mingw32/include",
-               "${workspaceRoot}/libretro-common/include",
-               "${workspaceRoot}/include",
-               "${workspaceRoot}"
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         }
-      },
-      {
-         "name": "msys2-mingw64",
-         "includePath": [
-            "C:/msys64/mingw64/include",
-            "C:/msys64/mingw64/x86_64-w64-mingw32/include",
-            "${workspaceRoot}/libretro-common/include",
-            "${workspaceRoot}/include",
-            "${workspaceRoot}"
-         ],
-         "defines": [
-            "_DEBUG",
-            "UNICODE"
-         ],
-         "intelliSenseMode": "msvc-x64",
-         "browse": {
-            "path": [
-               "C:/msys64/mingw64/include",
-               "C:/msys64/mingw64/x86_64-w64-mingw32/include",
-               "${workspaceRoot}/libretro-common/include",
-               "${workspaceRoot}/include",
-               "${workspaceRoot}"
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
+                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            },
+            "cStandard": "c11",
+            "cppStandard": "c++17"
+        },
+        {
+            "name": "msys2-mingw32",
+            "includePath": [
+                "C:/msys64/mingw32/include",
+                "C:/msys64/mingw32/i686-w64-mingw32/include",
+                "${workspaceRoot}/libretro-common/include",
+                "${workspaceRoot}/include",
+                "${workspaceRoot}"
            ],
-            "limitSymbolsToIncludedHeaders": true,
-            "databaseFilename": ""
-         }
-      },
-      {
-         "name": "Switch",
-         "includePath": [
-            "/opt/devkitpro/devkitA64/aarch64-none-elf/include",
-            "/opt/devkitpro/devkitA64/lib/gcc/aarch64-none-elf/8.3.0/include",
-            "/opt/devkitpro/libnx/include",
-            "/opt/devkitpro/portlibs/switch/include",
-            "/opt/devkitpro/portlibs/switch/include/freetype2",
-            "${workspaceFolder}/**"
-         ],
-         "defines": [
-            "_DEBUG",
-            "UNICODE",
-            "_UNICODE",
-            "__aarch64__",
-            "__SWITCH__",
-            "HAVE_LIBNX"
-         ],
-         "windowsSdkVersion": "10.0.17763.0",
-         "compilerPath": "/opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc",
-         "cStandard": "c11",
-         "cppStandard": "c++11",
-         "intelliSenseMode": "gcc-x64"
-      }
-   ],
-   "version": 4
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/msys64/mingw32/include",
+                    "C:/msys64/mingw32/i686-w64-mingw32/include",
+                    "${workspaceRoot}/libretro-common/include",
+                    "${workspaceRoot}/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+            "name": "msys2-mingw64",
+            "includePath": [
+                "C:/msys64/mingw64/include",
+                "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+                "${workspaceRoot}/libretro-common/include",
+                "${workspaceRoot}/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/msys64/mingw64/include",
+                    "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+                    "${workspaceRoot}/libretro-common/include",
+                    "${workspaceRoot}/include",
+                    "${workspaceRoot}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        }
+    ],
+    "version": 4
 }
@@ -13,7 +13,7 @@
         "stopAtEntry": false,
         "cwd": "${workspaceFolder}",
         "environment": [],
-         "externalConsole": true,
+         "externalConsole": false,
         "MIMode": "gdb",
         "miDebuggerPath": "c:\\msys64\\mingw64\\bin\\gdb.exe",
         "setupCommands": [
@@ -24,7 +24,7 @@
             }
         ]
      },
-      {
+      { 
         "name": "(gdb) Attach",
         "type": "cppdbg",
         "request": "attach",
@@ -40,31 +40,6 @@
             }
         ]
      },
-      {
-         "name": "PSP-GDB Debugger",
-          "type": "cppdbg",
-          "request": "launch",
-          "program": "${workspaceFolder}/retroarchpsp.elf",
-          "stopAtEntry": false,
-          "cwd": "${workspaceFolder}",
-          "environment": [],
-          "setupCommands": [
-             {
-                 "text": "symbol-file ${workspaceFolder}/retroarchpsp.elf",
-                 "description": "read symbols for elf file",
-                 "ignoreFailures": true
-             },
-             {
-               "description": "Enable all-exceptions",
-               "text": "-exec \"catch throw\"",
-               "ignoreFailures": true
-           }
-         ],
-         "showDisplayString": true,
-          "targetArchitecture": "mips",
-          "MIMode": "gdb",
-          "miDebuggerPath": "/usr/local/pspdev/bin/psp-gdb",
-          "miDebuggerServerAddress": "127.0.0.1:10001",
-     }
+
   ]
 }
@@ -1,15 +1,14 @@
 {
-   "terminal.integrated.shell.windows": "C:\\msys64\\usr\\bin\\bash.exe",
+   "terminal.integrated.shell.windows":    "C:\\msys64\\usr\\bin\\bash.exe",
   "terminal.integrated.env.windows": {
      "PATH": "/mingw64/lib/ccache/bin:/mingw64/lib/ccache/bin:/mingw64/lib/ccache/bin:/mingw64/bin:/usr/local/bin:/usr/bin:/bin:$PATH",
      "MSYSTEM": "MINGW64",
   },
   "terminal.integrated.cursorBlinking": true,
+
   "editor.tabSize": 3,
-   "editor.detectIndentation": false,
   "editor.renderWhitespace": "all",
   "editor.insertSpaces": true,
-   "editor.formatOnSave": false,
   "files.associations": {
      "frontend_driver.h": "c",
      "*.in": "c",
@@ -20,52 +19,7 @@
      "iosfwd": "c",
      "xlocbuf": "c",
      "xmemory0": "c",
-      "ios": "c",
-      "list": "c",
-      "input_driver.h": "c",
-      "menu_driver.h": "c",
-      "file_path.h": "c",
-      "unordered_map": "c",
-      "unordered_set": "c",
-      "sstream": "cpp",
-      "hash_map": "c",
-      "hash_set": "c",
-      "initializer_list": "c",
-      "string_view": "c",
-      "utility": "c",
-      "menu_input.h": "c",
-      "tasks_internal.h": "c",
-      "ozone.h": "c",
-      "ozone_theme.h": "c",
-      "ozone_texture.h": "c",
-      "string_list.h": "c",
-      "core_info.h": "c",
-      "thread": "c",
-      "xlocale": "c",
-      "gfx_widgets.h": "c",
-      "message_queue.h": "c",
-      "task_queue.h": "c",
-      "fifo_queue.h": "c",
-      "file_list.h": "c",
-      "strl.h": "c",
-      "configuration.h": "c",
-      "ozone_display.h": "c",
-      "verbosity.h": "c",
-      "retroarch.h": "c",
-      "gfx_animation.h": "c",
-      "netplay.h": "c",
-      "scaler.h": "c",
-      "deque": "c",
-      "vector": "c",
-      "xhash": "c",
-      "xiosbase": "c",
-      "xstring": "c",
-      "xtree": "c",
-      "xutility": "c",
-      "menu_input_dialog.h": "c",
-      "ozone_sidebar.h": "c",
-      "menu_thumbnail_path.h": "c",
-      "badges.h": "c"
+      "ios": "c"
   },
   "C_Cpp.dimInactiveRegions": false,
-}
+}
@@ -4,49 +4,12 @@
   "version": "2.0.0",
   "tasks": [
      {
-         "label": "linux clean build",
-         "type": "shell",
-         "group": "build",
-         "command": "make clean && ./configure && make -j12"
-      },
-      {
-         "label": "linux clean",
-         "type": "shell",
-         "group": "build",
-         "command": "make clean"
-      },
-      {
-         "label": "linux build with debug symbols",
-         "type": "shell",
-         "group": "build",
-         "command": "DEBUG=1 make -j12"
-      },
-      {
-         "label": "linux build",
-         "type": "shell",
-         "group": "build",
-         "command": "make -j12"
-      },
-      {
-         "label": "linux build and run",
-         "type": "shell",
-         "group": "build",
-         "command": "make -j12 && ./retroarch -v"
-      },
-      {
-         "label": "linux build and run with debug symbols",
-         "type": "shell",
-         "group": "build",
-         "command": "DEBUG=1 make -j12 && ./retroarch -v"
-      },
-      {
-         "label": "msys2-mingw64 build",
+         "taskName": "msys2-mingw64 build",
         "type": "shell",

         "group": {
            "kind": "build",
-            "isDefault": true
-         },
+            "isDefault": true },

         "command": "./configure; make -j2",
         "options": {
@@ -57,9 +20,9 @@
               ]
            }
         }
-      },
+      }
      {
-         "label": "msys2-mingw64 build with debug symbols",
+         "taskName": "msys2-mingw64 build with debug symbols",
         "type": "shell",

         "group": "build",
@@ -73,9 +36,9 @@
               ]
            }
         }
-      },
+      }
      {
-         "label": "msys2-mingw64 rebuild",
+         "taskName": "msys2-mingw64 rebuild",
         "type": "shell",

         "group": "build",
@@ -89,9 +52,9 @@
               ]
            }
         }
-      },
+      }
      {
-         "label": "msys2-mingw64 clean",
+         "taskName": "msys2-mingw64 clean",
         "type": "shell",

         "group": "build",
@@ -105,9 +68,9 @@
               ]
            }
         }
-      },
+      }
      {
-         "label": "msys2-mingw64 run",
+         "taskName": "msys2-mingw64 run",
         "type": "shell",

         "group": {
@@ -1,96 +0,0 @@
-diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c
-index b90a8e40c3..e57c4df194 100644
--- a/gfx/drivers_context/wgl_ctx.c
-+++ b/gfx/drivers_context/wgl_ctx.c
-@@ -78,6 +78,47 @@
- #ifndef WGL_CONTEXT_DEBUG_BIT_ARB
- #define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001
- #endif
-+
-+#ifndef WGL_ACCELERATION_ARB
-+#define WGL_ACCELERATION_ARB                    0x2003
-+#endif
-+
-+#ifndef WGL_FULL_ACCELERATION_ARB
-+#define WGL_FULL_ACCELERATION_ARB               0x2027
-+#endif
-+
-+#ifndef WGL_DRAW_TO_WINDOW_ARB
-+#define WGL_DRAW_TO_WINDOW_ARB                  0x2001
-+#endif
-+
-+#ifndef WGL_DOUBLE_BUFFER_ARB
-+#define WGL_DOUBLE_BUFFER_ARB                   0x2011
-+#endif
-+
-+#ifndef WGL_RED_BITS_ARB
-+#define WGL_RED_BITS_ARB                        0x2015
-+#endif
-+
-+#ifndef WGL_GREEN_BITS_ARB
-+#define WGL_GREEN_BITS_ARB                      0x2017
-+#endif
-+
-+#ifndef WGL_BLUE_BITS_ARB
-+#define WGL_BLUE_BITS_ARB                       0x2019
-+#endif
-+
-+#ifndef WGL_ALPHA_BITS_ARB
-+#define WGL_ALPHA_BITS_ARB                      0x201B
-+#endif
-+
-+#ifndef WGL_PIXEL_TYPE_ARB
-+#define WGL_PIXEL_TYPE_ARB                      0x2013
-+#endif
-+
-+#ifndef WGL_TYPE_RGBA_ARB
-+#define WGL_TYPE_RGBA_ARB                       0x202B
-+#endif
-+
- #endif
-
- #if defined(HAVE_OPENGL)
-@@ -313,6 +354,43 @@ static void create_gl_context(HWND hwnd, bool *quit)
-          RARCH_LOG("[WGL]: Adaptive VSync supported.\n");
-          wgl_adaptive_vsync = true;
-       }
-+      if (wgl_has_extension("WGL_ARB_pixel_format", extensions))
-+      {
-+         BOOL (WINAPI * wglChoosePixelFormatARB)
-+         (HDC hdc,
-+                                 const int *piAttribIList,
-+                                 const FLOAT *pfAttribFList,
-+                                 UINT nMaxFormats,
-+                                 int *piFormats,
-+                                 UINT *nNumFormats);
-+         UINT nMatchingFormats;
-+         int index = 0;
-+         int attribsDesired[] = {
-+            WGL_DRAW_TO_WINDOW_ARB, 1,
-+            WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB,
-+            WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB,
-+            WGL_RED_BITS_ARB, 10,
-+            WGL_GREEN_BITS_ARB, 10,
-+            WGL_BLUE_BITS_ARB, 10,
-+            WGL_ALPHA_BITS_ARB, 2,
-+            WGL_DOUBLE_BUFFER_ARB, 1,
-+            0,0
-+         };
-+         wglChoosePixelFormatARB = (BOOL (WINAPI *) (HDC, const int *,
-+                  const FLOAT*, UINT, int*, UINT*))
-+            gfx_ctx_wgl_get_proc_address("wglChoosePixelFormatARB");
-+
-+         RARCH_LOG("[WGL]: ARB pixel format supported.\n");
-+
-+         if (wglChoosePixelFormatARB(win32_hdc, attribsDesired,
-+                  NULL, 1, &index, &nMatchingFormats))
-+         {
-+            if (nMatchingFormats == 0)
-+            {
-+               RARCH_WARN("No 10bpc WGL_ARB_pixel_formats found!\n");
-+            }
-+         }
-+      }
-    }
- }
- #endif
@@ -5,13 +5,12 @@ acknowledge the following contributors:
 1ch (L0sted)
 Aaahh Ahh (Aaahh)
 Aaron Oneal (aarononeal)
-Adam Londero (alondero)
 Adam Mechtley (amechtley)
+Adolfo Ketzer (reztek)
 AdrianoML
 ajefr
 Alberto Simon (asimonf)
 Alcaro
-Aleksey Samoilov (Sunderland93)
 Alessandro Mangone (Vektor) (zevektor)
 Alex Eckhart (alex34567)
 Alex Folland (AlexFolland)
@@ -26,18 +25,15 @@ Amiga1200Gamer (amigagamer)
 Andre Leiradella (leiradel)
 Andrés (fr500)
 Anthony J. Bentley (bentley)
-Antonio Jose Ramos Marquez (psxdev)
 AridRayne
-ArnaudFaucher
 Arto Vainiolehto (arakerlu)
+asako (asakous)
 Ash (QuarkTheAwesome)
 Ashura (CoalaJoe)
 Autechre64
 Avton1
-ayssia
 barbudreadmon
 bearoso
-benutzer193
 blackgur
 Boris Timofeev (btimofeev)
 bparker06
@@ -50,26 +46,24 @@ Casey Borders (CaseyB)
 ceb33
 celerizer
 Chris Merrett (chrisfu)
-Christian Murphy (grimpunch)
 chu (9chu)
 CidVonHighwind
 clienthax
-cold-brewed
-CompCom
 Conn O'Griofa (psyke83)
-CozmoP
 cpsw
 Cray Elliott (MP2E)
 Cristian Sandu (crazyquark)
 ctult
+cubtekki
 cucholix
 cudencuden
 cxd4
 dalter
 Dan Weiss (Dwedit)
 danieljg
-Daniil Zhilin (LaserMoai)
+Daniil Zhilin (GeneralFailer)
 dankcushions
+Danny Glover (DannyGlover)
 Dave (freakdave)
 Dave Leaver (danzel)
 David Demelier (markand)
@@ -84,17 +78,14 @@ Diego Viola (diegoviola)
 Diogo Barros (BlueKore)
 DogParty
 dor3k
-driver1998
 Dudu Akiva (duduke)
 duganchen
-dukemiller
 duskgao
 ekipan
-Emmanuel Martin (daliaetnano)
-endrift
+ensra
 erbridge
+esoptron
 Ethan Lee (flibitijibibo)
-Exvat
 Ezio-PS
 Fabio (Oibaf66)
 Fabio Ritrovato (Sephiroth87)
@@ -102,9 +93,7 @@ Fayne Aldan (FayneAldan)
 FIX94
 Flame Sage (chris062689)
 flyinghead
-Francisco Javier Trujillo Mata (fjtrujy)
 Francisco José García García (frangarcj)
-Gabriel (Ghabry)
 GameDragon2k
 Garrett Brown (garbear)
 gblues
@@ -112,7 +101,6 @@ Geoffrey Plitt (GeoffreyPlitt)
 Glenn Hevey (hevey)
 Googer
 gouchi
-grant2258
 Gregor Richards (GregorR)
 Gui Andrade (archshift)
 Gustavo Maciel Dias Vieira (gmdvieira)
@@ -123,23 +111,17 @@ Hans-Kristian Arntzen (Themaister)
 Henri Gomez (hgomez)
 Henri Gomez (hgomez-sonarsource)
 Higor Eurípedes (heuripedes)
-Hisman Yosika (dnjstlr555)
 hizzlekizzle
-Hugo B. (hug0b)
-Hugo Hromic (hhromic)
+Hugo B. (777sha)
 hunterk
-hyarsan
 Hyllian
 i30817
 iAmGhost
 Jack (jakcron)
-Jacob (cubtekki)
 James Le Cuirot (chewi)
 James Sexton (Bezier89)
-Jamiras
 Jan Holthuis (Holzhaus)
 Jay McCarthy (jeapostrophe)
-jdgleaver
 Jean-André Santoni (kivutar)
 Jean-Paul Mari (djipi)
 Jean-Sébastien Guay (Skylark13)
@@ -152,7 +134,6 @@ Jon Maddox (maddox)
 Jonathan Relf (jonathanrelf)
 Joohan Lee (losernator)
 Jools Wills (joolswills)
-Jose Lage Miguez (Joselagem)
 Joseph Carter (iKarith)
 Joseph Conan Montgomery (Grotke)
 Josh Palmer (ShiftyAxel)
@@ -160,14 +141,11 @@ JuanVCS
 Justin Jacobs (dorkster)
 Justin Weiss (justinweiss)
 Ken Rossato (rossato)
-krzys_h (krzys-h)
 kurumushi
 kwyxz
 l3iggs
-lambolighting
 lasers
 Lawrence Kesteloot (lkesteloot)
-lifajucejo
 liffy (lifning)
 Lionel Flandrin (simias)
 littleguy77
@@ -177,26 +155,19 @@ Lothar Serra Mari (lotharsm)
 Lubosz Sarnecki (lubosz)
 lucianposton
 lxerandrew
-m4xw
 Mahyar Koshkouei (deltabeard)
-Manuel Alfayate Corchete (vanfanel)
 Marcelo Munhoz Pélos (mpelos)
 markwkidd
 Maschell
 Mat M. (lioncash)
-Mats A. (Datamats)
 Matt Sephton (gingerbeardman)
-Matthew Wang (asakous)
-Max K. (langerhans)
 Maxime Gauduin (alucryd)
 mcrisostomo
 meancoot
 meepingsnesroms
 meleu
 Michael K. (kuxii2016)
-Michael Lelli (ToadKing)
 Michał Durak (micechal)
-mickski56
 Mico Chopitea (micochops)
 miguelpinheiro
 Mike Swanson (chungy)
@@ -205,23 +176,17 @@ misson20000
 Monroe88
 mprobinson
 MrHuu
-MrJs (mrjschulte)
 muzuiget
 mwtremblay
-myfreeweb
 Nathan S. (natinusala)
-NathanStrong-Tripwire
 nattycleopatra
-nayslayer
-Nephilim
 netux79
 nfnty
-nia (ensra)
 Nicolas Adenis-Lamarre (nadenislamarre)
 Nicolas Guillaumin (nguillaumin)
 Nicolas Lopez Fernandez (pyroesp)
-Nikita Vakhrushev (SwooodGa)
-Nikola Kocić (nikola-kocic)
+Nikita Vakhrushev (JesterIOS)
+Nikola Kocic (nikola-kocic)
 Niouby
 nosh01
 not6 (r-type)
@@ -235,17 +200,13 @@ orbea
 OV2
 pamapa
 Paolo Bonzini (bonzini)
-Paul McCarty (notabeatle)
+Paul McCarty (a-shark)
 Pedro Ribeiro (pedrib)
 pinumbernumber
 pponso1
 Ramiro Morales (ramiro)
-Raphaël Zumer (rzumer)
 retro-wertz
-retrotails
-reztek
 Richard Howell (rmaz)
-rlnilsen
 Rob Loach (RobLoach)
 Romain Gay (vikbez)
 Romain Graillot (notnotme)
@@ -260,7 +221,6 @@ Saggi Mizrahi (ficoos)
 SAKUJ0
 Sam Pagenkopf (44100hertz)
 Sam Stenvall (Jalle19)
-Samuel P. (p-sam)
 Scheiker
 Sebastien Ronsse (sronsse)
 Sergi Granell (xerpi)
@@ -269,28 +229,26 @@ sergio-br2 (sergiobenrocha2)
 Seth Kingsley (sethk)
 Shane Mouton (ismouton)
 Shizeeg Unadequatov (shizeeg)
+Skarsnik
 slotek
 sparklewind
 spec-chum
 Stefan (gizmo98)
 stefan-gr
-stellarporter
 Steven M. Vascellaro (stevoisiak)
 Stuart Carnie (stuartcarnie)
 Sunguk Lee (d3m3vilurr)
 Supernature2k
 Sven (RetroSven)
-Swingflip
 Swizzy
-Sylvain Colinet (Skarsnik)
 Tatsuya79
 Terry Lewis (terry-au)
+The Last Cabra (vanfanel)
 thedax
 theheroGAC
-TheMrIron2
 TheOfficialFloW
 thiolliere
-Thomas Lorblanchès (Zlika)
+Toad King (ToadKing)
 Tobias Jakobi (tobiasjakobi)
 Tomáš Kelemen (ToKe79)
 Torsten Paul (t-paul)
@@ -301,21 +259,15 @@ URBANsUNITED
 vgmoose
 Vicky C Lau (vickychenglau)
 Vladimir Panteleev (CyberShadow)
-Vladimir Serbinenko (phcoder)
 Víctor "IlDucci" (IlDucci)
-waitingmoon
 Wang Vincent (susemm)
 webgeek1234
-Weedy Weed Smoker (WeedyWeedSmoker)
-WerWolv
-Wiimpathy
 Wiktor Strzębała (wiktorek140)
 xhp-creations
-yesfish (huwpascoe)
+Yarsan Hoessain (hyarsan)
 Yongwoon Cho (ssangkong)
 yoshisuga
 zeromus
 zlice
 Zoran Vuckovic (casdevel)
-Ömercan Kömür (fpscan)
 )";
@@ -1,66 +0,0 @@
-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.
@@ -1,58 +1,58 @@
-# Contributing to RetroArch
-
-If you are a developer and want to contribute to the development of RetroArch, please read this.
-If you have found a bug and want to submit a minor patch or a bug report, please read this as well.
-
-# Submitting a bug report
-When submitting a bug report, make sure that the bug is local to RetroArch.
-A bug in a libretro core or something deemed to be external is likely to be closed very fast.
-If you still suspect a bug in RetroArch, make sure to test with several cores to make sure.
-
-If you have troubles building RetroArch on Linux/BSD/OSX, make sure to paste shell output of ./configure,
-as well as config.log and shell output of make. If building on Windows, just paste shell output of make.
-
-If the issue occurs during runtime, make sure to paste RetroArch's verbose log.
-If using Phoenix frontend, you can find log in (File -> Show Log) after running.
-In console, make sure to run with verbose (-v) flag.
-
-# Pull Requests
-Outside contributions are generally only accepted in the form of a pull request. The process is very simple.
-Fork RetroArch, make your changes, and issue a pull request on GitHub. This can all be done within the browser.
-The changes are reviewed, and might be merged in. If the pull request isn't acceptable at the time,
-note that it's possible to continue pushing up commits to your branch.
-
-If you want to develop a larger feature,
-we'd like to discuss this first (ideally on IRC) so that you don't risk developing something
-that won't be merged. A pull request with a proof-of-concept is fine, but please indicate so.
-
-## libretro API
-If you wish to add functionality to libretro's API, it can take some time to merge in, because changes
-to libretro API will affect other projects as well, and we highly value API/ABI stability.
-Features will only be added when deemed *necessary* for a concrete libretro core to function properly.
-Features will not be added on basis of hypothetical libretro implementations.
-
-# Coding style
-Having a consistent code style throughout the code base is highly valued.
-Please look through the code to get a feel for the coding style.
-A pull request may be asked to fix the coding style before submission.
-In other cases, a pull request may be followed up with a "style nit commit".
-
-## Non-obvious things:
-  - Code should be both C89 and ISO C++ compatible. This dual requirement is for XBox360 and MSVC in general. Think of it as a C++ compatible subset of C99.
-  - Warnings are not allowed (-Wall). Make sure your code is warning-free. Note that warning sensitivity differs a bit across compiler versions.
-  - Using deprecated APIs is discouraged.
-
-# Copyright Headers and AUTHORS
-If you have contributed to a part of a source file (a chunk of code that's written by you),
-you should add yourself to the copyright header in that file.
-If you have contributed significantly
-(a feature, a contribution you can "name", e.g. "Added audio driver foo"), you should add yourself to AUTHORS file.
-We'd like your full name and email, and which features you have been part of.
-
-# IRC
-Active development happens on IRC. (#retroarch @ irc.freenode.org)
-We value discussing things in "real-time".
-
-# Commit Access
-Contributors who show a track record of making good pull requests over time will eventually get commit access to the repo.
-This typically happens when the "overhead" of looking through pull requests over time becomes a burden.
+# Contributing to RetroArch
+
+If you are a developer and want to contribute to the development of RetroArch, please read this.
+If you have found a bug and want to submit a minor patch or a bug report, please read this as well.
+
+# Submitting a bug report
+When submitting a bug report, make sure that the bug is local to RetroArch.
+A bug in a libretro core or something deemed to be external is likely to be closed very fast.
+If you still suspect a bug in RetroArch, make sure to test with several cores to make sure.
+
+If you have troubles building RetroArch on Linux/BSD/OSX, make sure to paste shell output of ./configure,
+as well as config.log and shell output of make. If building on Windows, just paste shell output of make.
+
+If the issue occurs during runtime, make sure to paste RetroArch's verbose log.
+If using Phoenix frontend, you can find log in (File -> Show Log) after running.
+In console, make sure to run with verbose (-v) flag.
+
+# Pull Requests
+Outside contributions are generally only accepted in the form of a pull request. The process is very simple.
+Fork RetroArch, make your changes, and issue a pull request on GitHub. This can all be done within the browser.
+The changes are reviewed, and might be merged in. If the pull request isn't acceptable at the time,
+note that it's possible to continue pushing up commits to your branch.
+
+If you want to develop a larger feature,
+we'd like to discuss this first (ideally on IRC) so that you don't risk developing something
+that won't be merged. A pull request with a proof-of-concept is fine, but please indicate so.
+
+## libretro API
+If you wish to add functionality to libretro's API, it can take some time to merge in, because changes
+to libretro API will affect other projects as well, and we highly value API/ABI stability.
+Features will only be added when deemed *necessary* for a concrete libretro core to function properly.
+Features will not be added on basis of hypothetical libretro implementations.
+
+# Coding style
+Having a consistent code style throughout the code base is highly valued.
+Please look through the code to get a feel for the coding style.
+A pull request may be asked to fix the coding style before submission.
+In other cases, a pull request may be followed up with a "style nit commit".
+
+## Non-obvious things:
+  - Code should be both ISO C99 and ISO C++ compatible. This dual requirement is for XBox360 and MSVC in general. Think of it as a C++ compatible subset of C99.
+  - Warnings are not allowed (-Wall). Make sure your code is warning-free. Note that warning sensitivity differs a bit across compiler versions.
+  - Using deprecated APIs is discouraged.
+
+# Copyright Headers and AUTHORS
+If you have contributed to a part of a source file (a chunk of code that's written by you),
+you should add yourself to the copyright header in that file.
+If you have contributed significantly
+(a feature, a contribution you can "name", e.g. "Added audio driver foo"), you should add yourself to AUTHORS file.
+We'd like your full name and email, and which features you have been part of.
+
+# IRC
+Active development happens on IRC. (#retroarch @ irc.freenode.org)
+We value discussing things in "real-time".
+
+# Commit Access
+Contributors who show a track record of making good pull requests over time will eventually get commit access to the repo.
+This typically happens when the "overhead" of looking through pull requests over time becomes a burden.
@@ -1,6 +1,6 @@
 HAVE_FILE_LOGGER=1
-NEED_CXX_LINKER?=0
-NEED_GOLD_LINKER?=0
+HAVE_CC_RESAMPLER=1
+NEED_CXX_LINKER=0
 MISSING_DECLS   =0

 ifneq ($(C90_BUILD),)
@@ -14,55 +14,31 @@ include config.mk
 # (It'd be better to put this comment in that file, but .gitignore doesn't work on files that exist in the repo.)
 -include Makefile.local

-ifeq ($(HAVE_ANGLE), 1)
-TARGET = retroarch_angle
-else
 TARGET = retroarch
+
+OBJDIR_BASE := obj-unix
+
+ifeq ($(DEBUG), 1)
+   OBJDIR := $(OBJDIR_BASE)/debug
+else
+   OBJDIR := $(OBJDIR_BASE)/release
 endif

 OBJ :=
 LIBS :=
-DEF_FLAGS := -I.
-ASFLAGS :=
 DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'

-OBJDIR_BASE := obj-unix
-
-ifeq ($(NEED_GOLD_LINKER), 1)
-   LDFLAGS += -fuse-ld=gold
-endif
-
-ifeq ($(DEBUG), 1)
-   OBJDIR := $(OBJDIR_BASE)/debug
-   CFLAGS ?= -O0 -g
-   CXXFLAGS ?= -O0 -g
-   DEFINES += -DDEBUG -D_DEBUG
-else
-   OBJDIR := $(OBJDIR_BASE)/release
-   CFLAGS ?= -O3
-   CXXFLAGS ?= -O3
-   DEF_FLAGS += -ffast-math
-endif
-
-DEF_FLAGS += -Wall
-
 ifneq ($(findstring BSD,$(OS)),)
-   DEF_FLAGS += -DBSD
+   CFLAGS += -DBSD
   LDFLAGS += -L/usr/local/lib
-   UDEV_CFLAGS += -I/usr/local/include/libepoll-shim
-   UDEV_LIBS += -lepoll-shim
 endif

 ifneq ($(findstring DOS,$(OS)),)
-   DEF_FLAGS += -march=i386
+   CFLAGS += -march=i386
   LDFLAGS += -lemu
 endif

-ifneq ($(findstring FPGA,$(OS)),)
-   DEFINES += -DHAVE_FPGA
-endif
-
 ifneq ($(findstring Win32,$(OS)),)
   LDFLAGS += -static-libgcc -lwinmm
 endif
@@ -70,7 +46,7 @@ endif
 include Makefile.common

 ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang"),1)
-   DEF_FLAGS += -Wno-invalid-source-encoding -Wno-incompatible-ms-struct
+   DEFINES +=  -Wno-invalid-source-encoding -Wno-incompatible-ms-struct
 endif

 ifeq ($(shell $(CC) -v 2>&1 | grep -c "tcc"),1)
@@ -82,7 +58,7 @@ endif
 HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)

 ifeq ($(MISSING_DECLS), 1)
-   DEF_FLAGS += -Werror=missing-declarations
+   DEFINES += -Werror=missing-declarations
 endif

 ifeq ($(HAVE_DYLIB), 1)
@@ -99,29 +75,21 @@ ifneq ($(V),1)
   Q := @
 endif

-ifeq ($(HAVE_DRMINGW), 1)
-   DEF_FLAGS += -DHAVE_DRMINGW
-   LDFLAGS += $(DRMINGW_LIBS)
+ifeq ($(DEBUG), 1)
+   OPTIMIZE_FLAG = -O0 -g
+   DEFINES += -DDEBUG -D_DEBUG
+else
+   OPTIMIZE_FLAG = -O3 -ffast-math
 endif

 ifneq ($(findstring Win32,$(OS)),)
   LDFLAGS += -mwindows
 endif

-ifneq ($(CXX_BUILD), 1)
-   ifneq ($(C89_BUILD),)
-      CFLAGS += -std=c89 -ansi -pedantic -Werror=pedantic -Wno-long-long
-   else ifeq ($(HAVE_C99), 1)
-      CFLAGS += $(C99_CFLAGS)
-   endif
+CFLAGS   += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb

-   CFLAGS += -D_GNU_SOURCE
-endif
-
-DEF_FLAGS += $(INCLUDE_DIRS) -Ideps -Ideps/stb
-
-CFLAGS += $(DEF_FLAGS)
-CXXFLAGS += $(DEF_FLAGS) -D__STDC_CONSTANT_MACROS
+APPEND_CFLAGS := $(CFLAGS)
+CXXFLAGS += $(APPEND_CFLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS
 OBJCFLAGS :=  $(CFLAGS) -D__STDC_CONSTANT_MACROS

 ifeq ($(HAVE_CXX), 1)
@@ -139,6 +107,29 @@ else
   LINK = $(CC)
 endif

+ifneq ($(CXX_BUILD), 1)
+   ifneq ($(GNU90_BUILD), 1)
+      ifneq ($(findstring icc,$(CC)),)
+         CFLAGS += -std=c99 -D_GNU_SOURCE
+      else
+         CFLAGS += -std=gnu99 -D_GNU_SOURCE
+      endif
+   endif
+
+   ifneq ($(C89_BUILD),)
+      CFLAGS += -std=c89 -ansi -pedantic -Werror=pedantic -Wno-long-long
+   endif
+endif
+
+ifeq ($(NOUNUSED), yes)
+   CFLAGS += -Wno-unused-result
+   CXXFLAGS += -Wno-unused-result
+endif
+ifeq ($(NOUNUSED_VARIABLE), yes)
+   CFLAGS += -Wno-unused-variable
+   CXXFLAGS += -Wno-unused-variable
+endif
+
 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))

 ifneq ($(X86),)
@@ -173,7 +164,7 @@ all: $(TARGET) config.mk
 $(MOC_SRC):
 	@$(if $(Q), $(shell echo echo MOC $<),)
 	$(eval MOC_TMP := $(patsubst %.h,%_moc.cpp,$@))
-	$(Q)QT_SELECT=$(QT_VERSION) $(MOC) -o $(MOC_TMP) $<
+	$(Q)$(MOC) -o $(MOC_TMP) $<

 $(foreach x,$(join $(addsuffix :,$(MOC_SRC)),$(MOC_HEADERS)),$(eval $x))

@@ -187,16 +178,12 @@ ifeq ($(MAKECMDGOALS),clean)
 config.mk:
 else
 -include $(RARCH_OBJ:.o=.d)
-ifeq ($(HAVE_CONFIG_MK),)
 config.mk: configure qb/*
 	@echo "config.mk is outdated or non-existing. Run ./configure again."
 	@exit 1
 endif
-endif

-SYMBOL_MAP := -Wl,-Map=output.map
-
-$(TARGET): $(RARCH_OBJ)
+retroarch: $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
 	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)

@@ -215,6 +202,13 @@ $(OBJDIR)/%.o: %.m
 	@$(if $(Q), $(shell echo echo OBJC $<),)
 	$(Q)$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<

+.FORCE:
+
+$(OBJDIR)/git_version.o: git_version.c .FORCE
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<
+
 $(OBJDIR)/%.o: %.S config.h config.mk $(HEADERS)
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo AS $<),)
@@ -226,17 +220,16 @@ $(OBJDIR)/%.o: %.rc $(HEADERS)
 	$(Q)$(WINDRES) -o $@ $<

 install: $(TARGET)
+	rm -f $(OBJDIR)/git_version.o
 	mkdir -p $(DESTDIR)$(BIN_DIR) 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(DATA_DIR)/applications 2>/dev/null || /bin/true
-	mkdir -p $(DESTDIR)$(DATA_DIR)/metainfo 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(DOC_DIR) 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(DATA_DIR)/pixmaps 2>/dev/null || /bin/true
 	cp $(TARGET) $(DESTDIR)$(BIN_DIR)
 	cp tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	cp retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)
-	cp com.libretro.RetroArch.appdata.xml $(DESTDIR)$(DATA_DIR)/metainfo
 	cp retroarch.desktop $(DESTDIR)$(DATA_DIR)/applications
 	cp docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
 	cp docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
@@ -247,32 +240,24 @@ install: $(TARGET)
 	chmod 755 $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	chmod 644 $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 	chmod 644 $(DESTDIR)$(DATA_DIR)/applications/retroarch.desktop
-	chmod 644 $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.appdata.xml
 	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
 	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
 	chmod 644 $(DESTDIR)$(DATA_DIR)/pixmaps/retroarch.svg
-	@if test -d media/assets && test $(HAVE_ASSETS); then \
+	@if test -d media/assets; then \
 		echo "Installing media assets..."; \
-		mkdir -p $(DESTDIR)$(ASSETS_DIR)/assets; \
-		if test $(HAVE_MATERIALUI) = 1; then \
-			cp -r media/assets/glui/ $(DESTDIR)$(ASSETS_DIR)/assets; \
-		fi; \
-		if test $(HAVE_XMB) = 1; then \
-			cp -r media/assets/xmb/ $(DESTDIR)$(ASSETS_DIR)/assets; \
-		fi; \
-		if test $(HAVE_OZONE) = 1; then \
-			cp -r media/assets/ozone/ $(DESTDIR)$(ASSETS_DIR)/assets; \
-		fi; \
+		mkdir -p $(DESTDIR)$(ASSETS_DIR)/assets/xmb; \
+		mkdir -p $(DESTDIR)$(ASSETS_DIR)/assets/glui; \
+		cp -r media/assets/xmb/ $(DESTDIR)$(ASSETS_DIR)/assets; \
+		cp -r media/assets/glui/ $(DESTDIR)$(ASSETS_DIR)/assets; \
 		cp media/assets/COPYING $(DESTDIR)$(DOC_DIR)/COPYING.assets; \
 		echo "Asset copying done."; \
 	fi

 uninstall:
-	rm -f $(DESTDIR)$(BIN_DIR)/$(TARGET)
+	rm -f $(DESTDIR)$(BIN_DIR)/retroarch
 	rm -f $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 	rm -f $(DESTDIR)$(DATA_DIR)/applications/retroarch.desktop
-	rm -f $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.appdata.xml
 	rm -f $(DESTDIR)$(DATA_DIR)/pixmaps/retroarch.svg
 	rm -f $(DESTDIR)$(DOC_DIR)/COPYING
 	rm -f $(DESTDIR)$(DOC_DIR)/COPYING.assets
@@ -19,6 +19,6 @@ $(foreach x,$(join $(addsuffix :,$(MOC_SRC)),$(MOC_HEADERS)),$(eval $x))

 generate: $(MOC_SRC)
 	@echo $(MOC_SRC)
-
+	
 print-%:
-	@echo '$*=$($*)'
+	@echo '$*=$($*)'
@@ -1,49 +0,0 @@
-# This build was put together and is maintained by ModMyClassic.com for Libretro.
-# The purpose is to give Libretro a proper "official" build platform for classic consoles.
-# If you need any help in building for the classics or have any questions then please visit
-# https://modmyclassic.com and we will help in any way possible!
-
-# Building Prerequisites ##############
-# arm-linux-gnueabihf-strip
-
-include version.all
-
-# General Shared Variables ############
-TARGET := retroarch
-
-# Libretro Defines ####################
-#HAVE_CLASSIC = Classic Hook, disable some features
-#HAVE_C_A7A7 = Classic Armv7 Cortex A7 optimisation override
-#HAVE_SEGAM = Sega Mini Hook, change default configurations etc (TODO)
-
-all: $(TARGET)
-
-retroarch:
-	#Build the RetroArch Binary for cross platform classics (ARMv7 Cortex A7)
-	patchelf --version #Check if you have patchelf installed... (sudo apt-get install patchelf)
-	CFLAGS="-marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard" ./configure --host=arm-linux-gnueabihf --disable-wayland --disable-x11 --disable-opengl --disable-opengl1 --disable-opengl_core --enable-mali_fbdev --disable-freetype --enable-opengles --enable-udev --enable-alsa --enable-neon --enable-floathard --disable-discord
-	make HAVE_CLASSIC=1 HAVE_C_A7A7=1 HAVE_SEGAM=1 -j #Cook it
-	arm-linux-gnueabihf-strip -v retroarch
-	@echo "*********************************************************************"
-	@echo "***   SEGA Mega Drive Mini RetroArch binary built successfully!   ***"
-	@echo "*********************************************************************"
-clean:
-	rm -rf obj-unix
-	rm -f *.d
-	rm -f *.o
-	rm -f audio/*.o
-	rm -f conf/*.o
-	rm -f gfx/*.o
-	rm -f gfx/drivers_font/*.o
-	rm -f gfx/drivers_font_renderer/*.o
-	rm -f gfx/drivers_context/*.o
-	rm -f gfx/py_state/*.o
-	rm -f compat/*.o
-	rm -f record/*.o
-	rm -f input/*.o
-	rm -f tools/*.o
-	rm -f $(BINDIR)/retroarch
-	rm -f $(BINDIR)/retroarch-joyconfig
-	rm -f $(PNDDIR)/readme.html
-	rm -f retroarch
-
@@ -1,53 +0,0 @@
-# This build was put together and is maintained by ModMyClassic.com for Libretro.
-# The purpose is to give Libretro a proper "official" build platform for classic consoles.
-# If you need any help in building for the classics or have any questions then please visit
-# https://modmyclassic.com and we will help in any way possible!
-
-# INFO: THIS BUILD TARGET ALSO COVERS THE NESC!!!
-
-# Building Prerequisites ##############
-# arm-linux-gnueabihf-strip
-# patchelf
-
-include version.all
-
-# General Shared Variables ############
-TARGET := retroarch
-
-# Libretro Defines ####################
-#HAVE_CLASSIC = Classic Hook, disable some features
-#HAVE_C_A7A7 = Classic Armv7 Cortex A7 optimisation override
-#HAVE_HAKCHI = Hakchi Hook, change default configurations etc (TODO)
-
-all: $(TARGET)
-
-retroarch:
-	#Build the RetroArch Binary for cross platform classics (ARMv7 Cortex A7)
-	patchelf --version #Check if you have patchelf installed... (sudo apt-get install patchelf)
-	CFLAGS="-marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard" ./configure --host=arm-linux-gnueabihf --disable-wayland --disable-x11 --disable-opengl --disable-opengl1 --disable-opengl_core --enable-mali_fbdev --disable-freetype --enable-opengles --enable-udev --enable-alsa --enable-neon --enable-floathard --disable-discord
-	make HAVE_CLASSIC=1 HAVE_C_A7A7=1 HAVE_HAKCHI=1 -j #Cook it
-	arm-linux-gnueabihf-strip -v retroarch
-	patchelf --replace-needed libSDL2-2.0.so.0 libSDL2.so retroarch #libSDL2-2.0.so.0 sym link doesn't exist on native build. Just patch the binary...
-	@echo "*********************************************************************"
-	@echo "***     NES/SNES Classic RetroArch binary built successfully!     ***"
-	@echo "*********************************************************************"
-clean:
-	rm -rf obj-unix
-	rm -f *.d
-	rm -f *.o
-	rm -f audio/*.o
-	rm -f conf/*.o
-	rm -f gfx/*.o
-	rm -f gfx/drivers_font/*.o
-	rm -f gfx/drivers_font_renderer/*.o
-	rm -f gfx/drivers_context/*.o
-	rm -f gfx/py_state/*.o
-	rm -f compat/*.o
-	rm -f record/*.o
-	rm -f input/*.o
-	rm -f tools/*.o
-	rm -f $(BINDIR)/retroarch
-	rm -f $(BINDIR)/retroarch-joyconfig
-	rm -f $(PNDDIR)/readme.html
-	rm -f retroarch
-
@@ -8,7 +8,6 @@ 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
@@ -36,7 +35,8 @@ 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/hax2.o \
+	ctr/exec-3dsx/mini-hb-menu/loaders/ninjhax1.o

 ifeq ($(APP_BIG_TEXT_SECTION), 1)
 	APP_USE_SVCHAX = 1
@@ -50,18 +50,10 @@ endif
 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 -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_THREADS
-	DEFINES += -DHAVE_GFX_WIDGETS
-	DEFINES += -DHAVE_OVERLAY
-	#DEFINES += -DHAVE_SOCKET_LEGACY
-	#-DHAVE_SSL -DHAVE_BUILTINMBEDTLS -DMBEDTLS_SSL_DEBUG_ALL
+	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB
+	DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DHAVE_SOCKET_LEGACY -DHAVE_THREADS
+	#-DHAVE_SSL -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
 	HAVE_CC_RESAMPLER = 1
@@ -70,30 +62,23 @@ else
 	HAVE_RPNG = 1
 	HAVE_RJPEG = 1
 	HAVE_RBMP = 1
-	HAVE_MENU = 1
 	HAVE_RGUI = 1
 	HAVE_ZLIB = 1
 	HAVE_7ZIP = 1
 	HAVE_BUILTINZLIB = 1
 	HAVE_LIBRETRODB = 1
+	HAVE_ZARCH = 0
 	HAVE_MATERIALUI = 1
 	HAVE_XMB = 1
 	HAVE_STATIC_VIDEO_FILTERS = 1
 	HAVE_STATIC_AUDIO_FILTERS = 1
-	HAVE_PATCH = 1
-	HAVE_SCREENSHOTS = 1
-	HAVE_REWIND = 1
-	HAVE_AUDIOMIXER = 1
-	HAVE_RWAV = 1
-	#HAVE_NETWORKING = 1
-	#HAVE_CHEEVOS = 1
-	#HAVE_SOCKET_LEGACY = 1
+	HAVE_NETWORKING = 1
+	HAVE_CHEEVOS = 1
+	HAVE_SOCKET_LEGACY = 1
 	HAVE_THREADS = 1
-	#HAVE_SSL = 1
-	#HAVE_BUILTINMBEDTLS = 1
+	HAVE_SSL = 1

 	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
 	BLACKLIST :=
 	BLACKLIST += input/input_overlay.o
 	BLACKLIST += tasks/task_overlay.o
@@ -108,36 +93,18 @@ 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)

-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)"
+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)

 INCDIRS := -I$(CTRULIB)/include
 LIBDIRS := -L. -L$(CTRULIB)/lib

+
 ARCH     := -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft

 CFLAGS	+=	-mword-relocations \
@@ -163,19 +130,10 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
   WHOLE_END := -Wl,--no-whole-archive
 endif

-CFLAGS += -I. \
-			 -Ideps \
-			 -Ideps/7zip \
-			 -Ideps/stb \
-			 -Ideps/rcheevos/include \
-			 -Ilibretro-common/include \
-			 -Ilibretro-common/include/compat/zlib
+CFLAGS += -I. -Ideps -Ideps/libz -Ideps/7zip -Ideps/stb -Ilibretro-common/include

 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
-CFLAGS += -DHAVE_DSP_FILTER
-CFLAGS += -DHAVE_VIDEO_FILTER
 CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
-CFLAGS += -DHAVE_CHEATS

 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11

@@ -184,6 +142,7 @@ LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

 CFLAGS   += -std=gnu99 -ffast-math

+
 LIBS	:= $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lm

 ifeq ($(DEBUG), 1)
@@ -192,6 +151,7 @@ else
 	LIBS	+= -lctru
 endif

+
 ifeq ($(BUILD_3DSX), 1)
 	TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
 endif
@@ -248,13 +208,13 @@ else
 endif

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

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

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

 %.vsh:

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

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

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

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

-$(TARGET).icn: $(TARGET).elf $(APP_ICON)
+$(TARGET).icn: $(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)
@@ -301,6 +261,7 @@ $(TARGET).3ds: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
 $(TARGET).cia: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
 	$(MAKEROM) -f cia -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=false

+
 clean:
 	rm -f $(OBJ)
 	rm -f $(TARGET).3dsx
@@ -314,3 +275,5 @@ clean:
 	rm -f ctr/3dsx_custom_crt0.o

 .PHONY: clean
+
+
@@ -5,7 +5,6 @@ DEBUG                   = 0
 BUILD_3DSX              = 1
 BUILD_3DS               = 0
 BUILD_CIA               = 1
-USE_CTRULIB_2          ?= 0

 APP_TITLE            = RetroArch 3DS
 APP_DESCRIPTION      = RetroArch 3DS
@@ -25,11 +24,10 @@ OBJ := ctr/ctr_system.o \
 		 frontend/frontend_salamander.o \
 		 frontend/frontend_driver.o \
 		 frontend/drivers/platform_ctr.o \
+		 frontend/drivers/platform_null.o \
 		 libretro-common/encodings/encoding_utf.o \
 		 libretro-common/compat/compat_strcasestr.o \
-		 libretro-common/compat/fopen_utf8.o \
 		 libretro-common/file/file_path.o \
-		 libretro-common/file/file_path_io.o \
 		 libretro-common/string/stdstring.o \
 		 libretro-common/lists/string_list.o \
 		 libretro-common/lists/dir_list.o \
@@ -38,32 +36,21 @@ 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/lrc_hash.o \
-		 libretro-common/time/rtime.o \
+		 libretro-common/hash/rhash.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/hax2.o \
+	ctr/exec-3dsx/mini-hb-menu/loaders/ninjhax1.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
@@ -95,7 +82,7 @@ else
   CFLAGS	+= -O3
 endif

-CFLAGS += -I. -Ideps/7zip -Ideps/stb -Ilibretro-common/include -Ilibretro-common/include/compat/zlib
+CFLAGS += -I. -Ideps/libz -Ideps/7zip -Ideps/stb -Ilibretro-common/include

 #CFLAGS += -DRARCH_INTERNAL
 CFLAGS += -DRARCH_CONSOLE -DIS_SALAMANDER
@@ -107,8 +94,10 @@ LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

 CFLAGS   += -std=gnu99 -ffast-math

+
 LIBS	:= -lctru -lm

+
 ifeq ($(BUILD_3DSX), 1)
 TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
 endif
@@ -165,13 +154,13 @@ else
 endif

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

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

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

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

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

 $(TARGET).elf: ctr/3dsx_custom_crt0.o
 	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
@@ -231,3 +220,5 @@ clean:
 	rm -f ctr/3dsx_custom_crt0.o

 .PHONY: clean
+
+
@@ -1,221 +0,0 @@
-#########################
-## 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
-HAVE_AL = 1
-# this freezes when switching back from menu
-HAVE_ALSA = 0
-HAVE_DSP_FILTER = 1
-HAVE_VIDEO_FILTER = 1
-HAVE_BUILTINMBEDTLS = 1
-HAVE_BUILTINZLIB = 1
-HAVE_C99 = 1
-HAVE_CC = 1
-HAVE_CC_RESAMPLER = 1
-HAVE_CHD = 1
-HAVE_CHEEVOS = 1
-HAVE_COMMAND = 0
-HAVE_CXX = 1
-HAVE_DR_MP3 = 1
-HAVE_DYNAMIC = 1
-HAVE_EGL = 1
-HAVE_FREETYPE = 1
-HAVE_GDI = 1
-HAVE_GETADDRINFO = 1
-HAVE_GETOPT_LONG = 1
-HAVE_GLSL = 1
-HAVE_HID = 1
-HAVE_IBXM = 1
-HAVE_IMAGEVIEWER = 1
-HAVE_LANGEXTRA = 1
-HAVE_LIBRETRODB = 1
-HAVE_MENU = 1
-HAVE_MENU_COMMON = 1
-HAVE_GFX_WIDGETS = 1
-HAVE_MMAP = 1
-HAVE_NETWORKING = 1
-HAVE_OPENDINGUX_FBDEV = 1
-HAVE_OPENGL = 1
-HAVE_OPENGL1 = 0
-HAVE_OPENGLES = 1
-HAVE_OPENGLES3 = 0
-HAVE_OPENGL_CORE = 0
-HAVE_OPENSSL = 1
-HAVE_OVERLAY = 1
-HAVE_RBMP = 1
-HAVE_RJPEG = 1
-HAVE_RPILED = 1
-HAVE_RPNG = 1
-HAVE_RUNAHEAD = 1
-HAVE_SDL_DINGUX = 1
-HAVE_SHADERPIPELINE = 1
-HAVE_STB_FONT = 1
-HAVE_STB_IMAGE = 1
-HAVE_STB_VORBIS = 1
-HAVE_STDIN_CMD = 0
-HAVE_STRCASESTR = 1
-HAVE_THREADS = 1
-HAVE_TRANSLATE = 1
-HAVE_UDEV = 1
-HAVE_VIDEO_LAYOUT = 1
-HAVE_XMB = 1
-HAVE_ZLIB = 1
-HAVE_CONFIGFILE = 1
-HAVE_PATCH = 1
-HAVE_CHEATS = 1
-HAVE_LIBSHAKE = 1
-
-OS = Linux
-TARGET = retroarch
-OPK_NAME = retroarch.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
-LIBS := -ldl -lz -lrt -lcrypto -lssl -ludev -pthread
-CFLAGS :=
-CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
-ASFLAGS :=
-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
-DEFINES += -DHAVE_AL=1
-DEFINES += -DHAVE_ONLINE_UPDATER=1
-DEFINES += -DHAVE_UPDATE_ASSETS=1
-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
-OPENGLES_CFLAGS := -DMESA_EGL_NO_X11_HEADERS
-OPENGLES_LIBS := -lGLESv2 -lEGL
-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)
-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
-	$(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 '$*=$($*)'
@@ -1,10 +1,4 @@
-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
@@ -13,60 +7,40 @@ PTHREAD = 0
 OS = Emscripten
 OBJ :=
 DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD)
-DEFINES += -DHAVE_FILTERS_BUILTIN
+DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN

-HAVE_DSP_FILTER = 1
-HAVE_VIDEO_FILTER = 1
 HAVE_OVERLAY = 1
-HAVE_GLSL = 1
-HAVE_SCREENSHOTS = 1
-HAVE_REWIND = 1
-HAVE_AUDIOMIXER = 1
-HAVE_VIDEO_LAYOUT = 0
 HAVE_CC_RESAMPLER = 1
 HAVE_EGL    = 1
 HAVE_OPENGLES = 1
 HAVE_RJPEG  = 0
 HAVE_RPNG   = 1
 HAVE_EMSCRIPTEN = 1
-HAVE_MENU = 1
-HAVE_GFX_WIDGETS = 1
 HAVE_RGUI = 1
 HAVE_SDL = 0
 HAVE_SDL2 = 0
 HAVE_ZLIB = 1
+WANT_ZLIB = 1
 HAVE_SHADERPIPELINE = 1
 HAVE_STATIC_VIDEO_FILTERS = 1
 HAVE_STATIC_AUDIO_FILTERS = 1
-HAVE_STB_FONT = 1
-HAVE_CONFIGFILE = 1
-HAVE_CHEATS = 1
-HAVE_IBXM = 1
-
-ASYNC ?= 0
-ifeq ($(LIBRETRO), mupen64plus)
-   ASYNC = 1
-endif
-
-LTO ?= 0
-ifeq ($(LIBRETRO), tyrquake)
-   LTO = 0
-endif
-
-MEMORY ?= 134217728
+MEMORY = 536870912

 PRECISE_F32 = 1

 OBJDIR := obj-emscripten

+ifneq ($(NATIVE_ZLIB),)
+   WANT_ZLIB = 0
+endif
+
 #if you compile with SDL2 flag add this Emscripten flag "-s USE_SDL=2" to LDFLAGS:

 LIBS    := -s USE_ZLIB=1
-LDFLAGS := -L. --no-heap-copy -s $(LIBS) -s TOTAL_MEMORY=$(MEMORY) -s NO_EXIT_RUNTIME=0 -s FULL_ES2=1 -s "EXTRA_EXPORTED_RUNTIME_METHODS=['callMain']" \
-           -s ALLOW_MEMORY_GROWTH=1 -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_load_state', '_cmd_take_screenshot']" \
+LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) -s NO_EXIT_RUNTIME=0 -s FULL_ES2=1 -s BINARYEN_TRAP_MODE=\"clamp\" \
+           -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_load_state', '_cmd_take_screenshot']" \
           --js-library emscripten/library_rwebaudio.js \
-           --js-library emscripten/library_rwebcam.js \
-           --js-library emscripten/library_errno_codes.js
+           --js-library emscripten/library_rwebcam.js
 ifneq ($(PTHREAD), 0)
   LDFLAGS += -s USE_PTHREADS=$(PTHREAD) -s PTHREAD_POOL_SIZE=2
 endif
@@ -82,7 +56,7 @@ endif

 include Makefile.common

-CFLAGS += $(DEF_FLAGS) -Ideps -Ideps/stb
+CFLAGS += -Ideps/libz -Ideps -Ideps/stb
 libretro = libretro_emscripten.bc

 ifneq ($(V), 1)
@@ -93,16 +67,16 @@ ifeq ($(DEBUG), 1)
   LDFLAGS += -O0 -g
   CFLAGS += -O0 -g
 else
-   LDFLAGS += -O3 -s WASM=1
+   LDFLAGS += -O2 -s WASM=1
   # WARNING: some optimizations can break some cores (ex: LTO breaks tyrquake)
   LDFLAGS += -s PRECISE_F32=$(PRECISE_F32)
   ifeq ($(LTO), 1)
      LDFLAGS += --llvm-lto 3
   endif
-   CFLAGS += -O3
+   CFLAGS += -O2
 endif

-CFLAGS += -Wall -I. -Ilibretro-common/include -std=gnu99 $(LIBS) \
+CFLAGS += -DHAVE_RPNG -Wall -I. -Ilibretro-common/include -std=gnu99 -s USE_ZLIB=1 \
          -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_take_screenshot']"

 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
@@ -33,13 +33,13 @@ endif
 ifeq ($(platform),)
   platform = unix

-   ifeq ($(shell uname -s),)
+   ifeq ($(shell uname -a),)
      platform = win
-   else ifneq ($(findstring MINGW,$(shell uname -s)),)
+   else ifneq ($(findstring MINGW,$(shell uname -a)),)
      platform = win
-   else ifneq ($(findstring Darwin,$(shell uname -s)),)
+   else ifneq ($(findstring Darwin,$(shell uname -a)),)
      platform = osx
-   else ifneq ($(findstring win,$(shell uname -s)),)
+   else ifneq ($(findstring win,$(shell uname -a)),)
      platform = win
   endif
 endif
@@ -47,12 +47,12 @@ endif
 # system platform
 system_platform = unix

-ifeq ($(shell uname -s),)
+ifeq ($(shell uname -a),)
   EXE_EXT = .exe
   system_platform = win
-else ifneq ($(findstring Darwin,$(shell uname -s)),)
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
   system_platform = osx
-else ifneq ($(findstring MINGW,$(shell uname -s)),)
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
   system_platform = win
 endif

@@ -75,18 +75,7 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
   WHOLE_END       := -Wl,--no-whole-archive
 endif

-STATIC_BUILD = 1
 ifneq (,$(findstring msvc,$(platform)))
-   STATIC_BUILD = 0
-endif
-ifneq (,$(findstring unix,$(platform)))
-   STATIC_BUILD = 0
-endif
-ifeq (qnx, $(platform))
-   STATIC_BUILD = 0
-endif
-
-ifeq ($(STATIC_BUILD), 0)
   LIBS               := $(WHOLE_START) $(WHOLE_END)
 else
   LIBS               := $(WHOLE_START) -lretro_$(platform) $(WHOLE_END)
@@ -100,8 +89,6 @@ else ifeq ($(platform), wii)
   libogc_platform    := 1
 endif

-HAVE_GFX_WIDGETS := 1
-
 # PS3
 ifeq ($(platform), ps3)
   #TODO
@@ -116,8 +103,7 @@ else ifeq ($(platform), ps3-cobra)

 # NGC/Wii - libogc
 else ifeq ($(libogc_platform), 1)
-   EXTERNAL_LIBOGC   ?= 0
-   GX_PTHREAD_LEGACY ?= 1
+   EXTERNAL_LIBOGC=0
   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
   CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
   LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
@@ -125,8 +111,8 @@ else ifeq ($(libogc_platform), 1)
   EXT_TARGET := $(TARGET_NAME)_$(platform).dol
   EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf

-   INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Iwii/libogc/include
-
+   INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/libz -Iwii/libogc/include
+ 
   ifeq ($(EXTERNAL_LIBOGC), 1)
      CFLAGS   += -DEXTERNAL_LIBOGC
      CXXFLAGS += -DEXTERNAL_LIBOGC
@@ -149,11 +135,6 @@ 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)
@@ -161,7 +142,7 @@ else ifeq ($(libogc_platform), 1)
   endif

   LIBDIRS += -L.
-   MACHDEP += -DGEKKO -mcpu=750 -meabi -mhard-float
+   MACHDEP += -DGEKKO -mcpu=750 -meabi -mhard-float -DMSB_FIRST

   ifeq ($(platform), ngc)
      LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_TARGET)).map
@@ -177,6 +158,8 @@ else ifeq ($(libogc_platform), 1)
      endif
   endif

+   LIBS += -logc
+
   ifeq ($(EXTERNAL_LIBOGC), 1)
      LIBS += -lfat
   endif
@@ -193,13 +176,9 @@ else ifeq ($(libogc_platform), 1)
      endif
   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
@@ -208,20 +187,13 @@ else ifeq ($(libogc_platform), 1)
   HAVE_RTGA                := 1
   HAVE_IBXM                := 1
   HAVE_OVERLAY             := 1
-   HAVE_VIDEO_LAYOUT        := 0
   HAVE_ZLIB                := 1
+   WANT_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

   ifeq ($(platform), wii)
-      #HAVE_LANGEXTRA          := 1
+      HAVE_LANGEXTRA           := 1
      HAVE_WIIUSB_HID          := 1
      HAVE_RARCH_EXEC          := 1
      HAVE_RSOUND              := 1
@@ -256,9 +228,6 @@ else ifeq ($(platform), xenon360)
   HAVE_THREADS             := 1
   HAVE_GETOPT_LONG         := 1
   RARCH_CONSOLE             = 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1

 # PSP
 else ifeq ($(platform), psp1)
@@ -281,11 +250,8 @@ else ifeq ($(platform), psp1)
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_KERNEL_PRX          := 1
-   #HAVE_LANGEXTRA          := 1
+   HAVE_LANGEXTRA           := 1
   RARCH_CONSOLE             = 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1

   ifeq ($(BUILD_PRX), 1)
      LDFLAGS += $(addprefix -L,$(PSPSDK)/lib) -specs=$(PSPSDK)/lib/prxspecs -Wl,-q,-T$(PSPSDK)/lib/linkfile.prx $(LDFLAGS)
@@ -299,11 +265,13 @@ else ifeq ($(platform), vita)
   EXT_TARGET := $(TARGET_NAME)_$(platform).velf
   EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
   MACHDEP := -DVITA
+   WANT_ZLIB                := 1
   INCLUDE += -Ideps/libvita2d/include
+   INCLUDE += -Ideps/libz
   PLATCFLAGS := -mfloat-abi=hard -fsingle-precision-constant \
        -mword-relocations -fno-unwind-tables -fno-asynchronous-unwind-tables -ftree-vectorize -fno-optimize-sibling-calls
   LIBS += -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
-           -lSceSysmodule_stub -lSceCtrl_stub -lSceHid_stub -lSceTouch_stub -lSceAudio_stub -lSceFiber_stub\
+           -lSceSysmodule_stub -lSceCtrl_stub -lSceTouch_stub -lSceAudio_stub -lSceFiber_stub\
           -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
           -lSceMotion_stub -lSceAppMgr_stub -lpng -lm -lc

@@ -325,8 +293,6 @@ else ifeq ($(platform), vita)
   LIBDIRS += -L.
   LDFLAGS +=  -Wl,-q

-   HAVE_DSP_FILTER          := 1
-   HAVE_VIDEO_FILTER        := 1
   HAVE_FILTERS_BUILTIN     := 1
   HAVE_LANGEXTRA           := 1
   HAVE_RPNG                := 1
@@ -338,28 +304,23 @@ else ifeq ($(platform), vita)
   HAVE_VITA2D              := 1
   HAVE_NETWORKING          := 1
   HAVE_OVERLAY             := 1
-   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
   HAVE_THREADS             := 1
   HAVE_LIBRETRODB          := 1
   RARCH_CONSOLE             = 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
 else ifeq ($(platform), windows_msvc6_x86)
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
+   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 0
   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
-   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
@@ -371,9 +332,6 @@ else ifeq ($(platform), windows_msvc6_x86)
   HAVE_DYLIB               := 1
   HAVE_DYNAMIC             := 1
   HAVE_GRIFFIN_CPP         := 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -394,18 +352,16 @@ else ifeq ($(platform), windows_msvc6_x86)
   export INCLUDE := $(INCLUDE);$(INETSDK)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
   export LIB := $(LIB);$(INETSDK)\Lib
 else ifeq ($(platform), windows_msvc2003_x86)
-   HAVE_GDI                 := 1
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
+   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
-   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
@@ -417,10 +373,6 @@ else ifeq ($(platform), windows_msvc2003_x86)
   HAVE_DYLIB               := 1
   HAVE_DYNAMIC             := 1
   HAVE_GRIFFIN_CPP         := 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_GFX_WIDGETS         := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -429,9 +381,8 @@ 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)
   PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../IDE")
   INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS71COMNTOOLS)../../Vc7/include")
@@ -447,22 +398,18 @@ else ifeq ($(platform), windows_msvc2003_x86)
      export LIB := $(LIB);$(INETSDK)\Lib
   endif
 else ifeq ($(platform), windows_msvc2005_x86)
-   HAVE_GDI                 := 1
-   HAVE_REWIND              := 1
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
+   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
-   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
-   HAVE_OZONE               := 1
   HAVE_STB_FONT            := 1
   HAVE_THREADS             := 1
   HAVE_LIBRETRODB          := 1
@@ -472,17 +419,7 @@ 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
@@ -491,31 +428,15 @@ else ifeq ($(platform), windows_msvc2005_x86)
   LD = link.exe

   PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS
-   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
-
+   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.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 -DHAVE_D3D -DHAVE_D3D8
+      PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND
      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
@@ -524,25 +445,18 @@ else ifeq ($(platform), windows_msvc2005_x86)
      export LIB := $(LIB);$(INETSDK)\Lib
   endif
 else ifneq (,$(findstring windows_msvc2010,$(platform)))
-   HAVE_GDI                 := 1
-   HAVE_SCREENSHOTS         := 1
-   HAVE_REWIND              := 1
-   HAVE_AUDIOMIXER          := 1
-   HAVE_RWAV                := 1
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
+   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
-   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
-   HAVE_OZONE               := 1
   HAVE_STB_FONT            := 1
   HAVE_THREADS             := 1
   HAVE_LIBRETRODB          := 1
@@ -552,17 +466,7 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
   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
@@ -571,14 +475,8 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
   LD = link.exe

   PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   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
+   PLATCFLAGS += -D__i686__ -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_UPDATE_ASSETS -DWIN32
+   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

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

@@ -603,12 +501,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.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 ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -io '[A-Z]:\\.*')
   WindowsSdkDir := $(WindowsSdkDir:\=)

   ifeq ($(HAVE_DIRECTX), 1)
-      PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D8 -DHAVE_XAUDIO -DHAVE_XINPUT
+      PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D9 -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)
@@ -617,22 +515,16 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
      export LIB := $(LIB);$(WindowsSdkDir)\$(PlatLib)
   endif
 else ifneq (,$(findstring windows_msvc2012,$(platform)))
-   HAVE_GDI                 := 1
-   HAVE_SCREENSHOTS         := 1
-   HAVE_REWIND              := 1
-   HAVE_AUDIOMIXER          := 1
-   HAVE_RWAV                := 1
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
+   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
-   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
@@ -644,11 +536,7 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
   HAVE_DYLIB               := 1
   HAVE_DYNAMIC             := 1
   HAVE_GRIFFIN_CPP         := 1
-   HAVE_RUNAHEAD            := 1
   HAVE_DIRECTX             ?= 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -657,7 +545,7 @@ else ifneq (,$(findstring windows_msvc2012,$(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
+   PLATCFLAGS += -D__i686__ -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_UPDATE_ASSETS -DWIN32
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2012_,,$(platform))
@@ -701,22 +589,16 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
      export LIB := $(LIB);$(WindowsSdkDir)\$(PlatLib)
   endif
 else ifneq (,$(findstring windows_msvc2013,$(platform)))
-   HAVE_GDI                 := 1
-   HAVE_SCREENSHOTS         := 1
-   HAVE_REWIND              := 1
-   HAVE_AUDIOMIXER          := 1
-   HAVE_RWAV                := 1
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
+   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
-   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
@@ -728,11 +610,7 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
   HAVE_DYLIB               := 1
   HAVE_DYNAMIC             := 1
   HAVE_GRIFFIN_CPP         := 1
-   HAVE_RUNAHEAD            := 1
   HAVE_DIRECTX             ?= 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -741,7 +619,7 @@ else ifneq (,$(findstring windows_msvc2013,$(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
+   PLATCFLAGS += -D__i686__ -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_UPDATE_ASSETS -DWIN32
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2013_,,$(platform))
@@ -785,22 +663,16 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
      export LIB := $(LIB);$(WindowsSdkDir)\$(PlatLib)
   endif
 else ifneq (,$(findstring windows_msvc2015,$(platform)))
-   HAVE_GDI                 := 1
-   HAVE_SCREENSHOTS         := 1
-   HAVE_REWIND              := 1
-   HAVE_AUDIOMIXER          := 1
-   HAVE_RWAV                := 1
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
+   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 1
   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
-   HAVE_VIDEO_LAYOUT        := 0
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
   HAVE_STB_FONT            := 1
@@ -812,11 +684,7 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
   HAVE_DYLIB               := 1
   HAVE_DYNAMIC             := 1
   HAVE_GRIFFIN_CPP         := 1
-   HAVE_RUNAHEAD            := 1
   HAVE_DIRECTX             ?= 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -824,9 +692,8 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
   CXX = cl.exe
   LD = link.exe

-   PLATCFLAGS += -utf-8
   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
+   PLATCFLAGS += -D__i686__ -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_UPDATE_ASSETS -DWIN32
   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib

   PlatformSuffix = $(subst windows_msvc2015_,,$(platform))
@@ -884,137 +751,15 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
      export INCLUDE := $(INCLUDE);libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
      export LIB := $(LIB)
   endif
-else ifeq (qnx,$(platform))
-   HAVE_SCREENSHOTS         := 1
-   HAVE_REWIND              := 1
-   HAVE_AUDIOMIXER          := 1
-   HAVE_RWAV                := 1
-   HAVE_RPNG                := 1
-   HAVE_RJPEG               := 1
-   HAVE_RBMP                := 1
-   HAVE_RTGA                := 1
-   HAVE_ZLIB                := 1
-   HAVE_7ZIP                := 1
-   HAVE_NETWORKING          := 1
-   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
-   HAVE_OVERLAY             := 1
-   HAVE_VIDEO_LAYOUT        := 0
-   HAVE_MATERIALUI          := 1
-   HAVE_XMB                 := 1
-   HAVE_STB_FONT            := 1
-   HAVE_THREADS             := 1
-   HAVE_LIBRETRODB          := 1
-   HAVE_COMMAND             := 1
-   HAVE_STDIN_CMD           := 1
-   HAVE_CMD                 := 1
-   HAVE_DYLIB               := 1
-   HAVE_DYNAMIC             := 1
-   HAVE_GRIFFIN_CPP         := 0
-   WANT_GLSLANG             := 0
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-
-   CC=qcc -Vgcc_ntoarmv7le
-   CXX=QCC -Vgcc_ntoarmv7le
-
-   ifeq ($(DEBUG), 1)
-      LDFLAGS += -g
-   endif
-
-   PLATCFLAGS += -DHAVE_SHADERPIPELINE -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_FBO -DHAVE_GL_SYNC -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_XCB -DHAVE_EGL -DHAVE_BB10 -DHAVE_GLSL -DHAVE_AL -DHAVE_BSV_MOVIE -DRARCH_MOBILE
-   EXT_TARGET := $(TARGET_NAME)
-   EXT_INTER_TARGET := $(TARGET_NAME)
-   INCLUDE += -Ilibretro-common/include -Igfx/include -Ideps -Ideps/stb -Ideps/rcheevos/include -Ideps/SPIRV-Cross -Ideps/glslang -I.
-   LIBS += -lEGL -lbps -lscreen -lsocket -lm -lGLESv2 -lOpenAL
-else ifneq (,$(findstring unix,$(platform)))
-   HAVE_SCREENSHOTS         := 1
-   HAVE_REWIND              := 1
-   HAVE_AUDIOMIXER          := 1
-   HAVE_RWAV                := 1
-   HAVE_RPNG                := 1
-   HAVE_RJPEG               := 1
-   HAVE_RBMP                := 1
-   HAVE_RTGA                := 1
-   HAVE_ZLIB                := 1
-   HAVE_7ZIP                := 1
-   HAVE_NETWORKING          := 1
-   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
-   HAVE_OVERLAY             := 1
-   HAVE_VIDEO_LAYOUT        := 0
-   HAVE_MATERIALUI          := 1
-   HAVE_XMB                 := 1
-   HAVE_STB_FONT            := 1
-   HAVE_THREADS             := 1
-   HAVE_LIBRETRODB          := 1
-   HAVE_COMMAND             := 1
-   HAVE_STDIN_CMD           := 1
-   HAVE_CMD                 := 1
-   HAVE_DYLIB               := 1
-   HAVE_DYNAMIC             := 1
-   HAVE_GRIFFIN_CPP         := 1
-   WANT_GLSLANG             := 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-
-   PLATCFLAGS += -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_FBO -DHAVE_GL_SYNC -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_VULKAN -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_X11 -DHAVE_XCB -DHAVE_UDEV -DHAVE_BSV_MOVIE -DHAVE_PULSE
-   EXT_TARGET := $(TARGET_NAME)
-   EXT_INTER_TARGET := $(TARGET_NAME)
-   INCLUDE += -Ilibretro-common/include -Igfx/include -Ideps -Ideps/stb -Ideps/rcheevos/include -Ideps/SPIRV-Cross -Ideps/glslang -I.
-   LIBS += -ldl -lm -lpthread -lGL -ludev -lpulse -lX11 -lX11-xcb -lXxf86vm
-else ifeq (dos,$(platform))
-   HAVE_RPNG                := 1
-   HAVE_RJPEG               := 1
-   HAVE_RBMP                := 1
-   HAVE_RTGA                := 1
-   HAVE_ZLIB                := 1
-   HAVE_7ZIP                := 1
-   HAVE_NETWORKING          := 0
-   HAVE_NETWORK_CMD         := 0
-   HAVE_NETPLAYDISCOVERY    := 0
-   HAVE_OVERLAY             := 1
-   HAVE_VIDEO_LAYOUT        := 0
-   HAVE_MATERIALUI          := 0
-   HAVE_XMB                 := 0
-   HAVE_STB_FONT            := 1
-   HAVE_THREADS             := 0
-   HAVE_LIBRETRODB          := 1
-   HAVE_COMMAND             := 1
-   HAVE_STDIN_CMD           := 1
-   HAVE_CMD                 := 1
-   HAVE_DYLIB               := 0
-   HAVE_DYNAMIC             := 0
-   HAVE_GRIFFIN_CPP         := 0
-   WANT_GLSLANG             := 0
-	HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 0
-   HAVE_CHEATS              := 0
-   CC=i586-pc-msdosdjgpp-gcc
-   CXX=i586-pc-msdosdjgpp-g++
-
-   ifeq ($(DEBUG), 1)
-      LDFLAGS += -g
-   endif
-
-   PLATCFLAGS += -DHAVE_SHADERPIPELINE -DHAVE_CC_RESAMPLER -DRC_DISABLE_LUA -DHAVE_FBO -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DRARCH_INTERNAL  -DHAVE_XCB
-   TARGET_NAME := retrodos
-   EXT_TARGET := $(TARGET_NAME).exe
-   EXT_INTER_TARGET := $(TARGET_NAME).exe
-   INCLUDE += -Ilibretro-common/include -Igfx/include -Ideps -Ideps/stb -Ideps/SPIRV-Cross -Ideps/glslang -I.
-   LIBS += -lm
-   LIBDIRS += -L.
 endif

 ifneq (,$(findstring msvc,$(platform)))
-   CFLAGS += -W3 $(MACHDEP) $(PLATCFLAGS)
+   CFLAGS += -W2 $(MACHDEP) $(PLATCFLAGS)
 else
   CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE)
   INCLUDE += -I./libretro-common/include \
 				  -Ideps \
-				  -Ideps/stb
+				  -Ideps/stb 
 endif

 OBJ = griffin/griffin.o  $(PLATOBJS)
@@ -1074,7 +819,10 @@ endif

 ifeq ($(HAVE_ZLIB), 1)
   CFLAGS      += -DHAVE_ZLIB
-   CFLAGS      += -I./libretro-common/include/compat/zlib
+endif
+
+ifeq ($(WANT_ZLIB), 1)
+   CFLAGS      += -DWANT_ZLIB
 endif

 ifeq ($(HAVE_RPNG), 1)
@@ -1093,50 +841,22 @@ 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
+   CFLAGS      += -DHAVE_7ZIP
 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
@@ -1167,14 +887,6 @@ 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
@@ -1191,18 +903,6 @@ ifeq ($(HAVE_THREADS), 1)
   endif
 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
@@ -1262,8 +962,8 @@ ifneq (,$(findstring msvc,$(platform)))
 	LINKOUT = -out:
 	LINK = link.exe
 else
-	OBJOUT   = -o
-	LINKOUT  = -o
+	OBJOUT   = -o 
+	LINKOUT  = -o 
 	LINK = $(CXX)
 endif

@@ -1311,12 +1011,7 @@ $(APP_BOOTER_DIR)/app_booter.bin:
 	$(MAKE) -C $(APP_BOOTER_DIR)

 pkg: all
-ifeq ($(platform), qnx)
-	mkdir -p pkg/qnx/pkg
-	cp -r $(EXT_TARGET) pkg/qnx/pkg/RetroArch
-	cp -r media/canvas.png pkg/qnx/pkg/canvas.png
-	cp -r media/retroarch-96x96.png pkg/qnx/pkg/retroarch-96x96.png
-else ifeq ($(platform), wii)
+ifeq ($(platform), wii)
 	cp -r $(EXT_TARGET) pkg/wii/CORE.dol
 else ifeq ($(platform), ngc)
 	cp -r $(EXT_TARGET) pkg/ngc/CORE.dol
@@ -1324,18 +1019,6 @@ else ifeq ($(platform), psp1)
 	psp-fixup-imports$(EXT) $(EXT_TARGET)
 endif

-ifeq ($(platform), qnx)
-retroarch-dev.bar: pkg
-ifeq ($(QNX_DEBUGTOKEN),)
-	blackberry-nativepackager -package $@ -devMode pkg/qnx/bar-descriptor.xml -C  pkg/qnx/pkg pkg/qnx/pkg/*
-else
-	blackberry-nativepackager -package $@ -devMode -debugToken $(QNX_DEBUGTOKEN) pkg/qnx/bar-descriptor.xml -C  pkg/qnx/pkg pkg/qnx/pkg/*
-endif
-
-retroarch-release.bar: pkg
-	blackberry-nativepackager -package $@ pkg/qnx/bar-descriptor.xml -C  pkg/qnx/pkg pkg/qnx/pkg/*
-endif
-
 shaders-checkout:
 	@if test -d $(SHADER_CG_DIR); then \
      echo "[SHADER CHECKOUT::] Git pulling common-shaders..."; \
@@ -1380,6 +1063,7 @@ overlays-checkout:
      $(GIT) clone git://github.com/libretro/common-overlays.git $(OVERLAY_DIR); \
   fi

+
 clean:
 	rm -f $(EXT_TARGET)
 	rm -f $(EXT_INTER_TARGET)
@@ -1,5 +1,3 @@
-include version.all
-
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
@@ -17,72 +15,43 @@ DEBUG                  ?= 0
 WHOLE_ARCHIVE_LINK      = 0
 GRIFFIN_BUILD           = 0

-OBJ :=
+OBJ := 

-DEFINES := -D__SWITCH__=1 -U__linux__ -U__linux -DGLM_FORCE_PURE=1 -DRARCH_CONSOLE -DRARCH_INTERNAL -DGLOBAL_CONFIG_DIR='"/switch"' -DHAVE_STB_VORBIS
+# For threading we need to overwrite some vars with global defines because devkitPro's includes 
+# make it hard for us. This works for the pthread wrapper
+DEFINES_THREAD := -Dpthread_t=Thread -Dpthread_mutex_t=Mutex -Dpthread_mutexattr_t='void*' -Dpthread_attr_t=int -Dpthread_cond_t=CondVar -Dpthread_condattr_t='int' -D_SYS__PTHREADTYPES_H_
+DEFINES := -U__linux__ -U__linux -DRARCH_INTERNAL -DGLOBAL_CONFIG_DIR='"/switch"' $(DEFINES_THREAD)

-HAVE_DR_MP3 = 1
-HAVE_TRANSLATE = 1
-HAVE_SCREENSHOTS = 1
-HAVE_REWIND = 1
-HAVE_AUDIOMIXER = 1
 HAVE_CC_RESAMPLER = 1
 HAVE_MENU_COMMON = 1
 HAVE_RTGA = 1
 HAVE_RPNG = 1
 HAVE_RJPEG = 1
 HAVE_RBMP = 1
-HAVE_7ZIP = 1
+HAVE_RGUI = 1
 HAVE_ZLIB = 1
 HAVE_BUILTINZLIB = 1
 HAVE_LIBRETRODB = 1
-HAVE_DSP_FILTER = 1
-HAVE_VIDEO_FILTER = 1
+HAVE_ZARCH = 0
+HAVE_MATERIALUI = 0
+HAVE_XMB = 0
 HAVE_STATIC_VIDEO_FILTERS = 1
 HAVE_STATIC_AUDIO_FILTERS = 1
 HAVE_MENU = 1
-HAVE_CONFIGFILE = 1
-HAVE_PATCH = 1
-HAVE_CHEATS = 1
 HAVE_RUNAHEAD = 1
-HAVE_NETWORKING = 1
-HAVE_NETPLAYDISCOVERY = 1
-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_OVERLAY = 0
 HAVE_THREADS = 1
 HAVE_PTHREADS = 1
 HAVE_FREETYPE = 0
 HAVE_SWITCH = 1
 HAVE_LIBNX = 1
-HAVE_OPENGL = 1
-HAVE_LANGEXTRA = 1
-HAVE_GFX_WIDGETS = 1
-
-ifeq ($(HAVE_OPENGL), 1)
-  HAVE_EGL = 1
-  HAVE_SHADERPIPELINE = 1
-  HAVE_RGUI = 1
-  HAVE_MATERIALUI = 1
-  HAVE_XMB = 1
-  HAVE_OZONE = 1
-  HAVE_OVERLAY = 1
-  HAVE_VIDEO_LAYOUT = 1
-  HAVE_GLSL = 1
-else
-  HAVE_RGUI = 1
-  HAVE_MATERIALUI = 0
-  HAVE_XMB = 0
-  HAVE_OZONE = 0
-  HAVE_STRIPES = 0
-endif

 include Makefile.common
 BLACKLIST :=
+#BLACKLIST += input/input_overlay.o
+#BLACKLIST += tasks/task_overlay.o

 OBJ := $(filter-out $(BLACKLIST),$(OBJ))

@@ -115,37 +84,26 @@ EXEFS_SRC := exefs_src
 #ROMFS := switch/romfs

 APP_TITLE := RetroArch
-APP_VERSION := $(RARCH_VERSION)
+APP_VERSION := 1.0.0
 APP_AUTHOR := libretro Team
-APP_ICON := pkg/libnx/retroarch.jpg
+NO_ICON := 1

 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -mcpu=cortex-a57+crc+fp+simd

-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	:=	-g -Wall -O3 -ffast-math -ffunction-sections \
+			$(ARCH) $(DEFINES) -Ideps -Ideps/libz -Ilibretro-common/include -Ideps/stb -I$(LIBNX)/include -include $(LIBNX)/include/switch.h #$(shell $(DEVKITPRO)/portlibs/switch/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
-
-ifeq ($(strip $(HAVE_STATIC_DUMMY)),1)
-  CFLAGS	+=	-DHAVE_STATIC_DUMMY=1
-endif
+CFLAGS	+=	$(INCLUDE) -DSWITCH=1 -DHAVE_LIBNX=1 -DNXLINK=1

 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11

 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs $(ARCH) -Wl,--allow-multiple-definition -Wl,-Map,$(notdir $*.map)

-# add things from Makefile.common
-CFLAGS += $(DEF_FLAGS)
-
-LIBS	:= -lswresample -lavformat -lavcodec -lavutil -lswscale -lstdc++ -lbz2 -lpng -lz -lnx -lvpx -lopus -llzma -lm
-
-ifeq ($(HAVE_OPENGL), 1)
-  LIBS := -lEGL -lglapi -ldrm_nouveau $(LIBS)
-endif
+LIBS	:= -lnx -lm -lstdc++ -lbz2 -lpng -lz

 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
@@ -187,12 +145,7 @@ else
 endif
 #---------------------------------------------------------------------------------

-export OFILES 	:=	$(OBJ)
-
-ifeq ($(strip $(HAVE_STATIC_DUMMY)),)
-  OFILES += libretro_libnx.a
-endif
-
+export OFILES 	:=	$(OBJ) libretro_switch.a
 export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))

 export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
@@ -232,8 +185,7 @@ ifneq ($(ROMFS),)
 	export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
 endif

-DEPENDS_TMP  := $(OFILES:.o=.d)
-DEPENDS      := $(filter-out libretro_libnx.a,$(DEPENDS_TMP))
+DEPENDS	:=	$(OFILES:.o=.d)

 .PHONY: clean all

@@ -255,7 +207,7 @@ endif
 $(OUTPUT).elf	:	$(OBJ)

 clean:
-	rm -f $(DEPENDS) $(OBJ) $(OUTPUT).pfs0 $(OUTPUT).nro $(OUTPUT).elf
+	rm -f $(OBJ) $(OUTPUT).pfs0 $(OUTPUT).nro $(OUTPUT).elf

 #---------------------------------------------------------------------------------
 # you need a rule like this for each extension you use as binary data
@@ -29,7 +29,7 @@ ifneq (,$(findstring Darwin,$(UNAME_S)))
 endif

 #---------------------------------------------------------------------------------
-# path to tools
+# path to tools 
 #---------------------------------------------------------------------------------
 export PORTLIBS	:=	$(DEVKITPRO)/portlibs/ppc
 export PATH	:=	$(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH)
@@ -45,6 +45,7 @@ export CXX	:=	$(PREFIX)g++
 export AR	:=	$(PREFIX)ar
 export OBJCOPY	:=	$(PREFIX)objcopy

+
 ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))

 #---------------------------------------------------------------------------------
@@ -56,7 +57,7 @@ ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSION
 #---------------------------------------------------------------------------------
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c $< -o $@
-
+	
 #---------------------------------------------------------------------------------
 %.o: %.c
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -130,6 +131,7 @@ INCLUDES	:=	$(DEFINCS) \

 MACHDEP		:= -DBIGENDIAN -DGEKKO -mcpu=750 -meabi -msdata=eabi -mhard-float -ffunction-sections -fdata-sections

+
 ifeq ($(PLATFORM),wii)
 MACHDEP		+=	-DHW_RVL
 endif
@@ -157,6 +159,7 @@ VPATH :=	$(LWIPDIR)				\
 			$(LIBWIIKEYB)		\
 			$(STUBSDIR)

+
 #---------------------------------------------------------------------------------
 SOURCES_LWIP := $(LWIPDIR)/network.c \
 					 $(LWIPDIR)/netio.c \
@@ -261,6 +264,7 @@ SOURCES_OGC_ASM := $(OGCDIR)/cache_asm.S \
 						 $(OGCDIR)/system_asm.S \
 						 $(OGCDIR)/video_asm.S

+
 ifneq ($(BUILD_LITE), 1)
 SOURCES_OGC += $(OGCDIR)/dvd.c
 endif
@@ -7,15 +7,11 @@ ARCH            = amd64
 BUILD_DIR       = objs/msvc
 CXX_BUILD       = 0

+
 WindowsSdkDir = C:\Program Files (x86)\Windows Kits\10\$(NOTHING)
 WindowsSDKVersion := 10.0.14393.0\$(NOTHING)
 VCINSTALLDIR := C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\$(NOTHING)

-HAVE_DSP_FILTER          := 1
-HAVE_VIDEO_FILTER        := 1
-HAVE_SCREENSHOTS         := 1
-HAVE_REWIND              := 1
-HAVE_AUDIOMIXER          := 1
 HAVE_D3DX                := 1
 HAVE_D3D8                := 0
 HAVE_D3D9                := 1
@@ -24,8 +20,6 @@ HAVE_D3D11               := 1
 HAVE_D3D12               := 1
 HAVE_CG                  := 1
 HAVE_OPENGL              := 1
-HAVE_OPENGL1             := 1
-HAVE_GFX_WIDGETS			 := 1
 HAVE_VULKAN              := 1
 HAVE_XAUDIO              := 1
 HAVE_XINPUT              := 1
@@ -35,9 +29,7 @@ HAVE_WINMM               := 1

 HAVE_RPNG                := 1
 HAVE_ZLIB                := 1
-HAVE_CONFIGFILE          := 1
-HAVE_PATCH               := 1
-HAVE_MENU                := 1
+WANT_ZLIB                := 1
 HAVE_RGUI                := 1
 HAVE_XMB                 := 1
 HAVE_MATERIALUI          := 1
@@ -60,31 +52,14 @@ HAVE_7ZIP                := 1
 HAVE_NETWORKING          := 1
 HAVE_NETWORK_CMD         := 1
 HAVE_OVERLAY             := 1
-HAVE_VIDEO_LAYOUT        := 0
 HAVE_LANGEXTRA           := 1
 HAVE_CHEEVOS             := 1
 HAVE_SHADERPIPELINE      := 1
 HAVE_IMAGEVIEWER         := 1
-HAVE_BSV_MOVIE           := 1
-HAVE_CHEATS              := 1
-
-ifeq ($(HAVE_D3D8), 1)
-   D3D8_LIBS := -ld3d8
-   ifeq ($(HAVE_D3DX), 1)
-      D3DX8_LIBS := -ld3dx8
-   endif
-endif
-
-ifeq ($(HAVE_D3D9), 1)
-   D3D9_LIBS := -ld3d9
-   ifeq ($(HAVE_D3DX), 1)
-      D3DX9_LIBS := -ld3dx9
-   endif
-endif

 include Makefile.common
 INCLUDE_DIRS := $(patsubst  -isystem%,-I%,$(INCLUDE_DIRS))
-CFLAGS       := $(filter-out  -Wno-unknown-pragmas,$(DEF_FLAGS))
+CFLAGS       := $(filter-out  -Wno-unknown-pragmas,$(CFLAGS))
 CXXFLAGS     := $(filter-out  -fpermissive -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -Wno-parentheses,$(CXXFLAGS))
 LIBS         := $(filter-out  -lstdc++,$(LIBS))

@@ -115,12 +90,14 @@ ifeq ($(ARCH),x86)
 CROSS =
 endif

+
 INCLUDE := $(VCINSTALLDIR)include;$(VCINSTALLDIR)atlmfc\include;$(WindowsSdkDir)include\$(WindowsSDKVersion)ucrt;$(WindowsSdkDir)include\$(WindowsSDKVersion)shared;$(WindowsSdkDir)include\$(WindowsSDKVersion)um;
 LIB     := $(VCINSTALLDIR)LIB\$(CROSS);$(VCINSTALLDIR)atlmfc\lib\$(CROSS);$(WindowsSdkDir)lib\$(WindowsSDKVersion)ucrt\$(TARGET_ARCH2);$(WindowsSdkDir)lib\$(WindowsSDKVersion)um\$(TARGET_ARCH2);C:\Program Files (x86)\NVIDIA Corporation\Cg\lib.$(TARGET_ARCH2);C:\Program Files (x86)\Microsoft DirectX SDK (February 2010)\Lib\$(TARGET_ARCH2);
 LIBPATH := $(VCINSTALLDIR)LIB\$(CROSS);$(VCINSTALLDIR)atlmfc\lib\$(CROSS);

 PATH := $(shell IFS=$$'\n'; cygpath "$(VCINSTALLDIR)bin\\$(CROSS)"):$(shell IFS=$$'\n'; cygpath "$(WindowsSdkDir)\bin\\$(ARCH2)"):$(PATH)

+
 export INCLUDE := $(INCLUDE)
 export LIB     := $(LIB)
 export LIBPATH := $(LIBPATH)
@@ -145,7 +122,7 @@ endif
 FLAGS  += -nologo -MP
 FLAGS  += -Gm- -Zc:inline -fp:precise -Zc:forScope -GR- -Gd -Oi -volatile:iso
 #FLAGS  += -Zc:wchar_t -Zp16 -Z7
-FLAGS += -utf-8
+#FLAGS += -utf-8
 #FLAGS += -source-charset:utf-8

 CXXFLAGS += $(CFLAGS) -TP -EHsc
@@ -167,6 +144,7 @@ RC = rc.exe
 LIBS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib
 LDFLAGS  += -nologo -wx -nxcompat -machine:$(TARGET_ARCH2)

+
 ifeq ($(DEBUG),1)
   FLAGS += -GS -Gy -Od -RTC1 -D_SECURE_SCL=1 -Zi
   FLAGS += -MDd
@@ -177,6 +155,7 @@ else
   FLAGS += -MD
 endif

+
 ifeq ($(DEBUG),1)
   BUILD_DIR := $(BUILD_DIR)-debug
 endif
@@ -191,6 +170,7 @@ ifneq ($(V), 1)
   Q := @
 endif

+
 ifeq ($(GRIFFIN_BUILD), 1)
   OBJ       := griffin/griffin.o griffin/griffin_cpp.o
   DEFINES   += -DHAVE_GRIFFIN -DUSE_MATH_DEFINES
@@ -199,13 +179,18 @@ else
   OBJ := $(filter-out $(BLACKLIST),$(OBJ))
 endif

-DEFINES += -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DHAVE_DYNAMIC -DJSON_STATIC
+DEFINES += -DRARCH_INTERNAL -DHAVE_DYNAMIC -DJSON_STATIC
 INCLUDE_DIRS += -I. -Igfx/include

+#OBJ := version_git.o
+
 OBJ := $(patsubst %rarch.o,%rarch.res,$(OBJ))
 OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))
 OBJ := $(OBJ:.o=.obj)

+
+
+
 LDFLAGS += -WX -SUBSYSTEM:WINDOWS -ENTRY:mainCRTStartup

 DEFINES := $(patsubst -f%,,$(DEFINES))
@@ -213,6 +198,7 @@ LDFLAGS := $(patsubst -l%,%.lib,$(LDFLAGS))
 LIBS := $(filter-out -lm,$(LIBS))
 LIBS := $(patsubst -l%,%.lib,$(LIBS))

+
 #$(info INCLUDE_DIRS : $(INCLUDE_DIRS))
 #$(info DEFINES : $(DEFINES))
 #$(info CFLAGS : $(CFLAGS))
@@ -1,363 +0,0 @@
-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 '$*=$($*)'
@@ -0,0 +1,62 @@
+# Hakchi version added to ease confusion amongst Hakchi community due to messy past...
+#
+# Make sure you have readelf installed (sudo apt-get install readelf) to patch the binary
+# Might not be needed for your build but it's a useful tool and for safety it should be
+# run anyway to ensure the SDL2 link isn't broken...
+
+HAKCHI_VER := Hakchi_Retroarch_Neo_v1_7_3b
+HAKCHI_NAME := "Hakchi RetroArch 'Neo' v1.7.3b
+MOD_CREATOR := TheOtherGuys
+MOD_CATEGORY := RetroArch
+
+HAKCHI_DIR := hakchi
+TARGET := retroarch
+GIT_COMMIT := $(shell echo "`git rev-parse --short HEAD``git diff-index --quiet HEAD -- || echo '-dirty'`")
+
+all: $(TARGET)
+
+retroarch:
+	readelf -v #Check if you have readelf installed... (sudo apt-get install readelf)
+	./configure --host=arm-linux-gnueabihf --disable-freetype --enable-opengles --enable-udev --enable-alsa --enable-neon --enable-floathard
+	make -f Makefile -j HAVE_HAKCHI=1
+	patchelf --replace-needed libSDL2-2.0.so.0 libSDL2.so retroarch #libSDL2-2.0.so.0 sym link doesn't exist on native build. Just patch the binary...
+	#/usr/bin/arm-linux-gnueabihf-strip retroarch
+	rm -f $(HAKCHI_DIR)/bin/retroarch
+	cp retroarch $(HAKCHI_DIR)/bin/retroarch
+	echo $$(echo "Built by: " $$USER @ $$(date) \\\\\\ Git Commit: $(GIT_COMMIT)) > $(HAKCHI_DIR)/etc/libretro/retroarch_version
+	cp $(HAKCHI_DIR)/readme.md $(HAKCHI_DIR)/readme_COPY.md
+	printf "%s\n" \
+	"---" \
+	"Name: $(HAKCHI_VER)" \
+	"Creator: $(MOD_CREATOR)" \
+	"Category: $(MOD_CATEGORY)" \
+	"Version: $(HAKCHI_VER)" \
+	"Built on: $(shell date)" \
+	"Git commit: $(GIT_COMMIT)" \
+	"---" > $(HAKCHI_DIR)/readme.md
+	cat $(HAKCHI_DIR)/readme_COPY.md >> $(HAKCHI_DIR)/readme.md
+	rm $(HAKCHI_DIR)/readme_COPY.md
+	@echo "** BUILDING HAKCHI $(HAKCHI_VER) HMOD PACKAGE **"
+	cd $(HAKCHI_DIR)/; tar -czvf "$(HAKCHI_VER).hmod" *
+	mv $(HAKCHI_DIR)/$(HAKCHI_VER).hmod .
+	@echo "** BUILT HAKCHI $(HAKCHI_VER) HMOD PACKAGE **"
+clean:
+	rm -f *.o
+	rm -f audio/*.o
+	rm -f conf/*.o
+	rm -f gfx/*.o
+	rm -f gfx/drivers_font/*.o
+	rm -f gfx/drivers_font_renderer/*.o
+	rm -f gfx/drivers_context/*.o
+	rm -f gfx/py_state/*.o
+	rm -f compat/*.o
+	rm -f record/*.o
+	rm -f input/*.o
+	rm -f tools/*.o
+	rm -f $(BINDIR)/retroarch
+	rm -f $(BINDIR)/retroarch-joyconfig
+	rm -f $(PNDDIR)/readme.html
+	rm -f retroarch
+	rm -f $(HAKCHI_DIR)/bin/retroarch
+	rm -f $(HAKCHI_VER).hmod
+	rm -f $(HAKCHI_DIR)/etc/libretro/retroarch_version
@@ -15,9 +15,7 @@ LDFLAGS = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib

 LIBS = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound
 DEFINES = -std=gnu99 -DHAVE_THREADS -DHAVE_GETOPT_LONG=1 -DHAVE_GRIFFIN -DRARCH_INTERNAL
-DEFINES += -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SCREENSHOTS -DHAVE_REWIND -D__ARM_ARCH_6__ -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_OVERLAY -DHAVE_VIDEO_LAYOUT -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
-DEFINES += -DHAVE_DSP_FILTER
-DEFINES += -DHAVE_VIDEO_FILTER
+DEFINES += -D__ARM_ARCH_6__ -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_OVERLAY -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
 DEFINES += $(INCDIRS)
 DEFINES += -D__OPENPANDORA__ -DPANDORA
 DEFINES += -marm -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -ftree-vectorize
@@ -1,172 +0,0 @@
-TARGET		    := retroarch_orbis
-DEBUG               ?= 0
-GRIFFIN_BUILD        = 0
-WHOLE_ARCHIVE_LINK   = 0
-
-PS4_TITLE_ID	:= RETROARCH
-PS4_TITLE_NAME	:= RetroArch
-
-PC_DEVELOPMENT_IP_ADDRESS  =
-PC_DEVELOPMENT_UDP_PORT	   =
-
-OBJ :=
-
-DEFINES :=
-
-ifeq ($(GRIFFIN_BUILD), 1)
-	OBJ += griffin/griffin.o
-	DEFINES += -DHAVE_GRIFFIN=1
-	DEFINES += -DHAVE_MENU -DHAVE_LIBRETRODB -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SCREENSHOTS -DHAVE_CHEATS
-	DEFINES += -DHAVE_REWIND
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_CC_RESAMPLER
-	ifeq ($(DEBUG), 1)
-		DEFINES += -DHAVE_NETLOGGER
-	endif
-else
-
-   HAVE_DSP_FILTER := 1
-   HAVE_VIDEO_FILTER := 1
-	HAVE_FILTERS_BUILTIN	:= 1
-	HAVE_LANGEXTRA		:= 0
-	HAVE_RPNG		:= 1
-	HAVE_RJPEG		:= 1
-	HAVE_RBMP		:= 1
-	HAVE_RTGA		:= 1
-	HAVE_ZLIB		:= 1
-	HAVE_OVERLAY		:= 1
-	HAVE_VIDEO_LAYOUT := 0
-	HAVE_7ZIP		:= 1
-	HAVE_EGL 		:= 1
-	HAVE_GFX_WIDGETS := 1
-	HAVE_GLSL      := 1
-	HAVE_OPENGLES  		:= 1
-	HAVE_NETWORKING		:= 0
-	HAVE_SOCKET_LEGACY	:= 0
-	HAVE_MENU		:= 1
-	HAVE_MENU_COMMON	:= 1
-	HAVE_CONFIGFILE := 1
-   HAVE_SCREENSHOTS := 1
-   HAVE_REWIND      := 1
-	HAVE_PATCH      := 1
-   HAVE_CHEATS       := 1
-	HAVE_RGUI		:= 0
-	HAVE_MATERIALUI 	:= 0
-	HAVE_XMB		:= 1
-	HAVE_THREADS		:= 1
-	HAVE_LIBRETRODB		:= 1
-	HAVE_CC_RESAMPLER	:= 1
-	HAVE_CHEEVOS		:= 1
-	RARCH_CONSOLE		:= 1
-	HAVE_STATIC_VIDEO_FILTERS = 1
-	HAVE_STATIC_AUDIO_FILTERS = 1
-
-	ifeq ($(DEBUG), 1)
-		HAVE_NETLOGGER = 1
-	endif
-
-	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
-	BLACKLIST :=
-	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-endif
-
-ifeq ($(strip $(PS4SDK)),)
-$(error "Please set PS4SDK in your environment. export PS4SDK=<path to>ps4sdk")
-endif
-
-export PATH := $(PATH):$(PS4SDK)/bin
-
-PREFIX :=
-
-CC      := $(PREFIX)clang
-CXX     := $(PREFIX)clang
-AS      := $(PREFIX)clang
-AR      := $(PREFIX)ar
-OBJCOPY := $(PREFIX)objcopy
-STRIP   := $(PREFIX)strip
-NM      := $(PREFIX)nm
-LD      := $(CXX)
-
-INCDIRS := -I. -Ideps/7zip -Ilibretro-common/include -Ideps/stb -Ilibretro-common/include/compat/zlib
-LIBDIRS := -L.
-
-ARCHFLAGS := -m64 -DORBIS
-CFLAGS    += $(ARCHFLAGS) -std=c11 -mcmodel=large -ffreestanding -nostdlib -nostdinc -fno-builtin -fno-stack-protector
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O2 -g
-else
-   CFLAGS += -O3
-endif
-
-ASFLAGS := $(ARCHFLAGS) -I$(PS4SDK)/include -target x86_64-scei-ps4-elf -fPIE
-LDFLAGS := -O3 -Wall -m64 -nostartfiles -nostdlib -L$(PS4SDK)/lib -pie
-ARFLAGS := rcs
-
-CRTFILE ?= $(PS4SDK)/crt0.s
-
-CFLAGS += -Wall -pedantic -Wno-zero-length-array -Wno-format-pedantic
-CFLAGS += -D__PS4__ -I$(PS4SDK)/include -I $(PS4SDK)/include/sce
-CFLAGS += -target x86_64-scei-ps4-elf -fPIE
-CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
-CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
-
-ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
-   CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
-endif
-
-ifneq ($(PC_DEVELOPMENT_UDP_PORT),)
-   CFLAGS += -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-endif
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-CXXFLAGS := $(CFLAGS)
-
-PS4_LIBS := -lps4link -ldebugnet -lorbisFile -lelfloader -lorbisKeyboard -lorbis2d -lpng -lz -lorbisGl -lorbisPad -lorbisAudio -lmod -lorbisFileBrowser -lorbisXbmFont -lSceNet_stub -lScePigletv2VSH_stub -lSceSystemService_stub -lSceUserService_stub -lScePad_stub -lSceAudioOut_stub -lSceIme_stub -lSceSysmodule_stub \
-	-lPs4_extension_kernel_call_standard -lPs4_extension_kernel_execute_dynlib_prepare_dlclose -lPs4_common_kernel -lPs4_common_user -lPs4_common_generic -lPs4LibCInternalAdaptive_stub -lPs4LibKernelAdaptive_stub -lSceLibcInternal_stub -lkernel_stub -lps4Kernel_stub -lPs4_base_stub_resolve_minimal -lPs4_base_kernel_dlsym_standard -lPs4_base_kernel_seek_elf_address_standard -lPs4_base_assembler_register_parameter_standard -lPs4_base_assembler_system_call_standard
-
-LIBS	:= $(WHOLE_START) -lretro_orbis $(WHOLE_END) $(PS4_LIBS)
-
-TARGETS := $(TARGET).elf
-
-DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
-POSTCOMPILE = mv -f $*.Tdepend $*.depend
-
-all: $(TARGETS)
-
-%.o: %.cpp
-%.o: %.cpp %.depend
-	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
-
-%.o: %.c
-%.o: %.c %.depend
-	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
-
-%.o: %.S
-%.o: %.S %.depend
-	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
-
-%.o: %.s
-%.o: %.s %.depend
-	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
-
-%.depend: ;
-
-$(TARGET).elf: $(OBJ) libretro_orbis.a
-	$(LD) $(CRTFILE) $(OBJ) $(LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
-
-clean:
-	rm -f $(OBJ) $(TARGET).elf
-	rm -f $(OBJ:.o=.depend)
-
-.PHONY: clean all
-.PRECIOUS: %.depend
-
-include $(OBJ:.o=.depend)
@@ -36,7 +36,7 @@ retroarch.pnd: install
 	pnd_make -c -p retroarch.pnd -d $(PNDDIR)/ -x $(PNDDIR)/PXML.xml -i $(PNDDIR)/icon.png

 clean:
-	rm -f *.o
+	rm -f *.o 
 	rm -f audio/*.o
 	rm -f conf/*.o
 	rm -f gfx/*.o
@@ -52,3 +52,4 @@ clean:
 	rm -f $(BINDIR)/retroarch-joyconfig
 	rm -f $(PNDDIR)/readme.html
 	rm -f retroarch
+
@@ -1,100 +0,0 @@
-BUILD_FOR_PCSX2    = 0
-DEBUG              = 0
-HAVE_THREADS       = 0
-MUTE_WARNINGS      = 1
-PS2_IP = 192.168.1.10
-
-TARGET = retroarchps2-debug.elf
-TARGET_RELEASE = retroarchps2.elf
-
-# Compile the IRXs first
-IRX_DIR = ps2/irx
-
-ifeq ($(DEBUG), 1)
-   OPTIMIZE_LV	:= -O0 -g
-	RARCH_DEFINES += -DDEBUG
-else
-   OPTIMIZE_LV	:= -O3
-	LDFLAGS :=  -s
-endif
-
-ifeq ($(MUTE_WARNINGS), 1)
-   DISABLE_WARNINGS := -Wno-unused -Wno-format -Wno-format-truncation
-endif
-
-INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include
-INCDIR += -Ips2/include -Ilibretro-common/include -Ideps -Ideps/stb -Ideps/7zip
-CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) -ffast-math -fsingle-precision-constant
-ASFLAGS = $(CFLAGS)
-
-RARCH_DEFINES += -DPS2 -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DHAVE_RGUI
-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 -lgskit -ldmakit -laudsrv -lmtap -lpadx -lz -lcdvd -lelf-loader
-
-ifeq ($(BUILD_FOR_PCSX2), 1)
-RARCH_DEFINES += -DBUILD_FOR_PCSX2
-endif
-
-ifeq ($(HAVE_THREADS), 1)
-RARCH_DEFINES += -DHAVE_THREADS
-endif
-
-CFLAGS += $(RARCH_DEFINES)
-
-# All the IRX objects
-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)/bdm_irx.o $(IRX_DIR)/bdmfs_vfat_irx.o $(IRX_DIR)/usbmass_bd_irx.o
-EE_OBJS += $(IRX_DIR)/libsd_irx.o $(IRX_DIR)/audsrv_irx.o
-EE_OBJS += $(IRX_DIR)/cdfs_irx.o
-EE_OBJS += $(IRX_DIR)/mtapman_irx.o $(IRX_DIR)/padman_irx.o
-
-# Missing objecst on the PS2SDK
-EE_OBJS += ps2/compat_files/ps2_devices.o
-
-EE_OBJS += griffin/griffin.o
-
-EE_CFLAGS = $(CFLAGS)
-EE_CXXFLAGS = $(CFLAGS)
-EE_LDFLAGS = $(LDFLAGS)
-EE_LIBS = $(LIBS)
-EE_ASFLAGS = $(ASFLAGS)
-EE_INCS = $(INCDIR)
-EE_BIN = $(TARGET)
-EE_GPVAL = $(GPVAL)
-
-
-all: irxdir $(EE_BIN)
-
-irxdir:
-	$(MAKE) -C $(IRX_DIR)
-
-clean:
-	rm -f $(EE_BIN) $(EE_OBJS)
-	$(MAKE) -C $(IRX_DIR) clean
-
-prepare:
-	ps2client -h $(PS2_IP) reset
-	ps2client -h $(PS2_IP) netdump
-
-run:
-	ps2client -h $(PS2_IP) execee host:$(EE_BIN)
-
-sim:
-	PCSX2 --elf=$(PWD)/$(EE_BIN) --nogui
-
-debug: clean all run
-
-package:
-	ps2-packer $(EE_BIN) $(TARGET_RELEASE)
-
-release: clean all package
-
-#Include preferences
-include $(PS2SDK)/samples/Makefile.pref
-include $(PS2SDK)/samples/Makefile.eeglobal_cpp
@@ -1,98 +0,0 @@
-BUILD_FOR_PCSX2   = 0
-DEBUG             = 0
-MUTE_WARNINGS     = 1
-PS2_IP = 192.168.1.150
-
-TARGET = raboot-debug.elf
-TARGET_RELEASE = raboot.elf
-
-# Compile the IRXs first
-IRX_DIR = ps2/irx
-
-ifeq ($(DEBUG), 1)
-   OPTIMIZE_LV	:= -O0 -g
-	RARCH_DEFINES += -DDEBUG
-else
-   OPTIMIZE_LV	:= -O3
-	LDFLAGS :=  -s
-endif
-
-ifeq ($(MUTE_WARNINGS), 1)
-   DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses
-endif
-
-INCDIR = -Ilibretro-common/include
-INCDIR += -Ips2/include
-CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) -ffast-math -fsingle-precision-constant
-ASFLAGS = $(CFLAGS)
-
-RARCH_DEFINES += -DPS2 -DIS_SALAMANDER -DRARCH_CONSOLE
-
-LIBDIR =
-LDFLAGS =
-LIBS = -lelf-loader -lpatches
-
-ifeq ($(BUILD_FOR_PCSX2), 1)
-RARCH_DEFINES += -DBUILD_FOR_PCSX2
-endif
-
-CFLAGS += $(RARCH_DEFINES)
-
-EE_OBJS = frontend/frontend_salamander.o \
-		 frontend/frontend_driver.o \
-		 frontend/drivers/platform_ps2.o \
-		 libretro-common/file/file_path.o \
-		 libretro-common/file/file_path_io.o \
-		 libretro-common/string/stdstring.o \
-		 libretro-common/lists/string_list.o \
-		 libretro-common/lists/dir_list.o \
-		 libretro-common/file/retro_dirent.o \
-		 libretro-common/encodings/encoding_utf.o \
-		 libretro-common/compat/fopen_utf8.o \
-		 libretro-common/compat/compat_strl.o \
-		 libretro-common/compat/compat_strcasestr.o \
-		 libretro-common/file/config_file.o \
-		 libretro-common/streams/file_stream.o \
-		 libretro-common/vfs/vfs_implementation.o \
-		 libretro-common/hash/lrc_hash.o \
-		 libretro-common/time/rtime.o \
-		 verbosity.o \
-		 ps2/compat_files/ps2_devices.o 
-
-# Needed IRX objects
-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)/bdm_irx.o $(IRX_DIR)/bdmfs_vfat_irx.o $(IRX_DIR)/usbmass_bd_irx.o
-EE_OBJS += $(IRX_DIR)/cdfs_irx.o
-
-EE_CFLAGS = $(CFLAGS)
-EE_CXXFLAGS = $(CFLAGS)
-EE_LDFLAGS = $(LDFLAGS)
-EE_LIBS = $(LIBS)
-EE_ASFLAGS = $(ASFLAGS)
-EE_INCS = $(INCDIR)
-EE_BIN = $(TARGET)
-EE_GPVAL = $(GPVAL)
-
-all: irxdir $(EE_BIN)
-
-irxdir:
-	$(MAKE) -C $(IRX_DIR)
-
-clean:
-	rm -f $(EE_BIN) $(EE_OBJS)
-	$(MAKE) -C $(IRX_DIR) clean
-
-debug: clean all run
-
-run:
-	ps2client -h $(PS2_IP) execee host:$(EE_BIN)
-
-package:
-	ps2-packer $(EE_BIN) $(TARGET_RELEASE)
-
-release: clean all package
-
-#Include preferences
-include $(PS2SDK)/samples/Makefile.pref
-include $(PS2SDK)/samples/Makefile.eeglobal_cpp
@@ -0,0 +1,202 @@
+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/libz -Ilibretro-common/include -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_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD -DHAVE_DR_MP3 -DHAVE_DR_FLAC
+
+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
+else
+#DEFINES			+= -DHAVE_LIBDBGFONT
+#FONT_LIBS		:= -ldbgfont
+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 -DWANT_ZLIB -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
+
+#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
@@ -0,0 +1,198 @@
+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
+else
+DEFINES			+= -DHAVE_LIBDBGFONT
+FONT_LIBS		:= -ldbgfont
+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_THREADS -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 -DWANT_ZLIB -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
@@ -0,0 +1,90 @@
+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 -Ideps/libz
+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 \
+				  frontend/drivers/platform_null.c \
+				  libretro-common/file/file_path.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/streams/file_stream.c \
+				  libretro-common/vfs/vfs_implementation.c \
+				  libretro-common/file/config_file.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
@@ -1,39 +1,29 @@
-#-------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#-------------------------------------------------------------------------------
-.SUFFIXES:
-#-------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
-endif
- 
-include $(PSL1GHT)/ppu_rules
-
 include version.all

 DEBUG			= 0
 HAVE_LOGGER		= 0
-HAVE_FILE_LOGGER	= 1
+HAVE_FILE_LOGGER	= 0

 PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
 PC_DEVELOPMENT_UDP_PORT		= 3490

-CONTENTID		= UP0001-SSNE10001_00-0000000000000001
-APPID                   = SSNE10001
-TITLE                   = Retroarch PSL1GHT
-PACKAGE_BASENAME := retroarch_psl1ght
+CC = $(PS3DEV)/ppu/bin/ppu-gcc
+CXX = $(PS3DEV)/ppu/bin/ppu-g++
+LD = $(PS3DEV)/ppu/bin/ppu-ld
+
+CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001

 ELF_TARGET := retroarch_psl1ght.elf
-SELF_TARGET := $(ELF_TARGET:.elf=.self)
-CORE_PATH		= pkg/psl1ght/pkg/USRDIR/cores/CORE.SELF
+EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
+CORE_PATH		= pkg/ps3/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 -Idefines
-LIBDIRS += -L.
+INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ideps/libz -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb
+LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.

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

 # system platform
 system_platform = unix
@@ -48,10 +38,46 @@ 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
+# 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
+
+MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe
+MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe

 OBJ = griffin/griffin.o

@@ -63,35 +89,43 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
 endif

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

 ifeq ($(DEBUG), 1)
   CFLAGS += -O0 -g
 else
-   CFLAGS += -O3 -g
+   CFLAGS += -O3 -g 
   CXXFLAGS += -03 -g
 endif

-all: $(SELF_TARGET)
+all: $(ELF_TARGET)

 $(ELF_TARGET): $(OBJ)
 	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)

-create-core: $(SELF_TARGET)
-	cp $(SELF_TARGET) $(CORE_PATH) 
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<

-pkg: create-core
-	$(PKG) --contentid $(CONTENTID) pkg/psl1ght/pkg/ $(PACKAGE_BASENAME).pkg
-#	cp $(PACKAGE_BASENAME).pkg $(PACKAGE_BASENAME).gnpdrm.pkg
-#	$(PACKAGE_FINALIZE) $(PACKAGE_BASENAME).gnpdrm.pkg
+%.o: %.cpp
+	$(CXX) $(CFLAGS) -c -o $@ $<
+
+create-npdrm-core:
+	$(MAKE_FSELF_NPDRM) $(ELF_TARGET) $(CORE_PATH)
+
+create-core:
+	$(MAKE_SELF_WC) $(ELF_TARGET) $(CORE_PATH)
+
+pkg: $(ELF_TARGET) create-npdrm-core
+	$(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf ps3/pkg
+
+pkg-signed: $(ELF_TARGET) create-core
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg

 clean:
 	rm -f $(ELF_TARGET)
 	rm -f $(OBJ)

 .PHONY: clean
+
@@ -1,120 +0,0 @@
-#-------------------------------------------------------------------------------
-# Clear the implicit built in rules
-#-------------------------------------------------------------------------------
-.SUFFIXES:
-#-------------------------------------------------------------------------------
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path>")
-endif
- 
-include $(PSL1GHT)/ppu_rules
-
-include version.all
-
-DEBUG			= 0
-HAVE_LOGGER		= 0
-HAVE_FILE_LOGGER	= 1
-
-PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
-PC_DEVELOPMENT_UDP_PORT		= 3490
-
-CONTENTID		= UP0001-SSNE10001_00-0000000000000001
-APPID                   = SSNE10001
-TITLE                   = Retroarch PSL1GHT
-PACKAGE_BASENAME := retroarch_psl1ght
-
-ELF_TARGET := retroarch_psl1ght_salamander.elf
-ELF_TARGET_NONSTRIPPED := retroarch_psl1ght_salamander_nonstripped.elf
-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 -Idefines
-LIBDIRS += -L.
-
-MACHDEP := -D__PS3__ -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 -lsysfs
-
-# 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)
-GIT			= git
-else
-GIT			= git.exe
-endif
-
-OBJ		= frontend/frontend_salamander.o \
-				  frontend/frontend_driver.o \
-				  frontend/drivers/platform_ps3.o \
-				  libretro-common/file/file_path.o \
-				  libretro-common/file/file_path_io.o \
-				  libretro-common/lists/dir_list.o \
-				  libretro-common/lists/string_list.o \
-				  libretro-common/file/retro_dirent.o \
-				  libretro-common/hash/lrc_hash.o \
-				  libretro-common/string/stdstring.o \
-				  libretro-common/encodings/encoding_utf.o \
-				  libretro-common/compat/compat_strl.o \
-				  libretro-common/compat/compat_strcasestr.o \
-				  libretro-common/compat/fopen_utf8.o \
-				  libretro-common/streams/file_stream.o \
-				  libretro-common/vfs/vfs_implementation.o \
-				  libretro-common/file/config_file.o \
-				  libretro-common/time/rtime.o \
-				  verbosity.o
-
-ifeq ($(HAVE_LOGGER), 1)
-CFLAGS		+= -DHAVE_LOGGER
-endif
-
-ifeq ($(HAVE_FILE_LOGGER), 1)
-CFLAGS		+= -DHAVE_FILE_LOGGER
-endif
-
-SHARED_FLAGS :=
-
-SHARED_FLAGS += -DHAVE_VIDEO_LAYOUT
-SHARED_FLAGS += -DHAVE_MENU -DHAVE_CONFIGFILE -DRARCH_CONSOLE -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts -DHAVE_CC_RESAMPLER -DHAVE_MULTIMAN -DHAVE_RGUI -DIS_SALAMANDER
-CFLAGS += -std=gnu99 $(SHARED_FLAGS)
-CXXFLAGS += $(SHARED_FLAGS)
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -g
-else
-   CFLAGS += -O3 -g
-   CXXFLAGS += -03 -g
-endif
-
-all: create-salamander
-
-$(ELF_TARGET_NONSTRIPPED): $(OBJ)
-	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)
-
-$(ELF_TARGET): $(ELF_TARGET_NONSTRIPPED)
-	$(STRIP) $< -o $@
-	$(SPRX) $@
-
-create-salamander: $(ELF_TARGET)
-	$(SELF_NPDRM) $(ELF_TARGET) $(EBOOT_PATH) $(CONTENTID)
-
-pkg: create-salamander
-	$(PKG) --contentid $(CONTENTID) pkg/psl1ght/pkg/ $(PACKAGE_BASENAME).pkg
-#	cp $(PACKAGE_BASENAME).pkg $(PACKAGE_BASENAME).gnpdrm.pkg
-#	$(PACKAGE_FINALIZE) $(PACKAGE_BASENAME).gnpdrm.pkg
-
-clean:
-	rm -f $(ELF_TARGET)
-	rm -f $(OBJ)
-
-.PHONY: clean
@@ -2,6 +2,8 @@ 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
@@ -19,20 +21,24 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
   WHOLE_END := -Wl,--no-whole-archive
 endif

-INCDIR = deps deps/stb deps/7zip libretro-common/include libretro-common/include/compat/zlib
+INCDIR = deps deps/stb deps/libz deps/7zip deps/pthreads deps/pthreads/platform/psp deps/pthreads/platform/helper libretro-common/include
 CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math -fsingle-precision-constant
 ASFLAGS = $(CFLAGS)

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

 LIBDIR =
 LDFLAGS =
-LIBS = $(WHOLE_START) -lretro_psp1 $(WHOLE_END) -lstdc++ -lpspgu -lpspgum -lm -lpspaudio -lpspfpu -lpsppower -lpsprtc -lpthread-psp
+LIBS = $(WHOLE_START) -lretro_psp1 $(WHOLE_END) -lstdc++ -lpspgu -lpspgum -lm -lpspaudio -lpspfpu -lpsppower -lpsprtc

 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
@@ -43,6 +49,7 @@ endif

 CFLAGS += $(RARCH_DEFINES)

+
 EXTRA_TARGETS = EBOOT.PBP
 PSP_EBOOT_TITLE = RetroArch PSP1

@@ -52,18 +59,3 @@ OBJS = $(PSP_OBJECTS)

 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak
-
-pspsh-debug:
-	pspsh -e reset
-	read -p "Start debugger in VSCode and press any key to continue... \n" -n1 -s
-	pspsh -e debug ./retroarchpsp.prx
-	pspsh
-
-pspsh-run:
-	pspsh -e reset
-	pspsh -e ./retroarchpsp.prx
-	pspsh
-
-debug: clean all pspsh-debug
-
-run: clean all pspsh-run
@@ -1,5 +1,6 @@
 BUILD_PRX         = 0
 PSP_LARGE_MEMORY  = 1
+HAVE_FILE_LOGGER  = 0
 DEBUG             = 0

 TARGET = retroarchpsp_salamander
@@ -20,7 +21,11 @@ LIBDIR =
 LDFLAGS =
 LIBS = -lstdc++ -lm -lpsppower

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

 EXTRA_TARGETS   = EBOOT.PBP
 PSP_EBOOT_TITLE = RetroArch
@@ -30,23 +35,22 @@ PSP_EBOOT_PIC1  = pkg/psp1/PIC1.PNG
 OBJS = frontend/frontend_salamander.o \
 		 frontend/frontend_driver.o \
 		 frontend/drivers/platform_psp.o \
+		 frontend/drivers/platform_null.o \
 		 libretro-common/file/file_path.o \
-		 libretro-common/file/file_path_io.o \
 		 libretro-common/string/stdstring.o \
 		 libretro-common/lists/string_list.o \
 		 libretro-common/lists/dir_list.o \
 		 libretro-common/file/retro_dirent.o \
 		 libretro-common/encodings/encoding_utf.o \
-		 libretro-common/compat/fopen_utf8.o \
 		 libretro-common/compat/compat_strl.o \
 		 libretro-common/compat/compat_strcasestr.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/vfs/vfs_implementation.o \
-		 libretro-common/hash/lrc_hash.o \
-		 libretro-common/time/rtime.o \
+		 libretro-common/hash/rhash.o \
+		 file_path_str.o \
 		 verbosity.o \
-		 bootstrap/psp1/kernel_functions.o
+		 bootstrap/psp1/kernel_functions.o 

 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak
@@ -1,231 +0,0 @@
-#########################
-## 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
-ifeq ($(STRIP_BIN),1)
-	$(STRIP) --strip-unneeded retroarch
-endif
-	$(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 '$*=$($*)'
@@ -1,232 +0,0 @@
-#########################
-## 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
-HAVE_ALSA = 1
-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
-DEF_FLAGS += -lasound
-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
-DEFINES += -DHAVE_ALSA
-
-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
-ifeq ($(STRIP_BIN),1)
-	$(STRIP) --strip-unneeded retroarch
-endif
-	$(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 '$*=$($*)'
@@ -1,234 +0,0 @@
-#########################
-## Toolchain variables ##
-#########################
-
-# Alpha toolchain
-TOOLCHAIN_DIR=/opt/rs90-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-rs90-linux-musl-gcc
-endif
-
-ifdef GCW0_CXX
-CXX                   = $(GCW0_CXX)
-else
-CXX                   = $(TOOLCHAIN_DIR)/usr/bin/mipsel-rs90-linux-musl-g++
-endif
-
-ifdef GCW0_STRIP
-STRIP                 = $(GCW0_STRIP)
-else
-STRIP                 = $(TOOLCHAIN_DIR)/usr/bin/mipsel-rs90-linux-musl-strip
-endif
-
-GCW0_SDL_CONFIG      ?= $(TOOLCHAIN_DIR)/usr/mipsel-rs90-linux-musl/sysroot/usr/bin/sdl-config
-GCW0_FREETYPE_CONFIG ?= $(TOOLCHAIN_DIR)/usr/mipsel-rs90-linux-musl/sysroot/usr/bin/freetype-config
-GCW0_MK_SQUASH_FS    ?= $(TOOLCHAIN_DIR)/usr/bin/mksquashfs
-
-GCW0_INC_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-rs90-linux-musl/sysroot/usr/include
-GCW0_LIB_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-rs90-linux-musl/sysroot/usr/lib
-
-#########################
-#########################
-
-PACKAGE_NAME = retroarch
-
-DEBUG ?= 0
-
-RS90 = 1
-DINGUX = 1
-DINGUX_BETA = 1
-HAVE_SCREENSHOTS = 0
-HAVE_REWIND = 0
-HAVE_7ZIP = 1
-HAVE_AL = 0
-HAVE_ALSA = 1
-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 = 0
-HAVE_COMMAND = 0
-HAVE_CXX = 1
-HAVE_DR_MP3 = 0
-HAVE_DYNAMIC = 1
-HAVE_EGL = 0
-HAVE_FREETYPE = 0
-HAVE_GDI = 0
-HAVE_GETADDRINFO = 0
-HAVE_GETOPT_LONG = 1
-HAVE_GLSL = 0
-HAVE_HID = 0
-HAVE_IBXM = 0
-HAVE_IMAGEVIEWER = 0
-HAVE_LANGEXTRA = 0
-HAVE_LIBRETRODB = 1
-HAVE_MENU = 1
-HAVE_MENU_COMMON = 1
-HAVE_GFX_WIDGETS = 0
-HAVE_MMAP = 1
-HAVE_OPENDINGUX_FBDEV = 0
-HAVE_OPENGL = 0
-HAVE_OPENGL1 = 0
-HAVE_OPENGLES = 0
-HAVE_OPENGLES3 = 0
-HAVE_OPENGL_CORE = 0
-HAVE_OPENSSL = 0
-HAVE_OVERLAY = 0
-HAVE_RBMP = 1
-HAVE_RJPEG = 1
-HAVE_RPILED = 0
-HAVE_RPNG = 1
-HAVE_RUNAHEAD = 0
-HAVE_SDL_DINGUX = 1
-HAVE_SHADERPIPELINE = 0
-HAVE_STB_FONT = 0
-HAVE_STB_IMAGE = 0
-HAVE_STB_VORBIS = 0
-HAVE_STDIN_CMD = 0
-HAVE_STRCASESTR = 1
-HAVE_THREADS = 1
-HAVE_UDEV = 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 = 0
-HAVE_TINYALSA = 1
-HAVE_NEAREST_RESAMPLER = 1
-
-OS = Linux
-TARGET = retroarch
-OPK_NAME = retroarch_rs90_odbeta.opk
-
-OBJ :=
-LINK := $(CXX)
-DEF_FLAGS := -mplt -mno-shared
-DEF_FLAGS += -ffunction-sections -fdata-sections
-DEF_FLAGS += -I. -Ideps -Ideps/stb -DRS90=1 -DDINGUX=1 -DDINGUX_BETA=1 -MMD
-DEF_FLAGS += -Wall -Wno-unused-variable
-DEF_FLAGS += -std=gnu99 -D_GNU_SOURopendinguxCE -flto -lasound
-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_FILTERS_BUILTIN
-DEFINES += -DHAVE_UDEV=1
-DEFINES += -DHAVE_ALSA
-DEFINES += -DCC_RESAMPLER_PRECISION=0
-
-SDL_DINGUX_CFLAGS := $(shell $(GCW0_SDL_CONFIG) --cflags)
-SDL_DINGUX_LIBS := $(shell $(GCW0_SDL_CONFIG) --libs)
-FREETYPE_CFLAGS := $(shell $(GCW0_FREETYPE_CONFIG) --cflags)
-FREETYPE_LIBS := $(shell $(GCW0_FREETYPE_CONFIG) --libs)
-MMAP_LIBS = -lc
-
-OBJDIR_BASE := obj-unix
-
-ifeq ($(DEBUG), 1)
-   OBJDIR := $(OBJDIR_BASE)/debug
-   DEF_FLAGS += -O0 -g -DDEBUG -D_DEBUG
-else
-   OBJDIR := $(OBJDIR_BASE)/release
-   DEF_FLAGS += -Ofast -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.rs90.desktop
-	rm -f $(OPK_NAME)
-	cp media/ico_src/icon32.png retroarch.png
-ifeq ($STRIP_BIN, 1)
-	$(STRIP) --strip-unneeded retroarch
-endif
-	$(GCW0_MK_SQUASH_FS) retroarch default.rs90.desktop retroarch.png $(OPK_NAME) -all-root -no-xattrs -noappend -no-exports
-	rm -f default.rs90.desktop retroarch.png
-
-.PHONY: all clean opk
-
-print-%:
-	@echo '$*=$($*)'
@@ -6,18 +6,14 @@ WHOLE_ARCHIVE_LINK      = 0

 OBJ :=

-DEFINES := -DSWITCH=1 -U__linux__ -U__linux -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_DYNAMIC -DHAVE_REWIND
+DEFINES := -DSWITCH=1 -U__linux__ -U__linux -DRARCH_INTERNAL -DHAVE_DYNAMIC

 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_NEON -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB
 	DEFINES += -DHAVE_RUNAHEAD -DHAVE_DYNAMIC
-	DEFINES += -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS
 else
-   HAVE_REWIND = 1
-	HAVE_AUDIOMIXER = 1
-	HAVE_RWAV       = 1
 	HAVE_CC_RESAMPLER = 1
 	HAVE_MENU_COMMON = 1
 	HAVE_RTGA = 1
@@ -26,37 +22,32 @@ else
 	HAVE_RBMP = 1
 	HAVE_RGUI = 1
 	HAVE_ZLIB = 1
-   HAVE_DSP_FILTER = 1
-   HAVE_VIDEO_FILTER = 1
 	HAVE_BUILTINZLIB = 1
 	HAVE_LIBRETRODB = 1
+	HAVE_ZARCH = 0
 	HAVE_MATERIALUI = 0 # enable later?
 	HAVE_XMB = 0
 	HAVE_STATIC_VIDEO_FILTERS = 1
 	HAVE_STATIC_AUDIO_FILTERS = 1
 	HAVE_MENU = 1
-	HAVE_CONFIGFILE = 1
 	HAVE_RUNAHEAD = 1
 	HAVE_DYNAMIC = 1
-	HAVE_PATCH   = 1
-	HAVE_CHEATS  = 1
-	HAVE_IBXM = 1

 	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
-	BLACKLIST :=
+        BLACKLIST :=
 	BLACKLIST += input/input_overlay.o
-	BLACKLIST += tasks/task_overlay.o
+        BLACKLIST += tasks/task_overlay.o
 	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
 endif

+
 ifeq ($(strip $(LIBTRANSISTOR_HOME)),)
 $(error "Please set LIBTRANSISTOR_HOME in your environment. export LIBTRANSISTOR_HOME=<path/to/libtransistor/dist/>")
 endif

 include $(LIBTRANSISTOR_HOME)/libtransistor.mk

-INCDIRS := -I. -Ideps -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -Ideps/stb -I$(LIBTRANSISTOR_HOME)/build/sdl2_install/include/SDL2/
+INCDIRS := -I. -Ideps -Ideps/libz -Ilibretro-common/include -Ideps/stb -I$(LIBTRANSISTOR_HOME)/build/sdl2_install/include/SDL2/
 LIBDIRS := -L.

 TARGETS := $(TARGET).nro
@@ -1,6 +1,5 @@
 TARGET		    := retroarch_vita
 DEBUG               ?= 0
-HAVE_FILE_LOGGER	= 1
 GRIFFIN_BUILD        = 0
 WHOLE_ARCHIVE_LINK   = 0

@@ -12,29 +11,19 @@ PC_DEVELOPMENT_UDP_PORT	   =

 OBJ :=

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

 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1
-	DEFINES += -DHAVE_REWIND
-	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB DEFINES -DHAVE_KEYMAPPER
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_CC_RESAMPLER
+	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB DEFINES -DHAVE_KEYMAPPER
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
 	ifeq ($(DEBUG), 1)
 		DEFINES += -DHAVE_NETLOGGER
 	endif
-	INCDIRS += -I. -Ideps/7zip -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -Ideps/stb
 else
-   HAVE_REWIND := 1
-   HAVE_UPDATE_ASSETS      := 1
-   HAVE_ONLINE_UPDATER     := 1
+
 	HAVE_NEON		:= 1
-   HAVE_MATH_NEON := 1
-   HAVE_DSP_FILTER := 1
-   HAVE_VIDEO_FILTER := 1
-   HAVE_SCREENSHOTS := 1
 	HAVE_FILTERS_BUILTIN	:= 1
 	HAVE_LANGEXTRA		:= 1
 	HAVE_RPNG		:= 1
@@ -43,30 +32,12 @@ else
 	HAVE_RTGA		:= 1
 	HAVE_ZLIB		:= 1
 	HAVE_7ZIP		:= 1
-   ifeq ($(HAVE_VITAGLES), 1)
-      HAVE_VITA2D		:= 0
-      HAVE_VITAGL		:= 0
-      HAVE_VITAGLES := 1
-      HAVE_OPENGL := 1
-      HAVE_OPENGLES := 1
-      HAVE_OPENGLES2 := 1
-      HAVE_EGL := 1
-      HAVE_GLSL := 1
-      HAVE_SHADERPIPELINE := 1
-   else
-      HAVE_VITA2D		:= 1
-      HAVE_VITAGL		:= 0
-   endif
+	HAVE_VITA2D		:= 1
 	HAVE_NETWORKING		:= 1
 	HAVE_SOCKET_LEGACY	:= 1
 	HAVE_MENU		:= 1
 	HAVE_MENU_COMMON	:= 1
-	HAVE_GFX_WIDGETS := 1
-	HAVE_CONFIGFILE := 1
-	HAVE_PATCH      := 1
-	HAVE_CHEATS     := 1
 	HAVE_OVERLAY		:= 1
-	HAVE_VIDEO_LAYOUT := 0
 	HAVE_MATERIALUI		:= 1
 	HAVE_XMB		:= 1
 	HAVE_RGUI		:= 1
@@ -75,24 +46,25 @@ else
 	HAVE_LIBRETRODB		:= 1
 	HAVE_CC_RESAMPLER	:= 1
 	HAVE_CHEEVOS		:= 1
-	HAVE_RUNAHEAD		:= 1
 	RARCH_CONSOLE		:= 1
 	HAVE_STATIC_VIDEO_FILTERS = 1
 	HAVE_STATIC_AUDIO_FILTERS = 1
-	HAVE_AUDIOMIXER 	:= 1
-	HAVE_RWAV       	:= 1

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

 	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
 	BLACKLIST :=
 	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-	INCDIRS += $(INCLUDE_DIRS)
+
+	OBJ += input/drivers/psp_input.o
+	OBJ += input/drivers_joypad/psp_joypad.o
+	OBJ += audio/drivers/psp_audio.o
+	OBJ += frontend/drivers/platform_psp.o
 endif

+
 ifeq ($(strip $(VITASDK)),)
 $(error "Please set VITASDK in your environment. export VITASDK=<path to>vitasdk")
 endif
@@ -110,28 +82,23 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)

+INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Ideps/stb
 LIBDIRS := -L.

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

 ifeq ($(DEBUG), 1)
-   CFLAGS += -g -Og
+   CFLAGS += -O2 -g
 else
-   CFLAGS += -O2
+   CFLAGS += -O3
 endif

 ASFLAGS := $(CFLAGS)
 LDFLAGS := -Wl,-q

 CFLAGS += -Wall -ffast-math
-CFLAGS += -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DRARCH_CONSOLE
-CFLAGS += -DHAVE_DSP_FILTER
-CFLAGS += -DHAVE_VIDEO_FILTER
+CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
 CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)

 ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
@@ -148,18 +115,10 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
 endif
 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 -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
+VITA_LIBS := -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub \
+	-lSceSysmodule_stub -lSceCtrl_stub -lSceTouch_stub -lSceAudio_stub \
+	-lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
+	-lSceFiber_stub -lSceMotion_stub -lSceAppMgr_stub -lpthread -lpng -lz

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

@@ -168,6 +127,7 @@ TARGETS := $(TARGET).vpk
 DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
 POSTCOMPILE = mv -f $*.Tdepend $*.depend

+
 all: $(TARGETS)

 %.o: %.cpp
@@ -180,6 +140,7 @@ all: $(TARGETS)
 	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
 	$(POSTCOMPILE)

+
 %.o: %.S
 %.o: %.S %.depend
 	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
@@ -192,30 +153,21 @@ all: $(TARGETS)

 %.depend: ;

-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 liblibScePiglet_stub.a
+$(TARGET).elf: $(OBJ) libretro_vita.a
 	$(LD) $(OBJ) $(LDFLAGS) $(LIBDIRS) $(LIBS) -o $@

 %.velf: %.elf
-	cp $< $<.unstripped.elf
-	$(PREFIX)strip -g $<
 	vita-elf-create $< $@

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

 %.vpk: %.self
-	vita-mksfoex -s TITLE_ID=$(VITA_TITLE_ID) "$(VITA_TITLE_NAME)" -d ATTRIBUTE2=12 param.sfo
+	vita-mksfoex -s TITLE_ID=$(VITA_TITLE_ID) "$(VITA_TITLE_NAME)" 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 
-	rm -rf  deps/Pigs-In-A-Blanket/piglet_stub/libScePiglet
+	rm -f $(OBJ) $(TARGET).elf $(TARGET).velf $(TARGET).self param.sfo $(TARGET).vpk
 	rm -f $(OBJ:.o=.depend)

 # Useful for developers
@@ -225,10 +177,6 @@ vpksend: $(TARGET).vpk
 send: $(TARGET).self
 	curl -T $< ftp://$(PSVITAIP):1337/ux0:/app/$(VITA_TITLE_ID)/eboot.bin

-launch: $(TARGET).self
-	curl -T $< ftp://$(PSVITAIP):1337/ux0:/app/$(VITA_TITLE_ID)/eboot.bin
-	echo "launch $(VITA_TITLE_ID)" | nc ${PSVITAIP} 1338
-
 .PHONY: clean all send vpksend
 .PRECIOUS: %.depend

@@ -21,9 +21,9 @@ RARCH_DEFINES = -DVITA -DIS_SALAMANDER -DRARCH_CONSOLE

 LIBDIR =
 LDFLAGS =
-LIBS = -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub -lSceAppUtil_stub\
-     -lSceSysmodule_stub -lSceCtrl_stub -lSceHid_stub -lSceAudio_stub -lSceFiber_stub\
-     -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub -lSceMotion_stub \
+LIBS = -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
+     -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub -lSceFiber_stub\
+     -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
     -lSceMotion_stub -lSceAppMgr_stub -lfreetype -lpng -lm -lc

 ifeq ($(HAVE_FILE_LOGGER), 1)
@@ -35,8 +35,8 @@ CFLAGS += $(RARCH_DEFINES)
 OBJS = frontend/frontend_salamander.o \
 		 frontend/frontend_driver.o \
 		 frontend/drivers/platform_psp.o \
+		 frontend/drivers/platform_null.o \
 		 libretro-common/file/file_path.o \
-		 libretro-common/file/file_path_io.o \
 		 libretro-common/string/stdstring.o \
 		 libretro-common/lists/string_list.o \
 		 libretro-common/lists/dir_list.o \
@@ -44,18 +44,17 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/encodings/encoding_utf.o \
 		 libretro-common/compat/compat_strl.o \
 		 libretro-common/compat/compat_strcasestr.o \
-		 libretro-common/compat/fopen_utf8.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/vfs/vfs_implementation.o \
-		 libretro-common/hash/lrc_hash.o \
-		 libretro-common/time/rtime.o \
+		 libretro-common/hash/rhash.o \
+		 file_path_str.o \
 		 verbosity.o

 all: $(TARGET).vpk

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

 eboot.bin: $(TARGET).velf
@@ -1,385 +0,0 @@
-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,11 +3,10 @@
 # Makefile for RetroArch Wii.
 ##

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

 # system platform
 system_platform = unix
@@ -28,48 +27,36 @@ 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

-INCLUDE := -I. -Ilibretro-common/include -Ilibretro-common/include/compat/zlib
+INCLUDE := -I. -Ilibretro-common/include -Ideps/libz
 ifeq ($(EXTERNAL_LIBOGC), 1)
-INCLUDE += -I$(DEVKITPRO)/libogc/include
+INCLUDE += -I$(DEVKITPRO)/libogc/include 
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
 else
-INCLUDE += -Iwii/libogc/include
+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
+LIBS := -lwiiuse -logc -lbte

 ifeq ($(EXTERNAL_LIBOGC), 1)
-LIBS := -lfat
+LIBS += -lfat
 endif

-LIBS += -lwiiuse -logc -lbte
-
 APP_BOOTER_DIR = wii/app_booter

 OBJ = frontend/frontend_salamander.o \
 		frontend/frontend_driver.o \
 		frontend/drivers/platform_gx.o \
 		frontend/drivers/platform_wii.o \
+		frontend/drivers/platform_null.o \
 		libretro-common/file/file_path.o \
-		libretro-common/file/file_path_io.o \
-		libretro-common/hash/lrc_hash.o \
+		libretro-common/hash/rhash.o \
 		libretro-common/string/stdstring.o \
 		libretro-common/lists/string_list.o \
 		libretro-common/lists/dir_list.o \
@@ -79,9 +66,8 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/encodings/encoding_utf.o \
 		libretro-common/compat/compat_strl.o \
 		libretro-common/compat/compat_strcasestr.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

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

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

 pkg: all
@@ -1,4 +1,4 @@
-TARGET := retroarch_wiiu
+TARGET		    := retroarch_wiiu

 BUILD_HBL_ELF              = 1
 BUILD_RPX                  = 1
@@ -10,7 +10,7 @@ WIIU_HID                   = 1
 HAVE_RUNAHEAD              = 1
 WIIU_LOG_RPX               = 0
 BUILD_DIR                  = objs/wiiu
-PC_DEVELOPMENT_TCP_PORT    ?=
+PC_DEVELOPMENT_TCP_PORT	   ?=

 ifeq ($(SALAMANDER_BUILD),1)
   BUILD_DIR := $(BUILD_DIR)-salamander
@@ -27,13 +27,7 @@ ifneq ($(V), 1)
   Q := @
 endif

-DEFINES :=
 OBJ :=
-INCDIRS :=
-
-#-----------------------------
-# Features and object files
-
 OBJ += wiiu/main.o
 OBJ += wiiu/system/memory.o
 OBJ += wiiu/system/atomic.o
@@ -43,9 +37,23 @@ OBJ += wiiu/fs/sd_fat_devoptab.o
 OBJ += wiiu/fs/fs_utils.o
 OBJ += wiiu/hbl.o

-RPX_OBJ = $(BUILD_DIR)/wiiu/system/stubs_rpl.o
-HBL_ELF_OBJ = $(BUILD_DIR)/wiiu/system/dynamic.o \
-              $(BUILD_DIR)/wiiu/system/stubs_elf.o
+DEFINES :=
+
+ifeq ($(WIIU_LOG_RPX),1)
+   defines += -DWIIU_LOG_RPX
+endif
+
+ifeq ($(WIIU_HID),1)
+   DEFINES += -DWIIU_HID
+   OBJ += input/drivers_joypad/wiiu/hidpad_driver.o
+   OBJ += input/drivers_hid/wiiu_hid.o
+   OBJ += input/connect/joypad_connection.o \
+          input/common/hid/hid_device_driver.o \
+          input/common/hid/device_wiiu_gca.o \
+          input/common/hid/device_ds3.o \
+          input/common/hid/device_ds4.o \
+          input/common/hid/device_null.o
+endif

 ifeq ($(SALAMANDER_BUILD),1)
   DEFINES += -DRARCH_CONSOLE -DIS_SALAMANDER
@@ -53,11 +61,10 @@ ifeq ($(SALAMANDER_BUILD),1)
   OBJ += frontend/frontend_salamander.o
   OBJ += frontend/frontend_driver.o
   OBJ += frontend/drivers/platform_wiiu.o
+   OBJ += frontend/drivers/platform_null.o
   OBJ += libretro-common/encodings/encoding_utf.o
   OBJ += libretro-common/compat/compat_strcasestr.o
-   OBJ += libretro-common/compat/fopen_utf8.o
   OBJ += libretro-common/file/file_path.o
-   OBJ += libretro-common/file/file_path_io.o
   OBJ += libretro-common/string/stdstring.o
   OBJ += libretro-common/lists/string_list.o
   OBJ += libretro-common/lists/dir_list.o
@@ -66,24 +73,19 @@ 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/lrc_hash.o
-   OBJ += libretro-common/time/rtime.o
+   OBJ += libretro-common/hash/rhash.o
+   OBJ += file_path_str.o
   OBJ += verbosity.o
-
-# $(SALAMANDER_BUILD),0
 else
   DEFINES += -DRARCH_INTERNAL
-   DEFINES += -DHAVE_SCREENSHOTS
   DEFINES += -DHAVE_KEYMAPPER
-   DEFINES += -DHAVE_ONLINE_UPDATER
   DEFINES += -DHAVE_UPDATE_ASSETS
-   DEFINES += -DHAVE_UPDATE_CORES
   DEFINES += -DHAVE_FILTERS_BUILTIN
   DEFINES += -DHAVE_SLANG
   DEFINES += -DHAVE_SHADERPIPELINE

 ifeq ($(HAVE_RUNAHEAD),1)
-   DEFINES += -DHAVE_RUNAHEAD
+	DEFINES += -DHAVE_RUNAHEAD
 endif

   OBJ += wiiu/shader_utils.o
@@ -96,150 +98,74 @@ endif
   OBJ += gfx/drivers/gx2_shaders/snow.o
   OBJ += gfx/drivers/gx2_shaders/snow_simple.o
   OBJ += gfx/drivers/gx2_shaders/snowflake.o
+   OBJ += gfx/drivers_shader/slang_preprocess.o
+   OBJ += gfx/drivers_shader/glslang_util.o

   ifeq ($(GRIFFIN_BUILD), 1)
-      OBJ += griffin/griffin.o griffin/griffin_cpp.o
-
-      INCDIRS += -Ilibretro-common/include/compat/zlib
-      # for stb, libfat, iosuhax
-      INCDIRS += -Ideps -Ideps/libfat/include -Ideps/libiosuhax/include
-      # pad_functions uses wiiu/input.h
-      INCDIRS += -Iinput/include
-      INCDIRS += -Ideps/SPIRV-Cross
-
-      DEFINES += -DHAVE_AUDIOMIXER
-      DEFINES += -DHAVE_RWAV
-      DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DHAVE_RGUI -DHAVE_LIBRETRODB
-		DEFINES += -DHAVE_REWIND
-      DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_CC_RESAMPLER
-      DEFINES += -DHAVE_SPIRV_CROSS -DHAVE_SLANG
-      DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY
-      #DEFINES += -DWANT_IFADDRS
-      #DEFINES += -DHAVE_FREETYPE
-      DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
-      DEFINES += -DHAVE_HID
-      DEFINES += -DWANT_LIBFAT -DHAVE_LIBFAT -DWANT_IOSUHAX -DHAVE_IOSUHAX
-      DEFINES += -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
-
-   # $(GRIFFIN_BUILD),0
+   	OBJ += griffin/griffin.o
+   	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_LIBRETRODB
+   	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
+   	DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING
+   #	DEFINES += -DWANT_IFADDRS
+   #	DEFINES += -DHAVE_FREETYPE
+   	DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
   else
-      HAVE_SCREENSHOTS = 1
-      HAVE_AUDIOMIXER = 1
-      HAVE_RWAV = 1
-      HAVE_MENU_COMMON = 1
-      HAVE_GFX_WIDGETS = 1
-      HAVE_RTGA = 1
-      HAVE_RPNG = 1
-      HAVE_RJPEG = 1
-      HAVE_RBMP = 1
-      HAVE_CONFIGFILE = 1
-      HAVE_PATCH      = 1
-      HAVE_REWIND     = 1
-      HAVE_CHEATS     = 1
-      HAVE_MENU = 1
-      HAVE_RGUI = 1
-      HAVE_7ZIP = 1
-      HAVE_ZLIB = 1
-      HAVE_BUILTINZLIB = 0
-      HAVE_LIBRETRODB = 1
-      HAVE_MATERIALUI = 1
-      HAVE_XMB = 1
-      HAVE_STB_FONT = 1
-      #HAVE_FREETYPE = 1
-      HAVE_LANGEXTRA = 1
-      HAVE_LIBRETRODB = 1
-      HAVE_NETWORKING = 1
-      HAVE_NETPLAYDISCOVERY = 1
-      HAVE_CHEEVOS = 1
-      #WANT_IFADDRS = 1
-      HAVE_OVERLAY = 1
-      HAVE_SPIRV_CROSS = 1
-      HAVE_SLANG = 1
-      HAVE_VIDEO_LAYOUT = 0
-      HAVE_DSP_FILTER = 1
-      HAVE_VIDEO_FILTER = 1
-      HAVE_STATIC_VIDEO_FILTERS = 1
-      HAVE_STATIC_AUDIO_FILTERS = 1
-      WANT_LIBFAT = 1
-      WANT_IOSUHAX = 1
+   	HAVE_MENU_COMMON = 1
+   	HAVE_RTGA = 1
+   	HAVE_RPNG = 1
+   	HAVE_RJPEG = 1
+   	HAVE_RBMP = 1
+   	HAVE_RGUI = 1
+   	HAVE_ZLIB = 1
+   	HAVE_7ZIP = 1
+	HAVE_BUILTINZLIB = 0
+   	HAVE_LIBRETRODB = 1
+   	HAVE_ZARCH = 0
+   	HAVE_MATERIALUI = 1
+   	HAVE_XMB = 1
+   	HAVE_STB_FONT = 1
+   #	HAVE_FREETYPE = 1
+   	HAVE_LANGEXTRA = 1
+   	HAVE_LIBRETRODB = 1
+   	HAVE_NETWORKING = 1
+   	HAVE_CHEEVOS = 1
+   #	WANT_IFADDRS = 1
+   	HAVE_OVERLAY = 1
+   	HAVE_STATIC_VIDEO_FILTERS = 1
+   	HAVE_STATIC_AUDIO_FILTERS = 1
+   	WANT_LIBFAT = 1
+   	WANT_IOSUHAX = 1

-      include Makefile.common
-      DEFINES += $(DEF_FLAGS)
-      INCDIRS += $(INCLUDE_DIRS)
+   	include Makefile.common
+   	BLACKLIST := $(LIBRETRO_COMM_DIR)/net/net_ifinfo.o
+   	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
+
+   	OBJ += gfx/drivers/gx2_gfx.o
+   	OBJ += gfx/drivers_font/wiiu_font.o
+   	OBJ += menu/drivers_display/menu_display_wiiu.o
+   	OBJ += input/drivers/wiiu_input.o
+   	OBJ += input/drivers_joypad/wiiu_joypad.o
+        OBJ += input/drivers_joypad/wiiu/wpad_driver.o
+        OBJ += input/drivers_joypad/wiiu/kpad_driver.o
+        OBJ += input/drivers_joypad/wiiu/pad_functions.o
+
+   	OBJ += audio/drivers/wiiu_audio.o
+   	OBJ += frontend/drivers/platform_wiiu.o
   endif
 endif

 OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))

-#-----------------------------
-# Compile flags
-
-DEFINES += -DWIIU -D__WUT__ -DHW_WUP -D__wiiu__
+#todo: remove -DWIIU and use the built-in macros instead (HW_WUP or __wiiu__).
+DEFINES += -DWIIU -DMSB_FIRST -D__WUT__
+#DEFINES += -D_GNU_SOURCE
 DEFINES += -DHAVE_MAIN
 DEFINES += -DRARCH_CONSOLE

-ifeq ($(WIIU_LOG_RPX),1)
-   DEFINES += -DWIIU_LOG_RPX
-endif
-
 ifneq ($(PC_DEVELOPMENT_TCP_PORT),)
   DEFINES += -DPC_DEVELOPMENT_TCP_PORT=$(PC_DEVELOPMENT_TCP_PORT)
 endif

-INCDIRS += -I.
-INCDIRS += -Ilibretro-common/include
-INCDIRS += -Iwiiu
-INCDIRS += -Iwiiu/include
-
-CFLAGS  := -mcpu=750 -meabi -mhard-float
-CFLAGS  += -ffast-math -Werror=implicit-function-declaration
-CFLAGS  += -ffunction-sections -fdata-sections
-#CFLAGS += -fomit-frame-pointer -mword-relocations
-CFLAGS += -Wall
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -g
-else
-   CFLAGS += -O3
-endif
-
-ASFLAGS := $(CFLAGS) -mregnames
-
-#-----------------------------
-# Linking/library flags
-
-LIBDIRS := -L.
-LDFLAGS := $(CFLAGS)
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-
-LIBS := $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm
-
-# Use portlibs zlib if deps/ isn't being used
-ifeq ($(HAVE_ZLIB),1)
-ifeq ($(HAVE_BUILTINZLIB),0)
-   INCDIRS += -I$(DEVKITPRO)/portlibs/ppc/include
-   LIBDIRS += -L$(DEVKITPRO)/portlibs/ppc/lib
-   # Bonus: libpng for cores that need it
-   LIBS += -lpng -lz
-endif
-endif
-
-LDFLAGS += -Wl,--gc-sections
-
-RPX_LDFLAGS      := -pie -fPIE
-RPX_LDFLAGS      += -z common-page-size=64 -z max-page-size=64
-RPX_LDFLAGS      += -T wiiu/link_rpl.ld
-RPX_LDFLAGS      += -nostartfiles
-
-HBL_ELF_LDFLAGS  := -T wiiu/link_elf.ld
-
-#-----------------------------
-# Compiler setup
-
 ifeq ($(strip $(DEVKITPPC)),)
 $(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
 endif
@@ -247,7 +173,7 @@ ifeq ($(strip $(DEVKITPRO)),)
 $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPRO")
 endif

-export PATH   := $(PATH):$(DEVKITPPC)/bin
+export PATH	  := $(PATH):$(DEVKITPPC)/bin

 PREFIX := powerpc-eabi-

@@ -268,8 +194,64 @@ else
   ELF2RPL   := $(ELF2RPL).exe
 endif

-#-----------------------------
-# Targets and build rules
+INCDIRS := -I.
+INCDIRS += -Ideps
+INCDIRS += -Ideps/stb
+INCDIRS += -Ideps/libz
+INCDIRS += -Ideps/7zip
+INCDIRS += -Ilibretro-common/include
+INCDIRS += -Iinput/include
+INCDIRS += -Iwiiu
+INCDIRS += -Iwiiu/include
+INCDIRS += -I$(DEVKITPRO)/portlibs/ppc/include
+LIBDIRS := -L. -L$(DEVKITPRO)/portlibs/ppc/lib
+
+CFLAGS  := -mwup -mcpu=750 -meabi -mhard-float
+LDFLAGS :=
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+else
+   CFLAGS += -O3
+endif
+
+LDFLAGS := $(CFLAGS)
+
+ASFLAGS := $(CFLAGS) -mregnames
+
+CFLAGS +=  -ffast-math -Werror=implicit-function-declaration
+#CFLAGS += -fomit-frame-pointer -mword-relocations
+#CFLAGS	+= -Wall
+
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+
+CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions
+
+LDFLAGS  += -Wl,--gc-sections
+
+LIBS	:= $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm -lpng -lz
+
+ifneq ($(WANT_LIBFAT), 1)
+LIBS += -lfat
+endif
+
+ifneq ($(WANT_IOSUHAX), 1)
+LIBS += -liosuhax
+endif
+
+
+RPX_OBJ           = $(BUILD_DIR)/wiiu/system/stubs_rpl.o
+HBL_ELF_OBJ       = $(BUILD_DIR)/wiiu/system/dynamic.o $(BUILD_DIR)/wiiu/system/stubs_elf.o
+
+RPX_LDFLAGS      := -pie -fPIE
+RPX_LDFLAGS      += -z common-page-size=64 -z max-page-size=64
+RPX_LDFLAGS      += -T wiiu/link_rpl.ld
+RPX_LDFLAGS      += -nostartfiles
+
+HBL_ELF_LDFLAGS  := -T wiiu/link_elf.ld

 TARGETS :=
 ifeq ($(BUILD_RPX), 1)
@@ -282,11 +264,13 @@ endif

 DEPFLAGS    = -MT $@ -MMD -MP -MF $(BUILD_DIR)/$*.depend

+
 all: $(TARGETS)

 %: $(BUILD_DIR)/%
 	cp $< $@

+
 $(BUILD_DIR)/%.o: %.cpp %.depend
 	@$(if $(Q), echo CXX $<,)
 	@mkdir -p $(dir $@)
@@ -333,11 +317,10 @@ $(BUILD_DIR)/$(TARGET).rpx: $(BUILD_DIR)/$(TARGET).rpx.elf $(ELF2RPL) .$(TARGET)
 	$(Q)-$(ELF2RPL) $< $@

 clean:
-	@$(if $(Q), echo $@,)
-	$(Q)rm -f $(OBJ) $(RPX_OBJ) $(HBL_ELF_OBJ) $(TARGET).elf $(TARGET).rpx.elf $(TARGET).rpx
-	$(Q)rm -f $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).rpx.elf $(BUILD_DIR)/$(TARGET).rpx
-	$(Q)rm -f .$(TARGET).elf.last .$(TARGET).rpx.elf.last .$(TARGET).rpx.last
-	$(Q)rm -f $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
+	rm -f $(OBJ) $(RPX_OBJ) $(HBL_ELF_OBJ) $(TARGET).elf $(TARGET).rpx.elf $(TARGET).rpx
+	rm -f $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).rpx.elf $(BUILD_DIR)/$(TARGET).rpx
+	rm -f .$(TARGET).elf.last .$(TARGET).rpx.elf.last .$(TARGET).rpx.last
+	rm -f $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)

 .PHONY: clean all
 .PRECIOUS: %.depend %.last
@@ -1,8 +1,5 @@
 TARGET = retroarch.exe

-HAVE_SCREENSHOTS = 1
-HAVE_AUDIOMIXER = 1
-HAVE_RWAV = 1
 HAVE_DINPUT = 1
 HAVE_XAUDIO = 1
 HAVE_DSOUND = 1
@@ -11,19 +8,11 @@ HAVE_OPENGL = 1
 HAVE_DYLIB = 1
 HAVE_D3D9 = 1
 HAVE_NETWORKING = 1
-HAVE_NETPLAYDISCOVERY = 1
 HAVE_STDIN_CMD = 1
 HAVE_COMMAND = 1
 HAVE_THREADS = 1
-HAVE_MENU = 1
-HAVE_CONFIGFILE = 1
-HAVE_PATCH      = 1
-HAVE_REWIND     = 1
-HAVE_CHEATS     = 1
 HAVE_RGUI = 1
 HAVE_MATERIALUI = 1
-HAVE_DSP_FILTER = 1
-HAVE_VIDEO_FILTER = 1
 HAVE_7ZIP = 1
 HAVE_PYTHON = 0
 DYNAMIC = 1
@@ -41,7 +30,9 @@ HAVE_FREETYPE := 1
 HAVE_FFMPEG   := 0

 HAVE_CG       := 1
+HAVE_LIBXML2  := 0
 HAVE_ZLIB     := 1
+WANT_ZLIB     := 1
 HAVE_CC_RESAMPLER := 1

 ifeq ($(HAVE_CG), 1)
@@ -53,6 +44,11 @@ FREETYPE_CFLAGS  := -DHAVE_FREETYPE -Ifreetype2
 FREETYPE_LIBS    := -lfreetype
 endif

+ifeq ($(HAVE_LIBXML2), 1)
+LIBXML2_CFLAGS   := -Ilibxml2 -DHAVE_LIBXML2 -DHAVE_GLSL
+LIBXML2_LIBS     := -lxml2 -liconv
+endif
+
 ifeq ($(HAVE_SDL), 1)
 SDL_LIBS         := -lSDL
 SDL_CFLAGS       := -ISDL -DHAVE_SDL
@@ -64,20 +60,6 @@ SDL2_LIBS        := -lSDL2
 SDL2_CFLAGS      := -ISDL2 -DHAVE_SDL2
 endif

-ifeq ($(HAVE_D3D8), 1)
-D3D8_LIBS        := -ld3d8
-ifeq ($(HAVE_D3DX), 1)
-D3DX8_LIBS       := -ld3dx8
-endif
-endif
-
-ifeq ($(HAVE_D3D9), 1)
-D3D9_LIBS        := -ld3d9
-ifeq ($(HAVE_D3DX), 1)
-D3DX9_LIBS       := -ld3dx9
-endif
-endif
-
 ifeq ($(HAVE_RSOUND), 1)
 RSOUND_CFLAGS    := -DHAVE_RSOUND
 RSOUND_LIBS      := -lrsound
@@ -102,9 +84,7 @@ OBJDIR           := obj-w32
 OS               := Win32
 OBJ              :=
 LIBS             := -lm
-DEFINES			  :=
-DEFINES          += -I. -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_OVERLAY
-#DEFINES			  += -DHAVE_VIDEO_LAYOUT
+DEFINES          := -I. -Ilibretro-common/include -DRARCH_INTERNAL -DHAVE_OVERLAY
 LDFLAGS          := -L. -static-libgcc

 include Makefile.common
@@ -121,6 +101,7 @@ else
   WINDRES = windres
 endif

+
 libretro ?= -lretro

 ifeq ($(DYNAMIC), 1)
@@ -141,7 +122,7 @@ else
   CXXFLAGS += -O3 -ffast-math
 endif

-CFLAGS += $(DEF_FLAGS) -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps
+CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps 
 CXXFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps -std=c++98 -D__STDC_CONSTANT_MACROS
 ifeq ($(CXX_BUILD), 1)
   CFLAGS += -std=c++98 -xc++ -D__STDC_CONSTANT_MACROS
@@ -167,6 +148,13 @@ $(OBJDIR)/%.o: %.c
 	@$(if $(Q), $(shell echo echo CC $<),)
 	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<

+.FORCE:
+
+$(OBJDIR)/git_version.o: git_version.c .FORCE
+	@-mkdir -p $(dir $@) || mkdir $(subst /,\,$(dir $@)) || echo .
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<
+
 $(OBJDIR)/%.o: %.cpp | $(dir $@)
 	@-mkdir -p $(dir $@) || mkdir $(subst /,\,$(dir $@)) || echo .
 	@$(if $(Q), $(shell echo echo CXX $<),)
@@ -183,3 +171,4 @@ clean:
 	rm -f *.d

 .PHONY: all install uninstall clean
+
@@ -1,7 +1,7 @@
 USAGE NOTES
 ===========

-This driver is meant for devices with Allwinner SoCs with Mali400 3D block and a
+This driver is meant for devices with Allwinner SoCs with Mali400 3D block and a 
 good fbdev implementation. It is derived from the old Android GLES driver.

 It was meant to be used on Cubieboard/Cubieboard2/Cubietruck, but it should not
@@ -19,7 +19,7 @@ First we will clone and build the kernel:
 git clone https://github.com/mireq/linux-sunxi.git -b sunxi-3.4 --depth 1

 Now we edit drivers/video/sunxi/disp/dev_fb.c, and uncomment the line 1074:
-// Fb_wait_for_vsync(info);
+// Fb_wait_for_vsync(info); 

 It is assumed you have a cross-compiler installed, so we configure and build the kernel and modules:

@@ -50,7 +50,7 @@ Now we need the headers. We can get them from here:

 http://malideveloper.arm.com/develop-for-mali/sdks/opengl-es-sdk-for-linux/#opengl-es-sdk-for-linux-download

-Download whatever version you want. We just get the headers from here, not machine-dependant compiled code.
+Download whatever version you want. We just get the headers from here, not machine-dependant compiled code. 

 Extract the files and copy the directories inside inc to /usr/include .

@@ -60,27 +60,27 @@ In the end you should have this on your system:

   /usr/include/EGL/
      eglext.h
-      egl.h
-      eglplatform.h
+      egl.h           
+      eglplatform.h   
      fbdev_window.h
   /usr/include/GLES/
      glext.h
-      gl.h
+      gl.h  
      glplatform.h
   /usr/include/GLES2
      gl2ext.h
-      gl2.h
+      gl2.h  
      gl2platform.h
   /usr/include/GLES3
      gl3ext.h
-      gl3.h
+      gl3.h  
      gl3platform.h

 To enable mali_fbdev you must configure RetroArch with --enable-gles and --enable-mali_fbdev.

 This is an example of what you would use on a CubieBoard2 for a lightweight RetroArch:

-./configure --enable-gles --enable-mali_fbdev --disable-x11 --disable-sdl2 --enable-floathard --disable-ffmpeg --disable-netplay --enable-udev --disable-sdl --disable-pulse --disable-oss --disable-freetype --disable-7zip
+./configure --enable-gles --enable-mali_fbdev --disable-x11 --disable-sdl2 --enable-floathard --disable-ffmpeg --disable-netplay --enable-udev --disable-sdl --disable-pulse --disable-oss --disable-freetype --disable-7zip --disable-libxml2

 NOTE: A TTY hack is used to auto-clean the console on exit, and the fbdev ioctls are used to retrieve
 current video mode. Both things work good, but they are not exactly ideal solutions.
@@ -1,6 +1,5 @@
 [![Build Status](https://travis-ci.org/libretro/RetroArch.svg?branch=master)](https://travis-ci.org/libretro/RetroArch)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/8936/badge.svg)](https://scan.coverity.com/projects/retroarch)
-[![Crowdin](https://badges.crowdin.net/retroarch/localized.svg)](https://crowdin.com/project/retroarch)

 # RetroArch

@@ -9,17 +8,15 @@ Popular examples of implementations for this API includes video game system emul
 more generalized 3D programs.
 These programs are instantiated as dynamic libraries. We refer to these as "libretro cores".

-![XMB menu driver](docs/XMB-main-menu.jpg "XMB menu driver")
+![XMB menu driver](http://i.imgur.com/BMR1xxr.png "XMB menu driver")

-![rgui menu driver](docs/rgui-main-menu.jpg "rgui menu driver")
+![rgui menu driver](http://i.imgur.com/X3CbBKa.png "rgui menu driver")

-![glui menu driver](docs/glui-main-menu.jpg "glui menu driver")
-
-![ozone menu driver](docs/ozone-main-menu.jpg "ozone menu driver")
+![glui menu driver](http://i.imgur.com/ooqv8rw.png "glui menu driver")

 ## libretro

-[libretro](https://www.libretro.com) is an API that exposes generic audio/video/input callbacks.
+[libretro](http://libretro.com) is an API that exposes generic audio/video/input callbacks.
 A frontend for libretro (such as RetroArch) handles video output, audio output, input and application lifecycle.
 A libretro core written in portable C or C++ can run seamlessly on many platforms with very little to no porting effort.

@@ -34,12 +31,12 @@ Latest binaries are currently hosted on the [buildbot](http://buildbot.libretro.

 ## Support

-To reach developers, either make an issue here on GitHub, make a thread on the [forum](https://www.libretro.com/forums/), chat on [discord](https://discord.gg/C4amCeV), or visit our IRC channel: #retroarch @ irc.freenode.org. You could create a post in [Reddit](https://www.reddit.com/r/RetroArch/) with *Technical Support* flair.
+To reach developers, either make an issue here on GitHub, make a thread on the [forum](http://www.libretro.com/forums/), chat on [Discord](https://discord.gg/C4amCeV), or visit our IRC channel: #retroarch @ irc.freenode.org.

 ## Documentation

 See our [Documentation Center](https://docs.libretro.com/). On Unix, man-pages are provided.
-More developer-centric stuff is found [here](https://docs.libretro.com/development/libretro-overview/).
+More developer-centric stuff is found [here](https://github.com/libretro/libretro.github.com/wiki/Documentation-devs).

 ## Related projects

@@ -75,7 +72,6 @@ RetroArch has been ported to the following platforms:
   - Haiku
   - Solaris
   - macOS (PPC, x86-32 and x86-64)
-   - PlayStation 2
   - PlayStation 3
   - PlayStation Portable
   - PlayStation Vita
@@ -84,7 +80,7 @@ RetroArch has been ported to the following platforms:
   - Nintendo GameCube
   - Nintendo Wii
   - Nintendo Wii U
-   - Nintendo 3DS/2DS
+   - Nintendo 3DS
   - Nintendo Switch
   - Nintendo NES/SNES Classic Edition
   - Raspberry Pi
@@ -109,6 +105,7 @@ OSX port of RetroArch requires latest versions of XCode to build.
 RetroArch can utilize these libraries if enabled:

   - nvidia-cg-toolkit
+   - libxml2 (GLSL XML shaders)
   - libfreetype2 (TTF font rendering on screen)

 RetroArch needs at least one of these audio driver libraries:
@@ -151,7 +148,7 @@ Instructions for compiling and installing RetroArch can be found in the [Libretr

 ## CRT 15Khz Resolution Switching

-CRT SwitchRes will turn on, on the fly. However, you will need to restart RetroArch to disable it. With CRT SwitchRes enable RetroArch will start in 2560 x 480 @ 60.
+CRT SwitchRes will turn on, on the fly. However, you will need to restart RetroArch to disable it. With CRT SwitchRes enable RetroArch will start in 2560 x 480 @ 60.  

 If you are running Windows, before enabling the CRT SwitchRes options please make sure you have installed CRTEmudriver and installed some modelines. The minimum modelines for all games to switch correctly are:

@@ -192,46 +189,46 @@ The default super resolution is 2560. It is displayed just under the CRT switch

 If native resolutions are activated you will need a whole new set of modelines:

- 256 x 240 @ 50.006977 SNESpal
- 256 x 448 @ 50.006977 SNESpal
- 512 x 224 @ 50.006977 SNESpal
 - 512 x 240 @ 50.006977 SNESpal
+- 512 x 224 @ 50.006977 SNESpal
 - 512 x 448 @ 50.006977 SNESpal
- 256 x 240 @ 60.098812 SNESntsc
- 256 x 448 @ 60.098812 SNESntsc
 - 512 x 240 @ 60.098812 SNESntsc
 - 512 x 224 @ 60.098812 SNESntsc
 - 512 x 448 @ 60.098812 SNESntsc
- 256 x 192 @ 59.922745 MDntsc
- 256 x 224 @ 59.922745 MDntsc
- 320 x 224 @ 59.922745 MDntsc
+- 256 x 240 @ 50.006977 SNESpal
+- 256 x 448 @ 50.006977 SNESpal
+- 256 x 240 @ 60.098812 SNESntsc
+- 256 x 448 @ 60.098812 SNESntsc
 - 320 x 240 @ 59.922745 MDntsc
- 320 x 448 @ 59.922745 MDntsc
+- 320 x 448 @ 59.922745 MDntp
 - 320 x 480 @ 59.922745 MDntsc
+- 256 x 192 @ 59.922745 MDntsc
+- 320 x 224 @ 59.922745 MDntsc
+- 256 x 224 @ 59.922745 MDntsc
+- 320 x 288 @ 49.701458 MDpal
+- 320 x 576 @ 49.701458 MDpal
 - 256 x 192 @ 49.701458 MDpal
- 256 x 224 @ 49.701458 MDpal
 - 320 x 224 @ 49.701458 MDpal
 - 320 x 240 @ 49.701458 MDpal
- 320 x 288 @ 49.701458 MDpal
 - 320 x 448 @ 49.701458 MDpal
 - 320 x 480 @ 49.701458 MDpal
- 320 x 576 @ 49.701458 MDpal
+- 256 x 224 @ 49.701458 MDpal
 - 256 x 288 @ 49.701458 MSYSpal
 - 256 x 240 @ 60.098812 NESntsc
 - 256 x 240 @ 50.006977 NESpal

+- 640 x 480 @ 60.130001 N64ntsc
 - 640 x 237 @ 60.130001 N64ntsc
 - 640 x 240 @ 60.130001 N64ntsc
- 640 x 480 @ 60.130001 N64ntsc
- 640 x 288 @ 50.000000 N64pal
 - 640 x 480 @ 50.000000 N64pal
- 640 x 576 @ 50.000000 N64pal
+- 640 x 576 @ 50.000000 n64pal
+- 640 x 288 @ 50.000000 n64pal

 - 256 x 252 @ 49.759998 PSXpal
- 320 x 252 @ 49.759998 PSXpal
 - 384 x 252 @ 49.759998 PSXpal
- 640 x 252 @ 49.759998 PSXpal
 - 640 x 540 @ 49.759998 PSXpal
+- 320 x 252 @ 49.759998 PSXpal
+- 640 x 252 @ 49.759998 PSXpal

 - 384 x 240 @ 59.941002 PSXntsc
 - 256 x 480 @ 59.941002 PSXntsc
@@ -260,23 +257,3 @@ These modelines are more accurate giving exact hz. However, some games may have
 Some arcade resolutions can be very different from consumer CRTs. There is resolution detection to ensure MAME games will be displayed in the closest available resolution but drawn at their native resolution within this resolution. Meaning that the MAME game will look just like the original hardware.

 MAME ROMs that run in a vertical aspect like DoDonPachi need to be rotated within MAME before resolution switching and aspect correction will work. Do this before enabling CRT SwitchRes so that RetroArch will run in your desktop resolution. Once you have rotated any games that may need it turn CRT SwitchRes on.
-
-## Socials
-
-The links below belong to our official channels. Links other than this may have been created by fans, independent members or followers. We seriously recommend using our original resources.
-
- [Website](https://www.retroarch.com/)
- [Blog](https://libretro.com/)
- [Facebook](https://www.facebook.com/libretro)
- [Twitter](https://twitter.com/libretro)
- [Reddit](https://www.reddit.com/r/RetroArch/)
- [YouTube](https://www.youtube.com/Libretro)
- [Google Post](https://posts.google.com/share/55Nhs2jG)
- [Steam](https://store.steampowered.com/app/1118310/RetroArch/)
- [YouTube Topic](https://www.youtube.com/channel/UC5q007PYyQPgin0HHbzF0zQ)
- [Patreon](https://www.patreon.com/libretro)
- [BOUNTYSOURCE](https://www.bountysource.com/teams/libretro/issues)
- [Discord](https://discord.gg/27Xxm2h)
- [Teespring](https://teespring.com/stores/retroarch)
- [Documentation](https://docs.libretro.com/)
- [Forum](https://forums.libretro.com/)
@@ -1,33 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RETROARCH_ACCESSIBILITY_H
-#define __RETROARCH_ACCESSIBILITY_H
-
-#include <stdint.h>
-#include <stddef.h>
-#include <sys/types.h>
-#include <stdlib.h>
-
-#include <boolean.h>
-#include <retro_inline.h>
-#include <retro_common_api.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#endif
@@ -1,89 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __AUDIO_DEFINES__H
-#define __AUDIO_DEFINES__H
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-#define AUDIO_CHUNK_SIZE_BLOCKING      512
-
-/* So we don't get complete line-noise when fast-forwarding audio. */
-#define AUDIO_CHUNK_SIZE_NONBLOCKING   2048
-
-#define AUDIO_MAX_RATIO                16
-
-#define AUDIO_MIXER_MAX_STREAMS        16
-
-#define AUDIO_MIXER_MAX_SYSTEM_STREAMS (AUDIO_MIXER_MAX_STREAMS + 5)
-
-/* do not define more than (MAX_SYSTEM_STREAMS - MAX_STREAMS) */
-enum audio_mixer_system_slot
-{
-   AUDIO_MIXER_SYSTEM_SLOT_OK = AUDIO_MIXER_MAX_STREAMS,
-   AUDIO_MIXER_SYSTEM_SLOT_CANCEL,
-   AUDIO_MIXER_SYSTEM_SLOT_NOTICE,
-   AUDIO_MIXER_SYSTEM_SLOT_BGM,
-   AUDIO_MIXER_SYSTEM_SLOT_ACHIEVEMENT_UNLOCK
-};
-
-enum audio_action
-{
-   AUDIO_ACTION_NONE = 0,
-   AUDIO_ACTION_RATE_CONTROL_DELTA,
-   AUDIO_ACTION_MIXER_MUTE_ENABLE,
-   AUDIO_ACTION_MUTE_ENABLE,
-   AUDIO_ACTION_VOLUME_GAIN,
-   AUDIO_ACTION_MIXER_VOLUME_GAIN,
-   AUDIO_ACTION_MIXER
-};
-
-enum audio_mixer_slot_selection_type
-{
-   AUDIO_MIXER_SLOT_SELECTION_AUTOMATIC = 0,
-   AUDIO_MIXER_SLOT_SELECTION_MANUAL
-};
-
-enum audio_mixer_stream_type
-{
-   AUDIO_STREAM_TYPE_NONE = 0,
-   AUDIO_STREAM_TYPE_USER,
-   AUDIO_STREAM_TYPE_SYSTEM
-};
-
-enum audio_mixer_state
-{
-   AUDIO_STREAM_STATE_NONE = 0,
-   AUDIO_STREAM_STATE_STOPPED,
-   AUDIO_STREAM_STATE_PLAYING,
-   AUDIO_STREAM_STATE_PLAYING_LOOPED,
-   AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL
-};
-
-typedef struct audio_statistics
-{
-   unsigned samples;
-   float average_buffer_saturation;
-   float std_deviation_percentage;
-   float close_to_underrun;
-   float close_to_blocking;
-} audio_statistics_t;
-
-RETRO_END_DECLS
-
-#endif
@@ -0,0 +1,347 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __AUDIO_DRIVER__H
+#define __AUDIO_DRIVER__H
+
+#include <stdint.h>
+#include <stddef.h>
+#include <sys/types.h>
+
+#include <boolean.h>
+#include <audio/audio_mixer.h>
+#include <audio/audio_resampler.h>
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+#define AUDIO_CHUNK_SIZE_BLOCKING      512
+
+/* So we don't get complete line-noise when fast-forwarding audio. */
+#define AUDIO_CHUNK_SIZE_NONBLOCKING   2048
+
+#define AUDIO_MAX_RATIO                16
+
+#define AUDIO_MIXER_MAX_STREAMS        16
+
+enum audio_action
+{
+   AUDIO_ACTION_NONE = 0,
+   AUDIO_ACTION_RATE_CONTROL_DELTA,
+   AUDIO_ACTION_MIXER_MUTE_ENABLE,
+   AUDIO_ACTION_MUTE_ENABLE,
+   AUDIO_ACTION_VOLUME_GAIN,
+   AUDIO_ACTION_MIXER_VOLUME_GAIN,
+   AUDIO_ACTION_MIXER
+};
+
+enum audio_mixer_state
+{
+   AUDIO_STREAM_STATE_NONE = 0,
+   AUDIO_STREAM_STATE_STOPPED,
+   AUDIO_STREAM_STATE_PLAYING,
+   AUDIO_STREAM_STATE_PLAYING_LOOPED,
+   AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL
+};
+
+typedef struct audio_mixer_stream
+{
+   audio_mixer_sound_t *handle;
+   audio_mixer_voice_t *voice;
+   audio_mixer_stop_cb_t stop_cb;
+   enum audio_mixer_state state;
+   float volume;
+   void *buf;
+   char *name;
+   size_t bufsize;
+} audio_mixer_stream_t;
+
+typedef struct audio_statistics
+{
+   float average_buffer_saturation;
+   float std_deviation_percentage;
+   float close_to_underrun;
+   float close_to_blocking;
+   unsigned samples;
+} audio_statistics_t;
+
+typedef struct audio_driver
+{
+   /* Creates and initializes handle to audio driver.
+    *
+    * Returns: audio driver handle on success, otherwise NULL.
+    **/
+   void *(*init)(const char *device, unsigned rate,
+         unsigned latency, unsigned block_frames, unsigned *new_rate);
+
+   /*
+    * @data         : Pointer to audio data handle.
+    * @buf          : Audio buffer data.
+    * @size         : Size of audio buffer.
+    *
+    * Write samples to audio driver.
+    *
+    * Write data in buffer to audio driver.
+    * A frame here is defined as one combined sample of left and right
+    * channels. (I.e. 44.1kHz, 16-bit stereo has 88.2k samples/s, and
+    * 44.1k frames/s.)
+    *
+    * Samples are interleaved in format LRLRLRLRLR ...
+    * If the driver returns true in use_float(), a floating point
+    * format will be used, with range [-1.0, 1.0].
+    * If not, signed 16-bit samples in native byte ordering will be used.
+    *
+    * This function returns the number of frames successfully written.
+    * If an error occurs, -1 should be returned.
+    * Note that non-blocking behavior that cannot write at this time
+    * should return 0 as returning -1 will terminate the driver.
+    *
+    * Unless said otherwise with set_nonblock_state(), all writes
+    * are blocking, and it should block till it has written all frames.
+    */
+   ssize_t (*write)(void *data, const void *buf, size_t size);
+
+   /* Temporarily pauses the audio driver. */
+   bool (*stop)(void *data);
+
+   /* Resumes audio driver from the paused state. */
+   bool (*start)(void *data, bool is_shutdown);
+
+   /* Is the audio driver currently running? */
+   bool (*alive)(void *data);
+
+   /* Should we care about blocking in audio thread? Fast forwarding.
+    *
+    * If state is true, nonblocking operation is assumed.
+    * This is typically used for fast-forwarding. If driver cannot
+    * implement nonblocking writes, this can be disregarded, but should
+    * log a message to stderr.
+    * */
+   void (*set_nonblock_state)(void *data, bool toggle);
+
+   /* Stops and frees driver data. */
+   void (*free)(void *data);
+
+   /* Defines if driver will take standard floating point samples,
+    * or int16_t samples.
+    *
+    * If true is returned, the audio driver is capable of using
+    * floating point data. This will likely increase performance as the
+    * resampler unit uses floating point. The sample range is
+    * [-1.0, 1.0].
+    * */
+   bool (*use_float)(void *data);
+
+   /* Human-readable identifier. */
+   const char *ident;
+
+   /* Optional. Get audio device list (allocates, caller has to free this) */
+   void *(*device_list_new)(void *data);
+
+   /* Optional. Frees audio device list */
+   void (*device_list_free)(void *data, void *data2);
+
+   /* Optional. */
+   size_t (*write_avail)(void *data);
+
+   size_t (*buffer_size)(void *data);
+} audio_driver_t;
+
+typedef struct audio_mixer_stream_params
+{
+   float volume;
+   enum audio_mixer_type  type;
+   enum audio_mixer_state state;
+   void *buf;
+   char *basename;
+   size_t bufsize;
+   audio_mixer_stop_cb_t cb;
+} audio_mixer_stream_params_t;
+
+void audio_driver_destroy_data(void);
+
+void audio_driver_set_own_driver(void);
+
+void audio_driver_unset_own_driver(void);
+
+void audio_driver_suspend(void);
+
+bool audio_driver_is_suspended(void);
+
+void audio_driver_resume(void);
+
+void audio_driver_set_active(void);
+
+bool audio_driver_is_active(void);
+
+void audio_driver_destroy(void);
+
+void audio_driver_deinit_resampler(void);
+
+bool audio_driver_free_devices_list(void);
+
+bool audio_driver_new_devices_list(void);
+
+bool audio_driver_enable_callback(void);
+
+bool audio_driver_disable_callback(void);
+
+/**
+ * audio_driver_find_handle:
+ * @index              : index of driver to get handle to.
+ *
+ * Returns: handle to audio driver at index. Can be NULL
+ * if nothing found.
+ **/
+const void *audio_driver_find_handle(int index);
+
+/**
+ * audio_driver_find_ident:
+ * @index              : index of driver to get handle to.
+ *
+ * Returns: Human-readable identifier of audio driver at index. Can be NULL
+ * if nothing found.
+ **/
+const char *audio_driver_find_ident(int index);
+
+void audio_driver_set_nonblocking_state(bool enable);
+
+/**
+ * config_get_audio_driver_options:
+ *
+ * Get an enumerated list of all audio driver names, separated by '|'.
+ *
+ * Returns: string listing of all audio driver names, separated by '|'.
+ **/
+const char* config_get_audio_driver_options(void);
+
+void audio_driver_sample(int16_t left, int16_t right);
+
+size_t audio_driver_sample_batch(const int16_t *data, size_t frames);
+
+void audio_driver_sample_rewind(int16_t left, int16_t right);
+
+size_t audio_driver_sample_batch_rewind(const int16_t *data, size_t frames);
+
+bool audio_driver_mixer_extension_supported(const char *ext);
+
+void audio_driver_dsp_filter_free(void);
+
+void audio_driver_dsp_filter_init(const char *device);
+
+void audio_driver_set_buffer_size(size_t bufsize);
+
+bool audio_driver_get_devices_list(void **ptr);
+
+void audio_driver_setup_rewind(void);
+
+void audio_driver_monitor_adjust_system_rates(void);
+
+bool audio_driver_set_callback(const void *data);
+
+bool audio_driver_callback(void);
+
+bool audio_driver_has_callback(void);
+
+/* Sets audio monitor rate to new value. */
+void audio_driver_monitor_set_rate(void);
+
+bool audio_driver_find_driver(void);
+
+bool audio_driver_toggle_mute(void);
+
+bool audio_driver_start(bool is_shutdown);
+
+bool audio_driver_stop(void);
+
+bool audio_driver_owns_driver(void);
+
+void audio_driver_unset_callback(void);
+
+void audio_driver_frame_is_reverse(void);
+
+void audio_set_float(enum audio_action action, float val);
+
+void audio_set_bool(enum audio_action action, bool val);
+
+void audio_unset_bool(enum audio_action action, bool val);
+
+float *audio_get_float_ptr(enum audio_action action);
+
+bool *audio_get_bool_ptr(enum audio_action action);
+
+bool audio_driver_deinit(void);
+
+bool audio_driver_init(void);
+
+void audio_driver_menu_sample(void);
+
+audio_mixer_stream_t *audio_driver_mixer_get_stream(unsigned i);
+
+bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params);
+
+void audio_driver_mixer_play_stream(unsigned i);
+
+void audio_driver_mixer_play_stream_sequential(unsigned i);
+
+void audio_driver_mixer_play_stream_looped(unsigned i);
+
+void audio_driver_mixer_stop_stream(unsigned i);
+
+float audio_driver_mixer_get_stream_volume(unsigned i);
+
+void audio_driver_mixer_set_stream_volume(unsigned i, float vol);
+
+void audio_driver_mixer_remove_stream(unsigned i);
+
+enum resampler_quality audio_driver_get_resampler_quality(void);
+
+enum audio_mixer_state audio_driver_mixer_get_stream_state(unsigned i);
+
+const char *audio_driver_mixer_get_stream_name(unsigned i);
+
+bool compute_audio_buffer_statistics(audio_statistics_t *stats);
+
+extern audio_driver_t audio_rsound;
+extern audio_driver_t audio_oss;
+extern audio_driver_t audio_alsa;
+extern audio_driver_t audio_alsathread;
+extern audio_driver_t audio_tinyalsa;
+extern audio_driver_t audio_roar;
+extern audio_driver_t audio_openal;
+extern audio_driver_t audio_opensl;
+extern audio_driver_t audio_jack;
+extern audio_driver_t audio_sdl;
+extern audio_driver_t audio_xa;
+extern audio_driver_t audio_pulse;
+extern audio_driver_t audio_dsound;
+extern audio_driver_t audio_wasapi;
+extern audio_driver_t audio_coreaudio;
+extern audio_driver_t audio_xenon360;
+extern audio_driver_t audio_ps3;
+extern audio_driver_t audio_gx;
+extern audio_driver_t audio_ax;
+extern audio_driver_t audio_psp;
+extern audio_driver_t audio_ctr_csnd;
+extern audio_driver_t audio_ctr_dsp;
+extern audio_driver_t audio_switch;
+extern audio_driver_t audio_switch_thread;
+extern audio_driver_t audio_rwebaudio;
+extern audio_driver_t audio_null;
+
+RETRO_END_DECLS
+
+#endif
@@ -31,16 +31,6 @@ 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;
@@ -48,6 +38,14 @@ 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)
@@ -57,8 +55,8 @@ static void audio_thread_loop(void *data)
   if (!thr)
      return;

-   thr->driver_data   = thr->driver->init(
-         thr->device, thr->out_rate, thr->latency,
+   RARCH_LOG("[Audio Thread]: Initializing audio driver.\n");
+   thr->driver_data   = thr->driver->init(thr->device, thr->out_rate, thr->latency,
         thr->block_frames, thr->new_rate);
   slock_lock(thr->lock);
   thr->inited        = thr->driver_data ? 1 : -1;
@@ -77,6 +75,8 @@ static void audio_thread_loop(void *data)
      scond_wait(thr->cond, thr->lock);
   slock_unlock(thr->lock);

+   RARCH_LOG("[Audio Thread]: Starting audio.\n");
+
   for (;;)
   {
      slock_lock(thr->lock);
@@ -94,8 +94,7 @@ static void audio_thread_loop(void *data)
         thr->driver->stop(thr->driver_data);
         while (thr->stopped)
         {
-            /* If we stop right after start, 
-             * we might not be able to properly ack.
+            /* If we stop right after start, we might not be able to properly ack.
             * Signal in the loop instead. */
            thr->stopped_ack = true;
            scond_signal(thr->cond);
@@ -109,6 +108,7 @@ static void audio_thread_loop(void *data)
      audio_driver_callback();
   }

+   RARCH_LOG("[Audio Thread]: Tearing down driver.\n");
   thr->driver->free(thr->driver_data);
 }

@@ -300,8 +300,8 @@ bool audio_init_thread(const audio_driver_t **out_driver,
   if (!(thr->lock     = slock_new()))
      goto error;

-   thr->alive          = true;
-   thr->stopped        = true;
+   thr->alive = true;
+   thr->stopped = true;

   if (!(thr->thread   = sthread_create(audio_thread_loop, thr)))
      goto error;
@@ -19,7 +19,7 @@

 #include <boolean.h>

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

 /**
 * audio_init_thread:
@@ -43,3 +43,4 @@ bool audio_init_thread(const audio_driver_t **out_driver, void **out_data,
      const audio_driver_t *driver);

 #endif
+
@@ -1,136 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdlib.h>
-
-#include <encodings/utf.h>
-#include <lists/string_list.h>
-
-#include "mmdevice_common.h"
-#include "mmdevice_common_inline.h"
-
-void *mmdevice_list_new(void *u)
-{
-   HRESULT hr;
-   UINT i;
-   PROPVARIANT prop_var;
-   union string_list_elem_attr attr;
-   IMMDeviceEnumerator *enumerator = NULL;
-   IMMDeviceCollection *collection = NULL;
-   UINT dev_count                  = 0;
-   IMMDevice *device               = NULL;
-   LPWSTR dev_id_wstr              = NULL;
-   IPropertyStore *prop_store      = NULL;
-   bool br                         = false;
-   bool prop_var_init              = false;
-   char *dev_id_str                = NULL;
-   char *dev_name_str              = NULL;
-   struct string_list *sl          = string_list_new();
-
-   if (!sl)
-      return NULL;
-
-   attr.i = 0;
-#ifdef __cplusplus
-   hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
-         IID_IMMDeviceEnumerator, (void **)&enumerator);
-#else
-   hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
-         &IID_IMMDeviceEnumerator, (void **)&enumerator);
-#endif
-   if (FAILED(hr))
-      goto error;
-
-   hr = _IMMDeviceEnumerator_EnumAudioEndpoints(enumerator,
-         eRender, DEVICE_STATE_ACTIVE, &collection);
-   if (FAILED(hr))
-      goto error;
-
-   hr = _IMMDeviceCollection_GetCount(collection, &dev_count);
-   if (FAILED(hr))
-      goto error;
-
-   for (i = 0; i < dev_count; ++i)
-   {
-      hr = _IMMDeviceCollection_Item(collection, i, &device);
-      if (FAILED(hr))
-         goto error;
-
-      hr = _IMMDevice_GetId(device, &dev_id_wstr);
-      if (FAILED(hr))
-         goto error;
-
-      if (!(dev_id_str = utf16_to_utf8_string_alloc(dev_id_wstr)))
-         goto error;
-
-      hr = _IMMDevice_OpenPropertyStore(device, STGM_READ, &prop_store);
-      if (FAILED(hr))
-         goto error;
-
-      PropVariantInit(&prop_var);
-      prop_var_init = true;
-      hr            = _IPropertyStore_GetValue(
-            prop_store, PKEY_Device_FriendlyName,
-            &prop_var);
-      if (FAILED(hr))
-         goto error;
-
-      if (!(dev_name_str = utf16_to_utf8_string_alloc(prop_var.pwszVal)))
-         goto error;
-
-      br = string_list_append(sl, dev_name_str, attr);
-      if (!br)
-         goto error;
-      if (dev_id_str)
-         sl->elems[sl->size-1].userdata = dev_id_str;
-
-      PropVariantClear(&prop_var);
-      prop_var_init = false;
-      if (dev_id_wstr)
-         CoTaskMemFree(dev_id_wstr);
-      if (dev_name_str)
-         free(dev_name_str);
-      dev_name_str = NULL;
-      dev_id_wstr  = NULL;
-      IFACE_RELEASE(prop_store);
-      IFACE_RELEASE(device);
-   }
-
-   IFACE_RELEASE(collection);
-   IFACE_RELEASE(enumerator);
-
-   return sl;
-
-error:
-   if (dev_id_str)
-      free(dev_id_str);
-   if (dev_name_str)
-      free(dev_name_str);
-   dev_id_str   = NULL;
-   dev_name_str = NULL;
-   if (prop_var_init)
-      PropVariantClear(&prop_var);
-   IFACE_RELEASE(prop_store);
-   if (dev_id_wstr)
-      CoTaskMemFree(dev_id_wstr);
-   dev_id_wstr = NULL;
-   IFACE_RELEASE(device);
-   IFACE_RELEASE(collection);
-   IFACE_RELEASE(enumerator);
-   if (sl)
-      string_list_free(sl);
-
-   return NULL;
-}
@@ -1,27 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _MMDEVICE_COMMON_H
-#define _MMDEVICE_COMMON_H
-
-#include <stdlib.h>
-
-RETRO_BEGIN_DECLS
-
-void *mmdevice_list_new(void *u);
-
-RETRO_END_DECLS
-
-#endif
@@ -1,114 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _MMDEVICE_COMMON_INLINE_H
-#define _MMDEVICE_COMMON_INLINE_H
-
-#include <stdlib.h>
-
-#ifdef _WIN32_WINNT
-#undef _WIN32_WINNT
-#endif
-#define _WIN32_WINNT 0x0600
-#define WIN32_LEAN_AND_MEAN
-
-#include <windows.h>
-#include <winerror.h>
-#include <propidl.h>
-#include <initguid.h>
-#include <mmdeviceapi.h>
-#include <mmreg.h>
-#include <audioclient.h>
-
-#include <retro_common_api.h>
-
-#ifdef _MSC_VER
-DEFINE_GUID(IID_IAudioClient, 0x1CB9AD4C, 0xDBFA, 0x4C32, 0xB1, 0x78, 0xC2, 0xF5, 0x68, 0xA7, 0x03, 0xB2);
-DEFINE_GUID(IID_IAudioRenderClient, 0xF294ACFC, 0x3146, 0x4483, 0xA7, 0xBF, 0xAD, 0xDC, 0xA7, 0xC2, 0x60, 0xE2);
-DEFINE_GUID(IID_IMMDeviceEnumerator, 0xA95664D2, 0x9614, 0x4F35, 0xA7, 0x46, 0xDE, 0x8D, 0xB6, 0x36, 0x17, 0xE6);
-DEFINE_GUID(CLSID_MMDeviceEnumerator, 0xBCDE0395, 0xE52F, 0x467C, 0x8E, 0x3D, 0xC4, 0x57, 0x92, 0x91, 0x69, 0x2E);
-#undef KSDATAFORMAT_SUBTYPE_IEEE_FLOAT
-DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-#endif
-
-DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14); /* DEVPROP_TYPE_STRING */
-
-#ifdef __cplusplus
-#define _IMMDeviceCollection_Item(This,nDevice,ppdevice) (This)->Item(nDevice,ppdevice)
-#define _IAudioClient_Start(This)	( (This)->Start() )
-#define _IAudioClient_Stop(This)	( (This)->Stop() )
-#define _IAudioClient_GetCurrentPadding(This,pNumPaddingFrames)	\
-    ( (This)->GetCurrentPadding(pNumPaddingFrames) )
-#define _IAudioRenderClient_GetBuffer(This,NumFramesRequested,ppData)	\
-    ( (This)->GetBuffer(NumFramesRequested,ppData) )
-#define _IAudioRenderClient_ReleaseBuffer(This,NumFramesWritten,dwFlags)	\
-    ( (This)->ReleaseBuffer(NumFramesWritten,dwFlags) )
-#define _IAudioClient_GetService(This,riid,ppv) ( (This)->GetService(riid,ppv) )
-#define _IAudioClient_SetEventHandle(This,eventHandle)	( (This)->SetEventHandle(eventHandle) )
-#define _IAudioClient_GetBufferSize(This,pNumBufferFrames) ( (This)->GetBufferSize(pNumBufferFrames) )
-#define _IAudioClient_GetStreamLatency(This,phnsLatency)	( (This)->GetStreamLatency(phnsLatency) )
-#define _IAudioClient_GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod)	( (This)->GetDevicePeriod(phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) )
-#define _IMMDevice_Activate(This,iid,dwClsCtx,pActivationParams,ppv) ((This)->Activate(iid,(dwClsCtx),pActivationParams,ppv))
-#define _IMMDeviceEnumerator_EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices) (This)->EnumAudioEndpoints(dataFlow,dwStateMask,ppDevices)
-#define _IMMDeviceEnumerator_GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint) (This)->GetDefaultAudioEndpoint(dataFlow,role,ppEndpoint)
-#define _IMMDevice_OpenPropertyStore(This,stgmAccess,ppProperties) (This)->OpenPropertyStore(stgmAccess,ppProperties)
-#define _IMMDevice_GetId(This,ppstrId) ((This)->GetId(ppstrId))
-#define _IPropertyStore_GetValue(This,key,pv) ( (This)->GetValue(key,pv) )
-#define _IMMDeviceCollection_GetCount(This,cProps) ( (This)->GetCount(cProps) )
-#else
-#define _IMMDeviceCollection_Item(This,nDevice,ppdevice) (This)->lpVtbl->Item(This,nDevice,ppdevice)
-#define _IAudioClient_Start(This)	( (This)->lpVtbl -> Start(This) )
-#define _IAudioClient_Stop(This)	( (This)->lpVtbl -> Stop(This) )
-#define _IAudioClient_GetCurrentPadding(This,pNumPaddingFrames)	\
-    ( (This)->lpVtbl -> GetCurrentPadding(This,pNumPaddingFrames) )
-#define _IAudioRenderClient_GetBuffer(This,NumFramesRequested,ppData)	\
-    ( (This)->lpVtbl -> GetBuffer(This,NumFramesRequested,ppData) )
-#define _IAudioRenderClient_ReleaseBuffer(This,NumFramesWritten,dwFlags)	\
-    ( (This)->lpVtbl -> ReleaseBuffer(This,NumFramesWritten,dwFlags) )
-#define _IAudioClient_GetService(This,riid,ppv)	( (This)->lpVtbl -> GetService(This,&(riid),ppv) )
-#define _IAudioClient_SetEventHandle(This,eventHandle)	( (This)->lpVtbl -> SetEventHandle(This,eventHandle) )
-#define _IAudioClient_GetBufferSize(This,pNumBufferFrames) ( (This)->lpVtbl -> GetBufferSize(This,pNumBufferFrames) )
-#define _IAudioClient_GetStreamLatency(This,phnsLatency)	( (This)->lpVtbl -> GetStreamLatency(This,phnsLatency) )
-#define _IAudioClient_GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod)	( (This)->lpVtbl -> GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) )
-#define _IMMDevice_Activate(This,iid,dwClsCtx,pActivationParams,ppv) ((This)->lpVtbl->Activate(This,&(iid),dwClsCtx,pActivationParams,ppv))
-#define _IMMDeviceEnumerator_EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices) (This)->lpVtbl->EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices)
-#define _IMMDeviceEnumerator_GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint) (This)->lpVtbl->GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint)
-#define _IMMDevice_OpenPropertyStore(This,stgmAccess,ppProperties) (This)->lpVtbl->OpenPropertyStore(This,stgmAccess,ppProperties)
-#define _IMMDevice_GetId(This,ppstrId) (This)->lpVtbl->GetId(This,ppstrId)
-#define _IPropertyStore_GetValue(This,key,pv) ( (This)->lpVtbl -> GetValue(This,&(key),pv) )
-#define _IMMDeviceCollection_GetCount(This,cProps) ( (This)->lpVtbl -> GetCount(This,cProps) )
-#endif
-
-#ifdef __cplusplus
-#ifndef IFACE_RELEASE
-#define IFACE_RELEASE(iface) \
-      if (iface) \
-      { \
-         iface->Release(); \
-         iface = NULL; \
-      }
-#endif
-#else
-#ifndef IFACE_RELEASE
-#define IFACE_RELEASE(iface) \
-      if (iface) \
-      { \
-         iface->lpVtbl->Release(iface);\
-         iface = NULL; \
-      }
-#endif
-#endif
-
-#endif
@@ -21,15 +21,15 @@

 #include <alsa/asoundlib.h>

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

 typedef struct alsa
 {
   snd_pcm_t *pcm;
   size_t buffer_size;
-   unsigned int frame_bits;
   bool nonblock;
+   unsigned int frame_bits;
   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;

-   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_any(alsa->pcm, params) < 0)
+      goto error;
+
   if (snd_pcm_hw_params_set_access(
            alsa->pcm, params, SND_PCM_ACCESS_RW_INTERLEAVED) < 0)
      goto error;
@@ -180,7 +180,6 @@ error:
 #define BYTES_TO_FRAMES(bytes, frame_bits)  ((bytes) * 8 / frame_bits)
 #define FRAMES_TO_BYTES(frames, frame_bits) ((frames) * frame_bits / 8)

-static bool alsa_start(void *data, bool is_shutdown);
 static ssize_t alsa_write(void *data, const void *buf_, size_t size_)
 {
   alsa_t *alsa              = (alsa_t*)data;
@@ -189,12 +188,6 @@ static ssize_t alsa_write(void *data, const void *buf_, size_t size_)
   snd_pcm_sframes_t size    = BYTES_TO_FRAMES(size_, alsa->frame_bits);
   size_t frames_size        = alsa->has_float ? sizeof(float) : sizeof(int16_t);

-   /* Workaround buggy menu code.
-    * If a write happens while we're paused, we might never progress. */
-   if (alsa->is_paused)
-      if (!alsa_start(alsa, false))
-         return -1;
-
   if (alsa->nonblock)
   {
      while (size)
@@ -276,8 +269,6 @@ static bool alsa_alive(void *data)
 static bool alsa_stop(void *data)
 {
   alsa_t *alsa = (alsa_t*)data;
-   if (alsa->is_paused)
-	  return true;

   if (alsa->can_pause
         && !alsa->is_paused)
@@ -302,8 +293,6 @@ static void alsa_set_nonblock_state(void *data, bool state)
 static bool alsa_start(void *data, bool is_shutdown)
 {
   alsa_t *alsa = (alsa_t*)data;
-   if (!alsa->is_paused)
-	  return true;

   if (alsa->can_pause
         && alsa->is_paused)
@@ -372,7 +361,7 @@ static void *alsa_device_list_new(void *data)

   n      = hints;

-   while (*n)
+   while (*n != NULL)
   {
      char *name = snd_device_name_get_hint(*n, "NAME");
      char *io   = snd_device_name_get_hint(*n, "IOID");
@@ -19,7 +19,7 @@
 #include <sys/asoundlib.h>
 #include <retro_math.h>

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

 #define MAX_FRAG_SIZE 3072
 #define DEFAULT_RATE 48000
@@ -29,19 +29,19 @@
 typedef struct alsa
 {
   uint8_t **buffer;
-   snd_pcm_t *pcm;
   uint8_t *buffer_chunk;
   unsigned buffer_index;
   unsigned buffer_ptr;
   volatile unsigned buffered_blocks;

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

 typedef long snd_pcm_sframes_t;

@@ -53,7 +53,7 @@ static void *alsa_qsa_init(const char *device,
   snd_pcm_channel_info_t pi;
   snd_pcm_channel_params_t params = {0};
   snd_pcm_channel_setup_t setup   = {0};
-   alsa_qsa_t *alsa                = (alsa_qsa_t*)calloc(1, sizeof(alsa_qsa_t));
+   alsa_t *alsa                    = (alsa_t*)calloc(1, sizeof(alsa_t));
   if (!alsa)
      return NULL;

@@ -165,8 +165,8 @@ error:
 static int check_pcm_status(void *data, int channel_type)
 {
   snd_pcm_channel_status_t status;
-   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
-   int ret          = EOK;
+   alsa_t *alsa = (alsa_t*)data;
+   int ret      = EOK;

   memset(&status, 0, sizeof (status));
   status.channel = channel_type;
@@ -219,9 +219,10 @@ static int check_pcm_status(void *data, int channel_type)
   return ret;
 }

+
 static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size)
 {
-   alsa_qsa_t          *alsa = (alsa_qsa_t*)data;
+   alsa_t              *alsa = (alsa_t*)data;
   snd_pcm_sframes_t written = 0;

   while (size)
@@ -268,7 +269,7 @@ static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size)

 static bool alsa_qsa_stop(void *data)
 {
-   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
+   alsa_t *alsa = (alsa_t*)data;

   if (alsa->can_pause && !alsa->is_paused)
   {
@@ -284,7 +285,7 @@ static bool alsa_qsa_stop(void *data)

 static bool alsa_qsa_alive(void *data)
 {
-   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
+   alsa_t *alsa = (alsa_t*)data;
   if (alsa)
      return !alsa->is_paused;
   return false;
@@ -292,7 +293,7 @@ static bool alsa_qsa_alive(void *data)

 static bool alsa_qsa_start(void *data, bool is_shutdown)
 {
-   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
+   alsa_t *alsa = (alsa_t*)data;

   if (alsa->can_pause && alsa->is_paused)
   {
@@ -313,7 +314,7 @@ static bool alsa_qsa_start(void *data, bool is_shutdown)

 static void alsa_qsa_set_nonblock_state(void *data, bool state)
 {
-   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
+   alsa_t *alsa = (alsa_t*)data;

   int err;

@@ -327,15 +328,16 @@ static void alsa_qsa_set_nonblock_state(void *data, bool state)
   alsa->nonblock = state;
 }

+
 static bool alsa_qsa_use_float(void *data)
 {
-   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
+   alsa_t *alsa = (alsa_t*)data;
   return alsa->has_float;
 }

 static void alsa_qsa_free(void *data)
 {
-   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
+   alsa_t *alsa = (alsa_t*)data;

   if (alsa)
   {
@@ -352,7 +354,7 @@ static void alsa_qsa_free(void *data)

 static size_t alsa_qsa_write_avail(void *data)
 {
-   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
+   alsa_t *alsa = (alsa_t*)data;
   size_t avail = (alsa->buf_count -
         (int)alsa->buffered_blocks - 1) * alsa->buf_size +
      (alsa->buf_size - (int)alsa->buffer_ptr);
@@ -361,7 +363,7 @@ static size_t alsa_qsa_write_avail(void *data)

 static size_t alsa_qsa_buffer_size(void *data)
 {
-   alsa_qsa_t *alsa = (alsa_qsa_t*)data;
+   alsa_t *alsa = (alsa_t*)data;
   return alsa->buf_size * alsa->buf_count;
 }

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

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

 #define TRY_ALSA(x) if (x < 0) \
@@ -33,18 +33,20 @@
 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)
@@ -64,7 +66,7 @@ static void alsa_worker_thread(void *data)
      size_t fifo_size;
      snd_pcm_sframes_t frames;
      slock_lock(alsa->fifo_lock);
-      avail     = FIFO_READ_AVAIL(alsa->buffer);
+      avail = fifo_read_avail(alsa->buffer);
      fifo_size = MIN(alsa->period_size, avail);
      fifo_read(alsa->buffer, buf, fifo_size);
      scond_signal(alsa->cond);
@@ -173,11 +175,10 @@ 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));
@@ -255,7 +256,7 @@ static ssize_t alsa_thread_write(void *data, const void *buf, size_t size)
      size_t write_amt;

      slock_lock(alsa->fifo_lock);
-      avail           = FIFO_WRITE_AVAIL(alsa->buffer);
+      avail           = fifo_write_avail(alsa->buffer);
      write_amt       = MIN(avail, size);

      fifo_write(alsa->buffer, buf, write_amt);
@@ -270,7 +271,7 @@ static ssize_t alsa_thread_write(void *data, const void *buf, size_t size)
      {
         size_t avail;
         slock_lock(alsa->fifo_lock);
-         avail = FIFO_WRITE_AVAIL(alsa->buffer);
+         avail = fifo_write_avail(alsa->buffer);

         if (avail == 0)
         {
@@ -333,7 +334,7 @@ static size_t alsa_thread_write_avail(void *data)
   if (alsa->thread_dead)
      return 0;
   slock_lock(alsa->fifo_lock);
-   val = FIFO_WRITE_AVAIL(alsa->buffer);
+   val = fifo_write_avail(alsa->buffer);
   slock_unlock(alsa->fifo_lock);
   return val;
 }
@@ -344,7 +345,7 @@ static size_t alsa_thread_buffer_size(void *data)
   return alsa->buffer_size;
 }

-static void *alsa_thread_device_list_new(void *data)
+static void *alsa_device_list_new(void *data)
 {
   void **hints, **n;
   union string_list_elem_attr attr;
@@ -360,7 +361,7 @@ static void *alsa_thread_device_list_new(void *data)

   n      = hints;

-   while (*n)
+   while (*n != NULL)
   {
      char *name = snd_device_name_get_hint(*n, "NAME");
      char *io   = snd_device_name_get_hint(*n, "IOID");
@@ -392,7 +393,7 @@ error:
   return NULL;
 }

-static void alsa_thread_device_list_free(void *data, void *array_list_data)
+static void alsa_device_list_free(void *data, void *array_list_data)
 {
   struct string_list *s = (struct string_list*)array_list_data;

@@ -412,8 +413,8 @@ audio_driver_t audio_alsathread = {
   alsa_thread_free,
   alsa_thread_use_float,
   "alsathread",
-   alsa_thread_device_list_new,
-   alsa_thread_device_list_free,
+   alsa_device_list_new,
+   alsa_device_list_free,
   alsa_thread_write_avail,
   alsa_thread_buffer_size,
 };
@@ -1,212 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include <sys/audioio.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "../../retroarch.h"
-#include "../../verbosity.h"
-
-#define DEFAULT_DEV "/dev/audio"
-
-static void *audioio_init(const char *device, unsigned rate, unsigned latency,
-      unsigned block_frames,
-      unsigned *new_out_rate)
-{
-   struct audio_info info;
-   const char *audiodev = device ? device : DEFAULT_DEV;
-   int              *fd = (int*)calloc(1, sizeof(int));
-
-   if (!fd)
-      return NULL;
-
-   AUDIO_INITINFO(&info);
-
-#ifdef AUMODE_PLAY_ALL
-   info.mode = AUMODE_PLAY_ALL;
-#elif defined(AUMODE_PLAY)
-   info.mode = AUMODE_PLAY;
-#endif
-   info.play.sample_rate = rate;
-   info.play.channels = 2;
-   info.play.precision = 16;
-#ifdef AUDIO_ENCODING_SLINEAR
-   info.play.encoding = AUDIO_ENCODING_SLINEAR;
-#else
-   info.play.encoding = AUDIO_ENCODING_LINEAR;
-#endif
-
-   if ((*fd = open(audiodev, O_WRONLY)) < 0)
-   {
-      free(fd);
-      perror("open");
-      return NULL;
-   }
-
-   if (ioctl(*fd, AUDIO_SETINFO, &info) < 0)
-      goto error;
-
-   if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
-      goto error;
-
-   *new_out_rate = info.play.sample_rate;
-
-   return fd;
-error:
-   close(*fd);
-   free(fd);
-   perror("ioctl");
-   return NULL;
-}
-
-static ssize_t audioio_write(void *data, const void *buf, size_t size)
-{
-   ssize_t ret;
-   int *fd = (int*)data;
-
-   if (size == 0)
-      return 0;
-
-   if ((ret = write(*fd, buf, size)) < 0)
-   {
-      if (errno == EAGAIN && (fcntl(*fd, F_GETFL) & O_NONBLOCK))
-         return 0;
-
-      return -1;
-   }
-
-   return ret;
-}
-
-static bool audioio_stop(void *data)
-{
-   struct audio_info info;
-   int *fd = (int*)data;
-
-#ifdef AUDIO_FLUSH
-   if (ioctl(*fd, AUDIO_FLUSH, NULL) < 0)
-      return false;
-#endif
-
-   if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
-      return false;
-
-   info.play.pause = true;
-
-   return ioctl(*fd, AUDIO_SETINFO, &info) == 0;
-}
-
-static bool audioio_start(void *data, bool is_shutdown)
-{
-   struct audio_info info;
-   int *fd = (int*)data;
-
-#ifdef AUDIO_FLUSH
-   if (ioctl(*fd, AUDIO_FLUSH, NULL) < 0)
-      return false;
-#endif
-
-   if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
-      return false;
-
-   info.play.pause = false;
-
-   return ioctl(*fd, AUDIO_SETINFO, &info) == 0;
-}
-
-static bool audioio_alive(void *data)
-{
-   struct audio_info info;
-   int *fd = (int*)data;
-
-   if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
-      return false;
-
-   return !info.play.pause;
-}
-
-static void audioio_set_nonblock_state(void *data, bool state)
-{
-   int rc;
-   int *fd = (int*)data;
-
-   if (state)
-      rc = fcntl(*fd, F_SETFL, fcntl(*fd, F_GETFL) | O_NONBLOCK);
-   else
-      rc = fcntl(*fd, F_SETFL, fcntl(*fd, F_GETFL) & (~O_NONBLOCK));
-   if (rc != 0)
-      RARCH_WARN("Could not set nonblocking on audio file descriptor. Will not be able to fast-forward.\n");
-}
-
-static void audioio_free(void *data)
-{
-   int *fd = (int*)data;
-
-#ifdef AUDIO_FLUSH
-   (void)ioctl(*fd, AUDIO_FLUSH, NULL);
-#endif
-
-   close(*fd);
-   free(fd);
-}
-
-static size_t audioio_buffer_size(void *data)
-{
-   struct audio_info info;
-   int *fd = (int*)data;
-
-   if (ioctl(*fd, AUDIO_GETINFO, &info) < 0)
-      return false;
-
-   return info.play.buffer_size;
-}
-
-static size_t audioio_write_avail(void *data)
-{
-   return audioio_buffer_size(data);
-}
-
-static bool audioio_use_float(void *data)
-{
-   (void)data;
-   return false;
-}
-
-audio_driver_t audio_audioio = {
-   audioio_init,
-   audioio_write,
-   audioio_stop,
-   audioio_start,
-   audioio_alive,
-   audioio_set_nonblock_state,
-   audioio_free,
-   audioio_use_float,
-   "audioio",
-   NULL,
-   NULL,
-   audioio_write_avail,
-   audioio_buffer_size,
-};
@@ -15,6 +15,7 @@
 */
 #include <stdlib.h>

+
 #if TARGET_OS_IPHONE
 #include <AudioToolbox/AudioToolbox.h>
 #else
@@ -31,28 +32,28 @@
 #include <retro_endianness.h>
 #include <string/stdstring.h>

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

 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
 static bool g_interrupted;
-#endif

 static void coreaudio_free(void *data)
 {
@@ -101,7 +102,7 @@ static OSStatus audio_write_cb(void *userdata,

   slock_lock(dev->lock);

-   if (FIFO_READ_AVAIL(dev->buffer) < write_avail)
+   if (fifo_read_avail(dev->buffer) < write_avail)
   {
      *action_flags = kAudioUnitRenderAction_OutputIsSilence;

@@ -125,9 +126,7 @@ static OSStatus audio_write_cb(void *userdata,
 static void coreaudio_interrupt_listener(void *data, UInt32 interrupt_state)
 {
    (void)data;
-#if TARGET_OS_IOS
    g_interrupted = (interrupt_state == kAudioSessionBeginInterruption);
-#endif
 }
 #else
 static void choose_output_device(coreaudio_t *dev, const char* device)
@@ -220,7 +219,7 @@ static void *coreaudio_init(const char *device,
   dev->lock = slock_new();
   dev->cond = scond_new();

-#if TARGET_OS_IOS
+#if TARGET_OS_IPHONE
   if (!session_initialized)
   {
      session_initialized = true;
@@ -243,7 +242,7 @@ static void *coreaudio_init(const char *device,
 #else
   comp = AudioComponentFindNext(NULL, &desc);
 #endif
-   if (!comp)
+   if (comp == NULL)
      goto error;

 #if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
@@ -344,24 +343,20 @@ static ssize_t coreaudio_write(void *data, const void *buf_, size_t size)
   const uint8_t *buf = (const uint8_t*)buf_;
   size_t written     = 0;

-#if TARGET_OS_IOS
   while (!g_interrupted && size > 0)
-#else
-   while (size > 0)
-#endif
   {
      size_t write_avail;

      slock_lock(dev->lock);

-      write_avail = FIFO_WRITE_AVAIL(dev->buffer);
+      write_avail = fifo_write_avail(dev->buffer);
      if (write_avail > size)
         write_avail = size;

      fifo_write(dev->buffer, buf, write_avail);
-      buf     += write_avail;
+      buf += write_avail;
      written += write_avail;
-      size    -= write_avail;
+      size -= write_avail;

      if (dev->nonblock)
      {
@@ -369,7 +364,7 @@ static ssize_t coreaudio_write(void *data, const void *buf_, size_t size)
         break;
      }

-#if TARGET_OS_IOS
+#if TARGET_OS_IPHONE
      if (write_avail == 0 && !scond_wait_timeout(
               dev->cond, dev->lock, 3000000))
         g_interrupted = true;
@@ -428,7 +423,7 @@ static size_t coreaudio_write_avail(void *data)
   coreaudio_t *dev = (coreaudio_t*)data;

   slock_lock(dev->lock);
-   avail = FIFO_WRITE_AVAIL(dev->buffer);
+   avail = fifo_write_avail(dev->buffer);
   slock_unlock(dev->lock);

   return avail;
@@ -1,393 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2019      - Stuart Carnie
- *
- *  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/>.
- */
-
-#import <Foundation/Foundation.h>
-#import <AudioToolbox/AudioToolbox.h>
-#import <AVFoundation/AVFoundation.h>
-
-#include <stdio.h>
-#include <stdatomic.h>
-#include <stdlib.h>
-#include <memory.h>
-
-#include "../../retroarch.h"
-#include "../../verbosity.h"
-
-#pragma mark - ringbuffer
-
-typedef struct ringbuffer
-{
-   float *buffer;
-   size_t cap;
-   size_t write_ptr;
-   size_t read_ptr;
-   atomic_int len;
-} ringbuffer_t;
-
-typedef ringbuffer_t * ringbuffer_h;
-
-static inline size_t rb_len(ringbuffer_h r)
-{
-   return atomic_load_explicit(&r->len, memory_order_relaxed);
-}
-
-static inline size_t rb_cap(ringbuffer_h r)
-{
-   return (r->read_ptr + r->cap - r->write_ptr) % r->cap;
-}
-
-static inline size_t rb_avail(ringbuffer_h r)
-{
-   return r->cap - rb_len(r);
-}
-
-static inline void rb_advance_write(ringbuffer_h r)
-{
-   r->write_ptr = (r->write_ptr + 1) % r->cap;
-}
-
-static inline void rb_advance_write_n(ringbuffer_h r, size_t n)
-{
-   r->write_ptr = (r->write_ptr + n) % r->cap;
-}
-
-static inline void rb_advance_read(ringbuffer_h r)
-{
-   r->read_ptr = (r->read_ptr + 1) % r->cap;
-}
-
-static inline void rb_len_add(ringbuffer_h r, int n)
-{
-   atomic_fetch_add(&r->len, n);
-}
-
-static inline void rb_len_sub(ringbuffer_h r, int n)
-{
-   atomic_fetch_sub(&r->len, n);
-}
-
-static void rb_init(ringbuffer_h r, size_t cap)
-{
-   r->buffer     = malloc(cap * sizeof(float));
-   r->cap        = cap;
-   atomic_init(&r->len, 0);
-   r->write_ptr  = 0;
-   r->read_ptr   = 0;
-}
-
-static void rb_free(ringbuffer_h r)
-{
-   free(r->buffer);
-   memset(r, 0, sizeof(*r));
-}
-
-#define UNLIKELY(x) __builtin_expect((x), 0)
-#define LIKELY(x)   __builtin_expect((x), 1)
-
-static void rb_write_data(ringbuffer_h r, const float *data, size_t len)
-{
-   size_t avail       = rb_avail(r);
-   size_t n           = MIN(len, avail);
-   size_t first_write = n;
-   size_t rest_write  = 0;
-
-   if (r->write_ptr + n > r->cap)
-   {
-      first_write     = r->cap - r->write_ptr;
-      rest_write      = n - first_write;
-   }
-
-   memcpy(r->buffer + r->write_ptr, data, first_write*sizeof(float));
-   memcpy(r->buffer, data + first_write, rest_write*sizeof(float));
-
-   rb_advance_write_n(r, n);
-   rb_len_add(r, (int)n);
-}
-
-static void rb_read_data(ringbuffer_h r,
-      float *d0, float *d1, size_t len)
-{
-   size_t need    = len * 2;
-
-   do {
-      size_t have = rb_len(r);
-      size_t n    = MIN(have, need);
-      int i       = 0;
-      for (; i < n/2; i++)
-      {
-         d0[i] = r->buffer[r->read_ptr];
-         rb_advance_read(r);
-         d1[i] = r->buffer[r->read_ptr];
-         rb_advance_read(r);
-      }
-
-      need -= n;
-      rb_len_sub(r, (int)n);
-
-      if (UNLIKELY(need > 0))
-      {
-         const float quiet = 0.0f;
-         size_t fill;
-
-         /* we got more data */
-         if (rb_len(r) > 0)
-            continue;
-
-         /* underflow */
-         fill = (need/2)*sizeof(float);
-         memset_pattern4(&d0[i], &quiet, fill);
-         memset_pattern4(&d1[i], &quiet, fill);
-      }
-   } while (0);
-}
-
-#pragma mark - CoreAudio3
-
-static bool g_interrupted;
-
-@interface CoreAudio3 : NSObject {
-   ringbuffer_t _rb;
-   dispatch_semaphore_t _sema;
-   AUAudioUnit *_au;
-   size_t _bufferSize;
-   BOOL _nonBlock;
-}
-
-@property (nonatomic, readwrite) BOOL nonBlock;
-@property (nonatomic, readonly) BOOL paused;
-@property (nonatomic, readonly) size_t writeAvailableInBytes;
-@property (nonatomic, readonly) size_t bufferSizeInBytes;
-
- (instancetype)initWithRate:(NSUInteger)rate
-                     latency:(NSUInteger)latency;
- (ssize_t)writeFloat:(const float *)data samples:(size_t)samples;
- (void)start;
- (void)stop;
-
-@end
-
-@implementation CoreAudio3
-
- (instancetype)initWithRate:(NSUInteger)rate
-                     latency:(NSUInteger)latency {
-   if (self = [super init])
-   {
-      NSError *err;
-      AUAudioUnit *au;
-      AudioComponentDescription desc;
-      AVAudioFormat *format, *renderFormat;
-
-      _sema        = dispatch_semaphore_create(0);
-
-      _bufferSize  = (latency * rate) / 1000;
-      _bufferSize *= 2; /* stereo */
-      rb_init(&_rb, _bufferSize);
-
-      desc.componentType          = kAudioUnitType_Output;
-      desc.componentSubType       = kAudioUnitSubType_DefaultOutput;
-      desc.componentManufacturer  = kAudioUnitManufacturer_Apple;
-
-      au = [[AUAudioUnit alloc] initWithComponentDescription:desc error:&err];
-      if (err != nil)
-         return nil;
-
-      format = au.outputBusses[0].format;
-      if (format.channelCount != 2)
-         return nil;
-
-      renderFormat = [[AVAudioFormat alloc] initStandardFormatWithSampleRate:rate channels:2];
-      [au.inputBusses[0] setFormat:renderFormat error:&err];
-      if (err != nil)
-         return nil;
-
-      ringbuffer_h rb = &_rb;
-      __block dispatch_semaphore_t sema = _sema;
-      au.outputProvider = ^AUAudioUnitStatus(AudioUnitRenderActionFlags * actionFlags, const AudioTimeStamp * timestamp, AUAudioFrameCount frameCount, NSInteger inputBusNumber, AudioBufferList * inputData)
-      {
-         rb_read_data(rb, inputData->mBuffers[0].mData, inputData->mBuffers[1].mData, frameCount);
-         dispatch_semaphore_signal(sema);
-         return 0;
-      };
-
-      [au allocateRenderResourcesAndReturnError:&err];
-      if (err != nil)
-         return nil;
-
-      _au = au;
-
-      RARCH_LOG("[CoreAudio3]: Using buffer size of %u bytes: (latency = %u ms)\n", (unsigned)self.bufferSizeInBytes, latency);
-
-      [self start];
-   }
-   return self;
-}
-
- (void)dealloc {
-   rb_free(&_rb);
-}
-
- (BOOL)paused {
-   return !_au.running;
-}
-
- (size_t)bufferSizeInBytes {
-   return _bufferSize * sizeof(float);
-}
-
- (size_t)writeAvailableInBytes {
-   return rb_avail(&_rb) * sizeof(float);
-}
-
- (void)start {
-   NSError *err;
-   [_au startHardwareAndReturnError:&err];
-}
-
- (void)stop {
-   [_au stopHardware];
-}
-
- (ssize_t)writeFloat:(const float *)data samples:(size_t)samples {
-   size_t written = 0;
-   while (!g_interrupted && samples > 0)
-   {
-      size_t write_avail = rb_avail(&_rb);
-      if (write_avail > samples)
-         write_avail = samples;
-
-      rb_write_data(&_rb, data, write_avail);
-      data    += write_avail;
-      written += write_avail;
-      samples -= write_avail;
-
-      if (_nonBlock)
-         break;
-
-      if (write_avail == 0)
-         dispatch_semaphore_wait(_sema, DISPATCH_TIME_FOREVER);
-   }
-
-   return written;
-}
-
-@end
-
-static void coreaudio3_free(void *data)
-{
-   CoreAudio3 *dev = (__bridge_transfer CoreAudio3 *)data;
-   if (dev == nil)
-      return;
-
-   [dev stop];
-   dev = nil;
-}
-
-static void *coreaudio3_init(const char *device,
-      unsigned rate, unsigned latency,
-      unsigned block_frames,
-      unsigned *new_rate)
-{
-   CoreAudio3 *dev = [[CoreAudio3 alloc] initWithRate:rate
-                                              latency:latency];
-
-   *new_rate = rate;
-
-   return (__bridge_retained void *)dev;
-}
-
-static ssize_t coreaudio3_write(void *data,
-      const void *buf_, size_t size)
-{
-   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
-   return [dev writeFloat:(const float *)
-             buf_ samples:size/sizeof(float)] * sizeof(float);
-}
-
-static void coreaudio3_set_nonblock_state(void *data, bool state)
-{
-   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
-   if (dev == nil)
-      return;
-
-   dev.nonBlock = state;
-}
-
-static bool coreaudio3_alive(void *data)
-{
-   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
-   if (dev == nil)
-      return NO;
-
-   return !dev.paused;
-}
-
-static bool coreaudio3_stop(void *data)
-{
-   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
-   if (dev == nil)
-      return NO;
-
-   [dev stop];
-   return dev.paused;
-}
-
-static bool coreaudio3_start(void *data, bool is_shutdown)
-{
-   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
-   if (dev == nil)
-      return NO;
-
-   [dev start];
-   return !dev.paused;
-}
-
-static bool coreaudio3_use_float(void *data)
-{
-   return YES;
-}
-
-static size_t coreaudio3_write_avail(void *data)
-{
-   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
-   if (dev == nil)
-      return 0;
-
-   return dev.writeAvailableInBytes;
-}
-
-static size_t coreaudio3_buffer_size(void *data)
-{
-   CoreAudio3 *dev = (__bridge CoreAudio3 *)data;
-   if (dev == nil)
-      return 0;
-
-   return dev.bufferSizeInBytes;
-}
-
-audio_driver_t audio_coreaudio3 = {
-   coreaudio3_init,
-   coreaudio3_write,
-   coreaudio3_stop,
-   coreaudio3_start,
-   coreaudio3_alive,
-   coreaudio3_set_nonblock_state,
-   coreaudio3_free,
-   coreaudio3_use_float,
-   "coreaudio3",
-   NULL, /* device_list_new */
-   NULL, /* device_list_free */
-   coreaudio3_write_avail,
-   coreaudio3_buffer_size,
-};
@@ -19,12 +19,12 @@
 #include <retro_miscellaneous.h>
 #include <retro_timers.h>

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

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

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

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

 #define CTR_CSND_AUDIO_COUNT       (1u << 11u)
@@ -57,6 +56,7 @@ static void ctr_csnd_audio_update_playpos(ctr_csnd_audio_t* ctr)
   ctr->cpu_ticks_last += samples_played * CTR_CSND_CPU_TICKS_PER_SAMPLE;
 }

+
 Result csndPlaySound_custom(int chn, u32 flags, float vol, float pan,
      void* data0, void* data1, u32 size)
 {
@@ -181,7 +181,7 @@ static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size)
      (((ctr->pos - ctr->playpos ) & CTR_CSND_AUDIO_COUNT_MASK) < (CTR_CSND_AUDIO_COUNT >> 4)) ||
      (((ctr->playpos  - ctr->pos) & CTR_CSND_AUDIO_COUNT_MASK) < (size >> 2)))
   {
-      if (ctr->nonblock)
+      if (ctr->nonblocking)
         ctr->pos = (ctr->playpos + (CTR_CSND_AUDIO_COUNT >> 1)) & CTR_CSND_AUDIO_COUNT_MASK;
      else
      {
@@ -190,7 +190,7 @@ static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size)
            retro_sleep(1);
            ctr_csnd_audio_update_playpos(ctr);
         }while (((ctr->playpos - ctr->pos) & CTR_CSND_AUDIO_COUNT_MASK) < (CTR_CSND_AUDIO_COUNT >> 1)
-               || (((ctr->pos - ctr->playpos) & CTR_CSND_AUDIO_COUNT_MASK) < (CTR_CSND_AUDIO_COUNT >> 4)));
+                 || (((ctr->pos - ctr->playpos) & CTR_CSND_AUDIO_COUNT_MASK) < (CTR_CSND_AUDIO_COUNT >> 4)));
      }
   }

@@ -266,7 +266,7 @@ static void ctr_csnd_audio_set_nonblock_state(void *data, bool state)
 {
   ctr_csnd_audio_t* ctr = (ctr_csnd_audio_t*)data;
   if (ctr)
-      ctr->nonblock = state;
+      ctr->nonblocking = state;
 }

 static bool ctr_csnd_audio_use_float(void *data)
@@ -289,6 +289,7 @@ static size_t ctr_csnd_audio_buffer_size(void *data)
   return CTR_CSND_AUDIO_COUNT;
 }

+
 audio_driver_t audio_ctr_csnd = {
   ctr_csnd_audio_init,
   ctr_csnd_audio_write,
@@ -17,16 +17,17 @@
 #include <string.h>
 #include <malloc.h>

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

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

 #define CTR_DSP_AUDIO_COUNT       (1u << 11u)
@@ -101,21 +102,12 @@ static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size)
      (((ctr->pos - sample_pos ) & CTR_DSP_AUDIO_COUNT_MASK) < (CTR_DSP_AUDIO_COUNT >> 4)) ||
      (((sample_pos  - ctr->pos) & CTR_DSP_AUDIO_COUNT_MASK) < (size >> 2)))
   {
-      if (ctr->nonblock)
+      if (ctr->nonblocking)
         ctr->pos = (sample_pos + (CTR_DSP_AUDIO_COUNT >> 1)) & CTR_DSP_AUDIO_COUNT_MASK;
      else
      {
         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)));
@@ -181,7 +173,7 @@ static void ctr_dsp_audio_set_nonblock_state(void *data, bool state)
 {
   ctr_dsp_audio_t* ctr = (ctr_dsp_audio_t*)data;
   if (ctr)
-      ctr->nonblock = state;
+      ctr->nonblocking = state;
 }

 static bool ctr_dsp_audio_use_float(void *data)
@@ -203,6 +195,7 @@ static size_t ctr_dsp_audio_buffer_size(void *data)
   return CTR_DSP_AUDIO_COUNT;
 }

+
 audio_driver_t audio_ctr_dsp = {
   ctr_dsp_audio_init,
   ctr_dsp_audio_write,
@@ -218,3 +211,4 @@ audio_driver_t audio_ctr_dsp = {
   ctr_dsp_audio_write_avail,
   ctr_dsp_audio_buffer_size
 };
+
@@ -1,339 +0,0 @@
-/*  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
-};
@@ -35,11 +35,9 @@
 #ifdef HAVE_THREADS
 #include <rthreads/rthreads.h>
 #endif
-#include <lists/string_list.h>
 #include <queues/fifo_queue.h>
-#include <string/stdstring.h>

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

 #ifdef _XBOX
@@ -53,6 +51,7 @@
 #pragma comment(lib, "dxguid")
 #endif

+
 typedef struct dsound
 {
   LPDIRECTSOUND ds;
@@ -75,15 +74,17 @@ typedef struct dsound
   volatile bool thread_alive;
 } dsound_t;

-/* Forward declarations */
-static void *dsound_list_new(void *u);
-
 static INLINE unsigned write_avail(unsigned read_ptr,
      unsigned write_ptr, unsigned buffer_size)
 {
   return (read_ptr + buffer_size - write_ptr) % buffer_size;
 }

+static INLINE void get_positions(dsound_t *ds, DWORD *read_ptr, DWORD *write_ptr)
+{
+   IDirectSoundBuffer_GetCurrentPosition(ds->dsb, read_ptr, write_ptr);
+}
+
 #define CHUNK_SIZE 256

 struct audio_lock
@@ -94,42 +95,54 @@ struct audio_lock
   DWORD size2;
 };

-static bool grab_region(dsound_t *ds, uint32_t write_ptr,
-      struct audio_lock *region, HRESULT res)
+static INLINE bool grab_region(dsound_t *ds, uint32_t write_ptr,
+      struct audio_lock *region)
 {
+   const char *err = NULL;
+   HRESULT     res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE,
+         &region->chunk1, &region->size1, &region->chunk2, &region->size2, 0);
+
   if (res == DSERR_BUFFERLOST)
   {
-#ifdef DEBUG
-      RARCH_WARN("[DirectSound error]: %s\n", "DSERR_BUFFERLOST");
-#endif
-      if ((res = IDirectSoundBuffer_Restore(ds->dsb)) != DS_OK)
+      res = IDirectSoundBuffer_Restore(ds->dsb);
+      if (res != DS_OK)
         return false;
-      if ((res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE,
-                  &region->chunk1, &region->size1, &region->chunk2, &region->size2, 0)) != DS_OK)
+
+      res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE,
+            &region->chunk1, &region->size1, &region->chunk2, &region->size2, 0);
+      if (res != DS_OK)
         return false;
-      return true;
   }

-#ifdef DEBUG
   switch (res)
   {
+      case DSERR_BUFFERLOST:
+         err = "DSERR_BUFFERLOST";
+         break;
      case DSERR_INVALIDCALL:
-         RARCH_WARN("[DirectSound error]: %s\n", "DSERR_INVALIDCALL");
+         err = "DSERR_INVALIDCALL";
         break;
      case DSERR_INVALIDPARAM:
-         RARCH_WARN("[DirectSound error]: %s\n", "DSERR_INVALIDPARAM");
+         err = "DSERR_INVALIDPARAM";
         break;
      case DSERR_PRIOLEVELNEEDED:
-         RARCH_WARN("[DirectSound error]: %s\n", "DSERR_PRIOLEVELNEEDED");
+         err = "DSERR_PRIOLEVELNEEDED";
         break;
-      default:
-         break;
-   }
-#endif

+      default:
+         return true;
+   }
+
+   RARCH_WARN("[DirectSound error]: %s\n", err);
   return false;
 }

+static INLINE void release_region(dsound_t *ds, const struct audio_lock *region)
+{
+   IDirectSoundBuffer_Unlock(ds->dsb, region->chunk1,
+         region->size1, region->chunk2, region->size2);
+}
+
 #ifdef HAVE_THREADS
 static void dsound_thread(void *data)
 #else
@@ -141,21 +154,19 @@ static DWORD CALLBACK dsound_thread(PVOID data)

   SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL);

-   IDirectSoundBuffer_GetCurrentPosition(ds->dsb, NULL, &write_ptr);
+   get_positions(ds, NULL, &write_ptr);
   write_ptr = (write_ptr + ds->buffer_size / 2) % ds->buffer_size;

   while (ds->thread_alive)
   {
-      HRESULT res;
-      bool is_pull = false;
      struct audio_lock region;
      DWORD read_ptr, avail, fifo_avail;
+      get_positions(ds, &read_ptr, NULL);

-      IDirectSoundBuffer_GetCurrentPosition(ds->dsb, &read_ptr, NULL);
      avail = write_avail(read_ptr, write_ptr, ds->buffer_size);

      EnterCriticalSection(&ds->crit);
-      fifo_avail = FIFO_READ_AVAIL(ds->buffer);
+      fifo_avail = fifo_read_avail(ds->buffer);
      LeaveCriticalSection(&ds->crit);

      if (avail < CHUNK_SIZE || ((fifo_avail < CHUNK_SIZE) && (avail < ds->buffer_size / 2)))
@@ -163,6 +174,7 @@ static DWORD CALLBACK dsound_thread(PVOID data)
         /* No space to write, or we don't have data in our fifo,
          * but we can wait some time before it underruns ... */

+
         /* We could opt for using the notification interface,
          * but it is not guaranteed to work, so use high
          * priority sleeping patterns.
@@ -171,23 +183,23 @@ static DWORD CALLBACK dsound_thread(PVOID data)
         continue;
      }

-      if ((res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE,
-                  &region.chunk1, &region.size1, &region.chunk2, &region.size2, 0)) != DS_OK)
+      if (!grab_region(ds, write_ptr, &region))
      {
-         if (!grab_region(ds, write_ptr, &region, res))
-         {
-            ds->thread_alive = false;
-            SetEvent(ds->event);
-            break;
-         }
+         ds->thread_alive = false;
+         SetEvent(ds->event);
+         break;
      }

      if (fifo_avail < CHUNK_SIZE)
      {
         /* Got space to write, but nothing in FIFO (underrun),
          * fill block with silence. */
+
         memset(region.chunk1, 0, region.size1);
         memset(region.chunk2, 0, region.size2);
+
+         release_region(ds, &region);
+         write_ptr = (write_ptr + region.size1 + region.size2) % ds->buffer_size;
      }
      else
      {
@@ -200,16 +212,11 @@ static DWORD CALLBACK dsound_thread(PVOID data)
            fifo_read(ds->buffer, region.chunk2, region.size2);
         LeaveCriticalSection(&ds->crit);

-         is_pull = true;
-      }
+         release_region(ds, &region);
+         write_ptr = (write_ptr + region.size1 + region.size2) % ds->buffer_size;

-      IDirectSoundBuffer_Unlock(ds->dsb, region.chunk1,
-            region.size1, region.chunk2, region.size2);
-      write_ptr = (write_ptr + region.size1 + region.size2) 
-         % ds->buffer_size;
-
-      if (is_pull)
         SetEvent(ds->event);
+      }
   }

   ExitThread(0);
@@ -303,100 +310,52 @@ static void dsound_free(void *data)
   free(ds);
 }

-static BOOL CALLBACK enumerate_cb(LPGUID guid,
-      LPCSTR desc, LPCSTR module, LPVOID context)
+struct dsound_dev
 {
-   union string_list_elem_attr attr;
-   struct string_list *list = (struct string_list*)context;
+   unsigned device;
+   unsigned total_count;
+   LPGUID guid;
+};

-   attr.i = 0;
+static BOOL CALLBACK enumerate_cb(LPGUID guid, LPCSTR desc, LPCSTR module, LPVOID context)
+{
+   struct dsound_dev *dev = (struct dsound_dev*)context;

-   string_list_append(list, desc, attr);
-
-   if (guid)
-   {
-      unsigned i;
-      LPGUID guid_copy = (LPGUID)malloc(sizeof(GUID) * 1);
-      guid_copy->Data1 = guid->Data1;
-      guid_copy->Data2 = guid->Data2;
-      guid_copy->Data3 = guid->Data3;
-      for (i = 0; i < 8; i++)
-         guid_copy->Data4[i] = guid->Data4[i];
-
-      list->elems[list->size-1].userdata = guid_copy;
-   }
+   RARCH_LOG("\t%u: %s\n", dev->total_count, desc);

+   if (dev->device == dev->total_count)
+      dev->guid = guid;
+   dev->total_count++;
   return TRUE;
 }

-static void dsound_set_wavefmt(WAVEFORMATEX *wfx,
-      unsigned channels, unsigned samplerate)
-{
-   wfx->wFormatTag        = WAVE_FORMAT_PCM;
-   wfx->nBlockAlign       = channels * sizeof(int16_t);
-   wfx->wBitsPerSample    = 16;
-
-   wfx->nChannels         = channels;
-   wfx->nSamplesPerSec    = samplerate;
-   wfx->nAvgBytesPerSec   = wfx->nSamplesPerSec * wfx->nBlockAlign;
-   wfx->cbSize            = 0;
-}
-
-static void *dsound_init(const char *dev, unsigned rate, unsigned latency,
+static void *dsound_init(const char *device, unsigned rate, unsigned latency,
      unsigned block_frames,
      unsigned *new_rate)
 {
-   LPGUID selected_device   = NULL;
-   WAVEFORMATEX wfx         = {0};
-   DSBUFFERDESC bufdesc     = {0};
-   int32_t idx_found        = -1;
-   struct string_list *list = (struct string_list*)dsound_list_new(NULL);
-   dsound_t          *ds    = (dsound_t*)calloc(1, sizeof(*ds));
+   WAVEFORMATEX wfx      = {0};
+   DSBUFFERDESC bufdesc  = {0};
+   struct dsound_dev dev = {0};
+   dsound_t          *ds = (dsound_t*)calloc(1, sizeof(*ds));

   if (!ds)
      goto error;

   InitializeCriticalSection(&ds->crit);

-   if (dev)
-   {
-       /* Search for device name first */
-      if (list && list->elems)
-      {
-         if (list->elems)
-         {
-            unsigned i;
-            for (i = 0; i < list->size; i++)
-            {
-               if (string_is_equal(dev, list->elems[i].data))
-               {
-                  idx_found       = i;
-                  selected_device = (LPGUID)list->elems[idx_found].userdata;
-                  break;
-               }
-            }
-            /* Index was not found yet based on name string,
-             * just assume id is a one-character number index. */
+   if (device)
+      dev.device = strtoul(device, NULL, 0);

-            if (idx_found == -1 && isdigit(dev[0]))
-            {
-               idx_found = strtoul(dev, NULL, 0);
-               RARCH_LOG("[DirectSound]: Fallback, device index is a single number index instead: %d.\n", idx_found);
+   RARCH_LOG("DirectSound devices:\n");
+#ifndef _XBOX
+#ifdef UNICODE
+   DirectSoundEnumerate((LPDSENUMCALLBACKW)enumerate_cb, &dev);
+#else
+   DirectSoundEnumerate((LPDSENUMCALLBACKA)enumerate_cb, &dev);
+#endif
+#endif

-               if (idx_found != -1)
-               {
-                  if (idx_found < (int32_t)list->size)
-                  {
-                     RARCH_LOG("[DirectSound]: Corresponding name: %s\n", list->elems[idx_found].data);
-                     selected_device = (LPGUID)list->elems[idx_found].userdata;
-                  }
-               }
-            }
-         }
-      }
-   }
-
-   if (DirectSoundCreate(selected_device, &ds->ds, NULL) != DS_OK)
+   if (DirectSoundCreate(dev.guid, &ds->ds, NULL) != DS_OK)
      goto error;

 #ifndef _XBOX
@@ -404,7 +363,12 @@ static void *dsound_init(const char *dev, unsigned rate, unsigned latency,
      goto error;
 #endif

-   dsound_set_wavefmt(&wfx, 2, rate);
+   wfx.wFormatTag        = WAVE_FORMAT_PCM;
+   wfx.nChannels         = 2;
+   wfx.nSamplesPerSec    = rate;
+   wfx.wBitsPerSample    = 16;
+   wfx.nBlockAlign       = 2 * sizeof(int16_t);
+   wfx.nAvgBytesPerSec   = rate * 2 * sizeof(int16_t);

   ds->buffer_size       = (latency * wfx.nAvgBytesPerSec) / 1000;
   ds->buffer_size      /= CHUNK_SIZE;
@@ -445,13 +409,10 @@ static void *dsound_init(const char *dev, unsigned rate, unsigned latency,
   if (!dsound_start_thread(ds))
      goto error;

-   string_list_free(list);
   return ds;

 error:
   RARCH_ERR("[DirectSound] Error occurred in init.\n");
-   if (list)
-      string_list_free(list);
   dsound_free(ds);
   return NULL;
 }
@@ -505,50 +466,27 @@ static ssize_t dsound_write(void *data, const void *buf_, size_t size)
   if (!ds->thread_alive)
      return -1;

-   if (ds->nonblock)
+   while (size > 0)
   {
-      if (size > 0)
-      {
-         size_t avail;
+      size_t avail;

-         EnterCriticalSection(&ds->crit);
-         avail = FIFO_WRITE_AVAIL(ds->buffer);
-         if (avail > size)
-            avail = size;
+      EnterCriticalSection(&ds->crit);
+      avail = fifo_write_avail(ds->buffer);
+      if (avail > size)
+         avail = size;

-         fifo_write(ds->buffer, buf, avail);
-         LeaveCriticalSection(&ds->crit);
+      fifo_write(ds->buffer, buf, avail);
+      LeaveCriticalSection(&ds->crit);

-         buf     += avail;
-         size    -= avail;
-         written += avail;
-      }
-   }
-   else
-   {
-      while (size > 0)
-      {
-         size_t avail;
+      buf     += avail;
+      size    -= avail;
+      written += avail;

-         EnterCriticalSection(&ds->crit);
-         avail = FIFO_WRITE_AVAIL(ds->buffer);
-         if (avail > size)
-            avail = size;
+      if (ds->nonblock || !ds->thread_alive)
+         break;

-         fifo_write(ds->buffer, buf, avail);
-         LeaveCriticalSection(&ds->crit);
-
-         buf     += avail;
-         size    -= avail;
-         written += avail;
-
-         if (!ds->thread_alive)
-            break;
-
-         if (avail == 0)
-            if (!(WaitForSingleObject(ds->event, 50) == WAIT_OBJECT_0))
-               return -1;
-      }
+      if (avail == 0)
+         WaitForSingleObject(ds->event, INFINITE);
   }

   return written;
@@ -560,38 +498,20 @@ static size_t dsound_write_avail(void *data)
   dsound_t *ds = (dsound_t*)data;

   EnterCriticalSection(&ds->crit);
-   avail = FIFO_WRITE_AVAIL(ds->buffer);
+   avail = fifo_write_avail(ds->buffer);
   LeaveCriticalSection(&ds->crit);
   return avail;
 }

-static size_t dsound_buffer_size(void *data) { return 4 * 1024; }
-static bool dsound_use_float(void *data) { return false; }
-
-static void *dsound_list_new(void *u)
+static size_t dsound_buffer_size(void *data)
 {
-   struct string_list *sl          = string_list_new();
-
-   if (!sl)
-      return NULL;
-
-#ifndef _XBOX
-#ifdef UNICODE
-   DirectSoundEnumerate((LPDSENUMCALLBACKW)enumerate_cb, sl);
-#else
-   DirectSoundEnumerate((LPDSENUMCALLBACKA)enumerate_cb, sl);
-#endif
-#endif
-
-   return sl;
+   return 4 * 1024;
 }

-static void dsound_device_list_free(void *u, void *slp)
+static bool dsound_use_float(void *data)
 {
-   struct string_list *sl = (struct string_list*)slp;
-
-   if (sl)
-      string_list_free(sl);
+   (void)data;
+   return false;
 }

 audio_driver_t audio_dsound = {
@@ -604,8 +524,8 @@ audio_driver_t audio_dsound = {
   dsound_free,
   dsound_use_float,
   "dsound",
-   dsound_list_new,
-   dsound_device_list_free,
+   NULL,
+   NULL,
   dsound_write_avail,
   dsound_buffer_size,
 };
@@ -27,16 +27,19 @@
 #include <boolean.h>
 #include <retro_inline.h>

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

 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;
+
+   OSCond cond;
   bool nonblock;
   bool is_paused;
 } gx_audio_t;
@@ -60,6 +63,8 @@ static void dma_callback(void)
   DCFlushRange(wa->data[wa->dma_next], CHUNK_SIZE);

   AIInitDMA((uint32_t)wa->data[wa->dma_next], CHUNK_SIZE);
+
+   OSSignalCond(wa->cond);
 }

 static void *gx_audio_init(const char *device,
@@ -90,6 +95,8 @@ static void *gx_audio_init(const char *device,
      *new_rate = 48000;
   }

+   OSInitThreadQueue(&wa->cond);
+
   wa->dma_write = BLOCKS - 1;
   DCFlushRange(wa->data, sizeof(wa->data));
   stop_audio = false;
@@ -107,7 +114,7 @@ static INLINE void copy_swapped(uint32_t * restrict dst,
   {
      uint32_t s = *src++;
      *dst++ = (s >> 16) | (s << 16);
-   } while (--size);
+   }while(--size);
 }

 static ssize_t gx_audio_write(void *data, const void *buf_, size_t size)
@@ -126,7 +133,8 @@ static ssize_t gx_audio_write(void *data, const void *buf_, size_t size)
      /* FIXME: Nonblocking audio should break out of loop
       * when it has nothing to write. */
      while ((wa->dma_write == wa->dma_next ||
-               wa->dma_write == wa->dma_busy) && !wa->nonblock);
+               wa->dma_write == wa->dma_busy) && !wa->nonblock)
+         OSSleepThread(wa->cond);

      copy_swapped(wa->data[wa->dma_write] + wa->write_ptr, buf, to_write);

@@ -197,6 +205,10 @@ static void gx_audio_free(void *data)
   AIStopDMA();
   AIRegisterDMACallback(NULL);

+   if (wa->cond)
+      OSCloseThreadQueue(wa->cond);
+   wa->cond = 0;
+
   free(data);
 }

@@ -25,8 +25,8 @@
 #include <boolean.h>
 #include <rthreads/rthreads.h>

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

 #define FRAMES(x) (x / (sizeof(float) * 2))
@@ -35,44 +35,23 @@ typedef struct jack
 {
   jack_client_t *client;
   jack_port_t *ports[2];
-   jack_ringbuffer_t *buffer;
+   jack_ringbuffer_t *buffer[2];
+   volatile bool shutdown;
+   bool nonblock;
+   bool is_paused;
+
 #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 read = 0;
+   jack_nframes_t avail[2], min_avail;
   jack_t *jd = (jack_t*)data;
-   jack_ringbuffer_data_t buf[2];
-   float *dst[2];

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

-   for (i = 0; i < 2; i++)
-      dst[i] = (float *)jack_port_get_buffer(jd->ports[i], nframes);
+   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);

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

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

-   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;
+      jack_ringbuffer_read(jd->buffer[i], (char*)out, min_avail * sizeof(jack_default_audio_sample_t));

+      for (f = min_avail; f < nframes; f++)
+         out[f] = 0.0f;
+   }
 #ifdef HAVE_THREADS
   scond_signal(jd->cond);
 #endif
@@ -164,8 +146,7 @@ static size_t find_buffersize(jack_t *jd, int latency, unsigned out_rate)
   return buffer_frames * sizeof(jack_default_audio_sample_t);
 }

-static void *ja_init(const char *device,
-      unsigned rate, unsigned latency,
+static void *ja_init(const char *device, unsigned rate, unsigned latency,
      unsigned block_frames,
      unsigned *new_rate)
 {
@@ -185,7 +166,7 @@ static void *ja_init(const char *device,
 #endif

   jd->client = jack_client_open("RetroArch", JackNullOption, NULL);
-   if (!jd->client)
+   if (jd->client == NULL)
      goto error;

   *new_rate = jack_get_sample_rate(jd->client);
@@ -195,14 +176,14 @@ static void *ja_init(const char *device,

   jd->ports[0] = jack_port_register(jd->client, "left", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
   jd->ports[1] = jack_port_register(jd->client, "right", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-   if (!jd->ports[0] || !jd->ports[1])
+   if (jd->ports[0] == NULL || jd->ports[1] == NULL)
   {
      RARCH_ERR("[JACK]: Failed to register ports.\n");
      goto error;
   }

   jports = jack_get_ports(jd->client, NULL, NULL, JackPortIsPhysical | JackPortIsInput);
-   if (!jports)
+   if (jports == NULL)
   {
      RARCH_ERR("[JACK]: Failed to get ports.\n");
      goto error;
@@ -212,12 +193,14 @@ 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)));
-
-   jd->buffer = jack_ringbuffer_create(bufsize);
-   if (!jd->buffer)
+   for (i = 0; i < 2; i++)
   {
-      RARCH_ERR("[JACK]: Failed to create buffers.\n");
-      goto error;
+      jd->buffer[i] = jack_ringbuffer_create(bufsize);
+      if (jd->buffer[i] == NULL)
+      {
+         RARCH_ERR("[JACK]: Failed to create buffers.\n");
+         goto error;
+      }
   }

   parsed = parse_ports(dest_ports, jports);
@@ -246,52 +229,71 @@ static void *ja_init(const char *device,
 error:
   for (i = 0; i < parsed; i++)
      free(dest_ports[i]);
-   if (jports)
+   if (jports != NULL)
      jack_free(jports);
   free(jd);
   return NULL;
 }

-static ssize_t ja_write(void *data, const void *buf_, size_t size)
+static size_t write_buffer(jack_t *jd, const float *buf, size_t size)
 {
-   jack_t      *jd = (jack_t*)data;
-   const char *buf = (const char *)buf_;
-   size_t  written = 0;
+   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);

-   while (size > 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)
   {
-      size_t avail, to_write;
-
+      size_t avail[2], min_avail, write_frames;
      if (jd->shutdown)
         return 0;

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

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

-      if (to_write > 0)
+      write_frames = frames - written > min_avail ? min_avail : frames - written;
+
+      if (write_frames > 0)
      {
-         jack_ringbuffer_write(jd->buffer, buf, to_write);
-         buf     += to_write;
-         size    -= to_write;
-         written += to_write;
+         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;
      }
-      else if (!jd->nonblock)
-      {
 #ifdef HAVE_THREADS
+      else
+      {
         slock_lock(jd->cond_lock);
         scond_wait(jd->cond, jd->cond_lock);
         slock_unlock(jd->cond_lock);
-#endif
-         continue;
      }
-      else
+#endif
+
+      if (jd->nonblock)
         break;
   }

-   return written;
+   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);
 }

 static bool ja_stop(void *data)
@@ -332,14 +334,15 @@ static void ja_free(void *data)

   jd->shutdown = true;

-   if (jd->client)
+   if (jd->client != NULL)
   {
      jack_deactivate(jd->client);
      jack_client_close(jd->client);
   }

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

 #ifdef HAVE_THREADS
   if (jd->cond_lock)
@@ -359,7 +362,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);
+   return jack_ringbuffer_write_space(jd->buffer[0]);
 }

 static size_t ja_buffer_size(void *data)
@@ -0,0 +1,96 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../audio_driver.h"
+#include "../../verbosity.h"
+
+static void *null_audio_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
+{
+   RARCH_ERR("Using the null audio driver. RetroArch will be silent.");
+
+   (void)device;
+   (void)rate;
+   (void)latency;
+   (void)new_rate;
+   return (void*)-1;
+}
+
+static void null_audio_free(void *data)
+{
+   (void)data;
+}
+
+static ssize_t null_audio_write(void *data, const void *buf, size_t size)
+{
+   (void)data;
+   (void)buf;
+
+   return size;
+}
+
+static bool null_audio_stop(void *data)
+{
+   (void)data;
+   return true;
+}
+
+static bool null_audio_alive(void *data)
+{
+   (void)data;
+   return true;
+}
+
+static bool null_audio_start(void *data, bool is_shutdown)
+{
+   (void)data;
+   return true;
+}
+
+static void null_audio_set_nonblock_state(void *data, bool state)
+{
+   (void)data;
+   (void)state;
+}
+
+static bool null_audio_use_float(void *data)
+{
+   (void)data;
+   return true;
+}
+
+static size_t null_audio_write_avail(void *data)
+{
+   (void)data;
+   return 0;
+}
+
+audio_driver_t audio_null = {
+   null_audio_init,
+   null_audio_write,
+   null_audio_stop,
+   null_audio_start,
+   null_audio_alive,
+   null_audio_set_nonblock_state,
+   null_audio_free,
+   null_audio_use_float,
+   "null",
+   NULL,
+   NULL,
+   null_audio_write_avail,
+   NULL
+};
@@ -33,7 +33,7 @@
 #include <retro_miscellaneous.h>
 #include <retro_timers.h>

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

 #define BUFSIZE 1024
@@ -43,14 +43,17 @@ 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;
@@ -112,7 +115,7 @@ static void *al_init(const char *device, unsigned rate, unsigned latency,

   al->buffers = (ALuint*)calloc(al->num_buffers, sizeof(ALuint));
   al->res_buf = (ALuint*)calloc(al->num_buffers, sizeof(ALuint));
-   if (!al->buffers || !al->res_buf)
+   if (al->buffers == NULL || al->res_buf == NULL)
      goto error;

   alGenSources(1, &al->source);
@@ -21,7 +21,7 @@

 #include <rthreads/rthreads.h>

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

 /* Helper macros, COM-style. */
 #define SLObjectItf_Realize(a, ...) ((*(a))->Realize(a, __VA_ARGS__))
@@ -37,6 +37,9 @@ 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;
@@ -48,13 +51,10 @@ typedef struct sl

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

 static void opensl_callback(SLAndroidSimpleBufferQueueItf bq, void *ctx)
@@ -67,7 +67,7 @@ static void opensl_callback(SLAndroidSimpleBufferQueueItf bq, void *ctx)
 #define GOTO_IF_FAIL(x) do { \
   if ((res = (x)) != SL_RESULT_SUCCESS) \
      goto error; \
-} while (0)
+} while(0)

 static void sl_free(void *data)
 {
@@ -152,7 +152,7 @@ static void *sl_init(const char *device, unsigned rate, unsigned latency,

   fmt_pcm.formatType     = SL_DATAFORMAT_PCM;
   fmt_pcm.numChannels    = 2;
-   fmt_pcm.samplesPerSec  = rate * 1000; /* Samplerate is in milli-Hz. */
+   fmt_pcm.samplesPerSec  = rate * 1000; // Samplerate is in milli-Hz.
   fmt_pcm.bitsPerSample  = 16;
   fmt_pcm.containerSize  = 16;
   fmt_pcm.channelMask    = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
@@ -232,6 +232,7 @@ static bool sl_start(void *data, bool is_shutdown)
   return sl->is_paused ? false : true;
 }

+
 static ssize_t sl_write(void *data, const void *buf_, size_t size)
 {
   sl_t           *sl = (sl_t*)data;
@@ -33,7 +33,7 @@
 #include "config.h"
 #endif

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

 #ifdef HAVE_OSS_BSD
@@ -42,27 +42,22 @@
 #define DEFAULT_OSS_DEV "/dev/dsp"
 #endif

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

-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;
-   oss_audio_t *ossaudio  = (oss_audio_t*)calloc(1, sizeof(oss_audio_t));
+   int              *fd   = (int*)calloc(1, sizeof(int));
   const char *oss_device = device ? device : DEFAULT_OSS_DEV;

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

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

-   if (ioctl(ossaudio->fd, SNDCTL_DSP_SETFRAGMENT, &frag) < 0)
+   if (ioctl(*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(ossaudio->fd, SNDCTL_DSP_CHANNELS, &channels) < 0)
+   if (ioctl(*fd, SNDCTL_DSP_CHANNELS, &channels) < 0)
      goto error;

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

   new_rate = rate;

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

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

-   return ossaudio;
+   return fd;

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

   if (size == 0)
      return 0;

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

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

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

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

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

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

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

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

   if (state)
-      rc =  fcntl(ossaudio->fd, F_SETFL,
-            fcntl(ossaudio->fd, F_GETFL) | O_NONBLOCK);
+      rc = fcntl(*fd, F_SETFL, fcntl(*fd, F_GETFL) | O_NONBLOCK);
   else
-      rc =  fcntl(ossaudio->fd, F_SETFL,
-            fcntl(ossaudio->fd, F_GETFL) & (~O_NONBLOCK));
+      rc = fcntl(*fd, F_SETFL, fcntl(*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)
 {
-   oss_audio_t *ossaudio  = (oss_audio_t*)data;
+   int *fd = (int*)data;

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

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

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

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

-   if (ioctl(ossaudio->fd, SNDCTL_DSP_GETOSPACE, &info) < 0)
+   if (ioctl(*fd, SNDCTL_DSP_GETOSPACE, &info) < 0)
   {
      RARCH_ERR("[OSS]: SNDCTL_DSP_GETOSPACE failed ...\n");
      return 1; /* Return something non-zero to avoid SIGFPE. */
@@ -1,162 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2014-2017 - Francisco Javier Trujillo Mata
- *
- *  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 <stdint.h>
-#include <malloc.h>
-#include <string.h>
-
-#include <kernel.h>
-#include <audsrv.h>
-
-#include "../../retroarch.h"
-
-#define AUDIO_BUFFER 128 * 1024
-#define AUDIO_CHANNELS 2
-#define AUDIO_BITS 16
-
-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)
-{
-   struct audsrv_fmt_t format;
-
-   format.bits     = AUDIO_BITS;
-   format.freq     = rate;
-   format.channels = AUDIO_CHANNELS;
-
-   audsrv_set_format(&format);
-   audsrv_set_volume(MAX_VOLUME);
-}
-
-static void *ps2_audio_init(const char *device,
-      unsigned rate, unsigned latency,
-      unsigned block_frames,
-      unsigned *new_rate)
-{
-   ps2_audio_t *ps2 = (ps2_audio_t*)calloc(1, sizeof(ps2_audio_t));
-
-   if (!ps2)
-      return NULL;
-
-   audioConfigure(ps2, rate);
-
-   return ps2;
-}
-
-static void ps2_audio_free(void *data)
-{
-   ps2_audio_t* ps2 = (ps2_audio_t*)data;
-   if (!ps2)
-      return;
-
-   ps2->running = false;
-   audsrv_stop_audio();
-   free(ps2);
-}
-
-static ssize_t ps2_audio_write(void *data, const void *buf, size_t size)
-{
-   ps2_audio_t* ps2 = (ps2_audio_t*)data;
-
-   if (!ps2->running)
-      return -1;
-
-   return audsrv_play_audio(buf, size);
-}
-
-static bool ps2_audio_alive(void *data)
-{
-   bool       alive = false;
-   ps2_audio_t* ps2 = (ps2_audio_t*)data;
-
-   if (ps2)
-      alive = ps2->running;
-
-   return alive;
-}
-
-static bool ps2_audio_stop(void *data)
-{
-   bool        stop = true;
-   ps2_audio_t* ps2 = (ps2_audio_t*)data;
-
-   if (ps2)
-   {
-      audsrv_stop_audio();
-      ps2->running = false;
-   }
-
-   return stop;
-}
-
-static bool ps2_audio_start(void *data, bool is_shutdown)
-{
-   ps2_audio_t* ps2 = (ps2_audio_t*)data;
-   bool       start = true;
-
-   if (ps2)
-      ps2->running = true;
-
-   return start;
-}
-
-static void ps2_audio_set_nonblock_state(void *data, bool toggle)
-{
-   ps2_audio_t* ps2 = (ps2_audio_t*)data;
-
-   if (ps2)
-      ps2->nonblock = toggle;
-}
-
-static bool ps2_audio_use_float(void *data)
-{
-   return false;
-}
-
-static size_t ps2_audio_write_avail(void *data)
-{
-   ps2_audio_t* ps2 = (ps2_audio_t*)data;
-
-   if (ps2 && ps2->running)
-      return AUDIO_BUFFER;
-
-   return 0;
-}
-
-static size_t ps2_audio_buffer_size(void *data)
-{
-   return AUDIO_BUFFER;
-}
-
-audio_driver_t audio_ps2 = {
-   ps2_audio_init,
-   ps2_audio_write,
-   ps2_audio_stop,
-   ps2_audio_start,
-   ps2_audio_alive,
-   ps2_audio_set_nonblock_state,
-   ps2_audio_free,
-   ps2_audio_use_float,
-   "ps2",
-   NULL,
-   NULL,
-   ps2_audio_write_avail,
-   ps2_audio_buffer_size
-};
@@ -19,61 +19,61 @@

 #include <queues/fifo_queue.h>

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

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

 #define AUDIO_BLOCKS 8
 #define AUDIO_CHANNELS 2

 typedef struct
 {
+   uint32_t audio_port;
+   bool nonblocking;
+   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[AUDIO_BLOCK_SAMPLES * AUDIO_CHANNELS]
+   float out_tmp[CELL_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;

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

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

-      sysLwMutexLock(&aud->lock, PS3_SYS_NO_TIMEOUT);
-      if (FIFO_READ_AVAIL(aud->buffer) >= sizeof(out_tmp))
+      sys_lwmutex_lock(&aud->lock, 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));
-      sysLwMutexUnlock(&aud->lock);
-      sysLwCondSignal(&aud->cond);
+      sys_lwmutex_unlock(&aud->lock);
+      sys_lwcond_signal(&aud->cond);

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

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

 static void *ps3_audio_init(const char *device,
@@ -81,63 +81,67 @@ static void *ps3_audio_init(const char *device,
      unsigned block_frames,
      unsigned *new_rate)
 {
-   audioPortParam params;
-   ps3_audio_t *data                 = NULL;
+   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));
+
 #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_attr_t cond_attr       = {"\0"};
+   sys_lwcond_attribute_t cond_attr = {"\0"};
 #else
-   sys_lwmutex_attr_t lock_attr;
-   sys_lwmutex_attr_t cond_lock_attr;
-   sys_lwcond_attr_t cond_attr;
+   sys_lwmutex_attribute_t lock_attr;
+   sys_lwmutex_attribute_t cond_lock_attr;
+   sys_lwcond_attribute_t cond_attr;

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

-   data                              = calloc(1, sizeof(*data));
-   if (!data)
-      return NULL;
+   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);

-   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);
+   cellAudioPortStart(data->audio_port);
   data->started = true;
-   sysThreadCreate(&data->thread, event_loop,
+   sys_ppu_thread_create(&data->thread, event_loop,
 #ifdef __PSL1GHT__
   data,
 #else
   (uint64_t)data,
 #endif
-   1500, 0x1000, SYS_THREAD_CREATE_JOINABLE, (char*)"sound");
+   1500, 0x1000, SYS_PPU_THREAD_CREATE_JOINABLE, (char*)"sound");

   return data;
 }
@@ -146,18 +150,18 @@ static ssize_t ps3_audio_write(void *data, const void *buf, size_t size)
 {
   ps3_audio_t *aud = data;

-   if (aud->nonblock)
+   if (aud->nonblocking)
   {
-      if (FIFO_WRITE_AVAIL(aud->buffer) < size)
+      if (fifo_write_avail(aud->buffer) < size)
         return 0;
   }

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

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

   return size;
 }
@@ -167,7 +171,7 @@ static bool ps3_audio_stop(void *data)
   ps3_audio_t *aud = data;
   if (aud->started)
   {
-      audioPortStop(aud->audio_port);
+      cellAudioPortStop(aud->audio_port);
      aud->started = false;
   }
   return true;
@@ -178,7 +182,7 @@ static bool ps3_audio_start(void *data, bool is_shutdown)
   ps3_audio_t *aud = data;
   if (!aud->started)
   {
-      audioPortStart(aud->audio_port);
+      cellAudioPortStart(aud->audio_port);
      aud->started = true;
   }
   return true;
@@ -196,7 +200,7 @@ static void ps3_audio_set_nonblock_state(void *data, bool toggle)
 {
   ps3_audio_t *aud = data;
   if (aud)
-      aud->nonblock = toggle;
+      aud->nonblocking = toggle;
 }

 static void ps3_audio_free(void *data)
@@ -206,28 +210,29 @@ static void ps3_audio_free(void *data)

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

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

-   sysLwMutexDestroy(&aud->lock);
-   sysLwMutexDestroy(&aud->cond_lock);
-   sysLwCondDestroy(&aud->cond);
+   sys_lwmutex_destroy(&aud->lock);
+   sys_lwmutex_destroy(&aud->cond_lock);
+   sys_lwcond_destroy(&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)
 {
-   /* TODO/FIXME - implement? */
+   (void)data;
   return 0;
 }

@@ -16,51 +16,44 @@
 */

 #include <stdint.h>
-#if defined(VITA) || defined(PSP)
 #include <malloc.h>
-#endif
 #include <stdio.h>
 #include <string.h>

 #include <rthreads/rthreads.h>
 #include <queues/fifo_queue.h>

-#if defined(VITA)
+#ifdef VITA
 #include <psp2/kernel/processmgr.h>
 #include <psp2/kernel/threadmgr.h>
 #include <psp2/kernel/sysmem.h>
 #include <psp2/audioout.h>
-#elif defined(PSP)
+#else
 #include <pspkernel.h>
 #include <pspaudio.h>
-#elif defined(ORBIS)
-#include <audioout.h>
-#define SCE_AUDIO_OUT_PORT_TYPE_MAIN   0
-#define SCE_AUDIO_OUT_MODE_STEREO      1
-#define SceUID uint32_t
 #endif

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

 typedef struct psp_audio
 {
+   bool nonblocking;
+
   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
@@ -71,14 +64,10 @@ static void audioMainLoop(void *data)
 {
   psp_audio_t* psp = (psp_audio_t*)data;

-#if defined(VITA)
+#ifdef VITA
   int port         = sceAudioOutOpenPort(
         SCE_AUDIO_OUT_PORT_TYPE_MAIN, AUDIO_OUT_COUNT,
         psp->rate, SCE_AUDIO_OUT_MODE_STEREO);
-#elif defined(ORBIS)
-   int port         = sceAudioOutOpen(0xff,
-         SCE_AUDIO_OUT_PORT_TYPE_MAIN, 0, AUDIO_OUT_COUNT,
-         psp->rate, SCE_AUDIO_OUT_MODE_STEREO);
 #else
   sceAudioSRCChReserve(AUDIO_OUT_COUNT, psp->rate, 2);
 #endif
@@ -106,7 +95,7 @@ static void audioMainLoop(void *data)
      scond_signal(psp->cond);
      slock_unlock(psp->cond_lock);

-#if defined(VITA) || defined(ORBIS)
+#ifdef VITA
      sceAudioOutOutput(port,
        cond ? (psp->zeroBuffer)
              : (psp->buffer + read_pos_2));
@@ -116,10 +105,8 @@ static void audioMainLoop(void *data)
 #endif
   }

-#if defined(VITA)
+#ifdef VITA
   sceAudioOutReleasePort(port);
-#elif defined(ORBIS)
-   sceAudioOutClose(port);
 #else
   sceAudioSRCChRelease();
 #endif
@@ -140,23 +127,12 @@ static void *psp_audio_init(const char *device,
   (void)device;
   (void)latency;

-#ifdef ORBIS
-   psp->buffer      = (uint32_t*)
-      malloc(AUDIO_BUFFER_SIZE * sizeof(uint32_t));
-#else
   /* Cache aligned, not necessary but helpful. */
   psp->buffer      = (uint32_t*)
      memalign(64, AUDIO_BUFFER_SIZE * sizeof(uint32_t));
-#endif
   memset(psp->buffer, 0, AUDIO_BUFFER_SIZE * sizeof(uint32_t));
-
-#ifdef ORBIS
-   psp->zeroBuffer      = (uint32_t*)
-      malloc(AUDIO_OUT_COUNT * sizeof(uint32_t));
-#else
   psp->zeroBuffer  = (uint32_t*)
      memalign(64, AUDIO_OUT_COUNT   * sizeof(uint32_t));
-#endif
   memset(psp->zeroBuffer, 0, AUDIO_OUT_COUNT * sizeof(uint32_t));

   psp->read_pos    = 0;
@@ -167,7 +143,7 @@ static void *psp_audio_init(const char *device,
   psp->cond_lock = slock_new();
   psp->cond = scond_new();

-   psp->nonblock    = false;
+   psp->nonblocking = false;
   psp->running     = true;
   psp->worker_thread = sthread_create(audioMainLoop, psp);

@@ -186,7 +162,7 @@ static void psp_audio_free(void *data)
            psp->running = false;
            sthread_join(psp->worker_thread);
      }
-
+      
      if (psp->cond)
            scond_free(psp->cond);
      if (psp->fifo_lock)
@@ -202,18 +178,18 @@ static void psp_audio_free(void *data)

 static ssize_t psp_audio_write(void *data, const void *buf, size_t size)
 {
-   psp_audio_t* psp     = (psp_audio_t*)data;
+   psp_audio_t* psp = (psp_audio_t*)data;
   uint16_t write_pos   = psp->write_pos;
   uint16_t sampleCount = size / sizeof(uint32_t);
-
+   
   if (!psp->running)
      return -1;

-   if (psp->nonblock)
+   if (psp->nonblocking)
   {
      if (AUDIO_BUFFER_SIZE - ((uint16_t)
-               (psp->write_pos - psp->read_pos) & AUDIO_BUFFER_SIZE_MASK) < size)
-         return 0;
+            (psp->write_pos - psp->read_pos) & AUDIO_BUFFER_SIZE_MASK) < size)
+      return 0;
   }

   slock_lock(psp->cond_lock);
@@ -241,6 +217,7 @@ static ssize_t psp_audio_write(void *data, const void *buf, size_t size)
   slock_unlock(psp->fifo_lock);
   return size;

+   
 }

 static bool psp_audio_alive(void *data)
@@ -251,6 +228,7 @@ static bool psp_audio_alive(void *data)
   return psp->running;
 }

+
 static bool psp_audio_stop(void *data)
 {
   psp_audio_t* psp = (psp_audio_t*)data;
@@ -287,7 +265,7 @@ static void psp_audio_set_nonblock_state(void *data, bool toggle)
 {
   psp_audio_t* psp = (psp_audio_t*)data;
   if (psp)
-      psp->nonblock = toggle;
+      psp->nonblocking = toggle;
 }

 static bool psp_audio_use_float(void *data)
@@ -316,6 +294,7 @@ static size_t psp_buffer_size(void *data)
   return AUDIO_BUFFER_SIZE /** sizeof(uint32_t)*/;
 }

+
 audio_driver_t audio_psp = {
   psp_audio_init,
   psp_audio_write,
@@ -325,10 +304,8 @@ audio_driver_t audio_psp = {
   psp_audio_set_nonblock_state,
   psp_audio_free,
   psp_audio_use_float,
-#if defined(VITA)
+#ifdef VITA
   "vita",
-#elif defined(ORBIS)
-   "orbis",
 #else
   "psp",
 #endif
@@ -23,7 +23,7 @@
 #include <retro_miscellaneous.h>
 #include <retro_endianness.h>

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

 typedef struct
@@ -237,19 +237,12 @@ error:
   return NULL;
 }

-static bool pulse_start(void *data, bool is_shutdown);
 static ssize_t pulse_write(void *data, const void *buf_, size_t size)
 {
   pa_t           *pa = (pa_t*)data;
   const uint8_t *buf = (const uint8_t*)buf_;
   size_t     written = 0;

-   /* Workaround buggy menu code.
-    * If a write happens while we're paused, we might never progress. */
-   if (pa->is_paused)
-      if (!pulse_start(pa, false))
-         return -1;
-
   pa_threaded_mainloop_lock(pa->mainloop);
   while (size)
   {
@@ -277,8 +270,6 @@ static bool pulse_stop(void *data)
 {
   bool ret;
   pa_t *pa = (pa_t*)data;
-   if (pa->is_paused)
-      return true;

   RARCH_LOG("[PulseAudio]: Pausing.\n");

@@ -305,8 +296,6 @@ static bool pulse_start(void *data, bool is_shutdown)
 {
   bool ret;
   pa_t *pa = (pa_t*)data;
-   if (!pa->is_paused)
-      return true;

   RARCH_LOG("[PulseAudio]: Unpausing.\n");

@@ -23,7 +23,7 @@

 #include <boolean.h>

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

 typedef struct
@@ -45,7 +45,7 @@ static void *ra_init(const char *device, unsigned rate, unsigned latency,

   (void)latency;

-   if (!(vss = roar_vs_new_simple(device, "RetroArch", rate, 2, ROAR_CODEC_PCM_S, 16, ROAR_DIR_PLAY, &err)))
+   if ((vss = roar_vs_new_simple(device, "RetroArch", rate, 2, ROAR_CODEC_PCM_S, 16, ROAR_DIR_PLAY, &err)) == NULL)
   {
      RARCH_ERR("RoarAudio: \"%s\"\n", roar_vs_strerr(err));
      free(roar);
@@ -105,11 +105,8 @@ static bool ra_alive(void *data)
 static void ra_set_nonblock_state(void *data, bool state)
 {
   roar_t *roar = (roar_t*)data;
-
   if (roar_vs_blocking(roar->vss, (state) ? ROAR_VS_FALSE : ROAR_VS_TRUE, NULL) < 0)
-   {
-      RARCH_ERR("Can't set nonblocking. Will not be able to fast-forward.\n");
-   }
+      fprintf(stderr, "RetroArch [ERROR]: Can't set nonblocking. Will not be able to fast-forward.\n");
   roar->nonblocking = state;
 }

@@ -21,26 +21,27 @@
 #include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>

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

 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)
 {
-   rsd_t *rsd        = (rsd_t*)userdata;
-   size_t avail      = FIFO_READ_AVAIL(rsd->buffer);
+   rsd_t *rsd = (rsd_t*)userdata;
+
+   size_t avail = fifo_read_avail(rsd->buffer);
   size_t write_size = bytes > avail ? avail : bytes;
   fifo_read(rsd->buffer, data, write_size);
   scond_signal(rsd->cond);
@@ -114,7 +115,7 @@ static ssize_t rs_write(void *data, const void *buf, size_t size)

      rsd_callback_lock(rsd->rd);

-      avail     = FIFO_WRITE_AVAIL(rsd->buffer);
+      avail = fifo_write_avail(rsd->buffer);
      write_amt = avail > size ? size : avail;

      fifo_write(rsd->buffer, buf, write_amt);
@@ -129,7 +130,7 @@ static ssize_t rs_write(void *data, const void *buf, size_t size)
         size_t avail;
         rsd_callback_lock(rsd->rd);

-         avail = FIFO_WRITE_AVAIL(rsd->buffer);
+         avail = fifo_write_avail(rsd->buffer);

         if (avail == 0)
         {
@@ -164,7 +165,7 @@ static bool rs_stop(void *data)

 static void rs_set_nonblock_state(void *data, bool state)
 {
-   rsd_t *rsd    = (rsd_t*)data;
+   rsd_t *rsd = (rsd_t*)data;
   rsd->nonblock = state;
 }

@@ -208,7 +209,7 @@ static size_t rs_write_avail(void *data)
   if (rsd->has_error)
      return 0;
   rsd_callback_lock(rsd->rd);
-   val = FIFO_WRITE_AVAIL(rsd->buffer);
+   val = fifo_write_avail(rsd->buffer);
   rsd_callback_unlock(rsd->rd);
   return val;
 }
@@ -106,7 +106,7 @@ enum rsd_format
   RSD_S32_NE = 0x1000,
   RSD_U32_LE = 0x2000,
   RSD_U32_BE = 0x4000,
-   RSD_U32_NE = 0x8000
+   RSD_U32_NE = 0x8000,
 };

 /* Defines operations that can be used with rsd_set_param() */
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <boolean.h>

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

 /* forward declarations */
 unsigned RWebAudioSampleRate(void);
@@ -30,69 +30,76 @@ void RWebAudioSetNonblockState(bool state);
 void RWebAudioFree(void);
 size_t RWebAudioWriteAvail(void);
 size_t RWebAudioBufferSize(void);
-
-typedef struct rweb_audio
-{
-   bool is_paused;
-} rweb_audio_t;
+static bool rwebaudio_is_paused;

 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)
 {
-   rweb_audio_t *rwebaudio = (rweb_audio_t*)calloc(1, sizeof(rweb_audio_t));
-   if (!rwebaudio)
-      return NULL;
-   if (RWebAudioInit(latency) == 1)
+   void *data           = RWebAudioInit(latency);
+
+   (void)device;
+   (void)rate;
+
+   if (data)
      *new_rate         = RWebAudioSampleRate();
-   return rwebaudio;
+   return data;
 }

 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)
 {
-   rweb_audio_t *rwebaudio = (rweb_audio_t*)data;
-   if (!rwebaudio)
-      return false;
-   rwebaudio->is_paused = true;
+   (void)data;
+   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)
 {
-   rweb_audio_t *rwebaudio = (rweb_audio_t*)data;
-   if (!rwebaudio)
-      return false;
-   return !rwebaudio->is_paused;
+   (void)data;
+   return !rwebaudio_is_paused;
 }

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

-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; }
+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;
+}

 audio_driver_t audio_rwebaudio = {
   rwebaudio_init,
@@ -14,38 +14,39 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stdint.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include <boolean.h>
 #include <rthreads/rthreads.h>
 #include <queues/fifo_queue.h>
 #include <retro_inline.h>
 #include <retro_math.h>

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

+#include <stdint.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "SDL.h"
 #include "SDL_audio.h"

 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)
 {
   sdl_audio_t  *sdl = (sdl_audio_t*)data;
-   size_t      avail = FIFO_READ_AVAIL(sdl->buffer);
+   size_t      avail = fifo_read_avail(sdl->buffer);
   size_t write_size = len > (int)avail ? avail : len;

   fifo_read(sdl->buffer, stream, write_size);
@@ -74,24 +75,19 @@ 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;
-   uint32_t sdl_subsystem_flags = SDL_WasInit(0);
+   SDL_AudioSpec spec   = {0};
+   void            *tmp = NULL;
+   sdl_audio_t *sdl     = NULL;

   (void)device;

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

   sdl = (sdl_audio_t*)calloc(1, sizeof(*sdl));
   if (!sdl)
@@ -155,7 +151,7 @@ static ssize_t sdl_audio_write(void *data, const void *buf, size_t size)
      size_t avail, write_amt;

      SDL_LockAudio();
-      avail = FIFO_WRITE_AVAIL(sdl->buffer);
+      avail = fifo_write_avail(sdl->buffer);
      write_amt = avail > size ? size : avail;
      fifo_write(sdl->buffer, buf, write_amt);
      SDL_UnlockAudio();
@@ -170,7 +166,7 @@ static ssize_t sdl_audio_write(void *data, const void *buf, size_t size)
         size_t avail;

         SDL_LockAudio();
-         avail = FIFO_WRITE_AVAIL(sdl->buffer);
+         avail = fifo_write_avail(sdl->buffer);

         if (avail == 0)
         {
@@ -232,6 +228,7 @@ static void sdl_audio_free(void *data)
   sdl_audio_t *sdl = (sdl_audio_t*)data;

   SDL_CloseAudio();
+   SDL_QuitSubSystem(SDL_INIT_AUDIO);

   if (sdl)
   {
@@ -20,7 +20,7 @@
 #include <stdint.h>

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

 #ifdef HAVE_LIBNX
@@ -29,11 +29,10 @@
 #define BUFFER_COUNT 3
 #endif

-
-#define SAMPLE_RATE 48000
-#define NUM_CHANNELS 2
-
-#define SAMPLE_BUFFER_SIZE (((SAMPLE_RATE * NUM_CHANNELS * sizeof(uint16_t)) + 0xfff) & ~0xfff)
+static const int sample_rate           = 48000;
+static const int max_num_samples       = sample_rate;
+static const int num_channels          = 2;
+static const size_t sample_buffer_size = ((max_num_samples * num_channels * sizeof(uint16_t)) + 0xfff) & ~0xfff;

 typedef struct
 {
@@ -50,26 +49,24 @@ typedef struct
 #endif
 } switch_audio_t;

+static uint32_t switch_audio_data_size(void)
+{
 #ifdef HAVE_LIBNX
-static uint32_t switch_audio_data_size(void)
-{
-   static const int framerate    = 1000 / 30;
-   static const int sample_count = (SAMPLE_RATE / framerate);
-   return (sample_count * NUM_CHANNELS * sizeof(uint16_t));
-}
+   static const int framerate = 1000 / 30;
+   static const int samplecount = (sample_rate / framerate);
+   return (samplecount * num_channels * sizeof(uint16_t));
 #else
-static uint32_t switch_audio_data_size(void)
-{
-   return SAMPLE_BUFFER_SIZE;
-}
+   return sample_buffer_size;
 #endif
+}

 static size_t switch_audio_buffer_size(void *data)
 {
+   (void) data;
 #ifdef HAVE_LIBNX
   return (switch_audio_data_size() + 0xfff) & ~0xfff;
 #else
-   return SAMPLE_BUFFER_SIZE;
+   return sample_buffer_size;
 #endif
 }

@@ -86,7 +83,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_ERR("[Audio]: Failed to get released buffer?\n");
+         RARCH_LOG("Failed to get released buffer?\n");
         return -1;
      }

@@ -95,27 +92,29 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size)

      if (!swa->current_buffer)
      {
-         /* no buffer, nonblocking... */
-         if (!swa->blocking)
-            return 0;
-
-         while (!swa->current_buffer)
+         if (swa->blocking)
         {
-#ifndef HAVE_LIBNX
-            uint32_t handle_idx = 0;
-#endif
-            num                 = 0;
+            RARCH_LOG("No buffer, blocking...\n");
+
+            while(swa->current_buffer == NULL)
+            {
+               uint32_t handle_idx = 0;
+               num                 = 0;

 #ifdef HAVE_LIBNX
-            if (audoutWaitPlayFinish(&swa->current_buffer, &num, UINT64_MAX) != 0) { }
+               if (audoutWaitPlayFinish(&swa->current_buffer, &num, U64_MAX) != 0) { }
 #else
-            svcWaitSynchronization(&handle_idx, &swa->event, 1, 33333333);
-            svcResetSignal(swa->event);
+               svcWaitSynchronization(&handle_idx, &swa->event, 1, 33333333);
+               svcResetSignal(swa->event);

-            if (switch_audio_ipc_output_get_released_buffer(swa, num) != 0)
-               return -1;
+               if (switch_audio_ipc_output_get_released_buffer(swa, num) != 0)
+                  return -1;
 #endif
+            }
         }
+         else
+            /* no buffer, nonblocking... */
+            return 0;
      }

      swa->current_buffer->data_size = 0;
@@ -123,12 +122,12 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size)

 	if (to_write > switch_audio_buffer_size(NULL) - swa->current_buffer->data_size)
 		to_write = switch_audio_buffer_size(NULL) - swa->current_buffer->data_size;
-
-#ifndef HAVE_LIBNX
-   memcpy(((uint8_t*) swa->current_buffer->sample_data) + swa->current_buffer->data_size, buf, to_write);
-#else
-   memcpy(((uint8_t*) swa->current_buffer->buffer) + swa->current_buffer->data_size, buf, to_write);
-#endif
+	
+   #ifndef HAVE_LIBNX
+	memcpy(((uint8_t*) swa->current_buffer->sample_data) + swa->current_buffer->data_size, buf, to_write);
+   #else
+	memcpy(((uint8_t*) swa->current_buffer->buffer) + swa->current_buffer->data_size, buf, to_write);
+   #endif
 	swa->current_buffer->data_size   += to_write;
 	swa->current_buffer->buffer_size  = switch_audio_buffer_size(NULL);

@@ -140,7 +139,7 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size)
 	}

 	swa->last_append = svcGetSystemTick();
-
+	
 	return to_write;
 }

@@ -152,6 +151,7 @@ static bool switch_audio_stop(void *data)

   /* TODO/FIXME - fix libnx codepath */
 #ifndef HAVE_LIBNX
+
   if (!swa->is_paused)
 	   if (switch_audio_ipc_output_stop(swa) != 0)
 		   return false;
@@ -211,7 +211,8 @@ static void switch_audio_free(void *data)

 static bool switch_audio_use_float(void *data)
 {
-   return false; /* force INT16 */
+	(void) data;
+	return false; /* force INT16 */
 }

 static size_t switch_audio_write_avail(void *data)
@@ -238,10 +239,8 @@ static void *switch_audio_init(const char *device,
      unsigned *new_rate)
 {
   unsigned i;
-#ifndef HAVE_LIBNX
   char names[8][0x20];
   uint32_t num_names  = 0;
-#endif
   switch_audio_t *swa = (switch_audio_t*) calloc(1, sizeof(*swa));

   if (!swa)
@@ -266,16 +265,16 @@ static void *switch_audio_init(const char *device,
   if (audio_ipc_open_output(names[0], &swa->output) != 0)
      goto fail_audio_ipc;

-   if (swa->output.sample_rate != SAMPLE_RATE)
+   if (swa->output.sample_rate != sample_rate)
   {
      RARCH_ERR("expected sample rate of %d, got sample rate of %d\n",
-            SAMPLE_RATE, swa->output.sample_rate);
+            sample_rate, swa->output.sample_rate);
      goto fail_audio_output;
   }

-   if (swa->output.num_channels != NUM_CHANNELS)
+   if (swa->output.num_channels != num_channels)
   {
-      RARCH_ERR("expected %d channels, got %d\n", NUM_CHANNELS,
+      RARCH_ERR("expected %d channels, got %d\n", num_channels,
            swa->output.num_channels);
      goto fail_audio_output;
   }
@@ -300,17 +299,16 @@ static void *switch_audio_init(const char *device,
      swa->buffers[i].data_offset = 0;
      swa->buffers[i].buffer      = memalign(0x1000, switch_audio_buffer_size(NULL));

-      if (!swa->buffers[i].buffer)
+      if (swa->buffers[i].buffer == NULL)
         goto fail_audio_output;

      memset(swa->buffers[i].buffer, 0, switch_audio_buffer_size(NULL));
 #else
      swa->buffers[i].ptr         = &swa->buffers[i].sample_data;
      swa->buffers[i].unknown     = 0;
-      swa->buffers[i].sample_data = alloc_pages(SAMPLE_BUFFER_SIZE,
-            switch_audio_buffer_size(NULL), NULL);
+      swa->buffers[i].sample_data = alloc_pages(sample_buffer_size, switch_audio_buffer_size(NULL), NULL);

-      if (!swa->buffers[i].sample_data)
+      if (swa->buffers[i].sample_data == NULL)
 	      goto fail_audio_output;
 #endif

@@ -332,16 +330,15 @@ static void *switch_audio_init(const char *device,
   swa->is_paused      = true;

   RARCH_LOG("[Audio]: Audio initialized\n");
-
+   
   return swa;

 fail_audio_output:
 /* TODO/FIXME - fix libnx codepath */
 #ifndef HAVE_LIBNX
   audio_ipc_output_close(&swa->output);
-fail_audio_ipc:
 #endif
-
+fail_audio_ipc:
 /* TODO/FIXME - fix libnx codepath */
 #ifndef HAVE_LIBNX
   audio_ipc_finalize();
@@ -17,7 +17,7 @@ typedef Thread compat_thread;
 typedef CondVar compat_condvar;

 #define compat_thread_create(thread, func, data, stack_size, prio, cpu) \
-   threadCreate(thread, func, data, NULL, stack_size, prio, cpu)
+   threadCreate(thread, func, data, stack_size, prio, cpu)
 #define compat_thread_start(thread) \
   threadStart(thread)
 #define compat_thread_join(thread) \
@@ -46,10 +46,6 @@ typedef AudioOutBuffer compat_audio_out_buffer;
 #define switch_audio_ipc_output_stop(a) audoutStopAudioOut()
 #define switch_audio_ipc_output_start(a) audoutStartAudioOut()

-#ifndef UINT64_MAX
-#define UINT64_MAX U64_MAX
-#endif
-
 #else

 /* libtransistor definitions */
@@ -1,368 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2019      - misson20000
- *  Copyright (C) 2019      - m4xw
- *  Copyright (C) 2019      - lifajucejo
- *  Copyright (C) 2019      - p-sam
- *
- *  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 <string.h>
-#include <malloc.h>
-#include <stdint.h>
-
-#include <switch.h>
-
-#include "../../retroarch.h"
-#include "../../verbosity.h"
-
-#define BUFFER_COUNT 5
-
-static const int sample_rate           = 48000;
-static const int num_channels          = 2;
-static const uint8_t sink_channels[]   = { 0, 1 };
-
-static const AudioRendererConfig audio_renderer_config =
-{
-   .output_rate     = AudioRendererOutputRate_48kHz,
-   .num_voices      = 24,
-   .num_effects     = 0,
-   .num_sinks       = 1,
-   .num_mix_objs    = 1,
-   .num_mix_buffers = 2,
-};
-
-typedef struct
-{
-   AudioDriver drv;
-   void* mempool;
-   AudioDriverWaveBuf wavebufs[BUFFER_COUNT];
-   AudioDriverWaveBuf* current_wavebuf;
-   void* current_pool_ptr;
-   size_t current_size;
-   size_t buffer_size;
-   size_t samples;
-   Mutex update_lock;
-   bool nonblock;
-} libnx_audren_t;
-
-static void *libnx_audren_audio_init(
-      const char *device, unsigned rate, unsigned latency,
-      unsigned block_frames,
-      unsigned *new_rate)
-{
-   unsigned i, j;
-   libnx_audren_t *aud;
-   Result rc;
-   int mpid;
-   size_t mempool_size;
-   unsigned real_latency;
-
-   RARCH_LOG("[Audio]: Using libnx_audren driver\n");
-
-   aud = (libnx_audren_t*)calloc(1, sizeof(libnx_audren_t));
-
-   if (!aud)
-   {
-      RARCH_ERR("[Audio]: struct alloc failed\n");
-      goto fail;
-   }
-
-   real_latency = MAX(5, latency);
-   RARCH_LOG("[Audio]: real_latency is %u\n", real_latency);
-
-   aud->nonblock     = !block_frames;
-   aud->buffer_size  = (real_latency * sample_rate / 1000);
-   aud->samples      = (aud->buffer_size / num_channels / sizeof(int16_t));
-   aud->current_size = 0;
-   *new_rate         = sample_rate;
-
-   mempool_size      = (aud->buffer_size * BUFFER_COUNT + (AUDREN_MEMPOOL_ALIGNMENT-1)) &~ (AUDREN_MEMPOOL_ALIGNMENT-1);
-   aud->mempool      = memalign(AUDREN_MEMPOOL_ALIGNMENT, mempool_size);
-   if (!aud->mempool)
-   {
-      RARCH_ERR("[Audio]: mempool alloc failed\n");
-      goto fail;
-   }
-
-   rc = audrenInitialize(&audio_renderer_config);
-   if (R_FAILED(rc))
-   {
-      RARCH_ERR("[Audio]: audrenInitialize: %x\n", rc);
-      goto fail;
-   }
-
-   rc = audrvCreate(&aud->drv, &audio_renderer_config, num_channels);
-   if (R_FAILED(rc))
-   {
-      RARCH_ERR("[Audio]: audrvCreate: %x\n", rc);
-      goto fail_init;
-   }
-
-   for(i = 0; i < BUFFER_COUNT; i++)
-   {
-      aud->wavebufs[i].data_raw = aud->mempool;
-      aud->wavebufs[i].size = mempool_size;
-      aud->wavebufs[i].start_sample_offset = i * aud->samples;
-      aud->wavebufs[i].end_sample_offset = aud->wavebufs[i].start_sample_offset + aud->samples;
-   }
-
-   aud->current_wavebuf = NULL;
-
-   mpid = audrvMemPoolAdd(&aud->drv, aud->mempool, mempool_size);
-   audrvMemPoolAttach(&aud->drv, mpid);
-
-   audrvDeviceSinkAdd(&aud->drv, AUDREN_DEFAULT_DEVICE_NAME, num_channels, sink_channels);
-
-   rc = audrenStartAudioRenderer();
-   if (R_FAILED(rc))
-   {
-      RARCH_ERR("[Audio]: audrenStartAudioRenderer: %x\n", rc);
-   }
-
-   audrvVoiceInit(&aud->drv, 0, num_channels, PcmFormat_Int16, sample_rate);
-   audrvVoiceSetDestinationMix(&aud->drv, 0, AUDREN_FINAL_MIX_ID);
-   for(i = 0; i < num_channels; i++)
-   {
-      for(j = 0; j < num_channels; j++)
-      {
-         audrvVoiceSetMixFactor(&aud->drv, 0, i == j ? 1.0f : 0.0f, i, j);
-      }
-   }
-
-   mutexInit(&aud->update_lock);
-   *new_rate = sample_rate;
-
-   return aud;
-
-fail_init:
-   audrenExit();
-
-fail:
-   if (aud)
-   {
-      if (aud->mempool)
-         free(aud->mempool);
-
-      free(aud);
-   }
-
-   return NULL;
-}
-
-static size_t libnx_audren_audio_buffer_size(void *data)
-{
-   libnx_audren_t *aud = (libnx_audren_t*)data;
-
-   if (!aud)
-      return 0;
-
-   return aud->buffer_size;
-}
-
-static ssize_t libnx_audren_audio_get_free_wavebuf_idx(libnx_audren_t* aud)
-{
-   unsigned i;
-
-   for (i = 0; i < BUFFER_COUNT; i++)
-   {
-      if (
-            aud->wavebufs[i].state == AudioDriverWaveBufState_Free
-         || aud->wavebufs[i].state == AudioDriverWaveBufState_Done)
-         return i;
-   }
-
-   return -1;
-}
-
-static size_t libnx_audren_audio_append(
-      libnx_audren_t* aud, const void *buf, size_t size)
-{
-   void *dstbuf     = NULL;
-   ssize_t free_idx = -1;
-
-   if (!aud->current_wavebuf)
-   {
-      free_idx = libnx_audren_audio_get_free_wavebuf_idx(aud);
-      if (free_idx == -1)
-         return 0;
-
-      aud->current_wavebuf = &aud->wavebufs[free_idx];
-      aud->current_pool_ptr = aud->mempool + (free_idx * aud->buffer_size);
-      aud->current_size = 0;
-   }
-
-   if (size > aud->buffer_size - aud->current_size)
-      size = aud->buffer_size - aud->current_size;
-
-   dstbuf = aud->current_pool_ptr + aud->current_size;
-   memcpy(dstbuf, buf, size);
-   armDCacheFlush(dstbuf, size);
-
-   aud->current_size += size;
-
-   if (aud->current_size == aud->buffer_size)
-   {
-      audrvVoiceAddWaveBuf(&aud->drv, 0, aud->current_wavebuf);
-
-      mutexLock(&aud->update_lock);
-      audrvUpdate(&aud->drv);
-      mutexUnlock(&aud->update_lock);
-
-      if (!audrvVoiceIsPlaying(&aud->drv, 0))
-      {
-         audrvVoiceStart(&aud->drv, 0);
-      }
-
-      aud->current_wavebuf = NULL;
-   }
-
-   return size;
-}
-
-static ssize_t libnx_audren_audio_write(void *data,
-      const void *buf, size_t size)
-{
-   libnx_audren_t *aud = (libnx_audren_t*)data;
-   size_t written      = 0;
-
-   if (!aud)
-      return -1;
-
-   if (aud->nonblock)
-   {
-      while (written < size)
-      {
-         written += libnx_audren_audio_append(
-               aud, buf + written, size - written);
-         if (written != size)
-            break;
-      }
-   }
-   else
-   {
-      while (written < size)
-      {
-         written += libnx_audren_audio_append(
-               aud, buf + written, size - written);
-         if (written != size)
-         {
-            mutexLock(&aud->update_lock);
-            audrvUpdate(&aud->drv);
-            mutexUnlock(&aud->update_lock);
-            audrenWaitFrame();
-         }
-      }
-   }
-
-   return written;
-}
-
-static bool libnx_audren_audio_stop(void *data)
-{
-   libnx_audren_t *aud = (libnx_audren_t*)data;
-
-   if (!aud)
-      return false;
-
-   audrvVoiceStop(&aud->drv, 0);
-
-   return true;
-}
-
-static bool libnx_audren_audio_start(void *data, bool is_shutdown)
-{
-   (void)is_shutdown;
-   libnx_audren_t *aud = (libnx_audren_t*)data;
-
-   if (!aud)
-      return false;
-
-   audrvVoiceStart(&aud->drv, 0);
-
-   return true;
-}
-
-static bool libnx_audren_audio_alive(void *data)
-{
-   libnx_audren_t *aud = (libnx_audren_t*)data;
-
-   if (!aud)
-      return false;
-
-   return true;
-}
-
-static void libnx_audren_audio_free(void *data)
-{
-   libnx_audren_t *aud = (libnx_audren_t*)data;
-
-   if (!aud)
-      return;
-
-   audrvVoiceStop(&aud->drv, 0);
-   audrvClose(&aud->drv);
-   audrenExit();
-
-   if (aud->mempool)
-   {
-      free(aud->mempool);
-   }
-
-   free(aud);
-}
-
-static bool libnx_audren_audio_use_float(void *data)
-{
-   (void)data;
-   return false; /* force S16 */
-}
-
-static size_t libnx_audren_audio_write_avail(void *data)
-{
-   libnx_audren_t *aud = (libnx_audren_t*)data;
-   size_t avail;
-
-   if (!aud || !aud->current_wavebuf)
-      return 0;
-
-   avail = aud->buffer_size - aud->current_size;
-
-   return avail;
-}
-
-static void libnx_audren_audio_set_nonblock_state(void *data, bool state)
-{
-   libnx_audren_t *aud = (libnx_audren_t*)data;
-
-   if (!aud)
-      return;
-
-   aud->nonblock    = state;
-}
-
-audio_driver_t audio_switch_libnx_audren = {
-   libnx_audren_audio_init,
-   libnx_audren_audio_write,
-   libnx_audren_audio_stop,
-   libnx_audren_audio_start,
-   libnx_audren_audio_alive,
-   libnx_audren_audio_set_nonblock_state,
-   libnx_audren_audio_free,
-   libnx_audren_audio_use_float,
-   "switch_audren",
-   NULL, /* device_list_new */
-   NULL, /* device_list_free */
-   libnx_audren_audio_write_avail,
-   libnx_audren_audio_buffer_size,
-};
@@ -1,440 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2019      - p-sam
- *
- *  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 <string.h>
-#include <malloc.h>
-#include <stdint.h>
-
-#include <switch.h>
-
-#include <queues/fifo_queue.h>
-#include "../../retroarch.h"
-#include "../../verbosity.h"
-#include "../../tasks/tasks_internal.h"
-
-#define BUFFER_COUNT 5
-
-static const int sample_rate           = 48000;
-static const int num_channels          = 2;
-static const uint8_t sink_channels[]   = { 0, 1 };
-static const size_t thread_stack_size  = 1024 * 8;
-static const int thread_preferred_cpu  = 2;
-
-static const AudioRendererConfig audio_renderer_config =
-{
-   .output_rate     = AudioRendererOutputRate_48kHz,
-   .num_voices      = 24,
-   .num_effects     = 0,
-   .num_sinks       = 1,
-   .num_mix_objs    = 1,
-   .num_mix_buffers = 2,
-};
-
-typedef struct
-{
-   AudioDriver drv;
-   void* mempool;
-   AudioDriverWaveBuf wavebufs[BUFFER_COUNT];
-   size_t buffer_size;
-   size_t samples;
-   bool nonblock;
-
-   fifo_buffer_t* fifo;
-   Mutex fifo_lock;
-   CondVar fifo_condvar;
-   Mutex fifo_condlock;
-   Thread thread;
-
-   volatile bool running;
-   volatile bool paused;
-} libnx_audren_thread_t;
-
-static void thread_job(void* data)
-{
-   unsigned i;
-   libnx_audren_thread_t *aud          = (libnx_audren_thread_t*)data;
-   size_t available                    = 0;
-   size_t current_size                 = 0;
-   size_t written_tmp                  = 0;
-   AudioDriverWaveBuf* current_wavebuf = NULL;
-   void* current_pool_ptr              = NULL;
-   void* dstbuf                        = NULL;
-
-   if (!aud)
-      return;
-
-   while (aud->running)
-   {
-      if (!current_wavebuf)
-      {
-         for (i = 0; i < BUFFER_COUNT; i++)
-         {
-            if (aud->wavebufs[i].state == AudioDriverWaveBufState_Free
-               || aud->wavebufs[i].state == AudioDriverWaveBufState_Done)
-            {
-               current_wavebuf = &aud->wavebufs[i];
-               current_pool_ptr = aud->mempool + (i * aud->buffer_size);
-               current_size = 0;
-               break;
-            }
-         }
-      }
-
-      if (current_wavebuf)
-      {
-         mutexLock(&aud->fifo_lock);
-         available = aud->paused ? 0 : FIFO_READ_AVAIL(aud->fifo);
-         written_tmp = MIN(available, aud->buffer_size - current_size);
-         dstbuf = current_pool_ptr + current_size;
-         if (written_tmp > 0)
-            fifo_read(aud->fifo, dstbuf, written_tmp);
-         mutexUnlock(&aud->fifo_lock);
-
-         if (written_tmp > 0)
-         {
-            condvarWakeAll(&aud->fifo_condvar);
-
-            current_size += written_tmp;
-            armDCacheFlush(dstbuf, written_tmp);
-         }
-
-         if (current_size == aud->buffer_size)
-         {
-            audrvVoiceAddWaveBuf(&aud->drv, 0, current_wavebuf);
-
-            audrvUpdate(&aud->drv);
-            if (!audrvVoiceIsPlaying(&aud->drv, 0))
-            {
-               audrvVoiceStart(&aud->drv, 0);
-            }
-
-            current_wavebuf = NULL;
-         }
-
-         svcSleepThread(1000UL);
-      }
-      else
-      {
-         audrvUpdate(&aud->drv);
-         audrenWaitFrame();
-      }
-   }
-}
-
-static void *libnx_audren_thread_audio_init(const char *device, unsigned rate, unsigned latency,
-      unsigned block_frames,
-      unsigned *new_rate)
-{
-   unsigned i, j;
-   libnx_audren_thread_t *aud;
-   Result rc;
-   int mpid;
-   size_t mempool_size;
-   unsigned real_latency;
-   int32_t thread_priority;
-
-   RARCH_LOG("[Audio]: Using libnx_audren_thread driver\n");
-
-   aud = (libnx_audren_thread_t*)calloc(1, sizeof(libnx_audren_thread_t));
-
-   if (!aud)
-   {
-      RARCH_ERR("[Audio]: struct alloc failed\n");
-      goto fail;
-   }
-
-   real_latency     = MAX(latency, 5);
-   RARCH_LOG("[Audio]: real_latency is %u\n", real_latency);
-
-   aud->running     = true;
-   aud->paused      = false;
-   aud->nonblock    = !block_frames;
-   aud->buffer_size = (real_latency * sample_rate / 1000);
-   aud->samples     = (aud->buffer_size / num_channels / sizeof(int16_t));
-
-   mempool_size     = (aud->buffer_size * BUFFER_COUNT + 
-         (AUDREN_MEMPOOL_ALIGNMENT-1)) &~ (AUDREN_MEMPOOL_ALIGNMENT-1);
-   aud->mempool     = memalign(AUDREN_MEMPOOL_ALIGNMENT, mempool_size);
-
-   if (!aud->mempool)
-   {
-      RARCH_ERR("[Audio]: mempool alloc failed\n");
-      goto fail;
-   }
-
-   rc = audrenInitialize(&audio_renderer_config);
-   if (R_FAILED(rc))
-   {
-      RARCH_ERR("[Audio]: audrenInitialize: %x\n", rc);
-      goto fail;
-   }
-
-   rc = audrvCreate(&aud->drv, &audio_renderer_config, num_channels);
-   if (R_FAILED(rc))
-   {
-      RARCH_ERR("[Audio]: audrvCreate: %x\n", rc);
-      goto fail_init;
-   }
-
-   for (i = 0; i < BUFFER_COUNT; i++)
-   {
-      aud->wavebufs[i].data_raw            = aud->mempool;
-      aud->wavebufs[i].size                = mempool_size;
-      aud->wavebufs[i].start_sample_offset = i * aud->samples;
-      aud->wavebufs[i].end_sample_offset   = aud->wavebufs[i].start_sample_offset + aud->samples;
-   }
-
-   mpid = audrvMemPoolAdd(&aud->drv, aud->mempool, mempool_size);
-   audrvMemPoolAttach(&aud->drv, mpid);
-
-   audrvDeviceSinkAdd(&aud->drv, AUDREN_DEFAULT_DEVICE_NAME,
-         num_channels, sink_channels);
-
-   rc = audrenStartAudioRenderer();
-   if (R_FAILED(rc))
-   {
-      RARCH_ERR("[Audio]: audrenStartAudioRenderer: %x\n", rc);
-   }
-
-   audrvVoiceInit(&aud->drv, 0, num_channels, PcmFormat_Int16, sample_rate);
-   audrvVoiceSetDestinationMix(&aud->drv, 0, AUDREN_FINAL_MIX_ID);
-   for (i = 0; i < num_channels; i++)
-   {
-      for (j = 0; j < num_channels; j++)
-      {
-         audrvVoiceSetMixFactor(&aud->drv, 0, i == j ? 1.0f : 0.0f, i, j);
-      }
-   }
-
-   aud->fifo = fifo_new(aud->buffer_size);
-   if (!aud->fifo)
-   {
-      RARCH_ERR("[Audio]: fifo alloc failed\n");
-      goto fail_drv;
-   }
-
-   mutexInit(&aud->fifo_lock);
-   condvarInit(&aud->fifo_condvar);
-   mutexInit(&aud->fifo_condlock);
-
-   svcGetThreadPriority(&thread_priority, CUR_THREAD_HANDLE);
-   rc = threadCreate(&aud->thread, &thread_job,
-         (void*)aud, NULL, thread_stack_size,
-         thread_priority - 1, thread_preferred_cpu);
-   if (R_FAILED(rc))
-   {
-      RARCH_ERR("[Audio]: threadCreate: %x\n", rc);
-      goto fail_drv;
-   }
-
-   rc = threadStart(&aud->thread);
-   if (R_FAILED(rc))
-   {
-      RARCH_ERR("[Audio]: threadStart: %x\n", rc);
-      threadClose(&aud->thread);
-      goto fail_drv;
-   }
-
-   *new_rate = sample_rate;
-
-   return aud;
-
-fail_drv:
-   audrvClose(&aud->drv);
-
-fail_init:
-   audrenExit();
-
-fail:
-   if (aud)
-   {
-      if (aud->mempool)
-         free(aud->mempool);
-
-      free(aud);
-   }
-
-   return NULL;
-}
-
-static size_t libnx_audren_thread_audio_buffer_size(void *data)
-{
-   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
-
-   if (!aud)
-      return 0;
-
-   return aud->buffer_size;
-}
-
-static ssize_t libnx_audren_thread_audio_write(void *data,
-      const void *buf, size_t size)
-{
-   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
-   size_t available, written, written_tmp;
-
-   if (!aud || !aud->running)
-      return -1;
-
-   if (aud->paused)
-      return 0;
-
-   if (aud->nonblock)
-   {
-      mutexLock(&aud->fifo_lock);
-      available = FIFO_WRITE_AVAIL(aud->fifo);
-      written = MIN(available, size);
-      if (written > 0)
-         fifo_write(aud->fifo, buf, written);
-      mutexUnlock(&aud->fifo_lock);
-   }
-   else
-   {
-      written = 0;
-      while (written < size && aud->running)
-      {
-         mutexLock(&aud->fifo_lock);
-         available = FIFO_WRITE_AVAIL(aud->fifo);
-         if (available)
-         {
-            written_tmp = MIN(size - written, available);
-            fifo_write(aud->fifo, (const char*)buf + written, written_tmp);
-            mutexUnlock(&aud->fifo_lock);
-            written += written_tmp;
-         }
-         else
-         {
-            mutexUnlock(&aud->fifo_lock);
-            mutexLock(&aud->fifo_condlock);
-            condvarWait(&aud->fifo_condvar, &aud->fifo_condlock);
-            mutexUnlock(&aud->fifo_condlock);
-         }
-      }
-   }
-
-   return written;
-}
-
-static bool libnx_audren_thread_audio_stop(void *data)
-{
-   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
-
-   if (!aud)
-      return false;
-
-   aud->paused = true;
-
-   return true;
-}
-
-static bool libnx_audren_thread_audio_start(void *data, bool is_shutdown)
-{
-   (void)is_shutdown;
-   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
-
-   if (!aud)
-      return false;
-
-   aud->paused = false;
-
-   return true;
-}
-
-static bool libnx_audren_thread_audio_alive(void *data)
-{
-   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
-
-   if (!aud)
-      return false;
-
-   return true;
-}
-
-static void libnx_audren_thread_audio_free(void *data)
-{
-   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
-
-   if (!aud)
-      return;
-
-   aud->running = false;
-   mutexUnlock(&aud->fifo_lock);
-   threadWaitForExit(&aud->thread);
-   threadClose(&aud->thread);
-   audrvVoiceStop(&aud->drv, 0);
-   audrvClose(&aud->drv);
-   audrenExit();
-
-   if (aud->mempool)
-   {
-      free(aud->mempool);
-   }
-
-   if (aud->fifo)
-   {
-      fifo_clear(aud->fifo);
-      fifo_free(aud->fifo);
-   }
-
-   free(aud);
-}
-
-static bool libnx_audren_thread_audio_use_float(void *data)
-{
-   (void)data;
-   return false; /* force S16 */
-}
-
-static size_t libnx_audren_thread_audio_write_avail(void *data)
-{
-   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
-   size_t available;
-
-   if (!aud)
-      return 0;
-
-   mutexLock(&aud->fifo_lock);
-   available = FIFO_WRITE_AVAIL(aud->fifo);
-   mutexUnlock(&aud->fifo_lock);
-
-   return available;
-}
-
-static void libnx_audren_thread_audio_set_nonblock_state(void *data, bool state)
-{
-   libnx_audren_thread_t *aud = (libnx_audren_thread_t*)data;
-
-   if (!aud)
-      return;
-
-   aud->nonblock = state;
-}
-
-audio_driver_t audio_switch_libnx_audren_thread = {
-   libnx_audren_thread_audio_init,
-   libnx_audren_thread_audio_write,
-   libnx_audren_thread_audio_stop,
-   libnx_audren_thread_audio_start,
-   libnx_audren_thread_audio_alive,
-   libnx_audren_thread_audio_set_nonblock_state,
-   libnx_audren_thread_audio_free,
-   libnx_audren_thread_audio_use_float,
-   "switch_audren_thread",
-   NULL, /* device_list_new */
-   NULL, /* device_list_free */
-   libnx_audren_thread_audio_write_avail,
-   libnx_audren_thread_audio_buffer_size,
-};
@@ -28,16 +28,18 @@
 #endif

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

 #include "../../tasks/tasks_internal.h"

 #include "switch_audio_compat.h"

-#define THREAD_STACK_SIZE (1024 * 8)
-#define THREAD_PREFERRED_CPU  2
-#define SAMPLE_SIZE sizeof(uint16_t)
+static const size_t thread_stack_size = 1024 * 8;
+static const int thread_preferred_cpu = 2;
+static const int channel_count = 2;
+static const size_t sample_size = sizeof(uint16_t);
+static const size_t frame_size = channel_count * sample_size;

 #define AUDIO_BUFFER_COUNT 2

@@ -51,7 +53,7 @@ typedef struct
   size_t fifoSize;

   volatile bool running;
-   bool nonblock;
+   bool nonblocking;
   bool is_paused;

   compat_audio_out_buffer buffers[AUDIO_BUFFER_COUNT];
@@ -78,6 +80,7 @@ static void mainLoop(void* data)

   RARCH_LOG("[Audio]: start mainLoop cpu %u tid %u\n", svcGetCurrentProcessorNumber(), swa->thread.handle);

+
   while (swa->running)
   {
      size_t buf_avail, avail, to_write;
@@ -85,7 +88,7 @@ static void mainLoop(void* data)
      if (!released_out_buffer)
      {
 #ifdef HAVE_LIBNX
-         rc = audoutWaitPlayFinish(&released_out_buffer, &released_out_count, UINT64_MAX);
+         rc = audoutWaitPlayFinish(&released_out_buffer, &released_out_count, U64_MAX);
 #else
         uint32_t handle_idx = 0;
         svcWaitSynchronization(&handle_idx, &swa->event, 1, 33333333);
@@ -106,7 +109,7 @@ static void mainLoop(void* data)

      compat_mutex_lock(&swa->fifoLock);

-      avail    = FIFO_READ_AVAIL(swa->fifo);
+      avail    = fifo_read_avail(swa->fifo);
      to_write = MIN(avail, buf_avail);
      if (to_write > 0)
      {
@@ -142,17 +145,15 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
   Result rc;
   unsigned i;
   uint32_t prio;
-#ifndef HAVE_LIBNX
   char names[8][0x20];
   uint32_t num_names  = 0;
-#endif
   switch_thread_audio_t *swa = (switch_thread_audio_t *)calloc(1, sizeof(*swa));

   if (!swa)
      return NULL;

   swa->running     = true;
-   swa->nonblock    = true;
+   swa->nonblocking = true;
   swa->is_paused   = true;
   swa->latency     = MAX(latency, 8);

@@ -206,7 +207,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
 #endif

   *new_rate     = swa->sampleRate;
-   swa->fifoSize = (swa->sampleRate * SAMPLE_SIZE * swa->latency) / 1000;
+   swa->fifoSize = (swa->sampleRate * sample_size * swa->latency) / 1000;

   for (i = 0; i < AUDIO_BUFFER_COUNT; i++)
   {
@@ -217,7 +218,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
      swa->buffers[i].data_size   = swa->buffers[i].buffer_size;
      swa->buffers[i].buffer      = memalign(0x1000, swa->buffers[i].buffer_size);

-      if (!swa->buffers[i].buffer)
+      if (swa->buffers[i].buffer == NULL)
         goto fail;

      memset(swa->buffers[i].buffer, 0, swa->buffers[i].buffer_size);
@@ -228,7 +229,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
      swa->buffers[i].data_size   = swa->buffers[i].buffer_size;
      swa->buffers[i].sample_data = alloc_pages(swa->buffers[i].buffer_size, swa->buffers[i].buffer_size, NULL);

-      if (!swa->buffers[i].sample_data)
+      if (swa->buffers[i].sample_data == NULL)
 	      goto fail_audio_output;

      memset(swa->buffers[i].sample_data, 0, swa->buffers[i].buffer_size);
@@ -237,7 +238,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
      if (switch_audio_ipc_output_append_buffer(swa, &swa->buffers[i]) != 0)
         goto fail_audio_output;
   }
-
+   
   compat_mutex_create(&swa->fifoLock);
   swa->fifo = fifo_new(swa->fifoSize);

@@ -247,7 +248,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne
         device, rate, swa->sampleRate, swa->latency, block_frames, swa->fifoSize);

   svcGetThreadPriority(&prio, 0xffff8000);
-   rc = compat_thread_create(&swa->thread, &mainLoop, (void*)swa, THREAD_STACK_SIZE, prio - 1, THREAD_PREFERRED_CPU);
+   rc = compat_thread_create(&swa->thread, &mainLoop, (void*)swa, thread_stack_size, prio - 1, thread_preferred_cpu);

   if (R_FAILED(rc))
   {
@@ -345,10 +346,10 @@ static ssize_t switch_thread_audio_write(void *data, const void *buf, size_t siz
   if (!swa || !swa->running)
         return 0;

-   if (swa->nonblock)
+   if (swa->nonblocking)
   {
      compat_mutex_lock(&swa->fifoLock);
-      avail = FIFO_WRITE_AVAIL(swa->fifo);
+      avail = fifo_write_avail(swa->fifo);
      written = MIN(avail, size);
      if (written > 0)
         fifo_write(swa->fifo, buf, written);
@@ -360,7 +361,7 @@ static ssize_t switch_thread_audio_write(void *data, const void *buf, size_t siz
      while (written < size && swa->running)
      {
         compat_mutex_lock(&swa->fifoLock);
-         avail = FIFO_WRITE_AVAIL(swa->fifo);
+         avail = fifo_write_avail(swa->fifo);
         if (avail == 0)
         {
            compat_mutex_unlock(&swa->fifoLock);
@@ -397,7 +398,7 @@ static void switch_thread_audio_set_nonblock_state(void *data, bool state)
   switch_thread_audio_t *swa = (switch_thread_audio_t *)data;

   if (swa)
-      swa->nonblock = state;
+      swa->nonblocking = state;
 }

 static bool switch_thread_audio_use_float(void *data)
@@ -412,7 +413,7 @@ static size_t switch_thread_audio_write_avail(void *data)
   switch_thread_audio_t* swa = (switch_thread_audio_t*)data;

   compat_mutex_lock(&swa->fifoLock);
-   val = FIFO_WRITE_AVAIL(swa->fifo);
+   val = fifo_write_avail(swa->fifo);
   compat_mutex_unlock(&swa->fifoLock);

   return val;
@@ -64,7 +64,7 @@
 #include <retro_inline.h>
 #include <retro_endianness.h>

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

 /* Implementation tinyalsa pcm */
@@ -174,17 +174,17 @@
 #define SNDRV_PCM_IOCTL_LINK		_IOW('A', 0x60, int)
 #define SNDRV_PCM_IOCTL_UNLINK		_IO('A', 0x61)

-#define	SNDRV_PCM_ACCESS_MMAP_INTERLEAVED	(( tinyalsa_snd_pcm_access_t) 0) /* interleaved mmap */
-#define	SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED	(( tinyalsa_snd_pcm_access_t) 1) /* noninterleaved mmap */
-#define	SNDRV_PCM_ACCESS_MMAP_COMPLEX		(( tinyalsa_snd_pcm_access_t) 2) /* complex mmap */
-#define	SNDRV_PCM_ACCESS_RW_INTERLEAVED		(( tinyalsa_snd_pcm_access_t) 3) /* readi/writei */
-#define	SNDRV_PCM_ACCESS_RW_NONINTERLEAVED	(( tinyalsa_snd_pcm_access_t) 4) /* readn/writen */
+#define	SNDRV_PCM_ACCESS_MMAP_INTERLEAVED	(( snd_pcm_access_t) 0) /* interleaved mmap */
+#define	SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED	(( snd_pcm_access_t) 1) /* noninterleaved mmap */
+#define	SNDRV_PCM_ACCESS_MMAP_COMPLEX		(( snd_pcm_access_t) 2) /* complex mmap */
+#define	SNDRV_PCM_ACCESS_RW_INTERLEAVED		(( snd_pcm_access_t) 3) /* readi/writei */
+#define	SNDRV_PCM_ACCESS_RW_NONINTERLEAVED	(( snd_pcm_access_t) 4) /* readn/writen */
 #define	SNDRV_PCM_ACCESS_LAST		SNDRV_PCM_ACCESS_RW_NONINTERLEAVED

-#define	SNDRV_PCM_SUBFORMAT_STD		(( tinyalsa_snd_pcm_subformat_t) 0)
+#define	SNDRV_PCM_SUBFORMAT_STD		(( snd_pcm_subformat_t) 0)
 #define	SNDRV_PCM_SUBFORMAT_LAST	SNDRV_PCM_SUBFORMAT_STD

-#define	SNDRV_PCM_SUBFORMAT_STD		(( tinyalsa_snd_pcm_subformat_t) 0)
+#define	SNDRV_PCM_SUBFORMAT_STD		(( snd_pcm_subformat_t) 0)
 #define	SNDRV_PCM_SUBFORMAT_LAST	SNDRV_PCM_SUBFORMAT_STD
 #define SNDRV_PCM_INFO_MMAP		0x00000001	/* hardware supports mmap */
 #define SNDRV_PCM_INFO_MMAP_VALID	0x00000002	/* period data are valid during transfer */
@@ -203,15 +203,15 @@
 #define SNDRV_PCM_INFO_NO_PERIOD_WAKEUP	0x00800000	/* period wakeup can be disabled */
 #define SNDRV_PCM_INFO_HAS_WALL_CLOCK   0x01000000      /* has audio wall clock for audio/system time sync */
 #define SNDRV_PCM_INFO_FIFO_IN_FRAMES	0x80000000	/* internal kernel flag - FIFO size is in frames */
-#define	SNDRV_PCM_STATE_OPEN		(( tinyalsa_snd_pcm_state_t) 0) /* stream is open */
-#define	SNDRV_PCM_STATE_SETUP		(( tinyalsa_snd_pcm_state_t) 1) /* stream has a setup */
-#define	SNDRV_PCM_STATE_PREPARED	(( tinyalsa_snd_pcm_state_t) 2) /* stream is ready to start */
-#define	SNDRV_PCM_STATE_RUNNING		(( tinyalsa_snd_pcm_state_t) 3) /* stream is running */
-#define	SNDRV_PCM_STATE_XRUN		(( tinyalsa_snd_pcm_state_t) 4) /* stream reached an xrun */
-#define	SNDRV_PCM_STATE_DRAINING	(( tinyalsa_snd_pcm_state_t) 5) /* stream is draining */
-#define	SNDRV_PCM_STATE_PAUSED		(( tinyalsa_snd_pcm_state_t) 6) /* stream is paused */
-#define	SNDRV_PCM_STATE_SUSPENDED	(( tinyalsa_snd_pcm_state_t) 7) /* hardware is suspended */
-#define	SNDRV_PCM_STATE_DISCONNECTED	(( tinyalsa_snd_pcm_state_t) 8) /* hardware is disconnected */
+#define	SNDRV_PCM_STATE_OPEN		(( snd_pcm_state_t) 0) /* stream is open */
+#define	SNDRV_PCM_STATE_SETUP		(( snd_pcm_state_t) 1) /* stream has a setup */
+#define	SNDRV_PCM_STATE_PREPARED	(( snd_pcm_state_t) 2) /* stream is ready to start */
+#define	SNDRV_PCM_STATE_RUNNING		(( snd_pcm_state_t) 3) /* stream is running */
+#define	SNDRV_PCM_STATE_XRUN		(( snd_pcm_state_t) 4) /* stream reached an xrun */
+#define	SNDRV_PCM_STATE_DRAINING	(( snd_pcm_state_t) 5) /* stream is draining */
+#define	SNDRV_PCM_STATE_PAUSED		(( snd_pcm_state_t) 6) /* stream is paused */
+#define	SNDRV_PCM_STATE_SUSPENDED	(( snd_pcm_state_t) 7) /* hardware is suspended */
+#define	SNDRV_PCM_STATE_DISCONNECTED	(( snd_pcm_state_t) 8) /* hardware is disconnected */
 #define	SNDRV_PCM_STATE_LAST		SNDRV_PCM_STATE_DISCONNECTED

 #define	SNDRV_PCM_HW_PARAM_ACCESS	         0	/* Access type */
@@ -237,53 +237,53 @@
 #define SNDRV_PCM_HW_PARAMS_EXPORT_BUFFER	   (1<<1)	/* export buffer */
 #define SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP	(1<<2)	/* disable period wakeups */

-#define	SNDRV_PCM_FORMAT_S8	(( tinyalsa_snd_pcm_format_t) 0)
-#define	SNDRV_PCM_FORMAT_U8	(( tinyalsa_snd_pcm_format_t) 1)
-#define	SNDRV_PCM_FORMAT_S16_LE	(( tinyalsa_snd_pcm_format_t) 2)
-#define	SNDRV_PCM_FORMAT_S16_BE	(( tinyalsa_snd_pcm_format_t) 3)
-#define	SNDRV_PCM_FORMAT_U16_LE	(( tinyalsa_snd_pcm_format_t) 4)
-#define	SNDRV_PCM_FORMAT_U16_BE	(( tinyalsa_snd_pcm_format_t) 5)
-#define	SNDRV_PCM_FORMAT_S24_LE	(( tinyalsa_snd_pcm_format_t) 6) /* low three bytes */
-#define	SNDRV_PCM_FORMAT_S24_BE	(( tinyalsa_snd_pcm_format_t) 7) /* low three bytes */
-#define	SNDRV_PCM_FORMAT_U24_LE	(( tinyalsa_snd_pcm_format_t) 8) /* low three bytes */
-#define	SNDRV_PCM_FORMAT_U24_BE	(( tinyalsa_snd_pcm_format_t) 9) /* low three bytes */
-#define	SNDRV_PCM_FORMAT_S32_LE	(( tinyalsa_snd_pcm_format_t) 10)
-#define	SNDRV_PCM_FORMAT_S32_BE	(( tinyalsa_snd_pcm_format_t) 11)
-#define	SNDRV_PCM_FORMAT_U32_LE	(( tinyalsa_snd_pcm_format_t) 12)
-#define	SNDRV_PCM_FORMAT_U32_BE	(( tinyalsa_snd_pcm_format_t) 13)
-#define	SNDRV_PCM_FORMAT_FLOAT_LE	(( tinyalsa_snd_pcm_format_t) 14) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */
-#define	SNDRV_PCM_FORMAT_FLOAT_BE	(( tinyalsa_snd_pcm_format_t) 15) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */
-#define	SNDRV_PCM_FORMAT_FLOAT64_LE	(( tinyalsa_snd_pcm_format_t) 16) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */
-#define	SNDRV_PCM_FORMAT_FLOAT64_BE	(( tinyalsa_snd_pcm_format_t) 17) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */
-#define	SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE (( tinyalsa_snd_pcm_format_t) 18) /* IEC-958 subframe, Little Endian */
-#define	SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE (( tinyalsa_snd_pcm_format_t) 19) /* IEC-958 subframe, Big Endian */
-#define	SNDRV_PCM_FORMAT_MU_LAW		(( tinyalsa_snd_pcm_format_t) 20)
-#define	SNDRV_PCM_FORMAT_A_LAW		(( tinyalsa_snd_pcm_format_t) 21)
-#define	SNDRV_PCM_FORMAT_IMA_ADPCM	(( tinyalsa_snd_pcm_format_t) 22)
-#define	SNDRV_PCM_FORMAT_MPEG		(( tinyalsa_snd_pcm_format_t) 23)
-#define	SNDRV_PCM_FORMAT_GSM		(( tinyalsa_snd_pcm_format_t) 24)
-#define	SNDRV_PCM_FORMAT_SPECIAL	(( tinyalsa_snd_pcm_format_t) 31)
-#define	SNDRV_PCM_FORMAT_S24_3LE	(( tinyalsa_snd_pcm_format_t) 32)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S24_3BE	(( tinyalsa_snd_pcm_format_t) 33)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U24_3LE	(( tinyalsa_snd_pcm_format_t) 34)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U24_3BE	(( tinyalsa_snd_pcm_format_t) 35)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S20_3LE	(( tinyalsa_snd_pcm_format_t) 36)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S20_3BE	(( tinyalsa_snd_pcm_format_t) 37)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U20_3LE	(( tinyalsa_snd_pcm_format_t) 38)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U20_3BE	(( tinyalsa_snd_pcm_format_t) 39)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S18_3LE	(( tinyalsa_snd_pcm_format_t) 40)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_S18_3BE	(( tinyalsa_snd_pcm_format_t) 41)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U18_3LE	(( tinyalsa_snd_pcm_format_t) 42)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_U18_3BE	(( tinyalsa_snd_pcm_format_t) 43)	/* in three bytes */
-#define	SNDRV_PCM_FORMAT_G723_24	(( tinyalsa_snd_pcm_format_t) 44) /* 8 samples in 3 bytes */
-#define	SNDRV_PCM_FORMAT_G723_24_1B	(( tinyalsa_snd_pcm_format_t) 45) /* 1 sample in 1 byte */
-#define	SNDRV_PCM_FORMAT_G723_40	(( tinyalsa_snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */
-#define	SNDRV_PCM_FORMAT_G723_40_1B	(( tinyalsa_snd_pcm_format_t) 47) /* 1 sample in 1 byte */
-#define	SNDRV_PCM_FORMAT_DSD_U8		(( tinyalsa_snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */
-#define	SNDRV_PCM_FORMAT_DSD_U16_LE	(( tinyalsa_snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */
-#define	SNDRV_PCM_FORMAT_DSD_U32_LE	(( tinyalsa_snd_pcm_format_t) 50) /* DSD, 4-byte samples DSD (x32), little endian */
-#define	SNDRV_PCM_FORMAT_DSD_U16_BE	(( tinyalsa_snd_pcm_format_t) 51) /* DSD, 2-byte samples DSD (x16), big endian */
-#define	SNDRV_PCM_FORMAT_DSD_U32_BE	(( tinyalsa_snd_pcm_format_t) 52) /* DSD, 4-byte samples DSD (x32), big endian */
+#define	SNDRV_PCM_FORMAT_S8	(( snd_pcm_format_t) 0)
+#define	SNDRV_PCM_FORMAT_U8	(( snd_pcm_format_t) 1)
+#define	SNDRV_PCM_FORMAT_S16_LE	(( snd_pcm_format_t) 2)
+#define	SNDRV_PCM_FORMAT_S16_BE	(( snd_pcm_format_t) 3)
+#define	SNDRV_PCM_FORMAT_U16_LE	(( snd_pcm_format_t) 4)
+#define	SNDRV_PCM_FORMAT_U16_BE	(( snd_pcm_format_t) 5)
+#define	SNDRV_PCM_FORMAT_S24_LE	(( snd_pcm_format_t) 6) /* low three bytes */
+#define	SNDRV_PCM_FORMAT_S24_BE	(( snd_pcm_format_t) 7) /* low three bytes */
+#define	SNDRV_PCM_FORMAT_U24_LE	(( snd_pcm_format_t) 8) /* low three bytes */
+#define	SNDRV_PCM_FORMAT_U24_BE	(( snd_pcm_format_t) 9) /* low three bytes */
+#define	SNDRV_PCM_FORMAT_S32_LE	(( snd_pcm_format_t) 10)
+#define	SNDRV_PCM_FORMAT_S32_BE	(( snd_pcm_format_t) 11)
+#define	SNDRV_PCM_FORMAT_U32_LE	(( snd_pcm_format_t) 12)
+#define	SNDRV_PCM_FORMAT_U32_BE	(( snd_pcm_format_t) 13)
+#define	SNDRV_PCM_FORMAT_FLOAT_LE	(( snd_pcm_format_t) 14) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */
+#define	SNDRV_PCM_FORMAT_FLOAT_BE	(( snd_pcm_format_t) 15) /* 4-byte float, IEEE-754 32-bit, range -1.0 to 1.0 */
+#define	SNDRV_PCM_FORMAT_FLOAT64_LE	(( snd_pcm_format_t) 16) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */
+#define	SNDRV_PCM_FORMAT_FLOAT64_BE	(( snd_pcm_format_t) 17) /* 8-byte float, IEEE-754 64-bit, range -1.0 to 1.0 */
+#define	SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE (( snd_pcm_format_t) 18) /* IEC-958 subframe, Little Endian */
+#define	SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE (( snd_pcm_format_t) 19) /* IEC-958 subframe, Big Endian */
+#define	SNDRV_PCM_FORMAT_MU_LAW		(( snd_pcm_format_t) 20)
+#define	SNDRV_PCM_FORMAT_A_LAW		(( snd_pcm_format_t) 21)
+#define	SNDRV_PCM_FORMAT_IMA_ADPCM	(( snd_pcm_format_t) 22)
+#define	SNDRV_PCM_FORMAT_MPEG		(( snd_pcm_format_t) 23)
+#define	SNDRV_PCM_FORMAT_GSM		(( snd_pcm_format_t) 24)
+#define	SNDRV_PCM_FORMAT_SPECIAL	(( snd_pcm_format_t) 31)
+#define	SNDRV_PCM_FORMAT_S24_3LE	(( snd_pcm_format_t) 32)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_S24_3BE	(( snd_pcm_format_t) 33)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_U24_3LE	(( snd_pcm_format_t) 34)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_U24_3BE	(( snd_pcm_format_t) 35)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_S20_3LE	(( snd_pcm_format_t) 36)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_S20_3BE	(( snd_pcm_format_t) 37)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_U20_3LE	(( snd_pcm_format_t) 38)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_U20_3BE	(( snd_pcm_format_t) 39)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_S18_3LE	(( snd_pcm_format_t) 40)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_S18_3BE	(( snd_pcm_format_t) 41)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_U18_3LE	(( snd_pcm_format_t) 42)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_U18_3BE	(( snd_pcm_format_t) 43)	/* in three bytes */
+#define	SNDRV_PCM_FORMAT_G723_24	(( snd_pcm_format_t) 44) /* 8 samples in 3 bytes */
+#define	SNDRV_PCM_FORMAT_G723_24_1B	(( snd_pcm_format_t) 45) /* 1 sample in 1 byte */
+#define	SNDRV_PCM_FORMAT_G723_40	(( snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */
+#define	SNDRV_PCM_FORMAT_G723_40_1B	(( snd_pcm_format_t) 47) /* 1 sample in 1 byte */
+#define	SNDRV_PCM_FORMAT_DSD_U8		(( snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */
+#define	SNDRV_PCM_FORMAT_DSD_U16_LE	(( snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */
+#define	SNDRV_PCM_FORMAT_DSD_U32_LE	(( snd_pcm_format_t) 50) /* DSD, 4-byte samples DSD (x32), little endian */
+#define	SNDRV_PCM_FORMAT_DSD_U16_BE	(( snd_pcm_format_t) 51) /* DSD, 2-byte samples DSD (x16), big endian */
+#define	SNDRV_PCM_FORMAT_DSD_U32_BE	(( snd_pcm_format_t) 52) /* DSD, 4-byte samples DSD (x32), big endian */
 #define	SNDRV_PCM_FORMAT_LAST		SNDRV_PCM_FORMAT_DSD_U32_BE

 #define SNDRV_MASK_MAX	               256
@@ -296,6 +296,7 @@
 #define SNDRV_PCM_MMAP_OFFSET_STATUS   0x80000000
 #define SNDRV_PCM_MMAP_OFFSET_CONTROL  0x81000000

+
 /** Audio sample format of a PCM.
 * The first letter specifiers whether the sample is signed or unsigned.
 * The letter 'S' means signed. The letter 'U' means unsigned.
@@ -427,10 +428,10 @@ enum
 typedef unsigned long snd_pcm_uframes_t;
 typedef signed long snd_pcm_sframes_t;
 typedef int snd_pcm_hw_param_t;
-typedef int __bitwise tinyalsa_snd_pcm_access_t;
-typedef int __bitwise tinyalsa_snd_pcm_subformat_t;
-typedef int __bitwise tinyalsa_snd_pcm_state_t;
-typedef int __bitwise tinyalsa_snd_pcm_format_t;
+typedef int __bitwise snd_pcm_access_t;
+typedef int __bitwise snd_pcm_subformat_t;
+typedef int __bitwise snd_pcm_state_t;
+typedef int __bitwise snd_pcm_format_t;

 /** A bit mask of 256 bits (32 bytes) that describes some hardware parameters of a PCM */
 struct pcm_mask
@@ -448,11 +449,11 @@ union snd_pcm_sync_id

 struct snd_pcm_mmap_status
 {
-	tinyalsa_snd_pcm_state_t state;		/* RO: state - SNDRV_PCM_STATE_XXXX */
+	snd_pcm_state_t state;		/* RO: state - SNDRV_PCM_STATE_XXXX */
 	int pad1;			/* Needed for 64 bit alignment */
 	snd_pcm_uframes_t hw_ptr;	/* RO: hw ptr (0...boundary-1) */
 	struct timespec tstamp;		/* Timestamp */
-	tinyalsa_snd_pcm_state_t suspended_state; /* RO: suspended stream state */
+	snd_pcm_state_t suspended_state; /* RO: suspended stream state */
 	struct timespec audio_tstamp;	/* from sample counter or wall clock */
 };

@@ -591,7 +592,7 @@ struct snd_xfern

 struct snd_pcm_status
 {
-   tinyalsa_snd_pcm_state_t state;		/* stream state */
+   snd_pcm_state_t state;		/* stream state */
   struct timespec trigger_tstamp;	/* time when stream was started/stopped/paused */
   struct timespec tstamp;		/* reference timestamp */
   snd_pcm_uframes_t appl_ptr;	/* appl ptr */
@@ -600,7 +601,7 @@ struct snd_pcm_status
   snd_pcm_uframes_t avail;	/* number of frames available */
   snd_pcm_uframes_t avail_max;	/* max frames available on hw since last status */
   snd_pcm_uframes_t overrange;	/* count of ADC (capture) overrange detections from last status */
-   tinyalsa_snd_pcm_state_t suspended_state; /* suspended stream state */
+   snd_pcm_state_t suspended_state; /* suspended stream state */
   __u32 reserved_alignment;	/* must be filled with zero */
   struct timespec audio_tstamp;	/* from sample counter or wall clock */
   unsigned char reserved[56-sizeof(struct timespec)]; /* must be filled with zero */
@@ -808,7 +809,7 @@ static unsigned int pcm_get_channels(const struct pcm *pcm)
 * */
 static const struct pcm_config * pcm_get_config(const struct pcm *pcm)
 {
-   if (!pcm)
+   if (pcm == NULL)
      return NULL;
   return &pcm->config;
 }
@@ -929,7 +930,7 @@ static int pcm_set_config(struct pcm *pcm, const struct pcm_config *config)
    struct snd_pcm_sw_params sparams;
    struct snd_pcm_hw_params params;

-    if (!pcm)
+    if (pcm == NULL)
        return -EFAULT;

    if (config)
@@ -1208,18 +1209,21 @@ 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)
-      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)
+    {
+        printf("%d\n", ret);
+        return ret;
+    }

-   return frames;
+    return frames;
 }

 static void pcm_mmap_appl_forward(struct pcm *pcm, int frames)
@@ -1290,7 +1294,7 @@ static int pcm_get_htimestamp(struct pcm *pcm, unsigned int *avail,
 */
 static int pcm_is_ready(const struct pcm *pcm)
 {
-   if (pcm)
+   if (pcm != NULL)
      return pcm->fd >= 0;
   return 0;
 }
@@ -1522,7 +1526,7 @@ static struct pcm_params *pcm_params_get(unsigned int card, unsigned int device,
   fd = open(fn, O_RDWR|O_NONBLOCK);
   if (fd < 0)
   {
-      RARCH_ERR("[TINYALSA] Cannot open device '%s'\n", fn);
+      fprintf(stderr, "cannot open device '%s'\n", fn);
      goto err_open;
   }

@@ -1535,7 +1539,7 @@ static struct pcm_params *pcm_params_get(unsigned int card, unsigned int device,
   param_init(params);
   if (ioctl(fd, SNDRV_PCM_IOCTL_HW_REFINE, params))
   {
-      RARCH_ERR("[TINYALSA] SNDRV_PCM_IOCTL_HW_REFINE error (%d)\n", errno);
+      fprintf(stderr, "SNDRV_PCM_IOCTL_HW_REFINE error (%d)\n", errno);
      goto err_hw_refine;
   }

@@ -1579,7 +1583,7 @@ static const struct pcm_mask *pcm_params_get_mask(const struct pcm_params *pcm_p
 {
    int p;
    struct snd_pcm_hw_params *params = (struct snd_pcm_hw_params *)pcm_params;
-    if (!params)
+    if (params == NULL)
        return NULL;

    p = pcm_param_to_alsa(param);
@@ -2016,7 +2020,7 @@ static int pcm_mmap_transfer(struct pcm *pcm, const void *buffer, unsigned int b
      avail = pcm_avail_update(pcm);
      if (avail < 0)
      {
-         RARCH_ERR("[TINYALSA] Cannot determine available mmap frames");
+         fprintf(stderr, "cannot determine available mmap frames");
         return err;
      }

@@ -2026,7 +2030,7 @@ static int pcm_mmap_transfer(struct pcm *pcm, const void *buffer, unsigned int b
      {
         if (pcm_start(pcm) < 0)
         {
-            RARCH_ERR("[TINYALSA] Start error: hw 0x%x app 0x%x avail 0x%x\n",
+            fprintf(stderr, "start error: hw 0x%x app 0x%x avail 0x%x\n",
                  (unsigned int)pcm->mmap_status->hw_ptr,
                  (unsigned int)pcm->mmap_control->appl_ptr,
                  avail);
@@ -2049,7 +2053,7 @@ static int pcm_mmap_transfer(struct pcm *pcm, const void *buffer, unsigned int b
         {
            pcm->prepared = 0;
            pcm->running = 0;
-            RARCH_ERR("[TINYALSA] Wait error: hw 0x%x app 0x%x avail 0x%x\n",
+            fprintf(stderr, "wait error: hw 0x%x app 0x%x avail 0x%x\n",
                  (unsigned int)pcm->mmap_status->hw_ptr,
                  (unsigned int)pcm->mmap_control->appl_ptr,
                  avail);
@@ -2070,7 +2074,7 @@ static int pcm_mmap_transfer(struct pcm *pcm, const void *buffer, unsigned int b
      frames = pcm_mmap_transfer_areas(pcm, (void *)buffer, offset, frames);
      if (frames < 0)
      {
-         RARCH_ERR("[TINYALSA] Write error: hw 0x%x app 0x%x avail 0x%x\n",
+         fprintf(stderr, "write error: hw 0x%x app 0x%x avail 0x%x\n",
               (unsigned int)pcm->mmap_status->hw_ptr,
               (unsigned int)pcm->mmap_control->appl_ptr,
               avail);
@@ -2166,9 +2170,10 @@ static void * tinyalsa_init(const char *devicestr, unsigned rate,
   unsigned int device          = 0;
   unsigned int frames_per_ms   = 0;
   unsigned int orig_rate       = rate;
-   unsigned int max_rate, min_rate, buffer_size;
+   unsigned int max_rate, min_rate;
   float initial_latency;

+   snd_pcm_uframes_t         buffer_size;
   struct pcm_config         config;

   tinyalsa_t *tinyalsa      = (tinyalsa_t*)calloc(1, sizeof(tinyalsa_t));
@@ -2182,7 +2187,7 @@ static void * tinyalsa_init(const char *devicestr, unsigned rate,
   RARCH_LOG("[TINYALSA]: Using card: %u, device: %u.\n", card, device);

   tinyalsa->params = pcm_params_get(card, device, PCM_OUT);
-   if (!tinyalsa->params)
+   if (tinyalsa->params == NULL)
   {
      RARCH_ERR("[TINYALSA]: params: Cannot open audio device.\n");
      goto error;
@@ -2221,7 +2226,7 @@ static void * tinyalsa_init(const char *devicestr, unsigned rate,

   tinyalsa->pcm = pcm_open(card, device, PCM_OUT, &config);

-   if (!tinyalsa->pcm)
+   if (tinyalsa->pcm == NULL)
   {
      RARCH_ERR("[TINYALSA]: Failed to allocate memory for pcm.\n");
      goto error;
@@ -2254,7 +2259,7 @@ static void * tinyalsa_init(const char *devicestr, unsigned rate,
   RARCH_LOG("[TINYALSA]: Can pause: %s.\n", tinyalsa->can_pause ? "yes" : "no");
   RARCH_LOG("[TINYALSA]: Audio rate: %uHz.\n", config.rate);
   RARCH_LOG("[TINYALSA]: Buffer size: %u frames.\n", buffer_size);
-   RARCH_LOG("[TINYALSA]: Buffer size: %u bytes.\n", (unsigned int)tinyalsa->buffer_size);
+   RARCH_LOG("[TINYALSA]: Buffer size: %u bytes.\n", tinyalsa->buffer_size);
   RARCH_LOG("[TINYALSA]: Frame  size: %u bytes.\n", tinyalsa->frame_bits / 8);
   RARCH_LOG("[TINYALSA]: Latency: %ums.\n", buffer_size * 1000 / (rate * 4));

@@ -21,20 +21,21 @@
 #include <wiiu/os.h>
 #include <wiiu/ax.h>

-#include "../../wiiu/wiiu_dbg.h"
-#include "../../wiiu/system/memory.h"
+#include "wiiu/wiiu_dbg.h"
+#include "wiiu/system/memory.h"

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

 typedef struct
 {
   AXMVoice* mvoice;
   uint16_t* buffer_l;
   uint16_t* buffer_r;
-   OSSpinLock spinlock;
+   bool nonblocking;
+
   uint32_t pos;
   uint32_t written;
-   bool nonblock;
+   OSSpinLock spinlock;
 } ax_audio_t;

 /* 3072 samples main buffer, 64ms total */
@@ -55,19 +56,17 @@ typedef struct
 static volatile ax_audio_t *wiiu_cb_ax = NULL;
 void wiiu_ax_callback(void)
 {
-   ax_audio_t *ax = NULL;
   /*possibly called before unregister */
-   if (!wiiu_cb_ax)
+   if(wiiu_cb_ax == NULL)
      return;

-   ax = (ax_audio_t*)wiiu_cb_ax;
-
-   if (AXIsMultiVoiceRunning(ax->mvoice))
+   ax_audio_t *ax = (ax_audio_t*)wiiu_cb_ax;
+   if(AXIsMultiVoiceRunning(ax->mvoice))
   {
-      if (OSUninterruptibleSpinLock_Acquire(&ax->spinlock))
+      if(OSUninterruptibleSpinLock_Acquire(&ax->spinlock))
      {
         /* Buffer underrun, stop playback to let it fill up */
-         if (ax->written < AX_AUDIO_SAMPLE_MIN)
+         if(ax->written < AX_AUDIO_SAMPLE_MIN)
            AXSetMultiVoiceState(ax->mvoice, AX_VOICE_STATE_STOPPED);
         ax->written -= AX_AUDIO_SAMPLE_COUNT;
         OSUninterruptibleSpinLock_Release(&ax->spinlock);
@@ -101,7 +100,7 @@ static void* ax_audio_init(const char* device, unsigned rate, unsigned latency,
      return NULL;
   }

-   ax->buffer_l              = MEM1_alloc(AX_AUDIO_SIZE, 0x100);
+   ax->buffer_l               = MEM1_alloc(AX_AUDIO_SIZE, 0x100);
   ax->buffer_r              = MEM1_alloc(AX_AUDIO_SIZE, 0x100);
   memset(ax->buffer_l,0,AX_AUDIO_SIZE);
   memset(ax->buffer_r,0,AX_AUDIO_SIZE);
@@ -167,9 +166,9 @@ static bool ax_audio_stop(void* data)

 static int ax_audio_limit(int in)
 {
-	if (in < 0)
+	if(in < 0)
 		in += AX_AUDIO_COUNT;
-	else if (in >= AX_AUDIO_COUNT)
+	else if(in >= AX_AUDIO_COUNT)
 		in -= AX_AUDIO_COUNT;
 	return in;
 }
@@ -184,62 +183,57 @@ static bool ax_audio_start(void* data, bool is_shutdown)
      return true;

   /* Set back to playing on enough buffered data */
-   if (ax->written > AX_AUDIO_SAMPLE_LOAD)
+   if(ax->written > AX_AUDIO_SAMPLE_LOAD)
   {
-      AXSetMultiVoiceCurrentOffset(ax->mvoice,
-            ax_audio_limit(ax->pos - ax->written));
+      AXSetMultiVoiceCurrentOffset(ax->mvoice, ax_audio_limit(ax->pos - ax->written));
      AXSetMultiVoiceState(ax->mvoice, AX_VOICE_STATE_PLAYING);
   }
-
   return true;
 }

 static ssize_t ax_audio_write(void* data, const void* buf, size_t size)
 {
   uint32_t i;
-   size_t count_avail  = 0;
+   size_t countAvail   = 0;
   ax_audio_t* ax      = (ax_audio_t*)data;
   const uint16_t* src = buf;
   size_t count        = size >> 2;

-   if (!size || (size & 0x3))
+   if(!size || (size & 0x3))
      return 0;

-   if (count > AX_AUDIO_MAX_FREE)
-      count            = AX_AUDIO_MAX_FREE;
+   if(count > AX_AUDIO_MAX_FREE)
+      count = AX_AUDIO_MAX_FREE;

-   count_avail         = (
-         (ax->written > AX_AUDIO_MAX_FREE) 
-         ? 0 
-         : (AX_AUDIO_MAX_FREE - ax->written));
+   countAvail = ((ax->written > AX_AUDIO_MAX_FREE) ? 0 : (AX_AUDIO_MAX_FREE - ax->written));

-   if (ax->nonblock)
+   if (ax->nonblocking)
   {
      /* Not enough available for 3ms of data */
-      if (count_avail < AX_AUDIO_SAMPLE_COUNT)
+      if(countAvail < AX_AUDIO_SAMPLE_COUNT)
         count = 0;
   }
-   else if (count_avail < count)
+   else if(countAvail < count)
   {
      /* Sync, wait for free memory */
-      while (AXIsMultiVoiceRunning(ax->mvoice) && (count_avail < count))
+      while(AXIsMultiVoiceRunning(ax->mvoice) && (countAvail < count))
      {
         OSYieldThread(); /* Gives threads with same priority time to run */
-         count_avail = (ax->written > AX_AUDIO_MAX_FREE ? 0 : (AX_AUDIO_MAX_FREE - ax->written));
+         countAvail = (ax->written > AX_AUDIO_MAX_FREE ? 0 : (AX_AUDIO_MAX_FREE - ax->written));
      }
   }

   /* Over available space, do as much as possible */
-   if (count > count_avail)
-      count = count_avail;
+   if(count > countAvail)
+      count = countAvail;

   /* make sure we have input size */
-   if (count > 0)
+   if(count > 0)
   {
      /* write in new data */
-      size_t start_pos    = ax->pos;
-      int flush_p2_needed = 0;
-      int flush_p2       = 0;
+      size_t startPos   = ax->pos;
+      int flushP2needed = 0;
+      int flushP2       = 0;

      for (i = 0; i < (count << 1); i += 2)
      {
@@ -248,31 +242,30 @@ static ssize_t ax_audio_write(void* data, const void* buf, size_t size)
         ax->pos               = ax_audio_limit(ax->pos + 1);

         /* wrapped around, make sure to store cache */
-         if (ax->pos == 0)
+         if(ax->pos == 0)
         {
-            flush_p2_needed = 1;
-            flush_p2       = ((count << 1) - i);
-            DCStoreRangeNoSync(ax->buffer_l + start_pos,
-                  (AX_AUDIO_COUNT - start_pos) << 1);
-            DCStoreRangeNoSync(ax->buffer_r + start_pos, (AX_AUDIO_COUNT - start_pos) << 1);
+            flushP2needed = 1;
+            flushP2       = ((count << 1) - i);
+            DCStoreRangeNoSync(ax->buffer_l+startPos, (AX_AUDIO_COUNT-startPos) << 1);
+            DCStoreRangeNoSync(ax->buffer_r+startPos, (AX_AUDIO_COUNT-startPos) << 1);
         }
      }

      /* standard cache store case */
-      if (!flush_p2_needed)
+      if(!flushP2needed)
      {
-         DCStoreRangeNoSync(ax->buffer_l + start_pos, count << 1);
-         DCStoreRange(ax->buffer_r + start_pos, count << 1);
+         DCStoreRangeNoSync(ax->buffer_l+startPos, count << 1);
+         DCStoreRange(ax->buffer_r+startPos, count << 1);
      }
      /* store the rest after wrap */
-      else if (flush_p2 > 0)
+      else if(flushP2 > 0)
      {
-         DCStoreRangeNoSync(ax->buffer_l, flush_p2);
-         DCStoreRange(ax->buffer_r, flush_p2);
+         DCStoreRangeNoSync(ax->buffer_l, flushP2);
+         DCStoreRange(ax->buffer_r, flushP2);
      }

      /* add in new audio data */
-      if (OSUninterruptibleSpinLock_Acquire(&ax->spinlock))
+      if(OSUninterruptibleSpinLock_Acquire(&ax->spinlock))
      {
         ax->written += count;
         OSUninterruptibleSpinLock_Release(&ax->spinlock);
@@ -283,7 +276,7 @@ static ssize_t ax_audio_write(void* data, const void* buf, size_t size)
    *
    * checks if it can be started
    */
-   if (!AXIsMultiVoiceRunning(ax->mvoice))
+   if(!AXIsMultiVoiceRunning(ax->mvoice))
      ax_audio_start(ax, false);

   /* return what was actually copied */
@@ -301,23 +294,31 @@ static void ax_audio_set_nonblock_state(void* data, bool state)
   ax_audio_t* ax = (ax_audio_t*)data;

   if (ax)
-      ax->nonblock = state;
+      ax->nonblocking = state;
 }

-static bool ax_audio_use_float(void* data) { return false; }
+static bool ax_audio_use_float(void* data)
+{
+   (void)data;
+   return false;
+}

 static size_t ax_audio_write_avail(void* data)
 {
   ax_audio_t* ax = (ax_audio_t*)data;
+
   size_t ret = AX_AUDIO_COUNT - ax->written;
+
   return (ret < AX_AUDIO_SAMPLE_COUNT ? 0 : ret);
 }

 static size_t ax_audio_buffer_size(void* data)
 {
+   (void)data;
   return AX_AUDIO_COUNT;
 }

+
 audio_driver_t audio_ax =
 {
   ax_audio_init,
@@ -331,6 +332,6 @@ audio_driver_t audio_ax =
   "AX",
   NULL, /* device_list_new */
   NULL, /* device_list_free */
-   ax_audio_write_avail,
-   ax_audio_buffer_size,
+   NULL, /* write_avail */
+   NULL, /* buffer_size */
 };
@@ -20,6 +20,7 @@
 #endif
 #endif

+#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -27,9 +28,6 @@

 #include <compat/msvc.h>
 #include <retro_miscellaneous.h>
-#include <string/stdstring.h>
-#include <encodings/utf.h>
-#include <lists/string_list.h>

 #if defined(_MSC_VER) && (_WIN32_WINNT <= _WIN32_WINNT_WIN2K)
 /* needed for CoInitializeEx */
@@ -38,11 +36,7 @@

 #include "xaudio.h"

-#if (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/)
-#include "../common/mmdevice_common.h"
-#endif
-
-#include "../../retroarch.h"
+#include "../audio_driver.h"
 #include "../../verbosity.h"

 typedef struct xaudio2 xaudio2_t;
@@ -60,14 +54,11 @@ 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 */
-static void *xa_list_new(void *u);
-
 #if defined(__cplusplus) && !defined(CINTERFACE)
 struct xaudio2 : public IXAudio2VoiceCallback
 #else
@@ -135,6 +126,29 @@ const struct IXAudio2VoiceCallbackVtbl voice_vtable = {
 };
 #endif

+#if 0
+static void xaudio2_enumerate_devices(xaudio2_t *xa)
+{
+   uint32_t dev_count = 0;
+   unsigned i = 0;
+
+   (void)xa;
+   (void)i;
+   (void)dev_count;
+#ifndef _XBOX
+   IXAudio2_GetDeviceCount(xa->pXAudio2, &dev_count);
+   fprintf(stderr, "XAudio2 devices:\n");
+
+   for (i = 0; i < dev_count; i++)
+   {
+      XAUDIO2_DEVICE_DETAILS dev_detail;
+      IXAudio2_GetDeviceDetails(xa->pXAudio2, i, &dev_detail);
+      fwprintf(stderr, L"\t%u: %s\n", i, dev_detail.DisplayName);
+   }
+#endif
+}
+#endif
+
 static void xaudio2_set_wavefmt(WAVEFORMATEX *wfx,
      unsigned channels, unsigned samplerate)
 {
@@ -180,23 +194,16 @@ 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,
-      size_t size, const char *device)
+      size_t size, unsigned device)
 {
-   int32_t idx_found        = -1;
-   WAVEFORMATEX wfx         = {0};
-   struct string_list *list = NULL;
-   xaudio2_t *handle        = NULL;
+   xaudio2_t *handle = NULL;
+   WAVEFORMATEX wfx  = {0};

-#if !defined(_XBOX) && !defined(__WINRT__)
-   if (FAILED(CoInitialize(NULL)))
-      goto error;
+#ifndef _XBOX
+   CoInitializeEx(0, COINIT_MULTITHREADED);
 #endif

 #if defined(__cplusplus) && !defined(CINTERFACE)
@@ -206,14 +213,7 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
 #endif

   if (!handle)
-   {
-#if !defined(_XBOX) && !defined(__WINRT__)
-      CoUninitialize();
-#endif
      goto error;
-   }
-
-   list = (struct string_list*)xa_list_new(NULL);

 #if !defined(__cplusplus) || defined(CINTERFACE)
   handle->lpVtbl = &voice_vtable;
@@ -222,58 +222,8 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
   if (FAILED(XAudio2Create(&handle->pXAudio2, 0, XAUDIO2_DEFAULT_PROCESSOR)))
      goto error;

-   if (device)
-   {
-      /* Search for device name first */
-      if (list && list->elems)
-      {
-         if (list->elems)
-         {
-            unsigned i;
-            for (i = 0; i < list->size; i++)
-            {
-               if (string_is_equal(device, list->elems[i].data))
-               {
-                  idx_found       = i;
-                  break;
-               }
-            }
-            /* Index was not found yet based on name string,
-             * just assume id is a one-character number index. */
-
-            if (idx_found == -1)
-            {
-               if (isdigit(device[0]))
-               {
-                  RARCH_LOG("[XAudio2]: Fallback, device index is a single number index instead: %d.\n", idx_found);
-                  idx_found = strtoul(device, NULL, 0);
-               }
-            }
-         }
-      }
-   }
-
-   if (idx_found == -1)
-      idx_found = 0;
-
-#if (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/)
-   {
-      wchar_t *temp = NULL;
-      if (device)
-         temp = utf8_to_utf16_string_alloc((const char*)list->elems[idx_found].userdata);
-
-      if (FAILED(IXAudio2_CreateMasteringVoice(handle->pXAudio2, &handle->pMasterVoice, channels, samplerate, 0, (LPCWSTR)(uintptr_t)temp, NULL, AudioCategory_GameEffects)))
-      {
-         free(temp);
-         goto error;
-      }
-      if (temp)
-         free(temp);
-   }
-#else
-   if (FAILED(IXAudio2_CreateMasteringVoice(handle->pXAudio2, &handle->pMasterVoice, channels, samplerate, 0, idx_found, NULL)))
+   if (FAILED(IXAudio2_CreateMasteringVoice(handle->pXAudio2, &handle->pMasterVoice, channels, samplerate, 0, device, NULL)))
      goto error;
-#endif

   xaudio2_set_wavefmt(&wfx, channels, samplerate);

@@ -296,63 +246,16 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
               XAUDIO2_COMMIT_NOW)))
      goto error;

-   if (list)
-      string_list_free(list);
   return handle;

 error:
-   if (list)
-      string_list_free(list);
   xaudio2_free(handle);
   return NULL;
 }

-static void *xa_init(const char *device, unsigned rate, unsigned latency,
-      unsigned block_frames,
-      unsigned *new_rate)
+static size_t xaudio2_write(xaudio2_t *handle, const uint8_t *buffer, size_t bytes_)
 {
-   size_t bufsize;
-   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;
-   xa->bufsize = bufsize * 2 * sizeof(float);
-
-   xa->xa = xaudio2_new(rate, 2, xa->bufsize, device);
-   if (!xa->xa)
-   {
-      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        = size;
-   xa_t *xa              = (xa_t*)data;
-   xaudio2_t *handle     = xa->xa;
-   const uint8_t *buffer = (const uint8_t*)buf;
-
-   if (xa->nonblock)
-   {
-      size_t avail = XAUDIO2_WRITE_AVAILABLE(xa->xa);
-
-      if (avail == 0)
-         return 0;
-      if (avail < size)
-         bytes = size = avail;
-   }
+   unsigned bytes        = bytes_;

   while (bytes)
   {
@@ -371,8 +274,7 @@ static ssize_t xa_write(void *data, const void *buf, size_t size)
         XAUDIO2_BUFFER xa2buffer;

         while (handle->buffers == MAX_BUFFERS - 1)
-            if (!(WaitForSingleObject(handle->hEvent, 50) == WAIT_OBJECT_0))
-               return -1;
+            WaitForSingleObject(handle->hEvent, INFINITE);

         xa2buffer.Flags      = 0;
         xa2buffer.AudioBytes = handle->bufsize;
@@ -386,11 +288,7 @@ static ssize_t xa_write(void *data, const void *buf, size_t size)

         if (FAILED(IXAudio2SourceVoice_SubmitSourceBuffer(
                     handle->pSourceVoice, &xa2buffer, NULL)))
-         {
-            if (size > 0)
-               return -1;
            return 0;
-         }

         InterlockedIncrement((LONG volatile*)&handle->buffers);
         handle->bufptr       = 0;
@@ -398,7 +296,62 @@ static ssize_t xa_write(void *data, const void *buf, size_t size)
      }
   }

-   return size;
+   return bytes_;
+}
+
+static void *xa_init(const char *device, unsigned rate, unsigned latency,
+      unsigned block_frames,
+      unsigned *new_rate)
+{
+   size_t bufsize;
+   unsigned device_index = 0;
+   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);
+
+   xa->bufsize = bufsize * 2 * sizeof(float);
+
+   if (device)
+      device_index = strtoul(device, NULL, 0);
+
+   xa->xa = xaudio2_new(rate, 2, xa->bufsize, device_index);
+   if (!xa->xa)
+   {
+      RARCH_ERR("Failed to init XAudio2.\n");
+      free(xa);
+      return NULL;
+   }
+
+   return xa;
+}
+
+static ssize_t xa_write(void *data, const void *buf, size_t size)
+{
+   size_t ret;
+   xa_t *xa = (xa_t*)data;
+
+   if (xa->nonblock)
+   {
+      size_t avail = XAUDIO2_WRITE_AVAILABLE(xa->xa);
+
+      if (avail == 0)
+         return 0;
+      if (avail < size)
+         size = avail;
+   }
+
+   ret = xaudio2_write(xa->xa, (const uint8_t*)buf, size);
+   if (ret == 0 && size > 0)
+      return -1;
+   return ret;
 }

 static bool xa_stop(void *data)
@@ -425,12 +378,16 @@ static void xa_set_nonblock_state(void *data, bool state)

 static bool xa_start(void *data, bool is_shutdown)
 {
-   xa_t *xa      = (xa_t*)data;
+   xa_t *xa = (xa_t*)data;
   xa->is_paused = false;
   return true;
 }

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

 static void xa_free(void *data)
 {
@@ -456,58 +413,6 @@ static size_t xa_buffer_size(void *data)
   return xa->bufsize;
 }

-static void xa_device_list_free(void *u, void *slp)
-{
-   struct string_list *sl = (struct string_list*)slp;
-
-   if (sl)
-      string_list_free(sl);
-}
-
-static void *xa_list_new(void *u)
-{
-#if defined(_XBOX) || !(_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/)
-   unsigned i;
-   union string_list_elem_attr attr;
-   uint32_t dev_count              = 0;
-   IXAudio2 *ixa2                  = NULL;
-   struct string_list *sl          = string_list_new();
-
-   if (!sl)
-      return NULL;
-
-   attr.i = 0;
-
-   if (FAILED(XAudio2Create(&ixa2, 0, XAUDIO2_DEFAULT_PROCESSOR)))
-      return NULL;
-
-   IXAudio2_GetDeviceCount(ixa2, &dev_count);
-
-   for (i = 0; i < dev_count; i++)
-   {
-      XAUDIO2_DEVICE_DETAILS dev_detail;
-      if (IXAudio2_GetDeviceDetails(ixa2, i, &dev_detail) == S_OK)
-      {
-         char *str = utf16_to_utf8_string_alloc(dev_detail.DisplayName);
-
-         if (str)
-         {
-            string_list_append(sl, str, attr);
-            free(str);
-         }
-      }
-   }
-
-   IXAudio2_Release(ixa2);
-
-   return sl;
-#elif defined(__WINRT__)
-   return NULL;
-#else
-   return mmdevice_list_new(u);
-#endif
-}
-
 audio_driver_t audio_xa = {
   xa_init,
   xa_write,
@@ -518,8 +423,8 @@ audio_driver_t audio_xa = {
   xa_free,
   xa_use_float,
   "xaudio",
-   xa_list_new,
-   xa_device_list_free,
+   NULL,
+   NULL,
   xa_write_avail,
   xa_buffer_size,
 };