Qt: add fallback path for older versions

2026-11-09 03:29:43 -10:00 · 2018-09-17 23:12:08 -04:00
9154 changed files with 546535 additions and 1683064 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,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
@@ -1,39 +0,0 @@
-name: CI 3DS
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-devkitpro:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile Salamander
-      run: |
-        make -f Makefile.ctr.salamander -j$(getconf _NPROCESSORS_ONLN) USE_CTRULIB_2=1 clean
-        make -f Makefile.ctr.salamander -j$(getconf _NPROCESSORS_ONLN) USE_CTRULIB_2=1
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.ctr -j$(getconf _NPROCESSORS_ONLN) USE_CTRULIB_2=1 clean
-        make -f Makefile.ctr -j$(getconf _NPROCESSORS_ONLN) USE_CTRULIB_2=1 HAVE_STATIC_DUMMY=1
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-3DS-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_3ds.cia
@@ -1,36 +0,0 @@
-name: CI Android
-
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
-  repository_dispatch:
-    types: [run_build]
-  
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Compile RA
-      run: |
-        cd pkg/android/phoenix
-        ./gradlew assembleDebug
-        find . -iname "*.apk" -exec ls -l "{}" \;
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: retroarch-android-${{ steps.slug.outputs.sha8 }}
-        path: |
-          pkg/android/phoenix/build/outputs/apk/normal/debug/phoenix-normal-debug.apk
-          pkg/android/phoenix/build/outputs/apk/aarch64/debug/phoenix-aarch64-debug.apk
@@ -1,35 +0,0 @@
-name: CI DOS/DJGPP
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-djgpp-build-container:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.dos -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.dos -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-DOS-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retrodos.exe
@@ -1,35 +0,0 @@
-name: CI Emscripten
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-emscripten:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        emmake make -f Makefile.emscripten -j$(getconf _NPROCESSORS_ONLN) clean
-        emmake make -f Makefile.emscripten -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-Emscripten-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch.js
@@ -1,34 +0,0 @@
-name: CI GameCube
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-devkitpro:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.ngc -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.ngc -j$(getconf _NPROCESSORS_ONLN) EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0 HAVE_STATIC_DUMMY=1
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-GameCube-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_ngc.dol
@@ -1,40 +0,0 @@
-name: CI Linux (i686)
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-i386-ubuntu:xenial-gcc9
-      options: --user root
-
-    steps:
-      - name: Check Out Repo
-        uses: actions/checkout@v3
-
-      - name: Configure Build
-        run: |
-          ./configure --disable-qt --enable-xdelta
-
-      - name: Compile RA
-        run: |
-          make -j$(getconf _NPROCESSORS_ONLN) clean
-          make -j$(getconf _NPROCESSORS_ONLN)
-
-      - name: Get short SHA
-        id: slug
-        run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: retroarch_linux_i686${{ steps.slug.outputs.sha8 }}
-          path: |
-            retroarch
@@ -1,55 +0,0 @@
-name: CI Windows (MSVC)
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-# These jobs run smoke tests to ensure that MSVC-specific builds work properly.
-jobs:
-
-  msvc:
-    runs-on: windows-2022
-    strategy:
-      matrix:
-        version: [UWP, 2019, 2022]
-        configuration: [Debug, Release]
-        platform: [x64]
-        exclude:
-          - version: UWP
-            configuration: Debug
-        include:
-          - version: UWP
-            configuration: ReleaseAngle
-            platform: x64
-        # Qt and Cg builds are excluded for now
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1
-
-      - name: Compile RA
-        working-directory: "${{github.workspace}}/pkg/msvc${{ matrix.version == 'UWP' && '-uwp' || ''}}"
-        run: |
-          msbuild -p:"Configuration=${{matrix.configuration}}" -p:"Platform=${{matrix.platform}}" .\RetroArch-msvc${{matrix.version}}.sln
-
-      - name: Get short SHA
-        id: slug
-        shell: powershell
-        run: echo "sha8=$('${{github.sha}}'.Substring(0,8))"  >> $env:GITHUB_OUTPUT
-        # https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: retroarch-${{matrix.version}}-${{matrix.configuration}}-${{matrix.platform}}-${{ steps.slug.outputs.sha8 }}
-          path: |
-            ${{ matrix.version != 'UWP' }}:
-              pkg/msvc/${{matrix.platform}}/${{matrix.configuration}}/RetroArch-msvc${{matrix.version}}.exe
-            ${{ matrix.version == 'UWP' }}:
-              pkg/msvc-uwp/AppPackages/RetroArch-msvcUWP
-
@@ -1,30 +0,0 @@
-name: CI macOS
-
-on:
-  push:
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Compile RA
-      run: |
-        set -o pipefail
-        xcodebuild -workspace pkg/apple/RetroArch.xcworkspace -scheme RetroArch -config Release -xcconfig pkg/apple/GitHubCI.xcconfig -derivedDataPath build | xcpretty --color
-
-    - name: Get short SHA
-      id: slug
-      run: echo "sha8=$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_OUTPUT
-
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RetroArch-${{ steps.slug.outputs.sha8 }}
-        path: |
-          build/Build/Products/Release
@@ -1,35 +0,0 @@
-name: CI Miyoo ARM32
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-dingux:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.miyoo clean
-        make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.miyoo
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: retroarch_miyoo_arm32${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch
@@ -1,41 +0,0 @@
-name: CI PS2
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-ps2:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile Salamander
-      run: |
-        make -f Makefile.ps2.salamander -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.ps2.salamander -j$(getconf _NPROCESSORS_ONLN) release
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.ps2 -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.ps2 -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 release
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-PS2-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          raboot.elf
-          retroarchps2.elf
@@ -1,48 +0,0 @@
-name: CI PS4/ORBIS
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-orbis:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install dependencies
-      run: |
-        apk add ncurses-dev make bash python2
-        apk add libintl icu-dev wget
-        wget https://dot.net/v1/dotnet-install.sh && chmod 755 dotnet-install.sh && ./dotnet-install.sh -c 3.0 --install-dir ~/cli
-    
-    - name: Compile RA
-      run: |
-        export PATH=~/cli:$PATH # .net cli
-        make -f Makefile.orbis -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: bin-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_orbis.elf
-          retroarch_orbis.oelf
-          retroarch_orbis.self
-
-    - name: Version of binaries
-      run: |
-        clang --version
-        orbis-ld --version
@@ -1,47 +0,0 @@
-name: CI PSP
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-psp:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile bootstrap
-      run: |
-        cd bootstrap/psp1/kernel_functions_prx
-        make -j$(getconf _NPROCESSORS_ONLN) clean
-        make -j$(getconf _NPROCESSORS_ONLN)
-
-    - name: Compile Salamander
-      run: |
-        make -f Makefile.psp1.salamander -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.psp1.salamander -j$(getconf _NPROCESSORS_ONLN)
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.psp1 -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.psp1 -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-PSP-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          kernel_functions.prx
-          EBOOT.PBP
@@ -1,39 +0,0 @@
-name: CI PSVita
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-vita:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile Salamander
-      run: |
-        make -f Makefile.vita.salamander -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.vita.salamander -j$(getconf _NPROCESSORS_ONLN)
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.vita -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.vita -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 HAVE_VITAGLES=1
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-PSVita-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          eboot.bin
@@ -1,35 +0,0 @@
-name: CI RS90 Odbeta MIPS32
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-dingux:odbeta
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.rs90 clean
-        make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.rs90
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: retroarch_rs90_mips32${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_rs90_odbeta.opk
@@ -1,35 +0,0 @@
-name: CI RetroFW MIPS32
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-dingux:odbeta
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.retrofw clean
-        make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.retrofw
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: retroarch_retrofw_mips32${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_retrofw.opk
@@ -1,34 +0,0 @@
-name: CI Switch/libnx
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-libnx-devkitpro:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.libnx -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.libnx -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-libnx-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_switch.nro
@@ -1,39 +0,0 @@
-name: CI Wii
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-devkitpro:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile Salamander
-      run: |
-        make -f Makefile.wii.salamander -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.wii.salamander -j$(getconf _NPROCESSORS_ONLN) EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.wii -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.wii -j$(getconf _NPROCESSORS_ONLN) EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0 HAVE_STATIC_DUMMY=1
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-Wii-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_wii.dol
@@ -1,39 +0,0 @@
-name: CI WiiU
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-wiiu:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile Salamander
-      run: |
-        make -f Makefile.wiiu -j$(getconf _NPROCESSORS_ONLN) SALAMANDER_BUILD=1 clean
-        make -f Makefile.wiiu -j$(getconf _NPROCESSORS_ONLN) SALAMANDER_BUILD=1
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.wiiu -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.wiiu -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-WiiU-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch.rpx
@@ -1,37 +0,0 @@
-name: CI Windows i686 (MXE)
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-mxe-win32-cross:gcc10
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        export MOC=/usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/bin/moc
-        ./configure --host=i686-w64-mingw32.shared
-        make clean
-        make -j$(getconf _NPROCESSORS_ONLN)
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: retroarch${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch.exe
@@ -1,37 +0,0 @@
-name: CI Windows x64 (MXE)
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-mxe-win64-cross:gcc10
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        export MOC=/usr/lib/mxe/usr/x86_64-w64-mingw32.shared/qt5/bin/moc
-        ./configure --host=x86_64-w64-mingw32.shared
-        make clean
-        make -j$(getconf _NPROCESSORS_ONLN)
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: retroarch${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch.exe
@@ -1,41 +0,0 @@
-# Download translations from Crowdin and push to GitHub
-
-name: Crowdin Daily Workflow
-
-on:
-  schedule:
-    - cron: '0 0 * * *'  # every day at midnight
-
-permissions:
-  contents: read
-
-jobs:
-  sync:
-    permissions:
-      contents: write  # for Git to git push
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: 18
-          distribution: zulu
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Crowdin Sync
-        shell: bash
-        env:
-          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
-        run: |
-          cd intl
-          python3 -m pip install requests PyYAML
-          python3 crowdin_sync.py "$CROWDIN_API_KEY"
-          git config user.name github-actions
-          git config user.email [email protected]
-          git add .
-          git commit -m "Fetch translations from Crowdin"
-          git push
@@ -1,37 +0,0 @@
-# Upload sources to Crowdin for translation
-
-name: Crowdin Workflow
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - 'intl/*_us.h'
-      - 'intl/*_us.json'
-
-permissions:
-  contents: read
-
-jobs:
-  sync:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: 18
-          distribution: zulu
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.10'
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Crowdin Sync
-        shell: bash
-        env:
-          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
-        run: |
-          cd intl
-          python3 crowdin_sync.py "$CROWDIN_API_KEY"
@@ -1,33 +0,0 @@
-# Validates compilation of RetroArch binary
-
-name: RetroArch CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-permissions:
-  contents: read
-
-jobs:
-  linux-c89: # Smoketest build using most restrictive compiler and default options
-    runs-on: ubuntu-latest
-    steps:
-      - name: Dependencies
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install build-essential libxkbcommon-dev libx11-xcb-dev zlib1g-dev libfreetype6-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev nvidia-cg-toolkit nvidia-cg-dev libavcodec-dev libsdl2-dev libsdl-image1.2-dev libxml2-dev yasm
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Configure
-        run: ./configure
-      - name: Build
-        run: make C89_BUILD=1
-      - name: Build Debug
-        run: |
-          make clean # making sure we don't have leftovers from previous build
-          make DEBUG=1 GL_DEBUG=1 C89_BUILD=1
@@ -1,52 +0,0 @@
-name: CI webOS
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check Out Repo
-        uses: actions/checkout@v4
-
-      - name: Download ares-cli-rs
-        uses: robinraju/[email protected]
-        with:
-          repository: "webosbrew/ares-cli-rs"
-          latest: true
-          fileName: "ares-package_*.deb"
-          out-file-path: "temp"
-
-      - name: Update packages
-        run: sudo apt-get -yq update
-
-      - name: Install webOS CLI
-        run: sudo apt-get -yq install ./temp/*.deb
-
-      - name: Download webOS NDK
-        uses: robinraju/[email protected]
-        with:
-          repository: "openlgtv/buildroot-nc4"
-          latest: true
-          fileName: "arm-webos-linux-gnueabi_sdk-buildroot.tar.gz"
-          out-file-path: "/tmp"
-
-      - name: Extract webOS NDK
-        shell: bash
-        working-directory: /tmp
-        run: |
-          tar xzf arm-webos-linux-gnueabi_sdk-buildroot.tar.gz
-          ./arm-webos-linux-gnueabi_sdk-buildroot/relocate-sdk.sh
-
-      - name: Compile RA
-        run: |
-          . /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
-          make -f Makefile.webos ADD_SDL2_LIB=1 -j$(getconf _NPROCESSORS_ONLN)
@@ -1,27 +1,17 @@
 *.o
-*.obj
-*.pdb
-*.exe
 *.bmpobj
 *.binobj
 *.so
-*.so.*
 *.dll
 *.a
 *.elf
 *.dol
 *.map
 *.swp
-*.cache
-*.gcda
-*.lcbk
-*.gcno
 .tmp
 .tmp.c
 .tmp.cxx
-.moc.h
-.moc.cpp
-*.log
+config.log
 /.project
 /.externalToolBuilders/
 /retroarch
@@ -30,6 +20,8 @@
 /retroarch_debug.exe
 /config.h
 /config.mk
+/tools/retroarch-joyconfig
+/tools/retroarch-joyconfig.exe
 *.ncb
 *.sdf
 *.opensdf
@@ -39,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/
@@ -62,6 +53,7 @@ DerivedData
 apple/tmp
 apple/*.mobileprovision
 apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
+menu/driverspzarch.c
 /Cg/
 /GL/
 /SDL/
@@ -69,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
@@ -82,36 +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
-cheats
-thumbnails
-docs/html
-system
-shaders/shaders_cg
-shaders/shaders_glsl
-shaders/shaders_slang
-
-# Qt Creator
-*.cflags
-*.cxxflags
-*.creator*
-*.config
-*.files
-*.includes

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

+
 # 3ds
 /.lst
 *.3dsx
@@ -139,7 +102,6 @@ wiiu/wut/elf2rpl/elf2rpl

 # CLion
 /cmake-build-debug/
-.run

 # Android
 /pkg/android/phoenix/obj/
@@ -148,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/
@@ -160,8 +118,8 @@ wiiu/wut/elf2rpl/elf2rpl
 /media/shaders_cg/
 /media/libretrodb/

-compile_commands.json
 pkg/apple/iOS/build/
+pkg/apple/iOS/modules/
 pkg/apple/build/
 ui/drivers/qt/moc_*
 ui/drivers/moc_*
@@ -169,26 +127,23 @@ ui/drivers/moc_*
 obj-unix/
 .vagrant/

-# Visual Studio
+/pkg/msvc/Release Cg/*.exe
 /pkg/msvc/Release Cg/*.iobj
 /pkg/msvc/Release Cg/*.ipdb
+/pkg/msvc/Release Cg/*.pdb
 /pkg/msvc/Release Cg/*.lpl
 /pkg/msvc/Release Cg/*.cfg
 /pkg/msvc/*.db
 /pkg/msvc/.vs
 /pkg/msvc/*/.vs
-*.tlog
-*.lastbuildstate
-*.FileListAbsolute.txt
-*.res
+/pkg/msvc/msvc-2010/Release Cg/RetroArc.27FF7CE1.tlog/*.tlog
+/pkg/msvc/msvc-2010/Release Cg/RetroArc.27FF7CE1.tlog/*.lastbuildstate
+/pkg/msvc/msvc-2010/Release Cg/*.log
+/pkg/msvc/msvc-2010/Release Cg/*.obj
+/pkg/msvc/msvc-2010/Release Cg/*.res
+/pkg/msvc/msvc-2010/Release Cg/*.pdb
 retroarch.cfg
 Makefile.local
-pkg/msvc/**/ARM
-pkg/msvc/**/ARM64
-pkg/msvc/**/* Cg
-pkg/msvc/**/* QT
-pkg/msvc/**/* QT+CG
-pkg/msvc/**/x64

 # Emscripten artifacts

@@ -208,44 +163,3 @@ retroarch_switch.lst
 retroarch_switch.nacp
 retroarch_switch.nro
 retroarch_switch.nso
-
-# PS2
-*_irx.c
-
-# Wayland
-gfx/common/wayland/fractional-scale-v1.c
-gfx/common/wayland/fractional-scale-v1.h
-gfx/common/wayland/viewporter.c
-gfx/common/wayland/viewporter.h
-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
-gfx/common/wayland/pointer-constraints-unstable-v1.c
-gfx/common/wayland/pointer-constraints-unstable-v1.h
-gfx/common/wayland/relative-pointer-unstable-v1.c
-gfx/common/wayland/relative-pointer-unstable-v1.h
-gfx/common/wayland/viewporter.c
-gfx/common/wayland/viewporter.h
-
-# libretro-common samples
-libretro-common/samples/streams/rzip/rzip
-
-# DINGUX
-*.opk
-
-#VITA
-param.sfo
-*.wo
-*.elf
-*.self
-*.vpk
-/.vs
-/deps/SPIRV-Cross/out/build/x64-Debug
-
-# Visual Studio Code
-.vscode/
@@ -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
@@ -29,9 +29,7 @@
            "includePath": [
                "/usr/include",
                "/usr/local/include",
-                "${workspaceRoot}",
-                "${workspaceFolder}/libretro-common/include",
-                "${workspaceRoot}/libretro-common/include"
+                "${workspaceRoot}"
            ],
            "defines": [],
            "intelliSenseMode": "clang-x64",
@@ -52,8 +50,7 @@
                "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"
+                "${workspaceRoot}"
            ],
            "defines": [
                "_DEBUG",
@@ -72,8 +69,7 @@
                "databaseFilename": ""
            },
            "cStandard": "c11",
-            "cppStandard": "c++17",
-            "configurationProvider": "ms-vscode.makefile-tools"
+            "cppStandard": "c++17"
        },
        {
            "name": "msys2-mingw32",
@@ -126,65 +122,6 @@
                "limitSymbolsToIncludedHeaders": true,
                "databaseFilename": ""
            }
-        },
-        {
-            "name": "Switch",
-            "includePath": [
-                "/opt/devkitpro/devkitA64/aarch64-none-elf/include",
-                "/opt/devkitpro/devkitA64/lib/gcc/aarch64-none-elf/8.3.0/include",
-                "/opt/devkitpro/libnx/include",
-                "/opt/devkitpro/portlibs/switch/include",
-                "/opt/devkitpro/portlibs/switch/include/freetype2",
-                "${workspaceFolder}/**"
-            ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE",
-                "_UNICODE",
-                "__aarch64__",
-                "__SWITCH__",
-                "HAVE_LIBNX"
-            ],
-            "windowsSdkVersion": "10.0.17763.0",
-            "compilerPath": "/opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc",
-            "cStandard": "c11",
-            "cppStandard": "c++11",
-            "intelliSenseMode": "gcc-x64"
-        },
-        {
-            "name": "WiiU",
-            "includePath": [
-                "/opt/devkitpro/devkitPPC/powerpc-eabi/include",
-                "/opt/devkitpro/devkitPPC/lib/gcc/powerpc-eabi/6.3.0/include",
-                "/opt/devkitpro/portlibs/ppc/include",
-                "${workspaceFolder}/**"
-            ],
-            "defines": [
-                "WIIU",
-                "WIIU_HID"
-            ],
-            "windowsSdkVersion": "10.0.17763.0",
-            "compilerPath": "/opt/devkitpro/devkitPPC/bin/powerpc-eabi-gcc",
-            "cStandard": "c11",
-            "cppStandard": "c++11",
-            "intelliSenseMode": "gcc-x64"
-        },
-        {
-            "name": "ps2sdk-ee",
-            "includePath": [
-                "${env:PS2DEV}/ps2sdk/common/include",
-                "${env:PS2DEV}/ps2sdk/ee/include",
-                "${env:PS2DEV}/gsKit/include",
-                "${workspaceFolder}/**"
-            ],
-            "defines": [
-                "PS2",
-                "_EE"
-            ],
-            "compilerPath": "${env:PS2DEV}/ee/bin/mips64r5900el-ps2-elf-gcc",
-            "cStandard": "c11",
-            "cppStandard": "c++11",
-            "intelliSenseMode": "gcc-x64"
        }
    ],
    "version": 4
@@ -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,43 +1,25 @@
 {
-   /*"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,
-   "editor.ruler": [80],
   "files.associations": {
-      "*.h": "c",
+      "frontend_driver.h": "c",
      "*.in": "c",
      "*.rh": "c",
      "array": "c",
+      "file_stream.h": "c",
+      "driver.h": "c",
      "iosfwd": "c",
      "xlocbuf": "c",
      "xmemory0": "c",
-      "ios": "c",
-      "list": "c",
-      "unordered_map": "c",
-      "unordered_set": "c",
-      "sstream": "cpp",
-      "hash_map": "c",
-      "hash_set": "c",
-      "initializer_list": "c",
-      "string_view": "c",
-      "utility": "c",
-      "thread": "c",
-      "xlocale": "c",
-      "deque": "c",
-      "vector": "c",
-      "xhash": "c",
-      "xiosbase": "c",
-      "xstring": "c",
-      "xtree": "c",
-      "xutility": "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
@@ -3,509 +3,271 @@ RetroArch and the libretro team would like to
 acknowledge the following contributors:

 1ch (L0sted)
-23rd
-6lackmag3
-A Schain (aschain)
+Aaahh Ahh (Aaahh)
 Aaron Oneal (aarononeal)
-Aaron Ramirez (aaronbytes)
-Abadede
-Adam Londero (alondero)
 Adam Mechtley (amechtley)
-Adriano de Moura Leite (amlib)
-Adrien Moulin (elyosh)
-Aethyrion
+Adolfo Ketzer (reztek)
+AdrianoML
 ajefr
-AKuHAK
-Alberto Alonso Ruibal (albertoruibal)
-Alberto Fustinoni (albertofustinoni)
 Alberto Simon (asimonf)
 Alcaro
-aldebaran27
-Aleksey Samoilov (Sunderland93)
 Alessandro Mangone (Vektor) (zevektor)
+Alex Eckhart (alex34567)
 Alex Folland (AlexFolland)
-Alex Kornitzer (alexkornitzer)
 Alexander Spady (alkaseltzerspadt)
-Alexander Trufanov (trufanov-nok)
 Alexandre Garcia (Alexandre-Garcia)
 Alfredo Monclus (alfrix)
 aliaspider
 alphanu1
 altiereslima
 Alwin Garside (Yogarine)
-amtz
-Anders Storhaug (andersstorhaug)
+Amiga1200Gamer (amigagamer)
 Andre Leiradella (leiradel)
 Andrés (fr500)
-Andy Nguyen (TheOfficialFloW)
 Anthony J. Bentley (bentley)
-Antonio Jose Ramos Marquez (psxdev)
-antonioginer
-Apaczer
 AridRayne
-ArnaudFaucher
-arpruss
-arstn
-Artem Polishchuk (tim77)
 Arto Vainiolehto (arakerlu)
-asavah
-Ash (ashquarky)
+asako (asakous)
+Ash (QuarkTheAwesome)
 Ashura (CoalaJoe)
+Autechre64
 Avton1
-ayssia
-BananaRama203
 barbudreadmon
-Barry Rowe (BarryJRowe)
-Bartłomiej Burdukiewicz (dev-0x7C6)
-Bashar Astifan (basharast)
 bearoso
-Ben Hamilton (Ben Gertzfield) (bhamiltoncx)
-benklop
-benutzer193
-Bernhard Schelling (schellingb)
 blackgur
-bmaupin
-Bobby Smith (bslenul)
 Boris Timofeev (btimofeev)
-Brad (SpiralBrad)
-Braden Farmer (farmerbb)
-Brandon Johnson (BinaryFissionGames)
-Breno Dantas Mendonça (brenodantas10)
-Brian Hoem (ZornTaov)
+bparker06
+Brandon Johnson (Denu8thell)
 Brian Koropoff (bkoropoff)
 Brian S. Stephan (bsstephan)
-BringerethOfLight
 Brunnis
-bsmith (DogParty)
 bubuleur
-bulzipke
-C.W. Betts (MaddTheSane)
 Casey Borders (CaseyB)
-CatGreen90
 ceb33
-cedorg
 celerizer
-Charlène (julianaito)
-CheezeCake
 Chris Merrett (chrisfu)
-Christian Murphy (grimpunch)
-christianhaitian
-Christoffer Tibell (Brottweiler)
-Christopher Snowhill (kode54)
 chu (9chu)
-Chuck Smith (chucksmith)
 CidVonHighwind
 clienthax
-cold-brewed
-Colin Kinloch (ColinKinloch)
-CompCom
-ComradeEcho
-confusedguy9
 Conn O'Griofa (psyke83)
-Connor McLaughlin (stenzek)
-Conrad Kreyling (konistehrad)
-CozmoP
-Cpasjuste
 cpsw
 Cray Elliott (MP2E)
-Crestwave
-CrewMdk
-Cristi Mitrana (cmitu)
 Cristian Sandu (crazyquark)
-crystalct
-CTCaer
+ctult
+cubtekki
 cucholix
 cudencuden
-CyberLabSystems
-Daehan Kim (iAmGhost)
+cxd4
 dalter
 Dan Weiss (Dwedit)
 danieljg
-Daniil Zhilin (LaserMoai)
+Daniil Zhilin (GeneralFailer)
 dankcushions
-Darren Thompson (DiscoStarslayer)
+Danny Glover (DannyGlover)
 Dave (freakdave)
 Dave Leaver (danzel)
-David CARLIER (devnexen)
 David Demelier (markand)
 David Erickson (daviderickson)
-David G. F. (davidgfnet)
-David Lawson (dmrlawson)
+David Shah (daveshah1)
 David Walters (hiddenasbestos)
-dbaronica
 DEX357
 diablodiab
 dibas
 Diego A. (SuperrSonic)
 Diego Viola (diegoviola)
-digitalisland-nino
 Diogo Barros (BlueKore)
-Dmitry Sergeenkov (DuMOHsmol)
+DogParty
 dor3k
-Doug Christman (dobyrch)
-driver1998
 Dudu Akiva (duduke)
 duganchen
-dukemiller
 duskgao
-Dylan Scott (dyscott)
-Dystopian
-eadmaster
-Eduard Strehlau (Herdinger)
 ekipan
-Elvira Khabirova (parport0)
-embercold
-Emmanuel Martin (daliaetnano)
+ensra
+erbridge
+esoptron
 Ethan Lee (flibitijibibo)
-extrowerk
 Ezio-PS
-F (erbridge)
 Fabio (Oibaf66)
 Fabio Ritrovato (Sephiroth87)
 Fayne Aldan (FayneAldan)
-fff (felinben)
-Filipe Azevedo (pasnox)
 FIX94
-Flame Sage (flamesage)
+Flame Sage (chris062689)
 flyinghead
-FmT0
-francescotintori
-Francisco Javier Trujillo Mata (fjtrujy)
 Francisco José García García (frangarcj)
-FreeShippingParty
-fuzzydunlops732 (JKoppel93)
-GABO1423
-Gabriel (Ghabry)
 GameDragon2k
 Garrett Brown (garbear)
-gatecat (daveshah1)
-GavinDarkglider
 gblues
 Geoffrey Plitt (GeoffreyPlitt)
-Giovanni Cascione (spleen1981)
 Glenn Hevey (hevey)
 Googer
-gordon-fish
 gouchi
 Gregor Richards (GregorR)
-Grzegorz Raciborski (graciborski)
 Gui Andrade (archshift)
-Guillaume Thiolliere (thiolliere)
-Guo Yunhe (guoyunhe)
 Gustavo Maciel Dias Vieira (gmdvieira)
 gvbr
+H. İbrahim Güngör (igungor)
 hadess
 Hans-Kristian Arntzen (Themaister)
 Henri Gomez (hgomez)
 Henri Gomez (hgomez-sonarsource)
-Henry Castro (hcvcastro)
-Higor E. (heuripedes)
+Higor Eurípedes (heuripedes)
 hizzlekizzle
-Hugo B. (hug0b)
-Hugo Hromic (hhromic)
+Hugo B. (777sha)
 hunterk
 Hyllian
-HyperspaceMadness
 i30817
-im4potato
-ImJezze
-İbrahim Güngör (igungor)
+iAmGhost
 Jack (jakcron)
-Jacob (cubtekki)
-Jacob (RegenJacob)
-Jacob Patterson (jacobpa)
-jacobsson (Roet-Ivar)
-Jahed
-Jake Stine (jstine35)
 James Le Cuirot (chewi)
 James Sexton (Bezier89)
-Jamiras
 Jan Holthuis (Holzhaus)
-Jason Tomsic (plaidman)
-Javier Martinez Canillas (martinezjavier)
 Jay McCarthy (jeapostrophe)
-jdgleaver
 Jean-André Santoni (kivutar)
 Jean-Paul Mari (djipi)
 Jean-Sébastien Guay (Skylark13)
-Jeff (jeffbdavenport)
-Jeff Sousa (LordeIlluminati)
-jess (winneon)
-Jesse Talavera-Greenberg (JesseTG)
-Joan Coll Cerdán (johanbcn)
-Job Adrian Salinas Gonzalez (efylan)
-Joe Osborn (JoeOsborn)
+Jesse Bryan (winneon)
 Joel (joel16)
-Joel Puig Rubio (XXLuigiMario)
 Joerg Sonnenberger (jsonn)
 Johannes Schickel (lordhoto)
-John Parton (john-parton)
 John Regan (jprjr)
 Jon Maddox (maddox)
-Jonathan (JonnyMe)
 Jonathan Relf (jonathanrelf)
 Joohan Lee (losernator)
 Jools Wills (joolswills)
-Jose Lage Miguez (Joselagem)
-Joseph Carter (knghtbrd)
+Joseph Carter (iKarith)
 Joseph Conan Montgomery (Grotke)
-jsd1982 (JamesDunne)
-jSTE0
+Josh Palmer (ShiftyAxel)
 JuanVCS
 Justin Jacobs (dorkster)
 Justin Weiss (justinweiss)
-JustMeDaFaq
-Kangmo-Ahn
-Karl Forshaw (karlforshaw)
-Kate Eckhart (katepango)
-Keith Bowes (keithbowes)
 Ken Rossato (rossato)
-kikmon
-Kopert
-Krzysztof Haładyn (krzys_h) (krzys-h)
 kurumushi
 kwyxz
 l3iggs
-lambolighting
 lasers
 Lawrence Kesteloot (lkesteloot)
-LazyBumHorse
-LazyFunker
-Lennard Kittner (Lennard599)
-LibretroAdmin
+liffy (lifning)
 Lionel Flandrin (simias)
 littleguy77
-liushuyu
-Logan McNaughton (loganmc10)
+Logan (loganmc10)
 lordashram
 Lothar Serra Mari (lotharsm)
 Lubosz Sarnecki (lubosz)
-lucasmr
 lucianposton
 lxerandrew
-m4xw
-mahoneyt944
 Mahyar Koshkouei (deltabeard)
-Mai (lioncash)
-MajorPainTheCactus
-maksun
-Manuel Alfayate Corchete (vanfanel)
 Marcelo Munhoz Pélos (mpelos)
-Marcus Crisostomo (mcrisostomo)
 markwkidd
 Maschell
-Mats (Myaats)
+Mat M. (lioncash)
 Matt Sephton (gingerbeardman)
-Matthew Bauer (matthewbauer)
-Matthew Wang (asakous)
-Max K. (langerhans)
 Maxime Gauduin (alucryd)
+mcrisostomo
 meancoot
 meepingsnesroms
 meleu
-Merry Mello (merryMellody)
-micechal
-Michael Burgardt (DisasterMo)
 Michael K. (kuxii2016)
-Michael Lelli (ToadKing)
-mickski56
+Michał Durak (micechal)
 Mico Chopitea (micochops)
 miguelpinheiro
 Mike Swanson (chungy)
-mikeOSX
-minucce
+miqlas (extrowerk)
 misson20000
-Mohmoud (esoptron) (Hedonium)
 Monroe88
-Morgane (MorganeAD)
 mprobinson
 MrHuu
-MrJs (mrjschulte)
-Muhamed Hobi (mmhobi7)
 muzuiget
-N/A (inactive123)
-Nargash
+mwtremblay
 Nathan S. (natinusala)
-NathanStrong-Tripwire
 nattycleopatra
-Naveen (naveensrinivasan)
-nayslayer
-negativeExponent
-Neil Barkhina (nbarkhina)
-neil4
 netux79
 nfnty
-nfp0
-nia (alarixnia)
 Nicolas Adenis-Lamarre (nadenislamarre)
 Nicolas Guillaumin (nguillaumin)
-Nicolas Roehm (NicolasRoehm)
-Nik (WerWolv)
-Nikita Vakhrushev (XF10C)
-Nikola Kocić (nikola-kocic)
-Nikos Chantziaras (realnc)
-Nils Hasenbanck (hasenbanck)
-njordan64
+Nicolas Lopez Fernandez (pyroesp)
+Nikita Vakhrushev (JesterIOS)
+Nikola Kocic (nikola-kocic)
+Niouby
 nosh01
 not6 (r-type)
 notaz
 nstCactus
 nurupo
 Oggom
-Oh Won Sik (dnjstlr555)
 Oleg Shevchenko (olsh)
-Omar Saleem (ofsaleem)
 opendata26
-Ophidon
 orbea
-Oschowa
-OsirizX
 OV2
-Palmic (mpalomas)
 pamapa
 Paolo Bonzini (bonzini)
-Paul McCarty (notabeatle)
-pcjco
-Pedro Ferraz (ferrazpedro)
+Paul McCarty (a-shark)
 Pedro Ribeiro (pedrib)
-Peter J Kos (pkos)
-Philippe Simons (loki666)
 pinumbernumber
-Piotr Dobrowolski (Informatic)
-pjft
-Poligraf
 pponso1
-pyroesp
-R-YaTian
-Rafael Toledo (rafaeltoledo)
 Ramiro Morales (ramiro)
-Raphaël Zumer (rzumer)
-redenvelope2000
-Reid Kleckner (rnk)
-repojohnray
-retrotails
-revvv
-reztek
+retro-wertz
 Richard Howell (rmaz)
-Rinnegatamante
-rlnilsen
 Rob Loach (RobLoach)
-Robin de Rooij (rrooij)
 Romain Gay (vikbez)
 Romain Graillot (notnotme)
 Romain TISSERAND (rtissera)
-Roman Fomin (rfomin)
 Roman Kalashnikov (lunixoid)
 Royerson
+rrooij
 rsn8887
-Ruben Nine (rnine)
-Ryan C. Gordon (icculus)
-Ryan Kuba (thelamer)
 Ryunam
 rz5
-Sage (neonfuz)
 Saggi Mizrahi (ficoos)
 SAKUJ0
-Salvador (salvacam)
-Sam (44100hertz)
-Sam Lantinga (slouken)
+Sam Pagenkopf (44100hertz)
 Sam Stenvall (Jalle19)
-Samuel P. (p-sam)
-Sanaki
 Scheiker
-Sean O'Neil (seanocali)
 Sebastien Ronsse (sronsse)
-SecularSteve
-Sefa Eyeoglu (Scrumplex)
-Sergei Nikitin (Kert)
-Sergei Trofimovich (trofi)
 Sergi Granell (xerpi)
 Sergio Padrino (sergiou87)
 sergio-br2 (sergiobenrocha2)
 Seth Kingsley (sethk)
-Shadow (ShadowOne333)
 Shane Mouton (ismouton)
-shantigilbert
-Shfty
 Shizeeg Unadequatov (shizeeg)
-SimpleTease
-SindenLightgun
-Sirrempat
+Skarsnik
 slotek
-Soar Qin (soarqin)
-sonninnos
-Sou Bunnbu (iyzsong)
 sparklewind
 spec-chum
 Stefan (gizmo98)
 stefan-gr
-stellarporter
-Stephanie Gawroriski (XerTheSquirrel)
-Steve Cox (stevenjamescox)
-Stevoisiak
-stoofin
-StormedBubbles
-strotlog
+Steven M. Vascellaro (stevoisiak)
 Stuart Carnie (stuartcarnie)
 Sunguk Lee (d3m3vilurr)
 Supernature2k
 Sven (RetroSven)
 Swizzy
-Sylvain Colinet (Skarsnik)
-Szunti
-Tadek Kijkowski (monkeyman79)
 Tatsuya79
 Terry Lewis (terry-au)
+The Last Cabra (vanfanel)
 thedax
 theheroGAC
-TheMrIron2
-ThePhxRises
-TheRhysWyrill
-Thomas Lorblanchès (Zlika)
-Tilman M. Jaeschke (asciibeats)
-Tim Van den Langenbergh (tmtvl)
-Tobias Gruetzmacher (TobiX)
+TheOfficialFloW
+thiolliere
+Toad King (ToadKing)
 Tobias Jakobi (tobiasjakobi)
-Todd Laney (ToddLa)
 Tomáš Kelemen (ToKe79)
-Tor Arne Vestbø (torarnv)
 Torsten Paul (t-paul)
 TotalCaesar659
-tr12345
 TroggleMonkey
-tunip3
-txorion
-Tyler Loch (TylerLoch)
+Twinaphex
 URBANsUNITED
-vaguerant
-Val Packett (valpackett)
-Valerio Proietti (kamicane)
 vgmoose
-Vicki Pfau (endrift)
 Vicky C Lau (vickychenglau)
-vin (suseme)
-Vincent Pelletier (vpelletier)
 Vladimir Panteleev (CyberShadow)
-Vladimir Serbinenko (phcoder)
 Víctor "IlDucci" (IlDucci)
-waitingmoon
-Warning: Non-Potable Water (warningnonpotablewater)
+Wang Vincent (susemm)
 webgeek1234
-Weedy Weed Smoker (WeedyWeedSmoker)
-whorsemaster
-Wiimpathy
 Wiktor Strzębała (wiktorek140)
-Woohyun Shin (sinusinu)
-xenomorph-us
 xhp-creations
-Yari (hyarsan)
-yesfish (huwpascoe)
+Yarsan Hoessain (hyarsan)
 Yongwoon Cho (ssangkong)
 yoshisuga
-Zer0xFF
 zeromus
 zlice
-Érico Nogueira Rolim (ericonr)
-Ömercan Kömür (fpscan)
-シーはディー四を取る (cxd4)
+Zoran Vuckovic (casdevel)
 )";
@@ -1,135 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at:
-
- * Via E-Mail to <libretro@gmail.com>, please include in the subject line
-   `RETROARCH COC` so that your e-mail may reach the correct party.
-
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
-at [https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
@@ -1,120 +0,0 @@
-Refer also to this page for more information -
-https://docs.libretro.com/development/coding-standards/
-
-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]. A balancing act here is necessary.
-
-Be mindful that heap allocations are slow compared to stack.
-
-Functions
---------
- Avoid doing small getter/setter functions. We want a function 
-to justify its function call overhead by doing a significant 
-body of work. Small one-line getter/setter functions for what 
-is predominantly C-style structs is not useful, plus it leads 
-to people thinking this function is more complex than it 
-actually is, thus obfuscating the sourcecode instead of it 
-being easier to read.
-
-If you can find examples in the codebase that violate this 
-guideline, do not hesitate to point them out to us.
-
-Variable declaration
--------------------
-For C source files, we have to insist you stick to the following:
-
- Declare variables either at the start of a function or the start 
-   of a code block, depending on the scope they need.
- Do not do initial for loop declarations. Refer to the bulletpoint above:
-   either declare them at the start of the function, or at the start
-   of the code block.
-
-Not doing this would break compilation on platforms where we are compiling
-these C source files in C89 compatibility mode. If such issues occur in pull
-requests, we have to request that it be fixed.
-
-VLA (Variable Length Array)
---------------------------
-Do not use VLAs (Variable Length Array) in C source files. These are not
-C89-compliant.
-
-Miscellaneous
-------------
- Brace usage follows "Allman style". The brace associated with a control statement is placed on the following line, 
-  indented to the same level as the control statement. 
-  Statements within the braces are indented to the next level.
- A single statement block must not include brackets (unless the block uses a macro that expands into multiple lines)
- If possible, avoid 'while (true)' and use 'for (;;)' instead
@@ -1,93 +1,58 @@
-# Contributing to RetroArch
-
-If you are a developer who wishes to contribute to the development of _RetroArch_; or if you have
-found a bug and wish to submit a minor patch and/or bug report, please read this document.
-
-Active discussions happen on our [Discord](https://discordapp.com/invite/27Xxm2h), mostly within
-the _Programming_ channel category. We value discussions that happen in real time around
-these contributions.
-
-Please do note that contributors to _RetroArch_ do such contributions within their spare time.
-We do prefer to keep a professional and non-aggressive atmosphere around the project, along
-with any disagreements to be settled professionally without insults, name calling, or otherwise.
-If there are any issues, we are willing to have discussions about it.
-
-## Submitting Bug Reports
-
-Bug reports in _RetroArch_ may fall into one of two categories:
-
- * _RetroArch_ itself, the user interface and API around all of the various cores.
- * Individual _Core_, of which interact with _RetroArch_.
-
-When submitting a bug report, ensure that the report is submitted to the correct repository.
-For _RetroArch_ itself, it is done by reporting a bug within the
-[RetroArch](https://github.com/libretro/RetroArch) repository. For other cores, please use
-the search function within the [libretro Organization](https://github.com/libretro) on
-GitHub. Issues that are specific to a core and not _RetroArch_ are likely to be closed very
-quickly. If an issue is suspected with _RetroArch_, please make sure to test with multiple
-cores to be sure that is is not isolated.
-
-If the issue occurs during runtime, please paste the verbose log output:
-
- * If using the _Pheonix_ interface, the log will be in _File_ -> _Show Log_.
- * If using the main interface, enable verbose logging with _Settings_ -> _Logging_ ->
-   _Logging Verbosity_. Ensure both _Log to File_ and _Timestamp log Files_ is enabled.
- * Otherwise, run _RetroArch_ with the verbose (`-v`) flag.
-
-If the error happens during compilation and/or building, paste the output of `./configure`
-and `make` accordingly. If using an IDE, please paste any of the errors and log output.
-
-## Submitting Pull Requests
-
-Any and all contributions should be submitted through Pull Requests on
-[GitHub](https://github.com/libretro/RetroArch/pulls). The process requires that you fork the
-repository, make the appropriate changes, and then open a pull request on _GitHub_. If your
-pull request is for a proof-of-concept then please indicate as such.
-
-Your pull request will then be reviewed. There may be comments and requests for additional
-changes to be made. It may also be possible that the changes will not be accepted. Otherwise, it
-may be merged in when it is fully approved. The final approval of merge requests is at the
-discretion of the project.
-
-If you want to develop a larger feature or make broad changes, please do join our
-[Discord](https://discordapp.com/invite/27Xxm2h) server to discuss. The discussion is
-necessary to prevent the possibility of major work being done which will not be accepted at all.
-
-## libretro API
-
-If you wish to contribute additional functionality to _libretro_'s API, there are considerations
-that must be accepted. Please note that because this API affects multiple different projects, we
-highly value and require API and ABI stability and backwards-compatibility. Due to this
-requirement, there will be additional scrutiny in reviews for this added functionality.
-
-Any and all features will be added only when **necessary** for an existing _libretro_ core to
-properly function. Hypothetical implementations of _libretro_ are not considered.
-
-## Coding style
-
-We highly value a consistent code style throughout the entire code base, please make sure you look
-through the existing code to get a feel for the coding style. When submitting a pull request, it may
-be asked to fix any coding style issues before submission. In other cases, there may be a follow-up
-pull request making the code style consistent.
-
-For full guidelines please see the [Coding Standards](https://docs.libretro.com/development/coding-standards/).
-
-Some non-obvious things to be aware of:
-
-  - Code should be both C89 and ISO C++ compatible. This is a requirement for XBox 360 and MSVC to
-    properly build. Think of it as a C++ compatible subset of C99.
-  - There must be no warnings in your code (enabled by `-Wall` for GCC compilers), do also note that
-    different compilers may produce different warnings.
-  - Avoid using deprecated APIs, these will be removed in the future at some point.
-
-## Copyright Headers and AUTHORS
-
-If you have contributed a chunk of source code that is written to you, you should add yourself to
-the copyright header in the file. If you have made a significant contribution you should add
-yourself to the `AUTHORS` file, adding your full name, e-mail, and the feature you worked on.
-
-## Commit Access
-
-Contributors who show a good track record of pull requests over time may eventually
-get commit access to the repository. This may happen when looking through pull requests
-over long amounts of 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,66 +14,39 @@ 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)"'
-DEFINES += -DASSETS_DIR='"$(DESTDIR)$(ASSETS_DIR)"'
-DEFINES += -DFILTERS_DIR='"$(DESTDIR)$(FILTERS_DIR)"'
-DEFINES += -DCORE_INFO_DIR='"$(DESTDIR)$(CORE_INFO_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 -Wsign-compare

 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 -limm32
+   LDFLAGS += -static-libgcc -lwinmm
 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)
@@ -85,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)
@@ -102,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 -Werror=declaration-after-statement
-   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)
@@ -142,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),)
@@ -176,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))

@@ -190,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)

@@ -218,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,20 +217,19 @@ $(OBJDIR)/%.o: %.S config.h config.mk $(HEADERS)
 $(OBJDIR)/%.o: %.rc $(HEADERS)
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo WINDRES $<),)
-	$(Q)$(WINDRES) $(DEFINES) -o $@ $<
+	$(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
@@ -250,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,48 +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 $(PNDDIR)/readme.html
-	rm -f retroarch
-
@@ -1,52 +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 $(PNDDIR)/readme.html
-	rm -f retroarch
-
@@ -2,16 +2,12 @@ TARGET := retroarch_3ds
 LIBRETRO =

 DEBUG                   = 0
-CONSOLE_LOG             = 0
 GRIFFIN_BUILD           = 1
-HAVE_STATIC_DUMMY ?= 0
 WHOLE_ARCHIVE_LINK      = 0
 BUILD_3DSX              = 1
 BUILD_3DS               = 0
 BUILD_CIA               = 1
 LIBCTRU_NO_DEPRECATION  = 1
-USE_CTRULIB_2          ?= 0
-LOAD_WITHOUT_CORE_INFO ?= 0

 APP_TITLE            = RetroArch 3DS
 APP_DESCRIPTION      = RetroArch 3DS
@@ -39,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
@@ -53,20 +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_LIBRETRODB -DHAVE_CC_RESAMPLER
-	DEFINES += -DHAVE_ZLIB -DHAVE_7ZIP -D_7ZIP_ST -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA
-	DEFINES += -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_CORES
-	DEFINES += -DHAVE_UPDATE_CORE_INFO
-	#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_CORE_INFO_CACHE
-	#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
@@ -75,31 +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_IFINFO = 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_CORE_INFO_CACHE = 1
+	HAVE_SSL = 1

 	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
 	BLACKLIST :=
 	BLACKLIST += input/input_overlay.o
 	BLACKLIST += tasks/task_overlay.o
@@ -109,61 +88,32 @@ endif
 ifeq ($(strip $(DEVKITPRO)),)
 	$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitpro")
 endif
-ifeq ($(strip $(DEVKITARM)),)
-	$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitarm")
-endif

 ifeq ($(strip $(CTRULIB)),)
 	CTRULIB = $(DEVKITPRO)/libctru
 endif

-ifeq ($(strip $(USE_CTRULIB_2)),1)
-	CFLAGS += -DUSE_CTRULIB_2
-endif
-
-ifeq ($(LOAD_WITHOUT_CORE_INFO),1)
-	CFLAGS += -DLOAD_WITHOUT_CORE_INFO
-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 \
-	   -fomit-frame-pointer -ffast-math \
-	   -Werror=implicit-function-declaration \
-	   $(ARCH)
+CFLAGS	+=	-mword-relocations \
+			-fomit-frame-pointer -ffast-math \
+         -Werror=implicit-function-declaration \
+			$(ARCH)

 #CFLAGS	+= -Wall
-CFLAGS	+= -DARM11 -D_3DS
-
-ifeq ($(strip $(USE_CTRULIB_2)),1)
-   CFLAGS	+= -D__3DS__
-endif
+CFLAGS	+=	-DARM11 -D_3DS

 ifeq ($(DEBUG), 1)
   CFLAGS	+= -O0 -g
@@ -171,10 +121,6 @@ else
   CFLAGS	+= -O3
 endif

-ifeq ($(CONSOLE_LOG), 1)
-   CFLAGS	+= -DCONSOLE_LOG
-endif
-
 ifeq ($(LIBCTRU_NO_DEPRECATION), 1)
   CFLAGS	+= -DLIBCTRU_NO_DEPRECATION
 endif
@@ -184,37 +130,20 @@ 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
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
+
+ASFLAGS	:=	-g $(ARCH) -O3
+LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

-ASFLAGS	 := -g $(ARCH) -O3
-LDFLAGS  += -specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 CFLAGS   += -std=gnu99 -ffast-math

-LIB_CORE      :=
-LIB_CORE_FULL :=

-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIB_CORE      += -lretro_ctr
-  LIB_CORE_FULL += libretro_ctr.a
-endif
-
-LIBS	:= $(WHOLE_START) $(LIB_CORE) $(WHOLE_END) -lm
+LIBS	:= $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lm

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

+
 ifeq ($(BUILD_3DSX), 1)
 	TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
 endif
@@ -240,7 +170,7 @@ all: $(TARGET)

 $(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
 $(TARGET).3dsx: $(TARGET).elf
-$(TARGET).elf: $(OBJ) $(LIB_CORE_FULL)
+$(TARGET).elf: $(OBJ) libretro_ctr.a

 PREFIX		:=	$(DEVKITARM)/bin/arm-none-eabi-

@@ -278,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
@@ -304,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)
@@ -313,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)
@@ -331,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
@@ -344,3 +275,5 @@ clean:
 	rm -f ctr/3dsx_custom_crt0.o

 .PHONY: clean
+
+
@@ -2,11 +2,9 @@ TARGET := retroarch_3ds_salamander
 LIBRETRO =

 DEBUG                   = 0
-CONSOLE_LOG             = 0
 BUILD_3DSX              = 1
 BUILD_3DS               = 0
 BUILD_CIA               = 1
-USE_CTRULIB_2          ?= 0

 APP_TITLE            = RetroArch 3DS
 APP_DESCRIPTION      = RetroArch 3DS
@@ -26,46 +24,33 @@ 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 \
 		 libretro-common/file/retro_dirent.o \
 		 libretro-common/compat/compat_strl.o \
-		 libretro-common/compat/compat_strldup.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
@@ -91,21 +76,13 @@ CFLAGS	+=	-mword-relocations \
 #CFLAGS	+= -Wall
 CFLAGS	+=	-DARM11 -D_3DS

-ifeq ($(strip $(USE_CTRULIB_2)),1)
-   CFLAGS	+= -D__3DS__
-endif
-
 ifeq ($(DEBUG), 1)
   CFLAGS	+= -O0 -g
 else
   CFLAGS	+= -O3
 endif

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

 #CFLAGS += -DRARCH_INTERNAL
 CFLAGS += -DRARCH_CONSOLE -DIS_SALAMANDER
@@ -117,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
@@ -175,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
@@ -202,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)
@@ -210,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 $@
@@ -241,3 +220,5 @@ clean:
 	rm -f ctr/3dsx_custom_crt0.o

 .PHONY: clean
+
+
@@ -1,222 +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_IFINFO = 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_XMB = 1
-HAVE_ZLIB = 1
-HAVE_CONFIGFILE = 1
-HAVE_PATCH = 1
-HAVE_CHEATS = 1
-HAVE_LIBSHAKE = 1
-HAVE_CORE_INFO_CACHE = 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,229 +0,0 @@
-include version.all
-
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-TOPDIR ?= $(CURDIR)
-
-
-DEBUG                  ?= 0
-WHOLE_ARCHIVE_LINK      = 0
-HAVE_STATIC_DUMMY ?= 0
-GRIFFIN_BUILD           = 0
-
-OBJ :=
-
-DEFINES := -DHAVE_DJGPP=1 -U__linux__ -U__linux -DRARCH_INTERNAL -DHAVE_STB_VORBIS
-CC := i586-pc-msdosdjgpp-gcc
-CXX := i586-pc-msdosdjgpp-g++
-TARGET := retrodos.exe
-
-RARCH_CONSOLE = 0
-HAVE_SHADERPIPELINE = 1
-HAVE_SPIRV_CROSS = 0
-HAVE_PATCH = 1
-HAVE_LUA = 0
-HAVE_CONFIGFILE = 1
-HAVE_GFX_WIDGETS = 1
-HAVE_LANGEXTRA = 1
-HAVE_DR_MP3 = 1
-HAVE_TRANSLATE = 0
-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_ZLIB = 1
-HAVE_IMAGEVIEWER = 1
-HAVE_BUILTINZLIB = 1
-HAVE_LIBRETRODB = 1
-HAVE_DSP_FILTER = 1
-HAVE_VIDEO_FILTER = 1
-HAVE_STATIC_VIDEO_FILTERS = 1
-HAVE_STATIC_AUDIO_FILTERS = 1
-HAVE_FILTERS_BUILTIN = 1
-HAVE_MENU = 1
-HAVE_CONFIGFILE = 1
-HAVE_PATCH = 1
-HAVE_CHEATS = 1
-HAVE_RUNAHEAD = 1
-HAVE_NETWORKING = 0
-HAVE_IFINFO = 0
-HAVE_NETPLAYDISCOVERY = 0
-HAVE_OVERLAY             := 1
-HAVE_STB_FONT = 1
-HAVE_COMMAND             := 1
-HAVE_STDIN_CMD           := 1
-HAVE_CMD                 := 1
-HAVE_CHEEVOS = 0
-HAVE_CHD = 0 # disabled due to static libretro-common and libchdr conflicts between different cores
-HAVE_STB_VORBIS = 1
-HAVE_IBXM = 1
-HAVE_CORE_INFO_CACHE = 1
-HAVE_XDELTA = 0 # disabled because <lzma.h> isn't available (or we haven't figured out how to install it)
-
-HAVE_RGUI = 1
-HAVE_MATERIALUI = 0
-HAVE_XMB = 0
-HAVE_OZONE = 0
-
-
-OBJ := \
-    frontend/drivers/platform_dos.o \
-    gfx/drivers/vga_gfx.o \
-    input/drivers/dos_input.o \
-    input/drivers_joypad/dos_joypad.o
-
-include Makefile.common
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# DATA is a list of directories containing data files
-# INCLUDES is a list of directories containing header files
-# EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm".
-# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional)
-#
-# NO_ICON: if set to anything, do not use icon.
-# NO_NACP: if set to anything, no .nacp file is generated.
-# APP_TITLE is the name of the app stored in the .nacp file (Optional)
-# APP_AUTHOR is the author of the app stored in the .nacp file (Optional)
-# APP_VERSION is the version of the app stored in the .nacp file (Optional)
-# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional)
-# ICON is the filename of the icon (.jpg), relative to the project folder.
-#   If not set, it attempts to use one of the following (in this order):
-#     - <Project name>.jpg
-#     - icon.jpg
-#     - <libnx folder>/default_icon.jpg
-#---------------------------------------------------------------------------------
-BUILD := build
-SOURCES := $(CURDIR)/source
-DATA := data
-INCLUDES :=	include
-EXEFS_SRC := exefs_src
-
-APP_TITLE := RetroArch
-APP_VERSION := $(RARCH_VERSION)
-APP_AUTHOR := libretro Team
-APP_ICON := pkg/libnx/retroarch.jpg
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-ARCH	:=
-
-CFLAGS := -g -Wall -O3 -fcommon -ffast-math -ffunction-sections \
-          $(ARCH) $(DEFINES) $(INCLUDE_DIRS)
-
-CFLAGS += $(INCLUDE)
-
-ifeq ($(HAVE_FILTERS_BUILTIN), 1)
-  CFLAGS += -DHAVE_FILTERS_BUILTIN
-endif
-
-ifeq ($(strip $(HAVE_STATIC_DUMMY)),1)
-  CFLAGS	+=	-DHAVE_STATIC_DUMMY=1
-endif
-
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
-
-ASFLAGS	:=	-g $(ARCH)
-LDFLAGS	=	$(ARCH) -Wl,--allow-multiple-definition -Wl,-Map,$(notdir $*.map)
-
-# add things from Makefile.common
-CFLAGS += $(DEF_FLAGS)
-
-LIBS	:= -lstdc++ -lm
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(TARGET)
-export TOPDIR	:=	$(CURDIR)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/
-
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-export OFILES 	:=	$(OBJ)
-
-ifeq ($(strip $(HAVE_STATIC_DUMMY)),)
-  OFILES += libretro_libnx.a
-endif
-
-export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
-
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-			-I$(CURDIR)/$(BUILD)
-
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
-
-export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC)
-
-ifneq ($(APP_TITLEID),)
-	export NACPFLAGS += --titleid=$(APP_TITLEID)
-endif
-
-ifneq ($(ROMFS),)
-	export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
-endif
-
-LIB_CORE :=
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIB_CORE += -lretro_dos
-endif
-
-DEPENDS_TMP  := $(OFILES:.o=.d)
-DEPENDS      := $(filter-out libretro_libnx.a,$(DEPENDS_TMP))
-
-.PHONY: clean all
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-all	:	$(OUTPUT)
-
-$(OUTPUT): $(OBJ)
-	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(PLATEXTRA) -L. $(LIB_CORE) $(LIBS)
-
-%.o: %.c
-	$(CC) -c -o $@ $(CFLAGS) $<
-
-%.o: %.cpp
-	$(CXX) -c -o $@ $(CFLAGS) $<
-
-clean:
-	rm -f $(DEPENDS) $(OBJ) $(OUTPUT)
-
-#---------------------------------------------------------------------------------
-# you need a rule like this for each extension you use as binary data
-#---------------------------------------------------------------------------------
-%.bin.o	%_bin.h :	%.bin
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
-#---------------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------------
@@ -1,114 +1,52 @@
-HAVE_STATIC_DUMMY ?= 0
-ifeq ($(TARGET),)
-ifeq ($(LIBRETRO),)
 TARGET := retroarch.js
-LIBRETRO = dummy
-else
-TARGET := $(LIBRETRO)_libretro.js
-endif
-endif

 EOPT = USE_ZLIB=1 # Emscripten specific options
 EOPTS = $(addprefix -s $(EMPTY), $(EOPT)) # Add '-s ' to each option

+PTHREAD = 0
 OS = Emscripten
 OBJ :=
-DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN
-DEFINES += -DHAVE_FILTERS_BUILTIN
-HAVE_PATCH = 1
-HAVE_DSP_FILTER = 1
-HAVE_VIDEO_FILTER = 1
+DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD)
+DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN
+
 HAVE_OVERLAY = 1
-HAVE_GLSL = 1
-HAVE_SCREENSHOTS = 1
-HAVE_REWIND = 1
-HAVE_AUDIOMIXER = 1
 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_COMMAND = 1
-HAVE_STDIN_CMD = 1
-HAVE_CHEATS = 1
-HAVE_IBXM = 1
-HAVE_CORE_INFO_CACHE = 1
-HAVE_7ZIP = 1
-HAVE_BSV_MOVIE = 1
-HAVE_AL = 1
-
-# WARNING -- READ BEFORE ENABLING
-# The rwebaudio driver is known to have several audio bugs, such as
-#  minor crackling, or the entire page freezing/crashing.
-#  It works perfectly on chrome, but even firefox has really bad audio quality.
-#  I should also note, the driver on iOS is completely broken (crashes the page).
-#  You have been warned.
-HAVE_RWEBAUDIO = 0
-
-ASYNC ?= 0
-ifeq ($(LIBRETRO), mupen64plus)
-   ASYNC = 1
-endif
-
-LTO ?= 0
-ifeq ($(LIBRETRO), tyrquake)
-   LTO = 0
-endif
-
-PTHREAD ?= 0
-
-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 "EXPORTED_RUNTIME_METHODS=['callMain', 'FS', 'PATH', 'ERRNO_CODES']" \
-           -s ALLOW_MEMORY_GROWTH=1 -s "EXPORTED_FUNCTIONS=['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_load_state', '_cmd_take_screenshot']" \
-           -s MODULARIZE=1 -s EXPORT_ES6=1 -s EXPORT_NAME="libretro_$(subst -,_,$(LIBRETRO))" \
-           -s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=1 \
-           --js-library emscripten/library_errno_codes.js \
+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
-
-ifeq ($(HAVE_RWEBAUDIO), 1)
-   LDFLAGS += --js-library emscripten/library_rwebaudio.js
-   DEFINES += -DHAVE_RWEBAUDIO
-endif
-ifeq ($(HAVE_AL), 1)
-   LDFLAGS += -lopenal
-   DEFINES += -DHAVE_AL
-   ASYNC = 1
-endif
-
 ifneq ($(PTHREAD), 0)
-   LDFLAGS += -s WASM_MEM_MAX=1073741824 -pthread -s PTHREAD_POOL_SIZE=$(PTHREAD)
-   CFLAGS += -pthread
-   HAVE_THREADS=1
-else
-   HAVE_THREADS=0
+   LDFLAGS += -s USE_PTHREADS=$(PTHREAD) -s PTHREAD_POOL_SIZE=2
 endif

 ifeq ($(ASYNC), 1)
-   LDFLAGS += -s ASYNCIFY=$(ASYNC) -s ASYNCIFY_STACK_SIZE=8192 
-   ifeq ($(DEBUG), 1)
-     LDFLAGS += -s ASYNCIFY_DEBUG=1 # -s ASYNCIFY_ADVISE
-   endif
+   LDFLAGS += -s ASYNCIFY=$(ASYNC)
 endif

 ifeq ($(HAVE_SDL2), 1)
@@ -118,40 +56,28 @@ endif

 include Makefile.common

-CFLAGS += $(DEF_FLAGS) -Ideps -Ideps/stb
-
-libretro :=
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  libretro += libretro_emscripten.bc
-endif
+CFLAGS += -Ideps/libz -Ideps -Ideps/stb
+libretro = libretro_emscripten.bc

 ifneq ($(V), 1)
   Q := @
 endif

 ifeq ($(DEBUG), 1)
-   LDFLAGS += -O0 -g -gsource-map -s SAFE_HEAP=1 -s STACK_OVERFLOW_CHECK=2 -s ASSERTIONS=1
-   CFLAGS += -O0 -g -gsource-map -s SAFE_HEAP=1 -s SAFE_HEAP_LOG=1 -s STACK_OVERFLOW_CHECK=2 -s ASSERTIONS=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

-# 128 * 1024, double the usual emscripten stack size
-LDFLAGS += -s STACK_SIZE=131072
-
-LDFLAGS += --extern-pre-js emscripten/pre.js
-
-CFLAGS += -Wall -I. -Ilibretro-common/include -std=gnu99 #\
-#          -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_take_screenshot']"
+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

@@ -66,6 +66,7 @@ SHADER_CG_DIR      := media/shaders_cg
 OVERLAY_DIR        := media/overlays
 SHADER_GLSL_DIR    := media/shaders_glsl

+PYTHON2            := python2$(EXE_EXT)
 PYTHON3            := python3$(EXE_EXT)
 GIT                := git$(EXE_EXT)

@@ -74,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)
@@ -99,8 +89,6 @@ else ifeq ($(platform), wii)
   libogc_platform    := 1
 endif

-HAVE_GFX_WIDGETS := 1
-
 # PS3
 ifeq ($(platform), ps3)
   #TODO
@@ -115,26 +103,19 @@ 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)
   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
   EXT_TARGET := $(TARGET_NAME)_$(platform).dol
   EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf

-   INCLUDE += -I.
-
+   INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/libz -Iwii/libogc/include
+ 
   ifeq ($(EXTERNAL_LIBOGC), 1)
      CFLAGS   += -DEXTERNAL_LIBOGC
      CXXFLAGS += -DEXTERNAL_LIBOGC
-      INCLUDE += -I$(DEVKITPRO)/libogc/include

      ifeq ($(platform), ngc)
         LIBDIRS += -L$(DEVKITPRO)/libogc/lib/cube
@@ -145,7 +126,6 @@ else ifeq ($(libogc_platform), 1)
   else
      CFLAGS   += -DINTERNAL_LIBOGC
      CXXFLAGS += -DINTERNAL_LIBOGC
-      INCLUDE += -Iwii/libogc/include

      ifeq ($(platform), ngc)
         LIBDIRS += -Lwii/libogc/libs/cube
@@ -155,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)
@@ -167,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
@@ -183,6 +158,8 @@ else ifeq ($(libogc_platform), 1)
      endif
   endif

+   LIBS += -logc
+
   ifeq ($(EXTERNAL_LIBOGC), 1)
      LIBS += -lfat
   endif
@@ -199,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
@@ -215,19 +188,12 @@ else ifeq ($(libogc_platform), 1)
   HAVE_IBXM                := 1
   HAVE_OVERLAY             := 1
   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
-   HAVE_CORE_INFO_CACHE     := 1

   ifeq ($(platform), wii)
-      #HAVE_LANGEXTRA          := 1
+      HAVE_LANGEXTRA           := 1
      HAVE_WIIUSB_HID          := 1
      HAVE_RARCH_EXEC          := 1
      HAVE_RSOUND              := 1
@@ -262,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)
@@ -287,12 +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
-   HAVE_CORE_INFO_CACHE     := 1

   ifeq ($(BUILD_PRX), 1)
      LDFLAGS += $(addprefix -L,$(PSPSDK)/lib) -specs=$(PSPSDK)/lib/prxspecs -Wl,-q,-T$(PSPSDK)/lib/linkfile.prx $(LDFLAGS)
@@ -306,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

@@ -332,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
@@ -344,8 +303,6 @@ else ifeq ($(platform), vita)
   HAVE_7ZIP                := 1
   HAVE_VITA2D              := 1
   HAVE_NETWORKING          := 1
-   HAVE_IFINFO              := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
@@ -353,21 +310,16 @@ else ifeq ($(platform), vita)
   HAVE_THREADS             := 1
   HAVE_LIBRETRODB          := 1
   RARCH_CONSOLE             = 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_CORE_INFO_CACHE     := 1
 else ifeq ($(platform), windows_msvc6_x86)
   HAVE_RPNG                := 1
   HAVE_RJPEG               := 1
   HAVE_RBMP                := 1
   HAVE_RTGA                := 1
   HAVE_ZLIB                := 1
+   WANT_ZLIB                := 1
   HAVE_7ZIP                := 1
   HAVE_NETWORKING          := 0
-   HAVE_IFINFO              := 0
-   HAVE_NETWORK_CMD         := 0
-   HAVE_NETPLAYDISCOVERY    := 0
+   HAVE_NETWORK_CMD         := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
@@ -380,10 +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
-   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -404,17 +352,15 @@ 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_IFINFO              := 0
   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
@@ -427,11 +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
-   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -440,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")
@@ -458,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_IFINFO              := 0
   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
-   HAVE_OZONE               := 1
   HAVE_STB_FONT            := 1
   HAVE_THREADS             := 1
   HAVE_LIBRETRODB          := 1
@@ -483,18 +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
-   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -503,33 +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 
-   PLATCFLAGS += -DHAVE_UPDATE_CORE_INFO 
-   PLATCFLAGS += -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
@@ -538,26 +445,18 @@ else ifeq ($(platform), windows_msvc2005_x86)
      export LIB := $(LIB);$(INETSDK)\Lib
   endif
 else ifneq (,$(findstring windows_msvc2010,$(platform)))
-   HAVE_GDI                 := 1
-   HAVE_CHEEVOS             := 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_IFINFO              := 1
   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
-   HAVE_OZONE               := 1
   HAVE_STB_FONT            := 1
   HAVE_THREADS             := 1
   HAVE_LIBRETRODB          := 1
@@ -567,18 +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
-   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -587,16 +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
-   PLATCFLAGS += -DHAVE_UPDATE_CORE_INFO
-   PLATCFLAGS += -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))

@@ -621,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)
@@ -635,21 +515,15 @@ 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_IFINFO              := 1
   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
@@ -662,12 +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
-   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -676,10 +545,8 @@ 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 
-   PLATCFLAGS += -DHAVE_UPDATE_CORE_INFO
-   PLATCFLAGS += -DWIN32 -DHAVE_CDROM
-   LDFLAGS    += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.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_msvc2012_,,$(platform))

@@ -722,21 +589,15 @@ 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_IFINFO              := 1
   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
@@ -749,12 +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
-   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -763,10 +619,8 @@ 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 
-   PLATCFLAGS += -DHAVE_UPDATE_CORE_INFO
-   PLATCFLAGS += -DWIN32 -DHAVE_CDROM
-   LDFLAGS    += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.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_msvc2013_,,$(platform))

@@ -809,21 +663,15 @@ 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_IFINFO              := 1
   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
   HAVE_OVERLAY             := 1
   HAVE_MATERIALUI          := 1
   HAVE_XMB                 := 1
@@ -836,12 +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
-   HAVE_CORE_INFO_CACHE     := 1

   EXT_TARGET := $(TARGET_NAME).exe
   EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -849,11 +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 
-   PLATCFLAGS += -DHAVE_UPDATE_CORE_INFO
-   PLATCFLAGS += -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))
@@ -911,102 +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_IFINFO              := 1
-   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
-   HAVE_OVERLAY             := 1
-   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
-   HAVE_CORE_INFO_CACHE     := 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_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 
-   PLATCFLAGS += -DHAVE_UPDATE_CORE_INFO
-   PLATCFLAGS += -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_IFINFO              := 1
-   HAVE_NETWORK_CMD         := 1
-   HAVE_NETPLAYDISCOVERY    := 1
-   HAVE_OVERLAY             := 1
-   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
-   HAVE_CORE_INFO_CACHE     := 1
-
-   PLATCFLAGS += -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_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 
-   PLATCFLAGS += -DHAVE_UPDATE_CORE_INFO
-   PLATCFLAGS += -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
 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)
@@ -1066,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)
@@ -1085,32 +841,12 @@ 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)
@@ -1121,22 +857,10 @@ ifeq ($(HAVE_NETWORKING), 1)
   CFLAGS      += -DHAVE_NETWORKING
 endif

-ifeq ($(HAVE_IFINFO), 1)
-   CFLAGS      += -DHAVE_IFINFO
-endif
-
-ifeq ($(HAVE_NETPLAYDISCOVERY), 1)
-   CFLAGS      += -DHAVE_NETPLAYDISCOVERY
-endif
-
 ifeq ($(RARCH_CONSOLE), 1)
   CFLAGS += -DRARCH_CONSOLE
 endif

-ifeq ($(HAVE_CORE_INFO_CACHE), 1)
-   CFLAGS += -DHAVE_CORE_INFO_CACHE
-endif
-
 ifeq ($(RARCH_MOBILE), 1)
   CFLAGS += -DRARCH_MOBILE
 endif
@@ -1163,22 +887,10 @@ 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_WINDOW_OFFSET), 1)
-   CFLAGS += -DHAVE_WINDOW_OFFSET
-endif
-
 ifeq ($(HAVE_THREADS), 1)
   CFLAGS += -DHAVE_THREADS

@@ -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,250 +0,0 @@
-#########################
-## Toolchain variables ##
-#########################
-
-# Default toolchain directory
-TOOLCHAIN_DIR="$(HOST_DIR)"
-
-# All toolchain-related variables may be
-# overridden via the command line
-
-ifdef GCW0_CC
-CC                    = $(GCW0_CC)
-else
-CC                    = $(TOOLCHAIN_DIR)/usr/bin/arm-linux-gcc
-endif
-
-ifdef GCW0_CXX
-CXX                   = $(GCW0_CXX)
-else
-CXX                   = $(TOOLCHAIN_DIR)/usr/bin/arm-linux-g++
-endif
-
-ifdef GCW0_STRIP
-STRIP                 = $(GCW0_STRIP)
-else
-STRIP                 = $(TOOLCHAIN_DIR)/usr/bin/arm-linux-strip
-endif
-
-GCW0_SDL_CONFIG      ?= $(TOOLCHAIN_DIR)/usr/arm-buildroot-linux-gnueabi/sysroot/usr/bin/sdl-config
-GCW0_FREETYPE_CONFIG ?= $(TOOLCHAIN_DIR)/usr/arm-buildroot-linux-gnueabi/sysroot/usr/bin/freetype-config
-
-GCW0_INC_DIR         ?= $(TOOLCHAIN_DIR)/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include
-GCW0_LIB_DIR         ?= $(TOOLCHAIN_DIR)/usr/arm-buildroot-linux-gnueabi/sysroot/usr/lib
-
-#########################
-#########################
-
-PACKAGE_NAME = retroarch
-
-DEBUG ?= 0
-
-MIYOO = 1
-DINGUX = 1
-HAVE_SCREENSHOTS = 1
-HAVE_REWIND = 1
-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 = 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 = 0
-HAVE_IBXM = 1
-HAVE_IMAGEVIEWER = 0
-HAVE_LANGEXTRA = 0
-HAVE_LIBRETRODB = 1
-HAVE_MENU = 1
-HAVE_MENU_COMMON = 1
-HAVE_GFX_WIDGETS = 0
-HAVE_MMAP = 1
-HAVE_OPENDINGUX_FBDEV = 0
-HAVE_OPENGL = 0
-HAVE_OPENGL1 = 0
-HAVE_OPENGLES = 0
-HAVE_OPENGLES3 = 0
-HAVE_OPENGL_CORE = 0
-HAVE_OPENSSL = 0
-HAVE_OVERLAY = 0
-HAVE_RBMP = 1
-HAVE_RJPEG = 1
-HAVE_RPILED = 0
-HAVE_RPNG = 1
-HAVE_RUNAHEAD = 0
-HAVE_SDL_DINGUX = 1
-HAVE_SHADERPIPELINE = 0
-HAVE_STB_FONT = 0
-HAVE_STB_IMAGE = 0
-HAVE_STB_VORBIS = 0
-HAVE_STDIN_CMD = 0
-HAVE_STRCASESTR = 1
-HAVE_THREADS = 1
-HAVE_UDEV = 0
-HAVE_RGUI = 1
-HAVE_MATERIALUI = 0
-HAVE_XMB = 0
-HAVE_OZONE = 0
-HAVE_ZLIB = 1
-HAVE_CONFIGFILE = 1
-HAVE_PATCH = 1
-HAVE_CHEATS = 1
-HAVE_CHEEVOS = 0
-HAVE_LIBSHAKE = 0
-HAVE_CORE_INFO_CACHE = 1
-#HAVE_TINYALSA = 1
-HAVE_NEAREST_RESAMPLER = 1
-
-OS = Linux
-TARGET = retroarch
-
-OBJ :=
-LINK := $(CXX)
-DEF_FLAGS := -march=armv5te -mtune=arm926ej-s -ffast-math -fomit-frame-pointer
-DEF_FLAGS += -ffunction-sections -fdata-sections
-DEF_FLAGS += -I. -Ideps -Ideps/stb -DMIYOO=1 -DDINGUX -MMD
-DEF_FLAGS += -Wall -Wno-unused-variable -flto
-DEF_FLAGS += -std=gnu99 -D_GNU_SOURCE
-LIBS := -ldl -lz -lrt -pthread -lasound
-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 -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)
-MMAP_LIBS = -lc
-
-OBJDIR_BASE := obj-unix
-
-ifeq ($(DEBUG), 1)
-   OBJDIR := $(OBJDIR_BASE)/debug
-   DEF_FLAGS += -O0 -g -DDEBUG -D_DEBUG
-else
-   OBJDIR := $(OBJDIR_BASE)/release
-   DEF_FLAGS += -O2 -DNDEBUG
-endif
-
-include Makefile.common
-
-DEF_FLAGS += $(INCLUDE_DIRS)
-LDFLAGS += $(CFLAGS) $(CXXFLAGS) $(DEF_FLAGS)
-CFLAGS += $(DEF_FLAGS)
-CXXFLAGS += $(DEF_FLAGS)
-
-HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
-
-Q := @
-
-RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
-
-all: $(TARGET)
-
-include $(RARCH_OBJ:.o=.d)
-
-SYMBOL_MAP := -Wl,-Map=output.map
-
-$(TARGET): $(RARCH_OBJ)
-	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
-
-ifeq ($(STRIP_BIN),1)
-	$(STRIP) --strip-unneeded $(TARGET)
-endif
-
-$(OBJDIR)/%.o: %.c
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c -o $@ $<
-
-$(OBJDIR)/%.o: %.cpp
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(OBJDIR)/%.o: %.m
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo OBJC $<),)
-	$(Q)$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(OBJDIR)/%.o: %.S $(HEADERS)
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo AS $<),)
-	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
-
-clean:
-	rm -rf $(OBJDIR_BASE)
-	rm -f $(TARGET)
-	rm -f *.d
-
-install: $(TARGET)
-	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
-	cp media/retroarch.svg $(DESTDIR)$(DATA_DIR)/pixmaps
-	cp COPYING $(DESTDIR)$(DOC_DIR)
-	cp README.md $(DESTDIR)$(DOC_DIR)
-	chmod 755 $(DESTDIR)$(BIN_DIR)/$(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 \
-		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; \
-		cp media/assets/COPYING $(DESTDIR)$(DOC_DIR)/COPYING.assets; \
-		echo "Asset copying done."; \
-	fi
-
-.PHONY: all clean
-
-print-%:
-	@echo '$*=$($*)'
@@ -1,5 +1,3 @@
-include version.all
-
 #---------------------------------------------------------------------------------
 .SUFFIXES:
 #---------------------------------------------------------------------------------
@@ -17,74 +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_RWAV = 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_FILTERS_BUILTIN = 1
 HAVE_MENU = 1
-HAVE_CONFIGFILE = 1
-HAVE_PATCH = 1
-HAVE_CHEATS = 1
 HAVE_RUNAHEAD = 1
-HAVE_NETWORKING = 1
-HAVE_IFINFO = 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
-HAVE_CORE_INFO_CACHE = 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_GLSL = 1
-else
-  HAVE_RGUI = 1
-  HAVE_MATERIALUI = 0
-  HAVE_XMB = 0
-  HAVE_OZONE = 0
-endif

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

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

@@ -117,41 +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_UPDATE_CORE_INFO -DHAVE_STB_FONT #-DHAVE_FREETYPE
-
-ifeq ($(HAVE_FILTERS_BUILTIN), 1)
-  CFLAGS += -DHAVE_FILTERS_BUILTIN
-endif
-
-ifeq ($(strip $(HAVE_STATIC_DUMMY)),1)
-  CFLAGS	+=	-DHAVE_STATIC_DUMMY=1
-endif
+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
@@ -193,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)) \
@@ -238,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

@@ -261,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
@@ -1,209 +0,0 @@
-#########################
-## Toolchain variables ##
-#########################
-
-# Default toolchain directory
-TOOLCHAIN_DIR=/opt/miyoo
-
-# All toolchain-related variables may be
-# overridden via the command line
-
-ifdef GCW0_CC
-CC                    = $(GCW0_CC)
-else
-CC                    = $(TOOLCHAIN_DIR)/usr/bin/arm-linux-gcc
-endif
-
-ifdef GCW0_CXX
-CXX                   = $(GCW0_CXX)
-else
-CXX                   = $(TOOLCHAIN_DIR)/usr/bin/arm-linux-g++
-endif
-
-ifdef GCW0_STRIP
-STRIP                 = $(GCW0_STRIP)
-else
-STRIP                 = $(TOOLCHAIN_DIR)/usr/bin/arm-linux-strip
-endif
-
-GCW0_SDL_CONFIG      ?= $(TOOLCHAIN_DIR)/usr/arm-miyoo-linux-uclibcgnueabi/sysroot/usr/bin/sdl-config
-GCW0_FREETYPE_CONFIG ?= $(TOOLCHAIN_DIR)/usr/arm-miyoo-linux-uclibcgnueabi/sysroot/usr/bin/freetype-config
-
-GCW0_INC_DIR         ?= $(TOOLCHAIN_DIR)/usr/arm-miyoo-linux-uclibcgnueabi/sysroot/usr/include
-GCW0_LIB_DIR         ?= $(TOOLCHAIN_DIR)/usr/arm-miyoo-linux-uclibcgnueabi/sysroot/usr/lib
-
-#########################
-#########################
-
-PACKAGE_NAME = retroarch
-
-DEBUG ?= 0
-
-MIYOO = 1
-DINGUX = 1
-HAVE_SCREENSHOTS = 1
-HAVE_REWIND = 1
-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 = 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 = 0
-HAVE_IBXM = 1
-HAVE_IMAGEVIEWER = 0
-HAVE_LANGEXTRA = 0
-HAVE_LIBRETRODB = 1
-HAVE_MENU = 1
-HAVE_MENU_COMMON = 1
-HAVE_GFX_WIDGETS = 0
-HAVE_MMAP = 1
-HAVE_OPENDINGUX_FBDEV = 0
-HAVE_OPENGL = 0
-HAVE_OPENGL1 = 0
-HAVE_OPENGLES = 0
-HAVE_OPENGLES3 = 0
-HAVE_OPENGL_CORE = 0
-HAVE_OPENSSL = 0
-HAVE_OVERLAY = 0
-HAVE_RBMP = 1
-HAVE_RJPEG = 1
-HAVE_RPILED = 0
-HAVE_RPNG = 1
-HAVE_RUNAHEAD = 0
-HAVE_SDL_DINGUX = 1
-HAVE_SHADERPIPELINE = 0
-HAVE_STB_FONT = 0
-HAVE_STB_IMAGE = 0
-HAVE_STB_VORBIS = 0
-HAVE_STDIN_CMD = 0
-HAVE_STRCASESTR = 1
-HAVE_THREADS = 1
-HAVE_UDEV = 0
-HAVE_RGUI = 1
-HAVE_MATERIALUI = 0
-HAVE_XMB = 0
-HAVE_OZONE = 0
-HAVE_ZLIB = 1
-HAVE_CONFIGFILE = 1
-HAVE_PATCH = 1
-HAVE_XDELTA = 0 # Disabled until we figure out how to include <lzma.h>
-HAVE_CHEATS = 1
-HAVE_CHEEVOS = 0
-HAVE_LIBSHAKE = 0
-HAVE_CORE_INFO_CACHE = 1
-#HAVE_TINYALSA = 1
-HAVE_NEAREST_RESAMPLER = 1
-
-OS = Linux
-TARGET = retroarch
-
-OBJ :=
-LINK := $(CXX)
-DEF_FLAGS := -march=armv5te -mtune=arm926ej-s -ffast-math -fomit-frame-pointer
-DEF_FLAGS += -ffunction-sections -fdata-sections
-DEF_FLAGS += -I. -Ideps -Ideps/stb -DMIYOO=1 -DDINGUX -MMD
-DEF_FLAGS += -Wall -Wno-unused-variable -flto
-DEF_FLAGS += -std=gnu99 -D_GNU_SOURCE
-LIBS := -ldl -lz -lrt -pthread -lasound
-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 -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)
-MMAP_LIBS = -lc
-
-OBJDIR_BASE := obj-unix
-
-ifeq ($(DEBUG), 1)
-   OBJDIR := $(OBJDIR_BASE)/debug
-   DEF_FLAGS += -O0 -g -DDEBUG -D_DEBUG
-else
-   OBJDIR := $(OBJDIR_BASE)/release
-   DEF_FLAGS += -O2 -DNDEBUG
-endif
-
-include Makefile.common
-
-DEF_FLAGS += $(INCLUDE_DIRS)
-LDFLAGS += $(CFLAGS) $(CXXFLAGS) $(DEF_FLAGS)
-CFLAGS += $(DEF_FLAGS)
-CXXFLAGS += $(DEF_FLAGS)
-
-HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
-
-Q := @
-
-RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
-
-all: $(TARGET)
-
-include $(RARCH_OBJ:.o=.d)
-
-SYMBOL_MAP := -Wl,-Map=output.map
-
-$(TARGET): $(RARCH_OBJ)
-	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
-
-ifeq ($(STRIP_BIN),1)
-	$(STRIP) --strip-unneeded $(TARGET)
-endif
-
-$(OBJDIR)/%.o: %.c
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c -o $@ $<
-
-$(OBJDIR)/%.o: %.cpp
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(OBJDIR)/%.o: %.m
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo OBJC $<),)
-	$(Q)$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(OBJDIR)/%.o: %.S $(HEADERS)
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo AS $<),)
-	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
-
-clean:
-	rm -rf $(OBJDIR_BASE)
-	rm -f $(TARGET)
-	rm -f *.d
-
-.PHONY: all clean
-
-print-%:
-	@echo '$*=$($*)'
@@ -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,20 +20,16 @@ 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
-HAVE_WASAPI              := 1
+HAVE_WASAPI              := 0
 HAVE_THREAD_STORAGE      := 1
 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
@@ -58,34 +50,16 @@ HAVE_RBMP                := 1
 HAVE_RTGA                := 1
 HAVE_7ZIP                := 1
 HAVE_NETWORKING          := 1
-HAVE_IFINFO              := 1
 HAVE_NETWORK_CMD         := 1
 HAVE_OVERLAY             := 1
 HAVE_LANGEXTRA           := 1
 HAVE_CHEEVOS             := 1
 HAVE_SHADERPIPELINE      := 1
 HAVE_IMAGEVIEWER         := 1
-HAVE_BSV_MOVIE           := 1
-HAVE_CHEATS              := 1
-HAVE_CORE_INFO_CACHE     := 1
-
-ifeq ($(HAVE_D3D8), 1)
-   D3D8_LIBS := -ld3d8
-   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))

@@ -116,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)
@@ -146,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
@@ -168,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
@@ -178,6 +155,7 @@ else
   FLAGS += -MD
 endif

+
 ifeq ($(DEBUG),1)
   BUILD_DIR := $(BUILD_DIR)-debug
 endif
@@ -192,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
@@ -200,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))
@@ -214,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,268 +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
-HAVE_STATIC_DUMMY ?= 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
-
-LIB_CORE :=
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIB_CORE += -lretro_ngc
-endif
-
-LIBS               := $(WHOLE_START) $(LIB_CORE) $(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.
-
-ifeq ($(EXTERNAL_LIBOGC), 1)
-   CFLAGS   += -DEXTERNAL_LIBOGC
-   CXXFLAGS += -DEXTERNAL_LIBOGC
-   LIBDIRS += -L$(DEVKITPRO)/libogc/lib/cube
-   INCLUDE += -I$(DEVKITPRO)/libogc/include
-else
-   CFLAGS   += -DINTERNAL_LIBOGC
-   CXXFLAGS += -DINTERNAL_LIBOGC
-   LIBDIRS += -Lwii/libogc/libs/cube
-   INCLUDE += -Iwii/libogc/include
-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_ZLIB                := 1
-HAVE_7ZIP                := 1
-HAVE_CONFIGFILE          := 1
-HAVE_PATCH               := 1
-HAVE_XDELTA              := 0 # disabled because <lzma.h> isn't available (or we haven't figured out how to install it)
-HAVE_CHEATS              := 1
-HAVE_SCREENSHOTS         := 1
-HAVE_REWIND              := 1
-HAVE_AUDIOMIXER          := 1
-HAVE_RWAV                := 1
-RARCH_CONSOLE             = 1
-HAVE_CHEATS              := 1
-HAVE_CORE_INFO_CACHE     := 1
-HAVE_MENU_COMMON         := 1
-HAVE_MENU                := 1
-HAVE_BUILTINZLIB         := 1
-HAVE_STATIC_AUDIO_FILTERS := 1
-HAVE_STATIC_VIDEO_FILTERS := 1
-HAVE_XMB                 := 0
-HAVE_OZONE               := 0
-HAVE_RGUI                := 1
-HAVE_MATERIALUI          := 0
-
-INCLUDE += -I./libretro-common/include \
-           -Ideps \
-           -Ideps/stb
-CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE)
-
-OBJ =  $(PLATOBJS) audio/drivers/gx_audio.o gfx/drivers/gx_gfx.o input/drivers/gx_input.o frontend/drivers/platform_gx.o input/drivers_joypad/gx_joypad.o
-
-ifeq ($(EXTERNAL_LIBOGC), 0)
-   OBJ += wii/libogc/libfat/libfat.o wii/libogc/libfat/fatfile.o wii/libogc/libfat/file_allocation_table.o wii/libogc/libfat/cache.o wii/libogc/libfat/fatdir.o wii/libogc/libfat/partition.o wii/libogc/libfat/directory.o wii/libogc/libfat/filetime.o wii/libogc/libfat/disc.o
-endif
-
-include Makefile.common
-
-CFLAGS += $(DEFINES)
-
-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 ($(BIG_STACK),1)
-   CFLAGS      += -DBIG_STACK
-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 ($(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_FILTERS_BUILTIN), 1)
-   CFLAGS += -DHAVE_FILTERS_BUILTIN
-endif
-
-ifeq ($(HAVE_RSOUND), 1)
-   CFLAGS += -DHAVE_RSOUND
-endif
-
-ifeq ($(HAVE_GETOPT_LONG), 1)
-   CFLAGS += -DHAVE_GETOPT_LONG=1
-endif
-
-ifeq ($(HAVE_NETWORK_CMD), 1)
-   CFLAGS += -DHAVE_NETWORK_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
@@ -1,45 +1,23 @@
 include version.all

-DEBUG    = 0
+DEBUG = 0

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

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

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

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

-LIBS     = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound
-DEFINES  = -std=gnu99
-DEFINES += -DHAVE_THREADS \
-	   -DHAVE_GETOPT_LONG=1 \
-	   -DHAVE_GRIFFIN \
-	   -DRARCH_INTERNAL \
-	   -DHAVE_CONFIGFILE \
-	   -DHAVE_PATCH \
-	   -DHAVE_SCREENSHOTS \
-	   -DHAVE_REWIND \
-	   -D__ARM_ARCH_6__ \
-	   -DHAVE_OPENGL \
-	   -DHAVE_OPENGLES \
-	   -DHAVE_OPENGLES2 \
-	   -DHAVE_GLSL \
-	   -DHAVE_DYNAMIC \
-	   -DHAVE_RPNG \
-	   -DHAVE_RJPEG \
-	   -DHAVE_OVERLAY \
-	   -DHAVE_ALSA \
-	   -DHAVE_ZLIB \
-	   -D__linux__ \
-	   -DHAVE_DSP_FILTER \
-	   -DHAVE_VIDEO_FILTER \
-	   -D__OPENPANDORA__ \
-	   -DPANDORA
+LIBS = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound
+DEFINES = -std=gnu99 -DHAVE_THREADS -DHAVE_GETOPT_LONG=1 -DHAVE_GRIFFIN -DRARCH_INTERNAL
+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

 ifeq ($(DEBUG), 1)
@@ -1,213 +0,0 @@
-TARGET		    := retroarch_orbis
-DEBUG               ?= 0
-GRIFFIN_BUILD        = 0
-WHOLE_ARCHIVE_LINK   = 0
-
-HAVE_STATIC_DUMMY ?= 0
-HAVE_GLES3 ?= 0
-HAVE_MOUSE ?= 0
-HAVE_KEYBOARD ?= 0
-
-PS4_TITLE_ID	:= RETROARCH
-PS4_TITLE_NAME	:= RetroArch
-
-PC_DEVELOPMENT_IP_ADDRESS  = 192.168.1.137
-PC_DEVELOPMENT_UDP_PORT	   = 18194
-
-AUTH_INFO = 000000000000000000000000001C004000FF000000000080000000000000000000000000000000000000008000400040000000000000008000000000000000080040FFFF000000F000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-
-OBJ += deps/xxHash/xxhash.o \
-# 	input/drivers/ps4_input.o \
-# 	input/drivers_joypad/ps4_joypad.o \
-# 	audio/drivers/psp_audio.o \
-# 	gfx/drivers_context/orbis_ctx.o \
-# 	frontend/drivers/platform_orbis.o
-
-ifeq ($(HAVE_GLES3),1)
-  DEFINES += -DHAVE_OPENGLES3
-endif
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-endif
-
-ifeq ($(GRIFFIN_BUILD), 1)
-	OBJ += griffin/griffin.o
-	DEFINES += -DHAVE_GRIFFIN=1
-	DEFINES += -DHAVE_MENU -DHAVE_LIBRETRODB -DHAVE_CONFIGFILE
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_CC_RESAMPLER
-	DEFINES += -DHAVE_CORE_INFO_CACHE
-	ifeq ($(DEBUG), 1)
-		DEFINES += -DHAVE_NETLOGGER
-	endif
-else
-
-	HAVE_FILTERS_BUILTIN	:= 1
-	HAVE_LANGEXTRA				:= 1
-	HAVE_IMAGEVIEWER 			:= 1
-	HAVE_RPNG							:= 1
-	HAVE_RJPEG						:= 1
-	HAVE_RBMP							:= 1
-	HAVE_RTGA							:= 1
-	HAVE_ZLIB							:= 1
-	HAVE_BUILTINZLIB			:= 1
-	HAVE_OVERLAY					:= 1
-	HAVE_7ZIP							:= 1
-	HAVE_EGL 							:= 1
-	HAVE_GFX_WIDGETS 			:= 1
-	HAVE_GLSL      				:= 1
-	HAVE_SHADERPIPELINE  	:= 1
-	HAVE_OPENGL  					:= 1
-	HAVE_OPENGLES  				:= 1
-	HAVE_OPENGLES2  			:= 1
-	HAVE_NETWORKING				:= 0
-	HAVE_IFINFO				:= 0
-	HAVE_SOCKET_LEGACY		:= 1
-	HAVE_MENU							:= 1
-	HAVE_MENU_COMMON			:= 1
-	HAVE_RGUI							:= 1
-	HAVE_STB_FONT					:= 1
-	HAVE_STB_VORBIS				:= 1
-	HAVE_DR_FLAC					:= 1
-	HAVE_DR_MP3						:= 1
-	HAVE_MATERIALUI 			:= 1
-	HAVE_XMB							:= 1
-	HAVE_OZONE						:= 1
-	HAVE_RGUI							:= 1
-	HAVE_THREADS					:= 1
-	HAVE_THREAD_ATTR			:= 1
-	HAVE_LIBRETRODB				:= 1
-	HAVE_CC_RESAMPLER			:= 1
-	HAVE_CHEEVOS					:= 0
-	HAVE_RUNAHEAD					:= 1
-	RARCH_CONSOLE					:= 1
-	HAVE_MAIN 						:= 1
-	HAVE_ONLINE_UPDATER 	:= 1
-	HAVE_COMPRESSION 			:= 1
-	HAVE_UPDATE_ASSETS 		:= 1
-	HAVE_UPDATE_CORES 		:= 1
-	HAVE_UPDATE_CORE_INFO 		:= 1
-	HAVE_CONFIGFILE 			:= 1
-	HAVE_CHD 							:= 1
-	HAVE_STATIC_VIDEO_FILTERS = 1
-	HAVE_STATIC_AUDIO_FILTERS = 1
-	HAVE_CORE_INFO_CACHE	:= 1
-
-	ifeq ($(DEBUG), 1)
-		HAVE_NETLOGGER = 1
-	endif
-
-	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
-	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-endif
-
-ifeq ($(strip $(ORBISDEV)),)
-$(error "Please set ORBISDEV in your environment. export ORBISDEV=<path to>orbisdev")
-endif
-
-PREFIX := orbis-
-CC      := clang
-CXX     := clang++
-AS      := $(PREFIX)as
-AR      := $(PREFIX)ar
-OBJCOPY := $(PREFIX)objcopy
-STRIP   := $(PREFIX)strip
-NM      := $(PREFIX)nm
-LD      := clang
-
-LIBDIRS += -L. -Lcores -Lbuild -L$(ORBISDEV)/usr/lib
-INCDIRS += -I. -Idefines -Ideps -Ideps/7zip -Ideps/libz -Ilibretro-common/include -Ideps/stb \
-					 -Ilibretro-common/include/compat/zlib -Ideps/rcheevos/include -I$(ORBISDEV)/usr/include -I$(ORBISDEV)/usr/include/c++/v1 -I$(ORBISDEV)/usr/include/orbis
-
-ARCHFLAGS += --target=x86_64-scei-ps4 -DORBIS -D__ORBIS__ -D__PS4__ -D_BSD_SOURCE
-DEFINES += -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_FILTERS_BUILTIN \
-					 -DHAVE_XMB -DHAVE_RGUI -DHAVE_OZONE \
-					 -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_CORES -DHAVE_UPDATE_CORE_INFO -DHAVE_UPDATE_ASSETS \
-
-# Compiling with -Werror and disabling some warnings
-DEFINES += -Werror -Wno-macro-redefined -Wno-typedef-redefinition -Wno-non-literal-null-conversion -Wno-void-pointer-to-int-cast \
-	-Wno-format -Wno-tautological-constant-out-of-range-compare -Wno-implicit-function-declaration
-
-ifeq ($(HAVE_KEYBOARD), 1)
-  DEFINES += -DHAVE_KEYBOARD
-  PS4_LIBS += -lSceDbgKeyboard_stub
-endif
-
-ifeq ($(HAVE_MOUSE),1)
-  DEFINES += -DHAVE_MOUSE
-  PS4_LIBS += -lSceMouse_stub
-endif
-
-ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
-  DEFINES += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
-endif
-
-ifneq ($(PC_DEVELOPMENT_UDP_PORT),)
-  DEFINES += -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-endif
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-  WHOLE_START := --whole-archive
-  WHOLE_END := --no-whole-archive
-endif
-
-PS4_LIBS += -luser_mem_sys -lkernel_stub -lSceLibcInternal_stub -lunwind -lc++ -lc++abi -lc++experimental \
-				-lorbisLink -lkernelUtil -ldebugnet -lorbisNfs -lSceSysmodule_stub -lSceSystemService_stub -lSceNet_stub \
-				-lSceUserService_stub -lScePigletv2VSH_stub -lSceVideoOut_stub -lSceGnmDriver_stub -lorbisPad \
-				-lScePad_stub -lSceAudioOut_stub -lSceIme_stub -lSceNetCtl_stub -lSQLite
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  LIBS	:= $(PS4_LIBS)
-else
-  LIBS	:= $(WHOLE_START) -lretro_orbis $(WHOLE_END) $(PS4_LIBS)
-endif
-
-
-CFLAGS   := $(ARCHFLAGS) $(INCDIRS) $(DEFINES)
-CXXFLAGS := $(ARCHFLAGS) $(INCDIRS) $(DEFINES)
-LDFLAGS  := $(LIBDIRS) -Wl,--gc-sections -Wl,-z -Wl,max-page-size=0x4000 -Wl,--dynamic-linker="/libexec/ld-elf.so.1" -Wl,-pie -Wl,--eh-frame-hdr -target x86_64-scei-ps4-elf -T $(ORBISDEV)/usr/lib/linker.x
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -fno-inline
-   CXXFLAGS += -O0 -fno-inline
-else
-   CFLAGS += -O3
-   CXXFLAGS += -O3
-endif
-
-TARGETS := $(TARGET).self
-
-all: $(TARGETS)
-
-OBJOUT   = -o
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.S
-	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.s
-	$(CC) -c $(OBJOUT)$@ $<
-
-$(TARGET).elf: $(OBJ)
-	$(LD) $(ORBISDEV)/usr/lib/crt0.o $(OBJ) $(LDFLAGS) $(LIBS) -o $(TARGET).elf
-
-$(TARGET).oelf: $(TARGET).elf
-	@orbis-elf-create $(TARGET).elf $(TARGET).oelf
-
-$(TARGET).self: $(TARGET).oelf
-	python $(ORBISDEV)/bin/make_fself.py --auth-info $(AUTH_INFO) $(TARGET).oelf $(TARGET).self
-
-install:
-	@cp $(TARGET).self $(SELF_PATH_INSTALL)/homebrew.self
-	@echo "Installed!"
-
-clean:
-	rm -f $(OBJ) $(TARGET).elf $(TARGET).oelf $(TARGET).self
-
-.PHONY: clean all
@@ -1,131 +0,0 @@
-TARGET		    := retroarch_orbis_salamander
-
-DEBUG               ?= 0
-
-
-PS4_TITLE_ID	:= RETROARCH
-PS4_TITLE_NAME	:= RetroArch
-
-PC_DEVELOPMENT_IP_ADDRESS  = 192.168.1.137
-PC_DEVELOPMENT_UDP_PORT	   = 18194
-
-AUTH_INFO = 000000000000000000000000001C004000FF000000000080000000000000000000000000000000000000008000400040000000000000008000000000000000080040FFFF000000F000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-
-
-
-endif
-
-ifeq ($(strip $(ORBISDEV)),)
-$(error "Please set ORBISDEV in your environment. export ORBISDEV=<path to>orbisdev")
-endif
-
-PREFIX := orbis-
-CC      := clang
-CXX     := clang++
-AS      := $(PREFIX)as
-AR      := $(PREFIX)ar
-OBJCOPY := $(PREFIX)objcopy
-STRIP   := $(PREFIX)strip
-NM      := $(PREFIX)nm
-LD      := clang
-
-LIBDIRS += -L. -Lcores -Lbuild -L$(ORBISDEV)/usr/lib
-INCDIRS += -I. -Idefines -Ilibretro-common/include -I$(ORBISDEV)/usr/include -I$(ORBISDEV)/usr/include/c++/v1 -I$(ORBISDEV)/usr/include/orbis
-
-ARCHFLAGS += --target=x86_64-scei-ps4 -DORBIS -D__ORBIS__ -D__PS4__ -D_BSD_SOURCE
-
-
-DEFINES += -DORBIS -D__ORBIS__ -DIS_SALAMANDER -DRARCH_CONSOLE -D__PS4__ -D_BSD_SOURCE
-
-# Compiling with -Werror and disabling some warnings
-DEFINES += -Werror -Wno-macro-redefined -Wno-typedef-redefinition -Wno-non-literal-null-conversion -Wno-void-pointer-to-int-cast \
-	-Wno-format -Wno-tautological-constant-out-of-range-compare -Wno-implicit-function-declaration
-
-ifeq ($(HAVE_FILE_LOGGER), 1)
-  DEFINES += -DHAVE_FILE_LOGGER
-endif
-ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
-  DEFINES += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
-endif
-
-ifneq ($(PC_DEVELOPMENT_UDP_PORT),)
-  DEFINES += -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-endif
-
-PS4_LIBS += -luser_mem_sys -lkernel_stub -lSceLibcInternal_stub -lunwind -lc++ -lc++abi -lc++experimental \
-				-lorbisLink -lkernelUtil -ldebugnet -lorbisNfs -lSceSysmodule_stub -lSceSystemService_stub -lSceNet_stub \
-				-lSceUserService_stub -lScePigletv2VSH_stub -lSceVideoOut_stub -lSceGnmDriver_stub -lorbisPad \
-				-lScePad_stub -lSceAudioOut_stub -lSceIme_stub -lSceNetCtl_stub -lSQLite
-
-
-  LIBS	:= $(PS4_LIBS)
-
-
-CFLAGS   := $(ARCHFLAGS) $(INCDIRS) $(DEFINES)
-CXXFLAGS := $(ARCHFLAGS) $(INCDIRS) $(DEFINES)
-LDFLAGS  := $(LIBDIRS) -Wl,--gc-sections -Wl,-z -Wl,max-page-size=0x4000 -Wl,--dynamic-linker="/libexec/ld-elf.so.1" -Wl,-pie -Wl,--eh-frame-hdr -target x86_64-scei-ps4-elf -T $(ORBISDEV)/usr/lib/linker.x
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -fno-inline
-   CXXFLAGS += -O0 -fno-inline
-else
-   CFLAGS += -O3
-   CXXFLAGS += -O3
-endif
-
-OBJS = frontend/frontend_salamander.o \
-		 frontend/frontend_driver.o \
-		 frontend/drivers/platform_orbis.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/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 \
-         network/net_logger.o \
-		 verbosity.o
-
-TARGETS := $(TARGET).elf
-
-all: $(TARGETS)
-
-OBJOUT   = -o
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.S
-	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.s
-	$(CC) -c $(OBJOUT)$@ $<
-
-$(TARGET).elf: $(OBJ)
-	$(LD) $(ORBISDEV)/usr/lib/crt0.o $(OBJ) $(LDFLAGS) $(LIBS) -o $(TARGET).elf
-
-$(TARGET).oelf: $(TARGET).elf
-	@orbis-elf-create $(TARGET).elf $(TARGET).oelf
-
-$(TARGET).self: $(TARGET).oelf
-	python $(ORBISDEV)/bin/make_fself.py --auth-info $(AUTH_INFO) $(TARGET).oelf $(TARGET).self
-
-install:
-	@cp $(TARGET).self $(SELF_PATH_INSTALL)/homebrew.self
-	@echo "Installed!"
-
-clean:
-	rm -f $(OBJ) $(TARGET).elf $(TARGET).oelf $(TARGET).self
-
-.PHONY: clean all
@@ -11,16 +11,20 @@ all: $(BINDIR)/retroarch

 pnd: retroarch.pnd

-install: all $(BINDIR)/retroarch-zip $(PNDDIR)/readme.html
+install: all $(BINDIR)/retroarch-joyconfig $(BINDIR)/retroarch-zip $(PNDDIR)/readme.html

 retroarch:
-	./configure --prefix=$PND_BASEDIR/$PRJ --disable-ffmpeg --disable-cg --disable-pulse --disable-jack --enable-opengles
+	./configure --prefix=$PND_BASEDIR/$PRJ --disable-ffmpeg --disable-cg --disable-python --disable-libpng --disable-pulse --disable-jack --enable-gles --enable-xml
 	make -f Makefile

 $(BINDIR)/retroarch: retroarch
 	mkdir -p $(BINDIR)
 	cp retroarch $(BINDIR)/retroarch

+$(BINDIR)/retroarch-joyconfig: tools/retroarch-joyconfig
+	mkdir -p $(BINDIR)
+	cp tools/retroarch-joyconfig $(BINDIR)/retroarch-joyconfig
+
 $(BINDIR)/retroarch-zip: retroarch-zip
 	mkdir -p $(BINDIR)
 	cp retroarch-zip $(BINDIR)/retroarch-zip
@@ -32,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
@@ -45,5 +49,7 @@ clean:
 	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,129 +0,0 @@
-TARGET := retroarch_ps2
-TARGET_RELEASE = retroarchps2.elf
-
-BUILD_FOR_PCSX2    = 0
-DEBUG              = 0
-SCREEN_DEBUG       = 0
-GRIFFIN_BUILD      = 0
-HAVE_THREADS       = 0
-MUTE_WARNINGS      = 1
-WHOLE_ARCHIVE_LINK = 0
-HAVE_STATIC_DUMMY ?= 0
-PS2_IP = 192.168.1.10
-
-ifeq ($(DEBUG), 1)
-   OPTIMIZE_LV	:= -O0 -g
-	DEFINES += -DDEBUG
-else
-   OPTIMIZE_LV	:= -O3
-endif
-
-ifeq ($(MUTE_WARNINGS), 1)
-   DISABLE_WARNINGS := -Wno-unused -Wno-format -Wno-format-truncation
-endif
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIBS += -lretro_ps2
-endif
-
-ifeq ($(SCREEN_DEBUG), 1)
-LIBS += -ldebug
-DEFINES += -DSCREEN_DEBUG
-endif
-
-ifeq ($(BUILD_FOR_PCSX2), 1)
-DEFINES += -DBUILD_FOR_PCSX2
-endif
-
-DEFINES += -DRARCH_INTERNAL -DRARCH_CONSOLE
-
-ifeq ($(GRIFFIN_BUILD), 1)
-	OBJ += griffin/griffin.o
-	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DHAVE_REWIND -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS
-	DEFINES += -DHAVE_ZLIB -DHAVE_NO_BUILTINZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -D_7ZIP_ST -DHAVE_CC_RESAMPLER -DHAVE_AUDIOMIXER
-	DEFINES += -DHAVE_VIDEO_FILTER -DHAVE_RGUI -DHAVE_WINDOW_OFFSET
-	DEFINES += -DHAVE_DSP_FILTER
-else
-	HAVE_CC_RESAMPLER = 1
-	HAVE_MENU_COMMON = 1
-	HAVE_RPNG = 1
-	HAVE_RJPEG = 1
-	HAVE_RBMP = 1
-	HAVE_MENU = 1
-	HAVE_CONFIGFILE = 1
-	HAVE_PATCH = 1
-	HAVE_PATCH = 0 # disabled because <lzma.h> isn't available (or we haven't figured out how to install it)
-	HAVE_CHEATS = 1
-	HAVE_RGUI = 1
-	HAVE_MATERIALUI = 0
-	HAVE_XMB = 0
-	HAVE_OZONE = 0
-	HAVE_ZLIB = 1
-	HAVE_NO_BUILTINZLIB = 1
-	HAVE_7ZIP = 1
-	HAVE_SCREENSHOTS = 1
-	HAVE_REWIND = 1
-	HAVE_AUDIOMIXER = 1
-	HAVE_RWAV = 1
-	HAVE_DSP_FILTER = 1
-	HAVE_VIDEO_FILTER = 1
-	HAVE_FILTERS_BUILTIN = 1
-	HAVE_WINDOW_OFFSET = 1
-
-	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
-	BLACKLIST :=
-	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-	INCDIRS += $(INCLUDE_DIRS)
-endif
-
-ifeq ($(strip $(PS2SDK)),)
-$(error "Please set PS2SDK in your environment. export PS2SDK=<path to>ps2sdk")
-endif
-
-INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include
-INCDIR += -Ilibretro-common/include -Ideps -Ideps/stb -Ideps/7zip
-
-LDFLAGS += -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ports/lib -L.
-# Lib cdvd is needed to get proper time
-LIBS += -lpatches -lgskit -ldmakit -lps2_drivers -lz -lelf-loader
-
-CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) $(DEFINES) -DPS2 -ffast-math -fsingle-precision-constant
-ASFLAGS = $(CFLAGS)
-
-EE_OBJS += $(OBJ)
-
-EE_CFLAGS = $(CFLAGS)
-EE_CXXFLAGS = $(CFLAGS)
-EE_LDFLAGS = $(LDFLAGS)
-EE_LIBS = $(LIBS)
-EE_ASFLAGS = $(ASFLAGS)
-EE_INCS = $(INCDIR)
-EE_BIN = $(TARGET).elf
-EE_GPVAL = $(GPVAL)
-
-all: $(EE_BIN)
-
-clean:
-	rm -f $(EE_BIN) $(EE_OBJS)
-
-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
-
-release: all
-	ps2-packer $(EE_BIN) $(TARGET_RELEASE)
-
-#Include preferences
-include $(PS2SDK)/samples/Makefile.pref
-include $(PS2SDK)/samples/Makefile.eeglobal_cpp
@@ -1,89 +0,0 @@
-BUILD_FOR_PCSX2   = 0
-DEBUG             = 0
-SCREEN_DEBUG      = 0
-MUTE_WARNINGS     = 1
-PS2_IP = 192.168.1.150
-
-TARGET = raboot-debug.elf
-TARGET_RELEASE = raboot.elf
-
-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 = -Ilibretro-common/include
-INCDIR += -I$(PS2SDK)/ports/include
-CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) -ffast-math -fsingle-precision-constant
-ASFLAGS = $(CFLAGS)
-
-RARCH_DEFINES += -DPS2 -DIS_SALAMANDER -DRARCH_CONSOLE
-
-LIBDIR =
-LDFLAGS += -L$(PS2SDK)/ports/lib
-LIBS = -lelf-loader -lps2_drivers -lpatches
-
-ifeq ($(SCREEN_DEBUG), 1)
-LIBS += -ldebug
-RARCH_DEFINES += -DSCREEN_DEBUG
-endif
-
-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_strldup.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
-
-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: $(EE_BIN)
-
-clean:
-	rm -f $(EE_BIN) $(EE_OBJS)
-
-debug: clean all run
-
-run:
-	ps2client -h $(PS2_IP) execee host:$(EE_BIN)
-
-release: all
-	ps2-packer $(EE_BIN) $(TARGET_RELEASE)
-
-#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

-ELF_TARGET  := retroarch_psl1ght.elf
-SELF_TARGET := $(ELF_TARGET:.elf=.self)
-CORE_PATH    = pkg/psl1ght/pkg/USRDIR/cores/CORE.SELF
+CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001

-INCLUDE += -I. -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude -Idefines -I$(PORTLIBS)/include -I$(PORTLIBS)/include/freetype2
-LIBDIRS += -L. -L$(PORTLIBS)/lib
+ELF_TARGET := retroarch_psl1ght.elf
+EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
+CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF

-MACHDEP := -D__PSL1GHT__ -D__PS3__ -mcpu=cell
+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__CELLOS_LV2__ -D__PSL1GHT__
 CFLAGS += -Wall $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP)
-LIBS := -lretro_psl1ght -lrt -laudio -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl -lsysfs -lfreetype -lcamera -lgem -lspurs
+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,19 +38,48 @@ 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

-SHADER_OBJS = gfx/drivers/rsx_shaders/modern_opaque.vpo.o \
-              gfx/drivers/rsx_shaders/modern_opaque.fpo.o \
-              gfx/drivers/rsx_shaders/modern_alpha_blend.vpo.o \
-              gfx/drivers/rsx_shaders/modern_alpha_blend.fpo.o
+MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe
+MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe

-LIBCO_OBJ = libretro-common/libco/ps3.o
-
-OBJ = $(SHADER_OBJS) $(LIBCO_OBJ) libretro-common/memmap/memmap.o griffin/griffin.o
+OBJ = griffin/griffin.o

 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
@@ -70,70 +89,43 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
 endif

-SHARED_FLAGS :=
-
-SHARED_FLAGS += -DHAVE_GCM
-SHARED_FLAGS += -DHAVE_MENU \
-		-DHAVE_CONFIGFILE \
-		-DHAVE_PATCH \
-		-DHAVE_CHEATS \
-		-DRARCH_CONSOLE \
-		-DHAVE_OVERLAY \
-		-DHAVE_HEADSET \
-		-DHAVE_SYSMODULES \
-		-DHAVE_SYSUTILS \
-		-DHAVE_RARCH_EXEC \
-		-DHAVE_MOUSE \
-		-DHAVE_LIGHTGUN \
-		-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_MEMINFO \
-		-DHAVE_RGUI \
-		-DHAVE_XMB \
-		-DHAVE_OZONE \
-		-DHAVE_GFX_WIDGETS \
-		-DHAVE_MENU_BUFFER \
-		-DHAVE_FREETYPE \
-		-DHAVE_CORE_INFO_CACHE \
-		-DHAVE_7ZIP \
-		-D_7ZIP_ST
-
+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. -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_strldup.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_MENU -DHAVE_CONFIGFILE -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 -DHAVE_MULTIMAN -DHAVE_RGUI -DIS_SALAMANDER -DHAVE_GCM
-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
@@ -1,12 +1,13 @@
-BUILD_PRX              ?= 0
-PSP_LARGE_MEMORY       ?= 1
-DEBUG                  ?= 0
-HAVE_KERNEL_PRX        ?= 1
-HAVE_THREADS           ?= 1
-BIG_STACK              ?= 0
-LOAD_WITHOUT_CORE_INFO ?= 0
-HAVE_STATIC_DUMMY      ?= 0
-HAVE_XDELTA            ?= 1
+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
+
 TARGET = retroarchpsp

 ifeq ($(DEBUG), 1)
@@ -15,51 +16,30 @@ else
   OPTIMIZE_LV	:= -O3
 endif

-INCDIR = deps deps/stb deps/7zip libretro-common/include libretro-common/include/compat/zlib
-CFLAGS = $(OPTIMIZE_LV) -ffast-math -fsingle-precision-constant
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+
+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_ZLIB \
-		-DHAVE_AUDIOMIXER \
-		-DHAVE_RWAV \
-		-DHAVE_RPNG \
-		-DHAVE_RJPEG \
-		-DHAVE_GRIFFIN=1 \
-		-DRARCH_INTERNAL \
-		-DHAVE_SCREENSHOTS \
-		-DHAVE_REWIND \
-		-DRARCH_CONSOLE \
-		-DHAVE_MENU \
-		-DHAVE_CONFIGFILE \
-		-DHAVE_PATCH \
-		-DHAVE_CHEATS \
-		-DHAVE_RGUI \
-		-DHAVE_FILTERS_BUILTIN \
-		-DHAVE_DSP_FILTER \
-		-DHAVE_VIDEO_FILTER \
-		-DHAVE_7ZIP \
-		-D_7ZIP_ST \
-		-DHAVE_CC_RESAMPLER \
-		-DHAVE_CORE_INFO_CACHE
+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 = -L$(shell psp-config --psp-prefix)
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  RARCH_DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIBS += -lretro_psp1
-endif
-LIBS += -lstdc++ -lpspgu -lpspgum -lpspaudio -lpspfpu -lpsppower -lpsprtc -lpthread
+LDFLAGS =
+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)
-OBJS += bootstrap/psp1/kernel_functions.o
 CFLAGS += -DHAVE_KERNEL_PRX
 endif

@@ -67,34 +47,15 @@ ifeq ($(BIG_STACK), 1)
 CFLAGS += -DBIG_STACK
 endif

-ifeq ($(LOAD_WITHOUT_CORE_INFO),1)
-RARCH_DEFINES += -DLOAD_WITHOUT_CORE_INFO
-endif
-
 CFLAGS += $(RARCH_DEFINES)

+
 EXTRA_TARGETS = EBOOT.PBP
 PSP_EBOOT_TITLE = RetroArch PSP1

-OBJS += griffin/griffin.o
+PSP_OBJECTS = griffin/griffin.o bootstrap/psp1/kernel_functions.o
+
+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
-
-sim:
-	/Applications/PPSSPPSDL.app/Contents/MacOS/PPSSPPSDL $(shell pwd)/EBOOT.PBP
@@ -1,6 +1,6 @@
 BUILD_PRX         = 0
 PSP_LARGE_MEMORY  = 1
-HAVE_KERNEL_PRX   = 1
+HAVE_FILE_LOGGER  = 0
 DEBUG             = 0

 TARGET = retroarchpsp_salamander
@@ -8,20 +8,24 @@ TARGET = retroarchpsp_salamander
 ifeq ($(DEBUG), 1)
   OPTIMIZE_LV	:= -O0 -g
 else
-   OPTIMIZE_LV	:= -O3
+   OPTIMIZE_LV	:= -O2
 endif

 INCDIR = $(PSPPATH)/include libretro-common/include
-CFLAGS = $(OPTIMIZE_LV) -ffast-math -fsingle-precision-constant
+CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
 ASFLAGS = $(CFLAGS)

 RARCH_DEFINES = -DPSP -DIS_SALAMANDER -DRARCH_CONSOLE

 LIBDIR =
 LDFLAGS =
-LIBS = -lstdc++ -lpsppower
+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
@@ -31,28 +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_strldup.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
-
-ifeq ($(HAVE_KERNEL_PRX), 1)
-OBJS   += bootstrap/psp1/kernel_functions.o
-CFLAGS += -DHAVE_KERNEL_PRX
-endif
+		 libretro-common/hash/rhash.o \
+		 file_path_str.o \
+		 verbosity.o \
+		 bootstrap/psp1/kernel_functions.o 

 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak
@@ -1,237 +0,0 @@
-#########################
-## Toolchain variables ##
-#########################
-
-# Default toolchain directory
-TOOLCHAIN_DIR=/opt/retrofw-toolchain
-
-# All toolchain-related variables may be
-# overridden via the command line
-ifdef RETROFW_CC
-CC                    = $(GCW0_CC)
-else
-CC                    = $(TOOLCHAIN_DIR)/usr/bin/mipsel-linux-gcc
-endif
-
-ifdef RETROFW_CXX
-CXX                   = $(GCW0_CXX)
-else
-CXX                   = $(TOOLCHAIN_DIR)/usr/bin/mipsel-linux-g++
-endif
-
-ifdef RETROFW_STRIP
-STRIP                 = $(GCW0_STRIP)
-else
-STRIP                 = $(TOOLCHAIN_DIR)/usr/bin/mipsel-linux-strip
-endif
-
-GCW0_SDL_CONFIG      ?= $(TOOLCHAIN_DIR)/usr/mipsel-buildroot-linux-uclibc/sysroot/usr/bin/sdl-config
-GCW0_FREETYPE_CONFIG ?= $(TOOLCHAIN_DIR)/usr/mipsel-buildroot-linux-uclibc/sysroot/usr/bin/freetype-config
-#GCW0_MK_SQUASH_FS    ?= $(TOOLCHAIN_DIR)/usr/bin/mksquashfs
-GCW0_MK_SQUASH_FS    ?= mksquashfs
-
-GCW0_INC_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-buildroot-linux-uclibc/sysroot/usr/include
-GCW0_LIB_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-buildroot-linux-uclibc/sysroot/usr/lib
-
-#########################
-#########################
-
-PACKAGE_NAME = retroarch
-RETROFW = 1
-
-DEBUG ?= 0
-
-DINGUX = 1
-HAVE_SCREENSHOTS = 0
-HAVE_REWIND = 1
-HAVE_7ZIP = 1
-HAVE_AL = 0
-# ALSA freezes when switching back from menu
-HAVE_ALSA = 0
-HAVE_DSP_FILTER = 1
-HAVE_VIDEO_FILTER = 1
-HAVE_STATIC_VIDEO_FILTERS = 1
-HAVE_STATIC_AUDIO_FILTERS = 1
-HAVE_FILTERS_BUILTIN	= 1
-HAVE_BUILTINMBEDTLS = 0
-HAVE_BUILTINZLIB = 1
-HAVE_C99 = 1
-HAVE_CC = 1
-HAVE_CC_RESAMPLER = 1
-HAVE_CHD = 1
-HAVE_COMMAND = 0
-HAVE_CXX = 1
-HAVE_DR_MP3 = 1
-HAVE_DYNAMIC = 1
-HAVE_EGL = 0
-HAVE_FREETYPE = 0
-HAVE_GDI = 1
-HAVE_GETADDRINFO = 0
-HAVE_GETOPT_LONG = 1
-HAVE_GLSL = 0
-HAVE_HID = 0
-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 = 0
-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 = 0
-HAVE_RGUI = 1
-HAVE_MATERIALUI = 0
-HAVE_XMB = 0
-HAVE_OZONE = 0
-HAVE_ZLIB = 1
-HAVE_CONFIGFILE = 1
-HAVE_PATCH = 1
-HAVE_XDELTA = 0 # disabled because <lzma.h> isn't available (or we haven't figured out how to install it)
-HAVE_CHEATS = 1
-HAVE_CHEEVOS = 0
-HAVE_LIBSHAKE = 0
-HAVE_CORE_INFO_CACHE = 1
-HAVE_OSS =1
-
-OS = Linux
-TARGET = retroarch
-OPK_NAME = retroarch_retrofw.opk
-
-OBJ :=
-LINK := $(CXX)
-DEF_FLAGS := -march=mips32 -mtune=mips32 -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 -DRETROFW=1 -MMD
-DEF_FLAGS += -Wall -Wno-unused-variable -flto
-DEF_FLAGS += -std=gnu99 -D_GNU_SOURCE
-LIBS := -ldl -lz -lrt -pthread
-CFLAGS :=
-CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
-ASFLAGS :=
-LDFLAGS := -Wl,--gc-sections
-INCLUDE_DIRS = -I$(GCW0_INC_DIR)
-LIBRARY_DIRS = -L$(GCW0_LIB_DIR)
-DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY
-DEFINES += -DHAVE_C99=1 -DHAVE_CXX=1
-DEFINES += -DHAVE_GETOPT_LONG=1 -DHAVE_STRCASESTR=1 -DHAVE_DYNAMIC=1
-DEFINES += -DHAVE_FILTERS_BUILTIN
-DEFINES += -DHAVE_OSS=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)
-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.retrofw.desktop
-	rm -f $(OPK_NAME)
-	cp media/ico_src/icon32.png retroarch.png
-	chmod +x retroarch
-	chmod 777 retroarch
-ifeq ($(STRIP_BIN),1)
-	$(STRIP) --strip-unneeded retroarch
-endif
-	$(GCW0_MK_SQUASH_FS) retroarch default.retrofw.desktop retroarch.png $(OPK_NAME) -all-root -no-xattrs -noappend -no-exports
-	rm -f default.retrofw.desktop retroarch.png
-
-.PHONY: all clean opk
-
-print-%:
-	@echo '$*=$($*)'
@@ -1,233 +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_NETWORKING = 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
-HAVE_CORE_INFO_CACHE = 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,235 +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 = 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 = 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_NETWORKING = 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
-HAVE_TINYALSA = 1
-HAVE_CORE_INFO_CACHE = 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 += -ffast-math
-DEF_FLAGS += -I. -Ideps -Ideps/stb -DDINGUX=1 -DDINGUX_BETA=1 -MMD
-DEF_FLAGS += -Wall -Wno-unused-variable
-DEF_FLAGS += -std=gnu99 -D_GNU_SOURCE -flto
-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_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,236 +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_XDELTA = 0 # Disabled until we figure out how to include <lzma.h>
-HAVE_CHEATS = 1
-HAVE_CHEEVOS = 0
-HAVE_LIBSHAKE = 0
-HAVE_TINYALSA = 1
-HAVE_NEAREST_RESAMPLER = 1
-HAVE_CORE_INFO_CACHE = 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,38 +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
-	HAVE_CORE_INFO_CACHE = 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,9 +1,7 @@
 TARGET		    := retroarch_vita
 DEBUG               ?= 0
-HAVE_FILE_LOGGER	= 1
 GRIFFIN_BUILD        = 0
 WHOLE_ARCHIVE_LINK   = 0
-HAVE_STATIC_DUMMY ?= 0

 VITA_TITLE_ID	:= RETROARCH
 VITA_TITLE_NAME	:= RetroArch
@@ -13,46 +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 \
-		   -DHAVE_REWIND \
-		   -DHAVE_NEON \
-		   -DHAVE_MENU \
-		   -DHAVE_CONFIGFILE \
-		   -DHAVE_PATCH \
-		   -DHAVE_CHEATS \
-		   -DHAVE_XMB \
-		   -DHAVE_MATERIALUI \
-		   -DHAVE_LIBRETRODB \
-		   -DHAVE_KEYMAPPER \
-		   -DHAVE_ZLIB \
-		   -DHAVE_RPNG \
-		   -DHAVE_RJPEG \
-		   -DHAVE_RBMP \
-		   -DHAVE_RTGA \
-		   -DHAVE_CC_RESAMPLER \
-		   -DHAVE_CORE_INFO_CACHE
+	DEFINES += -DHAVE_GRIFFIN=1
+	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_DSP_FILTER		:= 1
-	HAVE_VIDEO_FILTER	:= 1
-	HAVE_SCREENSHOTS	:= 1
 	HAVE_FILTERS_BUILTIN	:= 1
 	HAVE_LANGEXTRA		:= 1
 	HAVE_RPNG		:= 1
@@ -61,31 +32,11 @@ 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_NETWORKING		:= 1
-	HAVE_IFINFO		:= 1
-	HAVE_NETPLAYDISCOVERY	:= 1
 	HAVE_SOCKET_LEGACY	:= 1
 	HAVE_MENU		:= 1
 	HAVE_MENU_COMMON	:= 1
-	HAVE_GFX_WIDGETS 	:= 1
-	HAVE_CONFIGFILE 	:= 1
-	HAVE_PATCH      	:= 1
-	HAVE_XDELTA			:= 1 # disabled because <lzma.h> isn't available (or we haven't figured out how to install it)
-	HAVE_CHEATS     	:= 1
 	HAVE_OVERLAY		:= 1
 	HAVE_MATERIALUI		:= 1
 	HAVE_XMB		:= 1
@@ -95,25 +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
-	HAVE_CORE_INFO_CACHE    := 1

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

 	include Makefile.common
-	CFLAGS			+= $(DEF_FLAGS)
-	BLACKLIST 		:=
-	OBJ			:= $(filter-out $(BLACKLIST),$(OBJ))
-	INCDIRS			+= $(INCLUDE_DIRS)
+	BLACKLIST :=
+	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
+
+	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
@@ -131,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),)
@@ -169,34 +115,19 @@ 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
+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

-ifeq ($(HAVE_VITAGLES), 1)
-   VITA_LIBS += -llibScePiglet_stub -ltaihen_stub
-   FSELF_FLAGS := -ss
-else
-   VITA_LIBS += -lvitaGL -lvitashark
-   FSELF_FLAGS := -s
-endif
-
-LIBS	:= $(WHOLE_START) 
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIBS += -lretro_vita
-endif
-
-LIBS    += $(WHOLE_END) $(VITA_LIBS) -lm -lc
+LIBS	:= $(WHOLE_START) -lretro_vita $(WHOLE_END) $(VITA_LIBS) -lm -lc

 TARGETS := $(TARGET).vpk

 DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
 POSTCOMPILE = mv -f $*.Tdepend $*.depend

+
 all: $(TARGETS)

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

+
 %.o: %.S
 %.o: %.S %.depend
 	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
@@ -221,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) 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
@@ -254,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,28 +35,26 @@ 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 \
 		 libretro-common/file/retro_dirent.o \
 		 libretro-common/encodings/encoding_utf.o \
 		 libretro-common/compat/compat_strl.o \
-		 libretro-common/compat/compat_strldup.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,270 +0,0 @@
-include version.all
-
-ifneq ($(CROSS_COMPILE),arm-webos-linux-gnueabi-)
-    $(error You need webOS toolchain to build this. See https://github.com/webosbrew/native-toolchain)
-endif
-
-ifdef SDKTARGETSYSROOT
-    $(warning OE-based toolchain isn't supported anymore. Please use https://github.com/webosbrew/native-toolchain)
-    STAGING_DIR = $(SDKTARGETSYSROOT)
-else ifndef STAGING_DIR
-    $(error Can't find buildroot based toolchain. Please use https://github.com/webosbrew/native-toolchain)
-endif
-
-WEBOS_FREETYPE_CONFIG ?= $(STAGING_DIR)/usr/bin/freetype-config
-
-WEBOS_INC_DIR         ?= $(STAGING_DIR)/usr/include
-WEBOS_LIB_DIR         ?= $(STAGING_DIR)/usr/lib
-
-ADD_SDL2_LIB          ?= 0
-SDL2_PREBUILT_ARCHIVE ?= https://github.com/webosbrew/SDL-webOS/releases/download/release-2.30.0-2/SDL2-2.30.0-webos.tar.gz
-
-#########################
-#########################
-
-PACKAGE_NAME = com.retroarch
-PACKAGE_VERSION := $(patsubst "%",%,$(RARCH_VERSION))
-
-DEBUG ?= 0
-
-HAVE_SCREENSHOTS = 1
-HAVE_REWIND = 1
-HAVE_7ZIP = 1
-HAVE_ACCESSIBILITY = 1
-HAVE_AL = 0
-# ALSA freezes when switching back from menu
-HAVE_ALSA = 0
-HAVE_ANGLE = 0
-HAVE_AUDIOIO = 0
-HAVE_AUDIOMIXER = 1
-HAVE_BLISSBOX = 0
-HAVE_BSV_MOVIE = 1
-HAVE_BUILTINBEARSSL = 0
-HAVE_BUILTINFLAC = 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 = 1
-HAVE_BUILTINZLIB = 1
-HAVE_C99 = 1
-HAVE_CC = 1
-HAVE_CC_RESAMPLER = 1
-HAVE_NEAREST_RESAMPLER = 1
-HAVE_CHD = 1
-HAVE_COMMAND = 1
-HAVE_CXX = 1
-HAVE_DR_MP3 = 1
-HAVE_DYNAMIC = 1
-HAVE_DYLIB = 1
-HAVE_EGL = 0
-HAVE_FREETYPE = 0
-HAVE_GDI = 1
-HAVE_GETADDRINFO = 1
-HAVE_GETOPT_LONG = 1
-HAVE_GLSL = 1
-HAVE_GLSLANG = 0
-HAVE_GLSLANG_HLSL = 0
-HAVE_GLSLANG_OGLCOMPILER = 0
-HAVE_GLSLANG_OSDEPENDENT = 0
-HAVE_GLSLANG_SPIRV = 0
-HAVE_GLSLANG_SPIRV_TOOLS = 0
-HAVE_GLSLANG_SPIRV_TOOLS_OPT = 0
-HAVE_HID = 1
-HAVE_IBXM = 1
-HAVE_IMAGEVIEWER = 1
-HAVE_LANGEXTRA = 1
-HAVE_LIBRETRODB = 1
-HAVE_MENU = 1
-HAVE_MENU_COMMON = 1
-HAVE_NEON = 1
-HAVE_NETWORKING = 1
-HAVE_IFINFO = 1
-HAVE_NETWORK_CMD = 1
-HAVE_NETPLAYDISCOVERY = 1
-HAVE_NETWORKGAMEPAD = 1
-HAVE_GFX_WIDGETS = 1
-HAVE_MMAP = 1
-HAVE_ONLINE_UPDATER = 1
-HAVE_OPENDINGUX_FBDEV = 0
-HAVE_OPENGL = 0
-HAVE_OPENGL1 = 0
-HAVE_OPENGL_CORE = 0
-HAVE_OPENGLES = 1
-HAVE_OPENGLES3 = 0
-HAVE_OPENGLES3_1 = 0
-HAVE_OPENGLES3_2 = 0
-HAVE_OPENSSL = 0
-HAVE_OVERLAY = 1
-HAVE_PULSE = 1
-HAVE_RBMP = 1
-HAVE_RJPEG = 1
-HAVE_RPILED = 0
-HAVE_RPNG = 1
-HAVE_RUNAHEAD = 1
-HAVE_SDL = 0
-HAVE_SDL2 = 1
-HAVE_SHADERPIPELINE = 1
-HAVE_STB_FONT = 1
-HAVE_STB_IMAGE = 1
-HAVE_STB_VORBIS = 1
-HAVE_STDIN_CMD = 1
-HAVE_STRCASESTR = 1
-HAVE_THREADS = 1
-HAVE_UDEV = 0
-HAVE_RGUI = 1
-HAVE_MATERIALUI = 0
-HAVE_XMB = 1
-HAVE_OZONE = 1
-HAVE_ZLIB = 1
-HAVE_CONFIGFILE = 1
-HAVE_PATCH = 1
-HAVE_CHEATS = 1
-HAVE_CHEEVOS = 1
-HAVE_LIBSHAKE = 1
-HAVE_UPDATE_ASSETS = 1
-HAVE_UPDATE_CORES = 1
-HAVE_UPDATE_CORE_INFO = 1
-HAVE_CORE_INFO_CACHE = 1
-
-OS = Linux
-TARGET = retroarch
-
-OBJ :=
-LINK := $(CC)
-DEF_FLAGS += -ffunction-sections -fdata-sections
-DEF_FLAGS += -I. -Ideps -Ideps/stb -DWEBOS=1 -MMD
-DEF_FLAGS += -Wall -Wno-unused-variable
-LIBS := -ldl -lz -lrt -pthread
-CFLAGS :=
-CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
-ASFLAGS :=
-LDFLAGS := -Wl,-rpath=\$$ORIGIN/lib,--gc-sections
-INCLUDE_DIRS = -I$(WEBOS_INC_DIR)
-LIBRARY_DIRS = -L$(WEBOS_LIB_DIR)
-DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY
-DEFINES += -DHAVE_C99=1 -DHAVE_CXX=1 -D_GNU_SOURCE
-DEFINES += -DHAVE_GETOPT_LONG=1 -DHAVE_STRCASESTR=1 -DHAVE_DYNAMIC=1
-DEFINES += -DHAVE_FILTERS_BUILTIN
-DEFINES += -DHAVE_SDL2
-DEFINES += -DHAVE_PULSE
-DEFINES += -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES
-DEFINES += -DHAVE_UPDATE_CORE_INFO
-
-PKG_CONFIG=pkg-config
-
-SDL2_CFLAGS := $(shell $(PKG_CONFIG) --cflags sdl2)
-SDL2_LIBS := $(shell $(PKG_CONFIG) --libs sdl2)
-OPENGLES_LIBS = -lGLESv2
-PULSE_LIBS = $(shell $(PKG_CONFIG) --libs libpulse)
-MMAP_LIBS = -lc
-NEON_CFLAGS = -mfpu=neon
-NEON_ASFLAGS = -mfpu=neon
-NETWORKING_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 APPINFO
-{
-    "id": "$(PACKAGE_NAME)",
-    "version": "$(PACKAGE_VERSION)",
-    "vendor": "webosbrew.org",
-    "title": "RetroArch",
-    "icon": "icon160.png",
-    "main": "retroarch",
-    "iconColor": "#333333",
-    "type": "native",
-    "appDescription": "Emulation frontend"
-}
-endef
-export APPINFO
-
-all: $(TARGET) ipk
-
-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 SDL
-	rm -rf webos/*.ipk
-	rm -rf webos/dist
-
-sdl2: $(TARGET)
-ifeq ($(ADD_SDL2_LIB), 1)
-	@echo "Downloading SDL2 prebuilt"
-	mkdir -p SDL
-	wget -qO - $(SDL2_PREBUILT_ARCHIVE) | tar -C SDL -zxvf -
-endif
-
-ipk: $(TARGET) sdl2
-	rm -rf webos/dist
-	mkdir -p webos/dist/lib
-	echo "$$APPINFO" > webos/dist/appinfo.json
-	cp -t webos/dist -vf $(TARGET) webos/icon160.png
-	cp -t webos/dist/lib -vf $(WEBOS_LIB_DIR)/libstdc++.so.6
-ifeq ($(ADD_SDL2_LIB), 1)
-	cp -t webos/dist/lib -vf SDL/lib/libSDL2-2.0.so.0
-endif
-	$(STRIP) webos/dist/$(TARGET)
-	cd webos && ares-package dist
-
-install: ipk
-	ares-install webos/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(ARCH).ipk
-
-launch: install
-	ares-launch com.retroarch
-
-.PHONY: all clean ipk
-
-print-%:
-	@echo '$*=$($*)'
@@ -1,305 +0,0 @@
-ROOT_DIR                  := .
-DEPS_DIR                  := $(ROOT_DIR)/deps
-DEBUG                     ?= 0
-LOAD_WITHOUT_CORE_INFO    ?= 0
-HAVE_LOGGER                = 0
-HAVE_FILE_LOGGER           = 0
-HAVE_CC_RESAMPLER          = 1
-WHOLE_ARCHIVE_LINK         = 0
-BIG_STACK                  = 1
-HAVE_NETWORKING            = 1
-HAVE_IFINFO                = 1
-PC_DEVELOPMENT_IP_ADDRESS  = 255.255.255.255
-PC_DEVELOPMENT_UDP_PORT    = 3490
-RARCH_CONSOLE              = 0
-USBGECKO                   = 0
-HAVE_STATIC_DUMMY ?= 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
-
-LIB_CORE :=
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIB_CORE += -lretro_wii
-endif
-
-LIBS               := $(WHOLE_START) $(LIB_CORE) $(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.
-
-ifeq ($(EXTERNAL_LIBOGC), 1)
-   CFLAGS   += -DEXTERNAL_LIBOGC
-   CXXFLAGS += -DEXTERNAL_LIBOGC
-   LIBDIRS += -L$(DEVKITPRO)/libogc/lib/wii
-   INCLUDE +=  -I$(DEVKITPRO)/libogc/include
-else
-   CFLAGS   += -DINTERNAL_LIBOGC
-   CXXFLAGS += -DINTERNAL_LIBOGC
-   LIBDIRS += -Lwii/libogc/libs/wii
-   INCLUDE += -Iwii/libogc/include
-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
- 
-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_ZLIB                := 1
-HAVE_7ZIP                := 1
-HAVE_CONFIGFILE          := 1
-HAVE_PATCH               := 1
-HAVE_XDELTA              := 0 # disabled because <lzma.h> isn't available (or we haven't figured out how to install it)
-HAVE_CHEATS              := 1
-HAVE_SCREENSHOTS         := 1
-HAVE_REWIND              := 1
-HAVE_AUDIOMIXER          := 1
-HAVE_RWAV                := 1
-RARCH_CONSOLE             = 1
-HAVE_CHEATS              := 1
-HAVE_CORE_INFO_CACHE     := 1
-HAVE_MENU_COMMON         := 1
-HAVE_MENU                := 1
-HAVE_BUILTINZLIB         := 1
-HAVE_STATIC_AUDIO_FILTERS := 1
-HAVE_STATIC_VIDEO_FILTERS := 1
-
-#HAVE_LANGEXTRA          := 1
-HAVE_WIIUSB_HID          := 1
-HAVE_HID                 := 1
-HAVE_RARCH_EXEC          := 1
-HAVE_RSOUND              := 0
-HAVE_XMB                 := 0
-HAVE_OZONE               := 0
-HAVE_RGUI                := 1
-HAVE_MATERIALUI          := 0
-HAVE_CHEEVOS             := 1
-
-CFLAGS      += -DHAVE_SOCKET_LEGACY -DHAVE_CHEEVOS
-
-APP_BOOTER_DIR = wii/app_booter
-PLATOBJS := $(APP_BOOTER_DIR)/app_booter.binobj
-
-ifeq ($(USBGECKO), 1)
-   CFLAGS += -DUSBGECKO
-endif
-
-INCLUDE += -I./libretro-common/include \
-           -Ideps \
-	   -Ideps/rcheevos/include \
-           -Ideps/stb
-CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE)
-
-OBJ =  $(PLATOBJS) audio/drivers/gx_audio.o gfx/drivers/gx_gfx.o input/drivers/gx_input.o frontend/drivers/platform_gx.o input/drivers_joypad/gx_joypad.o memory/wii/mem2_manager.o gfx/drivers/gx_gfx_vi_encoder.o frontend/drivers/platform_wii.o input/drivers_hid/wiiusb_hid.o 
-
-ifeq ($(EXTERNAL_LIBOGC), 0)
-   OBJ += wii/libogc/libfat/libfat.o wii/libogc/libfat/fatfile.o wii/libogc/libfat/file_allocation_table.o wii/libogc/libfat/cache.o wii/libogc/libfat/fatdir.o wii/libogc/libfat/partition.o wii/libogc/libfat/directory.o wii/libogc/libfat/filetime.o wii/libogc/libfat/disc.o
-endif
-
-include Makefile.common
-
-CFLAGS += $(DEFINES) -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" \
-		-DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) \
-
-
-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
-endif
-
-ifeq ($(BIG_STACK),1)
-   CFLAGS      += -DBIG_STACK
-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 ($(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_FILTERS_BUILTIN), 1)
-   CFLAGS += -DHAVE_FILTERS_BUILTIN
-endif
-
-ifeq ($(HAVE_RSOUND), 1)
-   CFLAGS += -DHAVE_RSOUND
-endif
-
-ifeq ($(HAVE_GETOPT_LONG), 1)
-   CFLAGS += -DHAVE_GETOPT_LONG=1
-endif
-
-ifeq ($(HAVE_NETWORK_CMD), 1)
-   CFLAGS += -DHAVE_NETWORK_CMD
-endif
-
-ifeq ($(HAVE_DYNAMIC), 1)
-   CFLAGS += -DHAVE_DYNAMIC
-endif
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -g -DDEBUG
-else
-   CFLAGS += -O3
-endif
-
-ifeq ($(LOAD_WITHOUT_CORE_INFO),1)
-   CFLAGS += -DLOAD_WITHOUT_CORE_INFO
-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 \
@@ -78,11 +65,9 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/file/retro_dirent.o \
 		libretro-common/encodings/encoding_utf.o \
 		libretro-common/compat/compat_strl.o \
-		libretro-common/compat/compat_strldup.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

@@ -140,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,19 +1,16 @@
-TARGET := retroarch_wiiu
+TARGET		    := retroarch_wiiu

 BUILD_HBL_ELF              = 1
 BUILD_RPX                  = 1
 DEBUG                      = 0
 GRIFFIN_BUILD              = 0
 SALAMANDER_BUILD           = 0
-HAVE_STATIC_DUMMY ?= 0
 WHOLE_ARCHIVE_LINK         = 0
 WIIU_HID                   = 1
-HAVE_HID                   = 1
 HAVE_RUNAHEAD              = 1
 WIIU_LOG_RPX               = 0
 BUILD_DIR                  = objs/wiiu
-PC_DEVELOPMENT_TCP_PORT    ?=
-LOAD_WITHOUT_CORE_INFO     ?= 0
+PC_DEVELOPMENT_TCP_PORT	   ?=

 ifeq ($(SALAMANDER_BUILD),1)
   BUILD_DIR := $(BUILD_DIR)-salamander
@@ -30,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
@@ -46,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
@@ -56,42 +61,31 @@ 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
   OBJ += libretro-common/file/retro_dirent.o
   OBJ += libretro-common/compat/compat_strl.o
-   OBJ += libretro-common/compat/compat_strldup.o
   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_UPDATE_CORE_INFO
   DEFINES += -DHAVE_FILTERS_BUILTIN
   DEFINES += -DHAVE_SLANG
   DEFINES += -DHAVE_SHADERPIPELINE

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

   OBJ += wiiu/shader_utils.o
@@ -104,162 +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_IFINFO -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 += -DHAVE_CORE_INFO_CACHE
-      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_XDELTA     = 0 # disabled because <lzma.h> isn't available (or we haven't figured out how to install it)
-      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_IFINFO = 1
-      HAVE_NETPLAYDISCOVERY = 1
-      HAVE_CHEEVOS = 1
-      #WANT_IFADDRS = 1
-      HAVE_OVERLAY = 1
-      HAVE_SPIRV_CROSS = 1
-      HAVE_SLANG = 1
-      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_CORE_INFO_CACHE = 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
-
-LIB_CORE :=
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIB_CORE += -lretro_wiiu
-endif
-
-
-LIBS := $(WHOLE_START) $(LIB_CORE) $(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
@@ -267,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-

@@ -288,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)
@@ -302,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 $@)
@@ -347,23 +311,16 @@ $(BUILD_DIR)/$(TARGET).rpx.elf: $(OBJ) $(RPX_OBJ) libretro_wiiu.a wiiu/link_elf.
 	@$(if $(Q), echo LD $@,)
 	$(Q)$(LD) $(OBJ) $(RPX_OBJ) $(LDFLAGS) $(RPX_LDFLAGS) $(LIBDIRS)  $(LIBS) -o $@

-$(BUILD_DIR)/$(TARGET).large.rpx: $(BUILD_DIR)/$(TARGET).rpx.elf $(ELF2RPL) .$(TARGET).rpx.large.last
+$(BUILD_DIR)/$(TARGET).rpx: $(BUILD_DIR)/$(TARGET).rpx.elf $(ELF2RPL) .$(TARGET).rpx.last
 	@$(if $(Q), echo ELF2RPL $@,)
-	@touch .$(TARGET).rpx.large.last
+	@touch .$(TARGET).rpx.last
 	$(Q)-$(ELF2RPL) $< $@

-$(BUILD_DIR)/$(TARGET).rpx: $(BUILD_DIR)/$(TARGET).large.rpx .$(TARGET).rpx.last
-	@$(if $(Q), echo COMPRESS $@,)
-	@touch .$(TARGET).rpx.large.last
-	$(Q)wiiurpxtool -c $< $@
-
 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).large.rpx $(BUILD_DIR)/$(TARGET).rpx
-	$(Q)rm -f .$(TARGET).elf.last .$(TARGET).rpx.elf.last .$(TARGET).rpx.large.last .$(TARGET).rpx.last
-	$(Q)rm -f $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
-	$(Q)$(MAKE) -C wiiu/wut/elf2rpl/ clean
+	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,23 +8,14 @@ HAVE_OPENGL = 1
 HAVE_DYLIB = 1
 HAVE_D3D9 = 1
 HAVE_NETWORKING = 1
-HAVE_IFINFO = 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
-HAVE_CORE_INFO_CACHE = 1

 HAVE_XINPUT = 1
 HAVE_WINMM = 1
@@ -35,13 +23,16 @@ HAVE_WINMM = 1
 HAVE_SDL      := 0
 HAVE_SDL2     := 0
 HAVE_RSOUND   := 0
+HAVE_PYTHON   := 0

 HAVE_STB_FONT := 1
 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,25 +60,16 @@ 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
 endif

+ifeq ($(HAVE_PYTHON), 1)
+PYTHON_LIBS      := -lpython32
+PYTHON_CFLAGS    := -DHAVE_PYTHON -Ipython
+endif
+
 ifeq ($(HAVE_FFMPEG), 1)
 AVCODEC_LIBS     := -lavcodec
 AVUTIL_LIBS      := -lavutil
@@ -97,8 +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          := -I. -Ilibretro-common/include -DRARCH_INTERNAL -DHAVE_OVERLAY
 LDFLAGS          := -L. -static-libgcc

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

+
 libretro ?= -lretro

 ifeq ($(DYNAMIC), 1)
@@ -135,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
@@ -161,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 $<),)
@@ -169,7 +163,7 @@ $(OBJDIR)/%.o: %.cpp | $(dir $@)
 $(OBJDIR)/%.o: %.rc $(HEADERS)
 	@-mkdir -p $(dir $@) || mkdir $(subst /,\,$(dir $@)) || echo .
 	@$(if $(Q), $(shell echo echo WINDRES $<),)
-	$(Q)$(WINDRES) $(DEFINES) -o $@ $<
+	$(Q)$(WINDRES) -o $@ $<

 clean:
 	rm -rf $(OBJDIR)
@@ -177,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-opengles and --enable-mali_fbdev.
+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-opengles --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

@@ -64,52 +61,32 @@ RetroArch also emphasizes being easy to integrate into various launcher frontend
 ## Platforms

 RetroArch has been ported to the following platforms:
-   - Android (2.x to most recent version)
-   - Apple iOS
-   - Apple macOS (PPC, x86-32 and x86-64)
-   - Apple tvOS
-   - Blackberry
+
   - DOS
+   - Windows
+   - Linux
   - Emscripten (WebAssembly and JavaScript)
   - FreeBSD
-   - Haiku
-   - Linux
-   - Microsoft Xbox 360 (Libxenon/XeXDK)
-   - Microsoft Xbox One
-   - Microsoft Xbox Series S/X
-   - Miyoo
   - NetBSD
-   - Nintendo 3DS/2DS
-   - Nintendo GameCube
-   - Nintendo NES/SNES Classic Edition
-   - Nintendo Switch
-   - Nintendo Wii
-   - Nintendo Wii U
   - OpenBSD
-   - OpenDingux
-   - Original Microsoft Xbox
-   - PlayStation2
-   - PlayStation3
-   - PlayStation4
+   - Haiku
+   - Solaris
+   - macOS (PPC, x86-32 and x86-64)
+   - PlayStation 3
   - PlayStation Portable
   - PlayStation Vita
+   - Original Microsoft Xbox
+   - Microsoft Xbox 360 (Libxenon/XeXDK)
+   - Nintendo GameCube
+   - Nintendo Wii
+   - Nintendo Wii U
+   - Nintendo 3DS
+   - Nintendo Switch
+   - Nintendo NES/SNES Classic Edition
   - Raspberry Pi
-   - ReactOS
-   - RetroFW
-   - RS90
-   - SerenityOS
-   - Solaris
-   - Windows 10
-   - Windows 11
-   - Windows 2000
-   - Windows 7
-   - Windows 8
-   - Windows 95
-   - Windows 98
-   - Windows Millennium
-   - Windows NT 3.5
-   - Windows Vista
-   - Windows XP
+   - Android
+   - iOS
+   - Blackberry

 ## Dependencies (PC)

@@ -128,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:
@@ -152,47 +130,6 @@ dynamically, it's not required at build time.
 Console ports have their own dependencies, but generally do not require
 anything other than what the respective SDKs provide.

-## Requirements
-
-### OpenGL1 ###
-Your videocard needs to at least support the OpenGL 1.1 spec.
-
-***Shaders***: N/A
-
-**Menu driver support**: MaterialUI, XMB, Ozone and RGUI should all work correctly.
-XMB won't have shader pipeline effects because of the aforementioned lack of shader
-support.
-
-### OpenGL2 ###
-Your videocard needs to at least support the OpenGL 2.1 spec.
-
-***Shaders:*** You can choose between either NVIDIA Cg shaders (deprecated, requires separate runtime
-to be installed on your system), or GLSL shaders.
-
-***Menu driver support:*** MaterialUI, XMB, Ozone and RGUI should all work correctly.
-
-### OpenGL3 ###
-Your videocard needs to at least support the OpenGL 3.2 core feature spec.
-
-***Shaders:*** You will be able to use modern Slang shaders with this driver.
-
-***Menu driver support:*** MaterialUI, XMB, Ozone and RGUI should all work correctly.
-
-### Direct3D 11 ###
-Your videocard needs to at least support the Direct3D11 11.0 spec. The card
-also needs to support at least the Shader Model 4.0.
-
-***Shaders:*** You will be able to use modern Slang shaders with this driver.
-
-***Menu driver support:*** MaterialUI, XMB, Ozone and RGUI should all work correctly.
-
-### Vulkan ###
-Your videocard needs to at least support the Vulkan 1.0 spec.
-
-***Shaders:*** You will be able to use modern Slang shaders with this driver.
-
-***Menu driver support:*** MaterialUI, XMB, Ozone and RGUI should all work correctly.
-
 ## Configuring

 The default configuration is defined in `config.def.h`.
@@ -203,7 +140,7 @@ A sample configuration file is installed to `/etc/retroarch.cfg`. This is the sy
 RetroArch will on startup create a config file in `$XDG\_CONFIG\_HOME/retroarch/retroarch.cfg` if it does not exist.
 Users only need to configure a certain option if the desired value deviates from the value defined in config.def.h.

-To configure joypads, use the built-in menu or manually configure them in `retroarch.cfg`.
+To configure joypads, use the built-in menu or the `retroarch-joyconfig` command-line tool.

 ## Compiling and installing

@@ -211,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:

@@ -252,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
@@ -320,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.com/invite/VZ2b7wghxR)
- [Teespring](https://teespring.com/stores/retroarch)
- [Documentation](https://docs.libretro.com/)
- [Forum](https://forums.libretro.com/)
@@ -1,157 +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
-
-#include "configuration.h"
-#include "tasks/tasks_internal.h"
-
-#ifdef HAVE_THREADS
-#include "rthreads/rthreads.h"
-#endif
-
-typedef struct
-{
-   /* The last request task, used to prepare and send the translation */
-   retro_task_t *request_task;
-
-   /* The last response task, used to parse costly translation data */
-   retro_task_t *response_task;
-
-   /* Timestamp of the last translation request */
-   retro_time_t last_call;
-
-   #ifdef HAVE_THREADS
-   /* Necessary because last_image is manipulated by task handlers */
-   slock_t *image_lock;
-   #endif
-
-   /* Frame captured during the last call to the translation service */
-   uint8_t *last_image;
-   unsigned last_image_size;
-
-   /* 1 if the automatic mode has been enabled, 0 otherwise */
-   int ai_service_auto;
-
-   /* Text-to-speech narrator override flag */
-   bool enabled;
-} access_state_t;
-
-bool is_accessibility_enabled(bool accessibility_enable, bool accessibility_enabled);
-
-#ifdef HAVE_TRANSLATE
-bool is_narrator_running(bool accessibility_enable);
-#endif
-
-/*
-   Invoke this method to send a request to the AI service.
-   It makes the following POST request using URL params:
-      – source_lang (optional): language code of the content currently running.
-      – target_lang (optional): language of the content to return.
-      – output: comma-separated list of formats that must be provided by the
-         service. Also lists supported sub-formats.
-
-   The currently supported formats are:
-      – sound: raw audio to playback. (wav)
-      – text: text to be read through internal text-to-speech capabilities.
-         'subs' can be specified on top of that to explain that we are looking
-         for short text response in the manner of subtitles.
-      – image: image to display on top of the video feed. Widgets will be used
-         first if possible, otherwise we'll try to draw it directly on the
-         video buffer. (bmp, png, png-a) [All in 24-bits BGR formats]
-
-   In addition, the request contains a JSON payload, formatted as such:
-      – image: captured frame from the currently running content (in base64).
-      – format: format of the captured frame ("png", or "bmp").
-      – coords: array describing the coordinates of the image within the
-         viewport space (x, y, width, height).
-      – viewport: array describing the size of the viewport (width, height).
-      – label: a text string describing the content (<system id>__<content id>).
-      – state: a JSON object describing the state of the frontend, containing:
-         – paused: 1 if the content has been paused, 0 otherwise.
-         – <key>: the name of a retropad input, valued 1 if pressed.
-            (a, b, x, y, l, r, l2, r2, l3, r3)
-            (up, down, left, right, start, select)
-
-   The translation component then expects a response from the AI service in the
-   form of a JSON payload, formatted as such:
-      – image: base64 representation of an image in a supported format.
-      – sound: base64 representation of a sound byte in a supported format.
-      – text: results from the service as a string.
-      – text_position: hint for the position of the text when the service is
-         running in text mode (ie subtitles). Position is a number,
-         1 for Bottom or 2 for Top (defaults to bottom).
-      – press: a list of retropad input to forcibly press. On top of the
-         expected keys (cf. 'state' above) values 'pause' and 'unpause' can be
-         specified to control the flow of the content.
-      – error: any error encountered with the request.
-      – auto: either 'auto' or 'continue' to control automatic requests.
-
-   All fields are optional, but at least one of them must be present.
-   If 'error' is set, the error is shown to the user and everything else is
-   ignored, even 'auto' settings.
-
-   With 'auto' on 'auto', RetroArch will automatically send a new request
-   (with a minimum delay enforced by uints.ai_service_poll_delay), with a value
-   of 'continue', RetroArch will ignore the returned content and skip to the
-   next automatic request. This allows the service to specify that the returned
-   content is the same as the one previously sent, so RetroArch does not need to
-   update its display unless necessary. With 'continue' the service *must*
-   still send the content, as we may need to display it if the user paused the
-   AI service for instance.
-
-   {paused} boolean is passed in to indicate if the current call was made
-   during a paused frame. Due to how the menu widgets work, if the AI service
-   is called in 'auto' mode, then this call will be made while the menu widgets
-   unpause the core for a frame to update the on-screen widgets. To tell the AI
-   service what the pause mode is honestly, we store the runloop_paused
-   variable from before the service wipes the widgets, and pass that in here.
-*/
-bool run_translation_service(settings_t *settings, bool paused);
-
-void translation_release(bool inform);
-
-/* Proxy for calls related to menu navigation */
-bool navigation_say(
-      bool accessibility_enable,
-      unsigned accessibility_narrator_speech_speed,
-      const char* speak_text,
-      int priority);
-
-/* Local platform-specific TTS  */
-bool accessibility_speak_priority(
-      unsigned accessibility_narrator_speech_speed,
-      const char *speak_text,
-      int priority,
-      const char* voice);
-
-access_state_t *access_state_get_ptr(void);
-
-#endif
@@ -1,178 +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_MIN_RATIO                0.0625
-
-#define AUDIO_MIXER_MAX_STREAMS        16
-
-#define AUDIO_MIXER_MAX_SYSTEM_STREAMS (AUDIO_MIXER_MAX_STREAMS + 8)
-
-/* Fastforward timing calculations running average samples. Helps with a
-consistent pitch when fast-forwarding. */
-#define AUDIO_FF_EXP_AVG_SAMPLES       16
-
-/* 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_NOTICE_BACK,
-   AUDIO_MIXER_SYSTEM_SLOT_BGM,
-   AUDIO_MIXER_SYSTEM_SLOT_ACHIEVEMENT_UNLOCK,
-   AUDIO_MIXER_SYSTEM_SLOT_UP,
-   AUDIO_MIXER_SYSTEM_SLOT_DOWN
-};
-
-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
-};
-
-/**
- * Bit flags that describe the current state of the audio driver.
- */
-enum audio_driver_state_flags
-{
-   /**
-    * Indicates that the driver was successfully created
-    * and is currently valid.
-    * You may submit samples for output at any time.
-    *
-    * This flag does \em not mean that the player will hear anything;
-    * the driver might be suspended.
-    *
-    * @see AUDIO_FLAG_SUSPENDED
-    */
-   AUDIO_FLAG_ACTIVE       = (1 << 0),
-
-   /**
-    * Indicates that the audio driver outputs floating-point samples,
-    * as opposed to integer samples.
-    *
-    * All audio is sent through the resampler,
-    * which operates on floating-point samples.
-    *
-    * If this flag is set, then the resampled output doesn't need
-    * to be converted back to \c int16_t format.
-    *
-    * This won't affect the audio that the core writes;
-    * either way, it's supposed to output \c int16_t samples.
-    *
-    * This flag won't be set if the selected audio driver
-    * doesn't support (or is configured to not use) \c float samples.
-    *
-    * @see audio_driver_t::use_float
-    */
-   AUDIO_FLAG_USE_FLOAT    = (1 << 1),
-
-   /**
-    * Indicates that the audio driver is not currently rendering samples,
-    * although it's valid and can be resumed.
-    *
-    * Usually set when RetroArch needs to simulate audio output
-    * without actually rendering samples (e.g. runahead),
-    * or when reinitializing the driver.
-    *
-    * Samples will still be accepted, but they will be silently dropped.
-    */
-   AUDIO_FLAG_SUSPENDED    = (1 << 2),
-
-   /**
-    * Indicates that the audio mixer is available
-    * and can mix one or more audio streams.
-    *
-    * Will not be set if RetroArch was built without \c HAVE_AUDIOMIXER.
-    */
-   AUDIO_FLAG_MIXER_ACTIVE = (1 << 3),
-
-   /**
-    * Indicates that the frontend will never need audio from the core,
-    * usually when runahead is active.
-    *
-    * When set, any audio received by the core will not be processed.
-    *
-    * Will not be set if RetroArch was built without \c HAVE_RUNAHEAD.
-    *
-    * @see RETRO_ENVIRONMENT_GET_AUDIO_VIDEO_ENABLE
-    */
-   AUDIO_FLAG_HARD_DISABLE = (1 << 4),
-
-   /**
-    * Indicates that audio rate control is enabled.
-    * This means that the audio system will adjust the rate at which
-    * it sends samples to the driver,
-    * minimizing the occurrences of buffer overrun or underrun.
-    *
-    * @see audio_driver_t::write_avail
-    * @see audio_driver_t::buffer_size
-    */
-   AUDIO_FLAG_CONTROL      = (1 << 5)
-};
-
-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
@@ -18,63 +18,65 @@
 #define __AUDIO_DRIVER__H

 #include <stdint.h>
-#include <stdlib.h>
 #include <stddef.h>
 #include <sys/types.h>

 #include <boolean.h>
-#include <retro_common_api.h>
-#include <retro_inline.h>
-#include <libretro.h>
-#include <retro_miscellaneous.h>
-
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif /* HAVE_CONFIG_H */
-
-#ifdef HAVE_DSP_FILTER
-#include <audio/dsp_filter.h>
-#endif
-#ifdef HAVE_AUDIOMIXER
 #include <audio/audio_mixer.h>
-#endif
 #include <audio/audio_resampler.h>
-
-#include "audio_defines.h"
-
-#define AUDIO_BUFFER_FREE_SAMPLES_COUNT (8 * 1024)
+#include <retro_common_api.h>

 RETRO_BEGIN_DECLS

-#ifdef HAVE_AUDIOMIXER
+#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;
-   float volume;
-   enum audio_mixer_stream_type stream_type;
-   enum audio_mixer_type type;
-   enum audio_mixer_state state;
 } audio_mixer_stream_t;

-typedef struct audio_mixer_stream_params
+typedef struct audio_statistics
 {
-   void *buf;
-   char *basename;
-   audio_mixer_stop_cb_t cb;
-   size_t bufsize;
-   unsigned slot_selection_idx;
-   float volume;
-   enum audio_mixer_slot_selection_type slot_selection_type;
-   enum audio_mixer_stream_type stream_type;
-   enum audio_mixer_type type;
-   enum audio_mixer_state state;
-} audio_mixer_stream_params_t;
-#endif
+   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
 {
@@ -112,19 +114,10 @@ typedef struct audio_driver
    */
   ssize_t (*write)(void *data, const void *buf, size_t size);

-   /**
-    * Temporarily pauses the audio driver.
-    *
-    * @param data Opaque handle to the audio driver context
-    * that was returned by \c init.
-    * @return \c true if the audio driver was successfully paused,
-    * \c false if there was an error.
-    **/
+   /* Temporarily pauses the audio driver. */
   bool (*stop)(void *data);

-   /**
-    * Resumes audio driver from the paused state.
-    **/
+   /* Resumes audio driver from the paused state. */
   bool (*start)(void *data, bool is_shutdown);

   /* Is the audio driver currently running? */
@@ -139,7 +132,7 @@ typedef struct audio_driver
    * */
   void (*set_nonblock_state)(void *data, bool toggle);

-   /* Stops and frees driver. */
+   /* Stops and frees driver data. */
   void (*free)(void *data);

   /* Defines if driver will take standard floating point samples,
@@ -167,103 +160,87 @@ typedef struct audio_driver
   size_t (*buffer_size)(void *data);
 } audio_driver_t;

-typedef struct
+typedef struct audio_mixer_stream_params
 {
-   double source_ratio_original;
-   double source_ratio_current;
+   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;

-   uint64_t free_samples_count;
+void audio_driver_destroy_data(void);

-   struct string_list *devices_list;
+void audio_driver_set_own_driver(void);

-   /**
-    * A scratch buffer for audio output to be processed,
-    * up to (but excluding) the point where it's converted to 16-bit audio
-    * to give to the driver.
-    */
-   float *output_samples_buf;
-   size_t output_samples_buf_length;
-#ifdef HAVE_REWIND
-   int16_t *rewind_buf;
-#endif
+void audio_driver_unset_own_driver(void);

-   /**
-    * A scratch buffer for processed audio output to be converted to 16-bit,
-    * so that it can be sent to the driver.
-    */
-   int16_t *output_samples_conv_buf;
-   size_t output_samples_conv_buf_length;
-#ifdef HAVE_DSP_FILTER
-   retro_dsp_filter_t *dsp;
-#endif
-   const retro_resampler_t *resampler;
+void audio_driver_suspend(void);

-   void *resampler_data;
+bool audio_driver_is_suspended(void);

-   /**
-    * The current audio driver.
-    */
-   const audio_driver_t *current_audio;
+void audio_driver_resume(void);

-   void *context_audio_data;
+void audio_driver_set_active(void);

-   /**
-    * Scratch buffer for preparing data for the resampler
-    */
-   float *input_data;
-   size_t input_data_length;
-#ifdef HAVE_AUDIOMIXER
-   struct audio_mixer_stream mixer_streams[AUDIO_MIXER_MAX_SYSTEM_STREAMS];
-#endif
-   struct retro_audio_callback callback;                 /* ptr alignment */
-                                                         /* ptr alignment */
-   size_t chunk_size;
-   size_t chunk_nonblock_size;
-   size_t chunk_block_size;
+bool audio_driver_is_active(void);

-#ifdef HAVE_REWIND
-   size_t rewind_ptr;
-   size_t rewind_size;
-#endif
-   size_t buffer_size;
-   size_t data_ptr;
+void audio_driver_destroy(void);

-   unsigned free_samples_buf[AUDIO_BUFFER_FREE_SAMPLES_COUNT];
+void audio_driver_deinit_resampler(void);

-#ifdef HAVE_AUDIOMIXER
-   float mixer_volume_gain;
-#endif
+bool audio_driver_free_devices_list(void);

-   float rate_control_delta;
-   float input;
-   float volume_gain;
-
-   enum resampler_quality resampler_quality;
-
-   uint8_t flags;
-
-   char resampler_ident[64];
-
-   bool mute_enable;
-#ifdef HAVE_AUDIOMIXER
-   bool mixer_mute_enable;
-#endif
-
-   /* Sample the flush delta-time when fast forwarding to find the correct ratio. */
-   retro_time_t last_flush_time;
-   /* Exponential moving average */
-   retro_time_t avg_flush_delta;
-} audio_driver_state_t;
+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);

-bool audio_driver_dsp_filter_init(const char *device);
+void audio_driver_dsp_filter_init(const char *device);

 void audio_driver_set_buffer_size(size_t bufsize);

@@ -271,31 +248,53 @@ 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);

-#ifdef HAVE_AUDIOMIXER
+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_menu_sound(unsigned i);
-
-void audio_driver_mixer_play_scroll_sound(bool direction_up);
-
-void audio_driver_mixer_play_menu_sound_looped(unsigned i);
-
 void audio_driver_mixer_play_stream_sequential(unsigned i);

 void audio_driver_mixer_play_stream_looped(unsigned i);
@@ -308,107 +307,15 @@ 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);

-void audio_driver_load_system_sounds(void);
-
-#endif
-
-bool audio_driver_start(bool is_shutdown);
-
-bool audio_driver_stop(void);
-
-/**
- * If you need to query the size of audio samples,
- * use this function instead of checking the flags directly.
- *
- * @return The size of a single audio sample in bytes,
- * as determined by the presence of the \c AUDIO_FLAG_USE_FLOAT flag.
- * Will currently return either 2 (for \c uint16_t) or 4 (for \c float),
- * although this may change if we add support for more sample types.
- */
-unsigned audio_driver_get_sample_size(void);
-
-#ifdef HAVE_TRANSLATE
-/* TODO/FIXME - Doesn't currently work.  Fix this. */
-bool audio_driver_is_ai_service_speech_running(void);
-#endif
-
-/**
- * audio_compute_buffer_statistics:
- *
- * Computes audio buffer statistics.
- *
- **/
-bool audio_compute_buffer_statistics(audio_statistics_t *stats);
-
-bool audio_driver_init_internal(
-      void *settings_data,
-      bool audio_cb_inited);
-
-bool audio_driver_deinit(void);
-
-bool audio_driver_find_driver(
-      void *settings_data,
-      const char *prefix,
-      bool verbosity_enabled);
-
-/**
- * audio_driver_sample:
- * @left                 : value of the left audio channel.
- * @right                : value of the right audio channel.
- *
- * Audio sample render callback function.
- **/
-void audio_driver_sample(int16_t left, int16_t right);
-
-/**
- * audio_driver_sample_batch:
- * @data                 : pointer to audio buffer.
- * @frames               : amount of audio frames to push.
- *
- * Batched audio sample render callback function.
- *
- * Returns: amount of frames sampled.
- **/
-size_t audio_driver_sample_batch(const int16_t *data, size_t frames);
-
-#ifdef HAVE_REWIND
-/**
- * audio_driver_sample_rewind:
- * @left                 : value of the left audio channel.
- * @right                : value of the right audio channel.
- *
- * Audio sample render callback function (rewind version).
- * This callback function will be used instead of
- * audio_driver_sample when rewinding is activated.
- **/
-void audio_driver_sample_rewind(int16_t left, int16_t right);
-
-/**
- * audio_driver_sample_batch_rewind:
- * @data                 : pointer to audio buffer.
- * @frames               : amount of audio frames to push.
- *
- * Batched audio sample render callback function (rewind version).
- *
- * This callback function will be used instead of
- * audio_driver_sample_batch when rewinding is activated.
- *
- * Returns: amount of frames sampled.
- **/
-size_t audio_driver_sample_batch_rewind(
-      const int16_t *data, size_t frames);
-#endif
-
-#ifdef HAVE_MENU
-void audio_driver_menu_sample(void);
-#endif
+bool compute_audio_buffer_statistics(audio_statistics_t *stats);

 extern audio_driver_t audio_rsound;
-extern audio_driver_t audio_audioio;
 extern audio_driver_t audio_oss;
 extern audio_driver_t audio_alsa;
 extern audio_driver_t audio_alsathread;
@@ -423,28 +330,18 @@ extern audio_driver_t audio_pulse;
 extern audio_driver_t audio_dsound;
 extern audio_driver_t audio_wasapi;
 extern audio_driver_t audio_coreaudio;
-extern audio_driver_t audio_coreaudio3;
 extern audio_driver_t audio_xenon360;
 extern audio_driver_t audio_ps3;
 extern audio_driver_t audio_gx;
 extern audio_driver_t audio_ax;
 extern audio_driver_t audio_psp;
-extern audio_driver_t audio_ps2;
 extern audio_driver_t audio_ctr_csnd;
 extern audio_driver_t audio_ctr_dsp;
-#ifdef HAVE_THREADS
-extern audio_driver_t audio_ctr_dsp_thread;
-#endif
 extern audio_driver_t audio_switch;
 extern audio_driver_t audio_switch_thread;
-extern audio_driver_t audio_switch_libnx_audren;
-extern audio_driver_t audio_switch_libnx_audren_thread;
 extern audio_driver_t audio_rwebaudio;
-
-audio_driver_state_t *audio_state_get_ptr(void);
-
-extern audio_driver_t *audio_drivers[];
+extern audio_driver_t audio_null;

 RETRO_END_DECLS

-#endif /* __AUDIO_DRIVER__H */
+#endif
@@ -21,7 +21,6 @@
 #include <rthreads/rthreads.h>

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

 typedef struct audio_thread
@@ -32,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;
@@ -49,12 +38,16 @@ 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;

-/**
- * The thread that manages the life of the audio driver.
- * The wrapped audio driver lives and dies with this function.
- */
 static void audio_thread_loop(void *data)
 {
   audio_thread_t *thr = (audio_thread_t*)data;
@@ -62,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;
@@ -82,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);
@@ -99,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);
@@ -114,13 +108,10 @@ static void audio_thread_loop(void *data)
      audio_driver_callback();
   }

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

-/**
- * Lets the audio thread finish what it's doing,
- * then stops it from doing further work.
- */
 static void audio_thread_block(audio_thread_t *thr)
 {
   if (!thr)
@@ -141,19 +132,15 @@ static void audio_thread_block(audio_thread_t *thr)
   slock_unlock(thr->lock);
 }

-/**
- * Resumes the audio thread.
- * This function is called from the main thread.
- */
 static void audio_thread_unblock(audio_thread_t *thr)
 {
   if (!thr)
      return;

-   slock_lock(thr->lock); /* Prevent the audio thread from touching this flag... */
-   thr->stopped = false; /* ...so that the main thread can do it. */
-   scond_signal(thr->cond); /* Then let the audio thread know that it's okay to resume. */
-   slock_unlock(thr->lock); /* "As you were." */
+   slock_lock(thr->lock);
+   thr->stopped = false;
+   scond_signal(thr->cond);
+   slock_unlock(thr->lock);
 }

 static void audio_thread_free(void *data)
@@ -165,15 +152,13 @@ static void audio_thread_free(void *data)

   if (thr->thread)
   {
-      slock_lock(thr->lock); /* Let the audio thread finish what it's doing... */
-      thr->stopped = false; /* Then stop it. "You're fired." */
+      slock_lock(thr->lock);
+      thr->stopped = false;
      thr->alive   = false;
-      scond_signal(thr->cond); /* Let the thread know it's okay to continue */
-      slock_unlock(thr->lock); /* At this point, it will exit its loop. */
+      scond_signal(thr->cond);
+      slock_unlock(thr->lock);

      sthread_join(thr->thread);
-      /* Wait for the audio thread to exit, ensure that it's really dead.
-       * (It will call the wrapped driver's free() function.) */
   }

   if (thr->lock)
@@ -181,7 +166,6 @@ static void audio_thread_free(void *data)
   if (thr->cond)
      scond_free(thr->cond);
   free(thr);
-   /* The audio driver is done, clean up the thread itself. */
 }

 static bool audio_thread_alive(void *data)
@@ -206,9 +190,6 @@ static bool audio_thread_stop(void *data)
   if (!thr)
      return false;

-   /* Don't immediately call stop on the driver;
-    * let the audio thread finish its current loop iteration.
-    * It will call stop then. */
   audio_thread_block(thr);
   thr->is_paused = true;

@@ -237,8 +218,6 @@ static void audio_thread_set_nonblock_state(void *data, bool state)
 {
   (void)data;
   (void)state;
-   /* Ignored, because blocking state is irrelevant
-    * when audio is running on a separate thread. */
 }

 static bool audio_thread_use_float(void *data)
@@ -271,7 +250,7 @@ static ssize_t audio_thread_write(void *data, const void *buf, size_t size)
 }

 static const audio_driver_t audio_thread = {
-   NULL, /* No need to wrap init, it's called at the start of the thread loop */
+   NULL,
   audio_thread_write,
   audio_thread_stop,
   audio_thread_start,
@@ -282,8 +261,6 @@ static const audio_driver_t audio_thread = {
   "audio-thread",
   NULL, /* No point in using rate control with threaded audio. */
   NULL,
-   NULL,
-   NULL
 };

 /**
@@ -323,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;
@@ -43,3 +43,4 @@ bool audio_init_thread(const audio_driver_t **out_driver, void **out_data,
      const audio_driver_t *driver);

 #endif
+
@@ -1,482 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2017 Daniel De Matteis
- *  Copyright (C) 2023 Jesse Talavera-Greenberg
- *
- *  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 <lists/string_list.h>
-#include <string/stdstring.h>
-
-#include <alsa/asoundlib.h>
-#include <asm-generic/errno.h>
-
-#include "../audio_driver.h"
-#include "../common/alsa.h"
-#include "../../verbosity.h"
-
-int alsa_init_pcm(snd_pcm_t **pcm,
-   const char* device,
-   snd_pcm_stream_t stream,
-   unsigned rate,
-   unsigned latency,
-   unsigned channels,
-   alsa_stream_info_t *stream_info,
-   unsigned *new_rate,
-   int mode)
-{
-   snd_pcm_format_t format;
-   snd_pcm_uframes_t buffer_size;
-   snd_pcm_hw_params_t *params    = NULL;
-   snd_pcm_sw_params_t *sw_params = NULL;
-   unsigned latency_usec          = latency * 1000;
-   unsigned periods               = 4;
-   unsigned orig_rate             = rate;
-   const char *alsa_dev           = device ? device : "default";
-   int errnum                     = 0;
-
-   RARCH_DBG("[ALSA]: Requesting device \"%s\" for %s stream\n", alsa_dev, snd_pcm_stream_name(stream));
-
-   if ((errnum = snd_pcm_open(pcm, alsa_dev, stream, mode)) < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to open %s stream on device \"%s\": %s\n",
-            snd_pcm_stream_name(stream),
-            alsa_dev,
-            snd_strerror(errnum));
-
-      goto error;
-   }
-
-   if ((errnum = snd_pcm_hw_params_malloc(&params)) < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to allocate hardware parameters: %s\n",
-            snd_strerror(errnum));
-
-      goto error;
-   }
-
-   if ((errnum = snd_pcm_hw_params_any(*pcm, params)) < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to query hardware parameters from %s device \"%s\": %s\n",
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-
-      goto error;
-   }
-
-   format = (snd_pcm_hw_params_test_format(*pcm, params, SND_PCM_FORMAT_FLOAT) == 0)
-         ? SND_PCM_FORMAT_FLOAT : SND_PCM_FORMAT_S16;
-   stream_info->has_float = (format == SND_PCM_FORMAT_FLOAT);
-
-   RARCH_LOG("[ALSA]: Using %s sample format for %s device \"%s\"\n",
-         snd_pcm_format_name(format),
-         snd_pcm_stream_name(stream),
-         snd_pcm_name(*pcm)
-   );
-
-   if ((errnum = snd_pcm_hw_params_set_access(*pcm, params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to set %s access for %s device \"%s\": %s\n",
-            snd_pcm_access_name(SND_PCM_ACCESS_RW_INTERLEAVED),
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-
-      goto error;
-   }
-   stream_info->frame_bits = snd_pcm_format_physical_width(format) * channels;
-
-   if ((errnum = snd_pcm_hw_params_set_format(*pcm, params, format)) < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to set %s format for %s device \"%s\": %s\n",
-            snd_pcm_format_name(format),
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-
-      goto error;
-   }
-
-   if ((errnum = snd_pcm_hw_params_set_channels(*pcm, params, channels)) < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to set %u-channel audio for %s device \"%s\": %s\n",
-            channels,
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-
-      goto error;
-   }
-
-   /* Don't allow rate resampling when probing for the default rate (but ignore if this call fails) */
-   if ((errnum = snd_pcm_hw_params_set_rate_resample(*pcm, params, false)) < 0)
-   {
-      RARCH_WARN("[ALSA]: Failed to request a default unsampled rate for %s device \"%s\": %s\n",
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-   }
-
-   if ((errnum = snd_pcm_hw_params_set_rate_near(*pcm, params, &rate, 0)) < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to request a rate near %uHz for %s device \"%s\": %s\n",
-            rate,
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-
-      goto error;
-   }
-
-   if (new_rate)
-      *new_rate = rate;
-
-   if ((snd_pcm_hw_params_set_buffer_time_near(*pcm, params, &latency_usec, NULL)) < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to request a buffer time near %uus for %s device \"%s\": %s\n",
-            latency_usec,
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-
-      goto error;
-
-   }
-
-   if ((errnum = snd_pcm_hw_params_set_periods_near(*pcm, params, &periods, NULL)) < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to request %u periods per buffer for %s device \"%s\": %s\n",
-            periods,
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-
-      goto error;
-   }
-
-   if ((errnum = snd_pcm_hw_params(*pcm, params)) < 0)
-   { /* This calls snd_pcm_prepare() under the hood */
-      RARCH_ERR("[ALSA]: Failed to install hardware parameters for %s device \"%s\": %s\n",
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-
-      goto error;
-   }
-
-   /* Shouldn't have to bother with this,
-    * but some drivers are apparently broken. */
-   if ((errnum = snd_pcm_hw_params_get_period_size(params, &stream_info->period_frames, NULL)) < 0)
-   {
-      RARCH_WARN("[ALSA]: Failed to get an exact period size from %s device \"%s\": %s\n",
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-      RARCH_WARN("[ALSA]: Trying the minimum period size instead\n");
-
-      if ((errnum = snd_pcm_hw_params_get_period_size_min(params, &stream_info->period_frames, NULL)) < 0)
-      {
-         RARCH_ERR("[ALSA]: Failed to get min period size from %s device \"%s\": %s\n",
-               snd_pcm_stream_name(stream),
-               snd_pcm_name(*pcm),
-               snd_strerror(errnum));
-         goto error;
-      }
-   }
-
-   stream_info->period_size = snd_pcm_frames_to_bytes(*pcm, stream_info->period_frames);
-   if (stream_info->period_size < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to convert a period size of %lu frames to bytes: %s\n",
-            stream_info->period_frames,
-            snd_strerror(stream_info->period_frames));
-      goto error;
-   }
-
-   RARCH_LOG("[ALSA]: Period: %u periods per buffer (%lu frames, %lu bytes)\n",
-         periods,
-         stream_info->period_frames,
-         stream_info->period_size);
-
-   if ((errnum = snd_pcm_hw_params_get_buffer_size(params, &buffer_size)) < 0)
-   {
-      RARCH_WARN("[ALSA]: Failed to get exact buffer size from %s device \"%s\": %s\n",
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-      RARCH_WARN("[ALSA]: Trying the maximum buffer size instead\n");
-
-      if ((errnum = snd_pcm_hw_params_get_buffer_size_max(params, &buffer_size)) < 0)
-      {
-         RARCH_ERR("[ALSA]: Failed to get max buffer size from %s device \"%s\": %s\n",
-               snd_pcm_stream_name(stream),
-               snd_pcm_name(*pcm),
-               snd_strerror(errnum));
-         goto error;
-      }
-   }
-
-
-   stream_info->buffer_size = snd_pcm_frames_to_bytes(*pcm, buffer_size);
-   if (stream_info->buffer_size < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to convert a buffer size of %lu frames to bytes: %s\n",
-            buffer_size,
-            snd_strerror(buffer_size));
-      goto error;
-   }
-   RARCH_LOG("[ALSA]: Buffer size: %lu frames (%lu bytes)\n", buffer_size, stream_info->buffer_size);
-
-   stream_info->can_pause = snd_pcm_hw_params_can_pause(params);
-
-   RARCH_LOG("[ALSA]: Can pause: %s.\n", stream_info->can_pause ? "yes" : "no");
-
-   if ((errnum = snd_pcm_sw_params_malloc(&sw_params)) < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to allocate software parameters: %s\n",
-            snd_strerror(errnum));
-
-      goto error;
-   }
-
-   if ((errnum = snd_pcm_sw_params_current(*pcm, sw_params)) < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to query current software parameters for %s device \"%s\": %s\n",
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-
-      goto error;
-   }
-
-   if ((errnum = snd_pcm_sw_params_set_start_threshold(*pcm, sw_params, buffer_size / 2)) < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to set start %lu-frame threshold for %s device \"%s\": %s\n",
-            buffer_size / 2,
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-
-      goto error;
-   }
-
-   if ((errnum = snd_pcm_sw_params(*pcm, sw_params)) < 0)
-   {
-      RARCH_ERR("[ALSA]: Failed to install software parameters for %s device \"%s\": %s\n",
-            snd_pcm_stream_name(stream),
-            snd_pcm_name(*pcm),
-            snd_strerror(errnum));
-
-      goto error;
-   }
-
-   snd_pcm_hw_params_free(params);
-   snd_pcm_sw_params_free(sw_params);
-
-   RARCH_LOG("[ALSA]: Initialized %s device \"%s\"\n",
-         snd_pcm_stream_name(stream),
-         snd_pcm_name(*pcm));
-
-   return 0;
-error:
-   if (params)
-      snd_pcm_hw_params_free(params);
-
-   if (sw_params)
-      snd_pcm_sw_params_free(sw_params);
-
-   if (*pcm)
-   {
-      alsa_free_pcm(*pcm);
-      *pcm = NULL;
-   }
-
-   return errnum;
-}
-
-void alsa_free_pcm(snd_pcm_t *pcm)
-{
-   if (pcm)
-   {
-      int errnum = 0;
-
-      if ((errnum = snd_pcm_drop(pcm)) < 0)
-      {
-         RARCH_WARN("[ALSA]: Failed to drop remaining samples in %s stream \"%s\": %s\n",
-               snd_pcm_stream_name(snd_pcm_stream(pcm)),
-               snd_pcm_name(pcm),
-               snd_strerror(errnum));
-      }
-
-      if ((errnum = snd_pcm_close(pcm)) < 0)
-      {
-         RARCH_WARN("[ALSA]: Failed to close %s stream \"%s\": %s\n",
-               snd_pcm_stream_name(snd_pcm_stream(pcm)),
-               snd_pcm_name(pcm),
-               snd_strerror(errnum));
-      }
-   }
-}
-
-bool alsa_start_pcm(snd_pcm_t *pcm)
-{
-   int errnum = 0;
-   snd_pcm_state_t pcm_state;
-
-   if (!pcm)
-      return false;
-
-   pcm_state = snd_pcm_state(pcm);
-   switch (pcm_state)
-   {
-      case SND_PCM_STATE_PAUSED: /* If we're unpausing a valid (but paused) stream... */
-         if ((errnum = snd_pcm_pause(pcm, false)) < 0) /* ...but we failed... */
-            goto error;
-
-         break;
-      case SND_PCM_STATE_PREPARED:
-         /* If we're starting this stream for the first time... */
-         if ((errnum = snd_pcm_start(pcm)) < 0) /* ..but we failed... */
-            goto error;
-
-         break;
-      case SND_PCM_STATE_RUNNING:
-         RARCH_DBG("[ALSA]: %s stream \"%s\" is already running, no action needed.\n",
-            snd_pcm_stream_name(snd_pcm_stream(pcm)),
-            snd_pcm_name(pcm));
-         return true;
-      default:
-         RARCH_ERR("[ALSA]: Failed to start %s stream \"%s\" in unexpected state %s\n",
-                   snd_pcm_stream_name(snd_pcm_stream(pcm)),
-                   snd_pcm_name(pcm),
-                   snd_pcm_state_name(pcm_state));
-         return false;
-   }
-
-   RARCH_DBG("[ALSA]: Started %s stream \"%s\", transitioning from %s to %s\n",
-             snd_pcm_stream_name(snd_pcm_stream(pcm)),
-             snd_pcm_name(pcm),
-             snd_pcm_state_name(pcm_state),
-             snd_pcm_state_name(snd_pcm_state(pcm)));
-
-   return true;
-
-error:
-   RARCH_ERR("[ALSA]: Failed to start %s stream \"%s\" in state %s: %s\n",
-             snd_pcm_stream_name(snd_pcm_stream(pcm)),
-             snd_pcm_name(pcm),
-             snd_pcm_state_name(pcm_state),
-             snd_strerror(errnum));
-
-   return false;
-}
-
-bool alsa_stop_pcm(snd_pcm_t *pcm)
-{
-   int errnum = 0;
-   snd_pcm_state_t pcm_state;
-
-   if (!pcm)
-      return false;
-
-   pcm_state = snd_pcm_state(pcm);
-   switch (pcm_state)
-   {
-      case SND_PCM_STATE_PAUSED:
-         RARCH_DBG("[ALSA]: %s stream \"%s\" is already paused, no action needed.\n",
-            snd_pcm_stream_name(snd_pcm_stream(pcm)),
-            snd_pcm_name(pcm));
-         return true;
-      case SND_PCM_STATE_PREPARED:
-         RARCH_DBG("[ALSA]: %s stream \"%s\" is prepared but not running, no action needed.\n",
-            snd_pcm_stream_name(snd_pcm_stream(pcm)),
-            snd_pcm_name(pcm));
-         return true;
-      case SND_PCM_STATE_RUNNING:
-         /* If we're pausing an active stream... */
-         if ((errnum = snd_pcm_pause(pcm, true)) < 0) /* ...but we failed... */
-            goto error;
-
-         break;
-      default:
-         RARCH_ERR("[ALSA]: Failed to stop %s stream \"%s\" in unexpected state %s\n",
-                   snd_pcm_stream_name(snd_pcm_stream(pcm)),
-                   snd_pcm_name(pcm),
-                   snd_pcm_state_name(pcm_state));
-
-         return false;
-   }
-
-   RARCH_DBG("[ALSA]: Stopped %s stream \"%s\", transitioning from %s to %s\n",
-             snd_pcm_stream_name(snd_pcm_stream(pcm)),
-             snd_pcm_name(pcm),
-             snd_pcm_state_name(pcm_state),
-             snd_pcm_state_name(snd_pcm_state(pcm)));
-
-   return true;
-
-error:
-   RARCH_ERR("[ALSA]: Failed to stop %s stream \"%s\" in state %s: %s\n",
-             snd_pcm_stream_name(snd_pcm_stream(pcm)),
-             snd_pcm_name(pcm),
-             snd_pcm_state_name(pcm_state),
-             snd_strerror(errnum));
-
-   return false;
-}
-
-struct string_list *alsa_device_list_type_new(const char* type)
-{
-   void **hints, **n;
-   union string_list_elem_attr attr;
-   struct string_list *s = string_list_new();
-
-   if (!s)
-      return NULL;
-
-   attr.i = 0;
-
-   if (snd_device_name_hint(-1, "pcm", &hints) != 0)
-   {
-      string_list_free(s);
-      return NULL;
-   }
-
-   n      = hints;
-
-   while (*n)
-   {
-      char *name = snd_device_name_get_hint(*n, "NAME");
-      char *io   = snd_device_name_get_hint(*n, "IOID");
-      char *desc = snd_device_name_get_hint(*n, "DESC");
-
-      /* description of device IOID - input / output identifcation
-       * ("Input" or "Output"), NULL means both) */
-
-      if (!io || (string_is_equal(io, type)))
-         string_list_append(s, name, attr);
-
-      if (name)
-         free(name);
-      if (io)
-         free(io);
-      if (desc)
-         free(desc);
-
-      n++;
-   }
-
-   /* free hint buffer too */
-   snd_device_name_free_hint(hints);
-
-   return s;
-}
@@ -1,56 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2023 The RetroArch team
- *
- *  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_ALSA
-#define _RETROARCH_ALSA
-
-#include <boolean.h>
-#include "queues/fifo_queue.h"
-#include "rthreads/rthreads.h"
-/* Header file for common functions that are used by alsa and alsathread. */
-
-/**
- * Used for info that's common to all pcm devices
- * that's relevant for our purposes.
- */
-typedef struct alsa_stream_info
-{
-   size_t buffer_size;
-   size_t period_size;
-   snd_pcm_uframes_t period_frames;
-   unsigned int frame_bits;
-   bool has_float;
-   bool can_pause;
-} alsa_stream_info_t;
-
-int alsa_init_pcm(snd_pcm_t **pcm,
-   const char* device,
-   snd_pcm_stream_t stream,
-   unsigned rate,
-   unsigned latency,
-   unsigned channels,
-   alsa_stream_info_t *stream_info,
-   unsigned *new_rate,
-   int mode);
-void alsa_free_pcm(snd_pcm_t *pcm);
-void *alsa_device_list_new(void *data);
-struct string_list *alsa_device_list_type_new(const char* type);
-void alsa_device_list_free(void *data, void *array_list_data);
-
-bool alsa_start_pcm(snd_pcm_t *pcm);
-bool alsa_stop_pcm(snd_pcm_t *pcm);
-
-#endif /* _RETROARCH_ALSA */
@@ -1,43 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2017 Daniel De Matteis
- *  Copyright (C) 2023 Jesse Talavera-Greenberg
- *
- *  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 "alsathread.h"
-
-void alsa_thread_free_info_members(alsa_thread_info_t *info)
-{
-   if (info)
-   {
-      if (info->worker_thread)
-      {
-         slock_lock(info->cond_lock);
-         info->thread_dead = true;
-         slock_unlock(info->cond_lock);
-         sthread_join(info->worker_thread);
-      }
-      if (info->buffer)
-         fifo_free(info->buffer);
-      if (info->cond)
-         scond_free(info->cond);
-      if (info->fifo_lock)
-         slock_free(info->fifo_lock);
-      if (info->cond_lock)
-         slock_free(info->cond_lock);
-      if (info->pcm)
-         alsa_free_pcm(info->pcm);
-   }
-   /* Do NOT free() info itself; it's embedded within another struct
-    * that will be freed. */
-}
@@ -1,40 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2017 Daniel De Matteis
- *  Copyright (C) 2023 Jesse Talavera-Greenberg
- *
- *  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_ALSATHREAD_H
-#define RETROARCH_ALSATHREAD_H
-
-#include <alsa/asoundlib.h>
-#include <boolean.h>
-#include "queues/fifo_queue.h"
-#include "rthreads/rthreads.h"
-#include "./alsa.h"
-
-typedef struct alsa_thread_info
-{
-   snd_pcm_t *pcm;
-   fifo_buffer_t *buffer;
-   sthread_t *worker_thread;
-   slock_t *fifo_lock;
-   scond_t *cond;
-   slock_t *cond_lock;
-   alsa_stream_info_t stream_info;
-   volatile bool thread_dead;
-} alsa_thread_info_t;
-
-void alsa_thread_free_info_members(alsa_thread_info_t *info);
-
-#endif
@@ -1,149 +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"
-
-
-char* mmdevice_name(IMMDevice *device)
-{
-   HRESULT hr;
-   IPropertyStore *prop_store = NULL;
-   PROPVARIANT prop_var;
-   bool prop_var_init         = false;
-   char* result               = NULL;
-
-   if (!device)
-      return NULL;
-
-   hr = _IMMDevice_OpenPropertyStore(device, STGM_READ, &prop_store);
-
-   if (FAILED(hr))
-      return NULL;
-
-   PropVariantInit(&prop_var);
-   prop_var_init = true;
-   hr = _IPropertyStore_GetValue(prop_store, PKEY_Device_FriendlyName, &prop_var);
-   if (FAILED(hr))
-      goto done;
-
-   result = utf16_to_utf8_string_alloc(prop_var.pwszVal);
-
-done:
-   if (prop_var_init)
-      PropVariantClear(&prop_var);
-
-   IFACE_RELEASE(prop_store);
-
-   return result;
-}
-
-void *mmdevice_list_new(const void *u, EDataFlow data_flow)
-{
-   HRESULT hr;
-   UINT i;
-   union string_list_elem_attr attr;
-   IMMDeviceEnumerator *enumerator = NULL;
-   IMMDeviceCollection *collection = NULL;
-   UINT dev_count                  = 0;
-   IMMDevice *device               = NULL;
-   LPWSTR dev_id_wstr              = NULL;
-   bool br                         = 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,
-         data_flow, 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;
-
-      if (!(dev_name_str = mmdevice_name(device)))
-         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;
-
-      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(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 (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,36 +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>
-
-#include <retro_common_api.h>
-#include "mmdevice_common_inline.h"
-
-RETRO_BEGIN_DECLS
-
-void *mmdevice_list_new(const void *u, EDataFlow data_flow);
-
-/**
- * Gets the friendly name of the provided IMMDevice.
- * The string must be freed with free().
- */
-char* mmdevice_name(IMMDevice *device);
-
-RETRO_END_DECLS
-
-#endif