Bump version code

Bump up to 1.3.2
Fix missing linebreak.
2026-11-09 11:41:35 -10:00 · 2016-03-16 19:45:57 +01:00 · 2016-03-15 23:16:12 +01:00 · 2016-03-15 13:44:46 +01:00 · 2016-03-14 22:58:25 +01:00 · 2016-03-14 22:47:59 +01:00
11645 changed files with 288955 additions and 3030661 deletions
@@ -1,16 +0,0 @@
-;;; Directory Local Variables
-;;; See Info node `(emacs) Directory Variables' for more information.
-
-(
- (c-mode . ((standard-indent . 3)
-            (c-basic-offset . 3)
-            (c-file-offsets . ((arglist-intro . ++)
-                               (arglist-cont-nonempty . ++)
-                               (block-close . 0)
-                               (block-open . 0)))
-            (eval . (setq-local c-cleanup-list
-                                (cl-set-difference c-cleanup-list
-                                                   '(brace-else-brace
-                                                     brace-elseif-brace))))))
- (objc-mode . ((c-basic-offset . 3)))
- )
@@ -1,25 +0,0 @@
-# EditorConfig: https://EditorConfig.org
-
-# Top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-charset = utf-8
-
-# 3 space indentation
-[*.{c,h,js,css,html}]
-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
@@ -1,100 +0,0 @@
-name: Bug report
-description: This is not a forum or a help section, this is strictly developer oriented.
-body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Only RetroArch bugs should be filed here. Not core bugs or game bugs
-      options:
-      - label: This is a bug in RetroArch frontend
-        required: true
-      - label: I have searched the existing issues
-
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: Description of the actual behavior of the bug
-      placeholder: What is actually happening
-    validations:
-      required: true
-
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected behavior
-      description: What you expected to happen
-
-  - type: textarea
-    id: reproduce_steps
-    attributes:
-      label: Steps to reproduce the bug
-      description: List all steps to reproduce the problem
-      placeholder: |
-        1. [First step]
-        2. [Second step]
-        3. [and so on...]
-    validations:
-      required: true
-
-  - type: input
-    id: version
-    attributes:
-      label: Version/Commit
-      description: You can find this information under Information/System Information
-      placeholder: 1.20.0 (Git ab3b175)
-    validations:
-      required: true
-
-  - type: input
-    id: bisecting
-    attributes:
-      label: Bisect Results
-      description: Did this work with any older RetroArch version? Can you point to a version (or even commit) where it broke?
-      placeholder: 43105ab
-
-  - type: dropdown
-    id: nigthly
-    attributes:
-      label: Present in the nightly version
-      description: Is the issue reproducible with current [nightly builds](https://buildbot.libretro.com/nightly/)?
-      options:
-        - I don't know
-        - Yes, this is reproduced in the nightly build
-        - No, looks like this is already resolved
-      default: 0
-    validations:
-      required: true
-
-  - type: input
-    id: platform
-    attributes:
-      label: Platform & operating system
-      description: The system you're running RetroArch on
-      placeholder: Linux aarch64, Windows 11 23H2, Android 14, PS Vita
-    validations:
-      required: true
-
-  - type: input
-    id: cores
-    attributes:
-      label: Affected Cores
-      description: List the affected cores and their versions here, if applicable. If the issue **only occurs with a single core** then the bug may not be with RetroArch; in that case, you should report it in that core's repository instead of here.
-      placeholder: bsnes (115), FCEUmm ((SVN) aebea87), Snes9x (1.63.229933ea)
-
-  - type: textarea
-    id: environment
-    attributes:
-      label: Environment information
-      description: Additional information about hardware and software
-      placeholder: |
-        * Window Manager: dwm/X11
-        * Affected video drivers: sdl2, glcore
-        * Installed through Flatpak
-
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant log output
-      description: Paste [RetroArch log](https://docs.libretro.com/guides/generating-retroarch-logs/) and/or [GDB backtrace](https://docs.libretro.com/development/retroarch/debugging/). This will be automatically formatted into code, so no need for backticks.
-      render: shell
@@ -1,6 +0,0 @@
---
-name: Feature request
-title: "[Feature Request] <FEATURE NAME>"
-about: Is there something you'd like to see in RetroArch?
-labels: feature request
---
@@ -1,14 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: Libretro Forums
-    url: https://forums.libretro.com
-    about: A place to discuss all things libretro
-  - name: Discord
-    url: https://ra-link.web.app/discord
-    about: Join our Discord server for help
-  - name: RetroArch/libretro subreddit
-    url: https://www.reddit.com/r/RetroArch
-    about: Subreddit dedicated to RetroArch and the libretro API framework
-  - name: Documentation
-    url: https://docs.libretro.com
-    about: Official RetroArch documentation for users and developers
@@ -1,21 +0,0 @@
-## Guidelines
-
-1. Rebase before opening a pull request
-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]
-
-## Related Issues
-
-[Any issues this pull request may be addressing]
-
-## Related Pull Requests
-
-[Any other PRs from related repositories that might be needed for this pull request to work]
-
-## Reviewers
-
-[If possible @mention all the people that should review your pull request]
@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
@@ -1,36 +0,0 @@
-name: CI 3DS
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-devkitpro:latest
-      options: --user root
-
-    steps:
-    - uses: taiki-e/checkout-action@v1
-    
-    - 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 info all
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
@@ -1,38 +0,0 @@
-name: CI Android
-
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-jobs:
-  build:
-    runs-on: ubuntu-22.04
-
-    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@v4
-      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,38 +0,0 @@
-name: CI DOS/DJGPP
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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 info all
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: RA-DOS-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retrodos.exe
@@ -1,33 +0,0 @@
-name: CI Emscripten
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-emscripten:latest
-      options: --user root
-
-    steps:
-    - uses: taiki-e/checkout-action@v1
-
-    - 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)"
-
@@ -1,32 +0,0 @@
-name: CI GameCube
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-devkitpro:latest
-      options: --user root
-
-    steps:
-    - uses: taiki-e/checkout-action@v1
-
-    - 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 info all
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-
@@ -1,37 +0,0 @@
-name: CI Linux (i686)
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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: taiki-e/checkout-action@v1
-
-      - name: Configure Build
-        run: |
-          ./configure --disable-qt --enable-xdelta
-
-      - name: Compile RA
-        run: |
-          make -j$(getconf _NPROCESSORS_ONLN) clean
-          make -j$(getconf _NPROCESSORS_ONLN) info all
-
-      - name: Get short SHA
-        id: slug
-        run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
@@ -1,58 +0,0 @@
-name: CI Windows (MSVC)
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-# 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,77 +0,0 @@
-name: CI Windows (MSYS2)
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  msys2-build-test:
-    strategy:
-      fail-fast: false
-      matrix:
-        sys: [MINGW64, UCRT64,CLANG64]
-    runs-on: windows-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: ${{ matrix.sys }}
-          update: true
-          install: base-devel git
-          pacboy: >-
-            gettext:p
-            gobject-introspection:p
-            graphite2:p
-            p11-kit:p
-            qt6:p
-            qt6-3d:p
-            qt6-charts:p
-            qt6-datavis3d:p
-            qt6-imageformats:p
-            qt6-location:p
-            qt6-lottie:p
-            qt6-networkauth:p
-            qt6-quick3dphysics:p
-            qt6-quicktimeline:p
-            qt6-remoteobjects:p
-            qt6-scxml:p
-            qt6-sensors:p
-            qt6-serialbus:p
-            qt6-speech:p
-            qt6-tools:p
-            qt6-translations:p
-            qt6-virtualkeyboard:p
-            qt6-webchannel:p
-            qt6-websockets:p
-            x264:p
-            cc:p
-
-      - name: Configure and build RetroArch
-        shell: msys2 {0}
-        run: |
-          echo "Building RetroArch in ${{ matrix.sys }} environment"
-          ./configure
-          make -j$(nproc) info all
-
-      - name: Collect DLLs and binaries
-        shell: msys2 {0}
-        run: |
-          echo "Collecting DLLs and binaries"
-          mkdir -p dist
-          cp retroarch.exe dist/
-          ldd retroarch.exe|grep $MINGW_PREFIX |awk '{print $3}'|xargs -I {} cp {} dist/
-
-      - name: Archive build artifacts
-        if: success()
-        uses: actions/upload-artifact@v4
-        with:
-          name: retroarch-${{ matrix.sys }}
-          path: dist/
@@ -1,33 +0,0 @@
-name: CI macOS
-
-on:
-  push:
-  pull_request:
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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@v4
-      with:
-        name: RetroArch-${{ steps.slug.outputs.sha8 }}
-        path: |
-          build/Build/Products/Release
@@ -1,38 +0,0 @@
-name: CI Miyoo ARM32
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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 info all
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: retroarch_miyoo_arm32${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch
@@ -1,44 +0,0 @@
-name: CI PS2
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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 info release
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: RA-PS2-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          raboot.elf
-          retroarchps2.elf
@@ -1,44 +0,0 @@
-name: CI PS3/PSL1GHT
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-psl1ght:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Compile Salamander
-      run: |
-        make -f Makefile.psl1ght.salamander -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.psl1ght.salamander -j$(getconf _NPROCESSORS_ONLN)
-
-    - name: Compile RA
-      run: |
-        make -f Makefile.psl1ght -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.psl1ght -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 info all
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: RA-psl1ght-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_psl1ght_salamander.elf
-          retroarch_psl1ght.elf
@@ -1,51 +0,0 @@
-name: CI PS4/ORBIS
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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 info all
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-
-    - uses: actions/upload-artifact@v4
-      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,50 +0,0 @@
-name: CI PSP
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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@v4
-      with:
-        name: RA-PSP-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          kernel_functions.prx
-          EBOOT.PBP
@@ -1,42 +0,0 @@
-name: CI PSVita
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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 info all
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: RA-PSVita-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          eboot.bin
@@ -1,38 +0,0 @@
-name: CI RS90 Odbeta MIPS32
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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 info all
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: retroarch_rs90_mips32${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_rs90_odbeta.opk
@@ -1,38 +0,0 @@
-name: CI RetroFW MIPS32
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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 info all
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: retroarch_retrofw_mips32${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_retrofw.opk
@@ -1,52 +0,0 @@
-name: CI Generate Source Only Tarball
-
-# Trigger whenever a release and/or is created
-on:
-  release:
-    types:
-      - created
-  push:
-    tags:
-      - "v*.*"
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-jobs:
-  build:
-    name: build
-    runs-on: ubuntu-latest
-    steps:
-
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-
-    - name: archive
-      id: archive
-      run: |
-        VERSION=${GITHUB_REF##*/}
-        test -z "$VERSION" && VERSION=${{ github.event.release.tag_name }}
-        VERSION=$(printf "%s\n" "$VERSION" | sed 's/^v//')
-        PKGNAME="retroarch-sourceonly-$VERSION"
-        mkdir -p /tmp/$PKGNAME
-        mv * /tmp/$PKGNAME
-        mv /tmp/$PKGNAME .
-        rm -rf $PKGNAME/pkg || true
-        rm -rf $PKGNAME/wii/libogc || true
-        rm -rf $PKGNAME/deps/glslang/glslang/Test || true
-        rm -rf $PKGNAME/deps/SPIRV-Cross/reference || true
-        rm -rf $PKGNAME/gfx/include/userland || true
-        find $PKGNAME/ -type f -name '*.a' -delete || true
-        find $PKGNAME/ -type f -name '*.lib' -delete || true
-        find $PKGNAME/ -type f -name '*.dylib' -delete || true
-        find $PKGNAME/ -type f -name '*.so.*' -delete || true
-        find $PKGNAME/ -type f -name '*.dll' -delete || true
-        TARBALL=$PKGNAME.tar.xz
-        tar cJf $TARBALL $PKGNAME
-        echo "tarball=$TARBALL" >> $GITHUB_OUTPUT
-
-    - name: upload tarball
-      uses: softprops/action-gh-release@v2
-      with:
-        files: ${{ steps.archive.outputs.tarball }}
@@ -1,37 +0,0 @@
-name: CI Switch/libnx
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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@v4
-      with:
-        name: RA-libnx-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_switch.nro
@@ -1,37 +0,0 @@
-name: CI Wii
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-devkitpro:latest
-      options: --user root
-
-    steps:
-    - uses: taiki-e/checkout-action@v1
-
-    - 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 info all
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-
@@ -1,36 +0,0 @@
-name: CI WiiU
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-wiiu:latest
-      options: --user root
-
-    steps:
-    - uses: taiki-e/checkout-action@v1
-
-    - 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 info all
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
@@ -1,34 +0,0 @@
-name: CI Windows i686 (MXE)
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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: taiki-e/checkout-action@v1
-
-    - 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)"
@@ -1,34 +0,0 @@
-name: CI Windows x64 (MXE)
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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: taiki-e/checkout-action@v1
-
-    - 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)"
@@ -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@v4
-        with:
-          java-version: 18
-          distribution: zulu
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        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@v4
-        with:
-          java-version: 18
-          distribution: zulu
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        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,36 +0,0 @@
-# Validates compilation of RetroArch binary
-
-name: RetroArch CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-permissions:
-  contents: read
-
-env:
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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 info all
@@ -1,125 +0,0 @@
-name: CI webOS
-
-on:
-  push:
-    tags-ignore:
-      - '*'
-    branches:
-      - '*'
-  pull_request:
-  release:
-    types: [ published ]
-  repository_dispatch:
-    types: [ run_build ]
-
-env:
-  PACKAGE_NAME: com.retroarch.webos
-  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-
-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: Download Manifest Generator
-        uses: robinraju/[email protected]
-        with:
-          repository: "webosbrew/dev-toolbox-cli"
-          latest: true
-          fileName: "webosbrew-toolbox-gen-manifest_*.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-x86_64.tar.gz"
-          out-file-path: "/tmp"
-
-      - name: Extract webOS NDK
-        shell: bash
-        working-directory: /tmp
-        run: |
-          tar xzf arm-webos-linux-gnueabi_sdk-buildroot-x86_64.tar.gz
-          ./arm-webos-linux-gnueabi_sdk-buildroot/relocate-sdk.sh
-
-      - name: Load RARCH_VERSION from version.all
-        id: version
-        shell: bash
-        run: |
-          RARCH_VERSION=$(grep -Po '(?<=#define PACKAGE_VERSION ")[^"]+' version.all)
-          echo "RARCH_VERSION=$RARCH_VERSION" >> "$GITHUB_ENV"
-
-      - name: Compile RA (GLES3 variant)
-        shell: bash
-        run: |
-          . /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
-          make -f Makefile.webos clean
-          make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 \
-            HAVE_OPENGLES3=1 HAVE_OPENGLES3_1=1 HAVE_OPENGLES3_2=1 -j"$(getconf _NPROCESSORS_ONLN)"
-          mv webos/com.retroarch.webos_${RARCH_VERSION}_arm.ipk \
-             webos/com.retroarch.webos.gles3_${RARCH_VERSION}_arm.ipk
-        env:
-          DEBUG: ${{ github.event_name == 'release' && '0' || '1' }}
-
-      - name: Upload GLES3 artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: com.retroarch.webos.gles3_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk
-          path: webos/com.retroarch.webos.gles3_${{ env.RARCH_VERSION }}_arm.ipk
-
-      - name: Compile RA (default)
-        shell: bash
-        run: |
-          . /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
-          make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 -j"$(getconf _NPROCESSORS_ONLN)"
-        env:
-          DEBUG: ${{ github.event_name == 'release' && '0' || '1' }}
-
-      - name: Upload default artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: com.retroarch.webos_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk
-          path: webos/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk
-
-      - name: Generate Manifest (default only)
-        if: github.repository == 'webosbrew/Retroarch'
-        shell: bash
-        run: |
-          webosbrew-gen-manifest -o webos/${PACKAGE_NAME}.manifest.json \
-              -p webos/${PACKAGE_NAME}_${RARCH_VERSION}_arm.ipk \
-              -i https://github.com/webosbrew/RetroArch/raw/webos/webos/icon160.png \
-              -l https://github.com/webosbrew/RetroArch
-
-      - name: Release
-        if: github.event_name == 'release' && github.repository == 'webosbrew/Retroarch'
-        uses: ncipollo/release-action@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.event.release.tag_name }}
-          allowUpdates: true
-          omitNameDuringUpdate: true
-          omitBody: true
-          omitPrereleaseDuringUpdate: true
-          artifacts: |
-            webos/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk
-            webos/com.retroarch.webos.gles3_${{ env.RARCH_VERSION }}_arm.ipk
-            webos/${{ env.PACKAGE_NAME }}.manifest.json
@@ -1,35 +1,20 @@
 *.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
-/.project
-/.externalToolBuilders/
+config.log
 /retroarch
 /retroarch.cfg
 /retroarch.exe
-/retroarch_debug.exe
 /config.h
 /config.mk
+/tools/retroarch-joyconfig
+/tools/retroarch-joyconfig.exe
 *.ncb
 *.sdf
 *.opensdf
@@ -39,7 +24,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 +46,7 @@ DerivedData
 apple/tmp
 apple/*.mobileprovision
 apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
+menu/driverspzarch.c
 /Cg/
 /GL/
 /SDL/
@@ -69,78 +54,17 @@ 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
-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
-*.rpx
-*.last
-wiiu/wut/elf2rpl/elf2rpl
-/pkg/wiiu/retroarch
-/pkg/wiiu/wiiu
-/pkg/wiiu/rpx
-/wiiu-devel.properties
-
-# 3ds
-/.lst
-*.3dsx
-*.cia
-*.3ds
-*.bnr
-*.smdh
-/retroarch_3ds.core
-/retroarch_3ds.icn
-/retroarch_3ds_salamander.icn

 # Ctags
 /tags

-# CLion
-/cmake-build-debug/
-.run
-
 # Android
 /pkg/android/phoenix/obj/
 /pkg/android/phoenix/assets/
@@ -148,9 +72,6 @@ wiiu/wut/elf2rpl/elf2rpl
 /pkg/android/phoenix/bin/
 /pkg/android/phoenix/gen/
 /pkg/android/phoenix/local.properties
-/pkg/android/phoenix/.gradle
-/pkg/android/phoenix/.externalNativeBuild
-/pkg/android/phoenix/build

 # Cloned by libretro-fetch.sh
 /media/assets/
@@ -159,122 +80,8 @@ wiiu/wut/elf2rpl/elf2rpl
 /media/shaders_cg/
 /media/libretrodb/

-compile_commands.json
 pkg/apple/iOS/build/
-pkg/apple/build/
-ui/drivers/qt/moc_*
-ui/drivers/moc_*
+pkg/apple/iOS/modules/

 obj-unix/
 .vagrant/
-
-# Visual Studio
-/pkg/msvc/Release Cg/*.iobj
-/pkg/msvc/Release Cg/*.ipdb
-/pkg/msvc/Release Cg/*.lpl
-/pkg/msvc/Release Cg/*.cfg
-/pkg/msvc/*.db
-/pkg/msvc/.vs
-/pkg/msvc/*/.vs
-*.tlog
-*.lastbuildstate
-*.FileListAbsolute.txt
-*.res
-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
-
-retroarch.js
-retroarch.js.mem
-*.bc
-*.wasm
-*.wasm.map
-obj-emscripten/
-
-# only ignore .js files in the repo root
-/*.js
-
-# Switch
-*.d
-exefs/*
-retroarch_switch.pfs0
-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
-gfx/common/wayland/cursor-shape-v1.h
-gfx/common/wayland/cursor-shape-v1.c
-gfx/common/wayland/tablet-unstable-v2.h
-gfx/common/wayland/tablet-unstable-v2.c
-gfx/common/wayland/content-type-v1.h
-gfx/common/wayland/content-type-v1.c
-gfx/common/wayland/single-pixel-buffer-v1.h
-gfx/common/wayland/single-pixel-buffer-v1.c
-gfx/common/wayland/xdg-toplevel-icon-v1.h
-gfx/common/wayland/xdg-toplevel-icon-v1.c
-
-# 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/
-
-# Clazy
-*.clazy.yaml
-
-# PSL1GHT
-*.SELF
-EBOOT.BIN
-pkg/psl1ght/*.pkg
-modern_alpha_blend_fpo.h
-modern_alpha_blend_vpo.h
-modern_opaque_fpo.h
-modern_opaque_vpo.h
-gfx/drivers/rsx_shaders/modern_alpha_blend.fpo
-gfx/drivers/rsx_shaders/modern_alpha_blend.vpo
-gfx/drivers/rsx_shaders/modern_opaque.fpo
-gfx/drivers/rsx_shaders/modern_opaque.vpo
-pkg/psl1ght/pkg/USRDIR/shaders_cg/
-!pkg/psl1ght/pkg/USRDIR/system/
@@ -0,0 +1,3 @@
+[submodule "deps/glslang/glslang"]
+	path = deps/glslang/glslang
+	url = git://github.com/KhronosGroup/glslang.git
@@ -5,23 +5,7 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 </projectDescription>
@@ -1,185 +0,0 @@
-# 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
-      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
-      script:
-        - cd pkg/android/phoenix
-        - ./gradlew assembleNormalRelease
-
-jobs:
-  allow_failure:
-    - 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"
-
-script:
-  - ./configure $ARGS
-  - |
-     if [ -n "$C89_BUILD" ]; then
-       make C89_BUILD=1
-     elif [ -n "$CXX_BUILD" ]; then
-       make CXX_BUILD=1
-     else
-       make
-     fi
-
-env:
-  global:
-   - ARGS=""
-   - MAKEFLAGS="-j2"
-   - secure: "qc91ReC3OlzSh2gFaSH6TYzC2qIQvgA2AZff6J13eaH8xijAhuMzttZ0rMQJ0DWCIhPeUb0kIzVyaGoe4MwPALzpw1C1AznIWiZJ53HN+hWCOcS/af7YVPk6HPySnwqrS+Wv3AIIvIKFV2mxv21F/JbT/N+pArlRrp904Xj+KPo="
-addons:
-  apt:
-    packages:
-      - libsdl2-dev
-      - libusb-1.0-0-dev
-      - qtbase5-dev
-      - qtdeclarative5-dev
-    sources:
-      - ubuntu-toolchain-r-test
-      - llvm-toolchain-xenial
-  coverity_scan:
-    project:
-      name: "RetroArch"
-      description: "RetroArch is the official reference frontend for the libretro API."
-    notification_email: [email protected]
-    build_command_prepend: "./configure; make clean"
-    build_command:   "make"
-    branch_pattern: coverity_scan
-notifications:
-  email: true
@@ -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
@@ -1,512 +0,0 @@
-static const char *retroarch_contributors_list = R"(
-RetroArch and the libretro team would like to
-acknowledge the following contributors:
-
-1ch (L0sted)
-23rd
-6lackmag3
-A Schain (aschain)
-Aaron Oneal (aarononeal)
-Aaron Ramirez (aaronbytes)
-Abadede
-Adam Londero (alondero)
-Adam Mechtley (amechtley)
-Adriano de Moura Leite (amlib)
-Adrien Moulin (elyosh)
-Aethyrion
-ajefr
-AKuHAK
-Alberto Alonso Ruibal (albertoruibal)
-Alberto Fustinoni (albertofustinoni)
-Alberto Simon (asimonf)
-Alcaro
-aldebaran27
-Aleksey Samoilov (Sunderland93)
-Alessandro Mangone (Vektor) (zevektor)
-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)
-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)
-Ashura (CoalaJoe)
-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)
-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
-cucholix
-cudencuden
-CyberLabSystems
-Daehan Kim (iAmGhost)
-dalter
-Dan Weiss (Dwedit)
-danieljg
-Daniil Zhilin (LaserMoai)
-dankcushions
-Darren Thompson (DiscoStarslayer)
-Dave (freakdave)
-Dave Leaver (danzel)
-David CARLIER (devnexen)
-David Demelier (markand)
-David Erickson (daviderickson)
-David G. F. (davidgfnet)
-David Lawson (dmrlawson)
-David Walters (hiddenasbestos)
-dbaronica
-DEX357
-diablodiab
-dibas
-Diego A. (SuperrSonic)
-Diego Viola (diegoviola)
-digitalisland-nino
-Diogo Barros (BlueKore)
-Dmitry Sergeenkov (DuMOHsmol)
-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)
-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)
-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
-hadess
-Hans-Kristian Arntzen (Themaister)
-Henri Gomez (hgomez)
-Henri Gomez (hgomez-sonarsource)
-Henry Castro (hcvcastro)
-Higor E. (heuripedes)
-hizzlekizzle
-Hugo B. (hug0b)
-Hugo Hromic (hhromic)
-hunterk
-Hyllian
-HyperspaceMadness
-i30817
-im4potato
-ImJezze
-İbrahim Güngör (igungor)
-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)
-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 Conan Montgomery (Grotke)
-jsd1982 (JamesDunne)
-jSTE0
-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
-Lionel Flandrin (simias)
-littleguy77
-liushuyu
-Logan McNaughton (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)
-Matt Sephton (gingerbeardman)
-Matthew Bauer (matthewbauer)
-Matthew Wang (asakous)
-Max K. (langerhans)
-Maxime Gauduin (alucryd)
-meancoot
-meepingsnesroms
-meleu
-Merry Mello (merryMellody)
-micechal
-Michael Burgardt (DisasterMo)
-Michael K. (kuxii2016)
-Michael Lelli (ToadKing)
-mickski56
-Mico Chopitea (micochops)
-miguelpinheiro
-Mike Swanson (chungy)
-mikeOSX
-minucce
-misson20000
-esoptron
-Monroe88
-Morgane (MorganeAD)
-mprobinson
-MrHuu
-MrJs (mrjschulte)
-Muhamed Hobi (mmhobi7)
-muzuiget
-N/A (inactive123)
-Nargash
-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
-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)
-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
-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
-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 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
-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
-Stuart Carnie (stuartcarnie)
-Sunguk Lee (d3m3vilurr)
-Supernature2k
-Sven (RetroSven)
-Swizzy
-Sylvain Colinet (Skarsnik)
-Szunti
-Tadek Kijkowski (monkeyman79)
-Tatsuya79
-Terry Lewis (terry-au)
-thedax
-theheroGAC
-TheMrIron2
-ThePhxRises
-TheRhysWyrill
-Thomas Lorblanchès (Zlika)
-Tilman M. Jaeschke (asciibeats)
-Tim Van den Langenbergh (tmtvl)
-Tobias Gruetzmacher (TobiX)
-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)
-URBANsUNITED
-vaguerant
-Val Packett (valpackett)
-Valerio Proietti (kamicane)
-vgmoose
-Viachaslau Khalikin (viachaslavic)
-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)
-webgeek1234
-Weedy Weed Smoker (WeedyWeedSmoker)
-whorsemaster
-Wiimpathy
-Wiktor Strzębała (wiktorek140)
-Woohyun Shin (sinusinu)
-xenomorph-us
-xhp-creations
-Yari (hyarsan)
-yesfish (huwpascoe)
-Yongwoon Cho (ssangkong)
-yoshisuga
-Zer0xFF
-zeromus
-zlice
-Érico Nogueira Rolim (ericonr)
-Ömercan Kömür (fpscan)
-シーはディー四を取る (cxd4)
-)";
@@ -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[DIR_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,107 +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 for _RetroArch_ may fall into a few categories:
-
- * _RetroArch_ itself, the user interface and API around all of the various cores.
- * Individual _Core_, that interacts with _RetroArch_.
- * Supplementary data provided within _RetroArch_, such as controller autoconfigs, databases,
-   thumbnails...
- * The [documentation set](https://docs.libretro.com/)
-
-When submitting a bug report, ensure that the report is submitted to the correct repository.
- * For _RetroArch_ itself, submit an issue to the [RetroArch](https://github.com/libretro/RetroArch)
-   repository. Please read and fill the issue template.
- * 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.
- * For database content, submit an issue to
-   [libretro-database repo](https://github.com/libretro/libretro-database) or ask in the
-   _database_ channel on Discord.
- * For controller autoconfigs, submit an issue to
-   [retroarch-joypad-autoconfig repo](https://github.com/libretro/retroarch-joypad-autoconfig)
- * For actual thumbnail images, submit an issue to
-   [libretro-thumbnails](https://github.com/libretro-thumbnails/libretro-thumbnails) repo
-   or ask in the _database_ channel on Discord.
- * For documentation, submit an issue to [libretro-docs](https://github.com/libretro/libretro-docs)
-   repo or ask in the _documentation_ channel.
- * For translations, please see [here](https://docs.libretro.com/development/retroarch/new-translations-crowdin/).
-
-If the issue occurs during runtime, please paste the verbose log output:
-
- * If using the main interface, enable verbose logging with _Settings_ -> _Logging_ ->
-   _Logging Verbosity_. Ensure both _Log to File_ and _Timestamp log Files_ is enabled.
-   Set frontend log level to _0 (Debug)_.
- * Or run _RetroArch_ with the verbose (`-v`) flag and get the log from the console.
-
-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,7 +1,4 @@
 HAVE_FILE_LOGGER=1
-HAVE_STATESTREAM?=1
-NEED_CXX_LINKER?=0
-NEED_GOLD_LINKER?=0
 MISSING_DECLS   =0

 ifneq ($(C90_BUILD),)
@@ -10,82 +7,33 @@ endif

 include config.mk

-# Put your favorite compile flags in this file, if you want different defaults than upstream.
-# Do not attempt to create that file upstream.
-# (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 := obj-unix
+
+ifeq ($(GLOBAL_CONFIG_DIR),)
+   GLOBAL_CONFIG_DIR = /etc
 endif

-OBJ :=
+OBJ := 
 LIBS :=
-DEF_FLAGS := -I.
-ASFLAGS :=
-DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64
+DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY
 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
-endif
-
-DEF_FLAGS += -Wall -Wsign-compare
-
-ifneq ($(findstring BSD,$(OS)),)
-   DEF_FLAGS += -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
-   LDFLAGS += -lemu
-endif
-
-ifneq ($(findstring FPGA,$(OS)),)
-   DEFINES += -DHAVE_FPGA
-endif

 ifneq ($(findstring Win32,$(OS)),)
-   LDFLAGS += -static-libgcc -lwinmm -limm32
+   LDFLAGS += -static-libgcc
 endif

 include Makefile.common

 ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang"),1)
-   DEF_FLAGS += -Wno-invalid-source-encoding -Wno-incompatible-ms-struct
-endif
-
-ifeq ($(shell $(CC) -v 2>&1 | grep -c "tcc"),1)
-   MD = -MD
-else
-   MD = -MMD
+   DEFINES +=  -Wno-invalid-source-encoding
 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,58 +50,60 @@ ifneq ($(V),1)
   Q := @
 endif

-ifeq ($(HAVE_DRMINGW), 1)
-   DEF_FLAGS += -DHAVE_DRMINGW
-   LDFLAGS += $(DRMINGW_LIBS)
-endif
-
+ifeq ($(DEBUG), 1)
+   OPTIMIZE_FLAG = -O0 -g
+else
+   OPTIMIZE_FLAG = -O3 -ffast-math
 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 -Wno-variadic-macros
-   else ifeq ($(HAVE_C99), 1)
-      CFLAGS += $(C99_CFLAGS)
-   endif
-
-   CFLAGS += -D_GNU_SOURCE
 endif

-DEF_FLAGS += $(INCLUDE_DIRS) -Ideps -Ideps/stb
+CFLAGS   += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) $(DEBUG_FLAG) -I.

-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)
-   ifeq ($(CXX_BUILD), 1)
-      LINK = $(CXX)
-      CFLAGS   := $(CXXFLAGS) -xc++
-      CFLAGS   += -DCXX_BUILD
-      CXXFLAGS += -DCXX_BUILD
-   else ifeq ($(NEED_CXX_LINKER),1)
-      LINK = $(CXX)
-   else
-      LINK = $(CC)
-   endif
+ifeq ($(CXX_BUILD), 1)
+   LINK = $(CXX)
+   CFLAGS := $(CXXFLAGS) -xc++
 else
-   LINK = $(CC)
+   ifeq ($(findstring Win32,$(OS)),)
+      LINK = $(CC)
+   else
+      # directx-related code is c++
+      LINK = $(CXX)
+   endif
+
+   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),)
-   CFLAGS += -m32
-   CXXFLAGS += -m32
-   LDFLAGS += -m32
-endif
-
 ifneq ($(SANITIZER),)
-   CFLAGS   := -fsanitize=$(SANITIZER) $(CFLAGS)
-   CXXFLAGS := -fsanitize=$(SANITIZER) $(CXXFLAGS)
-   LDFLAGS  := -fsanitize=$(SANITIZER) $(LDFLAGS)
+    CFLAGS   := -fsanitize=$(SANITIZER) $(CFLAGS)
+    CXXFLAGS := -fsanitize=$(SANITIZER) $(CXXFLAGS)
+    LDFLAGS  := -fsanitize=$(SANITIZER) $(LDLAGS)
 endif

 ifneq ($(findstring $(GPERFTOOLS),profiler),)
@@ -163,88 +113,39 @@ ifneq ($(findstring $(GPERFTOOLS),tcmalloc),)
   LIBS += -ltcmalloc
 endif

-# Qt MOC generation, required for QObject-derived classes
-ifneq ($(MOC_HEADERS),)
-    # prefix moc_ to base filename of paths and change extension from h to cpp, so a/b/foo.h becomes a/b/moc_foo.cpp
-    MOC_SRC := $(join $(addsuffix moc_,$(addprefix $(OBJDIR)/,$(dir $(MOC_HEADERS)))), $(notdir $(MOC_HEADERS:.h=.cpp)))
-    MOC_OBJ := $(patsubst %.cpp,%.o,$(MOC_SRC))
-    RARCH_OBJ += $(MOC_OBJ)
-endif
-
 all: $(TARGET) config.mk

-define INFO
-ASFLAGS: $(ASFLAGS)
-CC: $(CC)
-CFLAGS: $(CFLAGS)
-CPPFLAGS: $(CPPFLAGS)
-CXX: $(CXX)
-CXXFLAGS: $(CXXFLAGS)
-DEFINES: $(DEFINES)
-LDFLAGS: $(LDFLAGS)
-LIBRARY_DIRS: $(LIBRARY_DIRS)
-LIBS: $(LIBS)
-LINK: $(LINK)
-MD: $(MD)
-MOC: $(MOC)
-MOC_TMP: $(MOC_TMP)
-OBJCFLAGS: $(OBJCFLAGS)
-QT_VERSION: $(QT_VERSION)
-RARCH_OBJ: $(RARCH_OBJ)
-WINDRES: $(WINDRES)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
-
-$(MOC_SRC):
-	@$(if $(Q), $(shell echo echo MOC $<),)
-	$(eval MOC_TMP := $(patsubst %.h,%_moc.cpp,$@))
-	$(Q)QT_SELECT=$(QT_VERSION) $(MOC) -o $(MOC_TMP) $<
-
-$(foreach x,$(join $(addsuffix :,$(MOC_SRC)),$(MOC_HEADERS)),$(eval $x))
-
-$(MOC_OBJ):
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(foreach x,$(join $(addsuffix :,$(MOC_OBJ)),$(MOC_SRC)),$(eval $x))
-
-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)

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

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

 $(OBJDIR)/%.o: %.m
 	@mkdir -p $(dir $@)
 	@$(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 $<),)
@@ -253,71 +154,35 @@ $(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)
-	mkdir -p $(DESTDIR)$(BIN_DIR) 2>/dev/null || /bin/true
+	rm -f $(OBJDIR)/git_version.o
+	mkdir -p $(DESTDIR)$(PREFIX)/bin 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.metainfo.xml $(DESTDIR)$(DATA_DIR)/metainfo
-	cp com.libretro.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/com.libretro.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/com.libretro.RetroArch.desktop
-	chmod 644 $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.metainfo.xml
-	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
-	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
-	chmod 644 $(DESTDIR)$(DATA_DIR)/pixmaps/com.libretro.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
+	mkdir -p $(DESTDIR)$(PREFIX)/share/applications 2>/dev/null || /bin/true
+	mkdir -p $(DESTDIR)$(MAN_DIR) 2>/dev/null || /bin/true
+	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
+	install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin 
+	install -m755 tools/cg2glsl.py $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
+	install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
+	install -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
+	install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR)
+	install -m644 docs/retroarch-cg2glsl.1 $(DESTDIR)$(MAN_DIR)
+	install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps

 uninstall:
-	rm -f $(DESTDIR)$(BIN_DIR)/$(TARGET)
-	rm -f $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
+	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch
+	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
 	rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
-	rm -f $(DESTDIR)$(DATA_DIR)/applications/com.libretro.RetroArch.desktop
-	rm -f $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.metainfo.xml
-	rm -f $(DESTDIR)$(DATA_DIR)/pixmaps/com.libretro.RetroArch.svg
-	rm -f $(DESTDIR)$(DOC_DIR)/COPYING
-	rm -f $(DESTDIR)$(DOC_DIR)/COPYING.assets
-	rm -f $(DESTDIR)$(DOC_DIR)/README.md
-	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
-	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
-	rm -rf $(DESTDIR)$(ASSETS_DIR)
+	rm -f $(DESTDIR)$(PREFIX)/share/applications/retroarch.desktop
+	rm -f $(DESTDIR)$(MAN_DIR)/retroarch.1
+	rm -f $(DESTDIR)$(MAN_DIR)/retroarch-cg2glsl.1
+	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.svg

 clean:
-	@$(if $(Q), echo $@,)
-	$(Q)rm -rf $(OBJDIR_BASE)
-	$(Q)rm -f $(TARGET)
-	$(Q)rm -f *.d
+	rm -rf $(OBJDIR)
+	rm -f $(TARGET)
+	rm -f *.d

 .PHONY: all install uninstall clean
-
-print-%:
-	@echo '$*=$($*)'
@@ -1,24 +0,0 @@
-include Makefile.common
-
-# Qt MOC generation, required for QObject-derived classes
-ifneq ($(MOC_HEADERS),)
-	# prefix moc_ to base filename of paths and change extension from h to cpp, so a/b/foo.h becomes a/b/moc_foo.cpp
-	MOC_SRC := $(join $(addsuffix moc_,$(dir $(MOC_HEADERS))), $(notdir $(MOC_HEADERS:.h=.cpp)))
-endif
-
-MOC ?= $(error missing moc path)
-
-.PHONY: generate
-
-$(MOC_SRC):
-	@$(if $(Q), $(shell echo echo MOC $<),)
-	$(eval MOC_TMP := $(patsubst %.h,%_moc.cpp,$@))
-	$(MOC) -o $(MOC_TMP) $<
-
-$(foreach x,$(join $(addsuffix :,$(MOC_SRC)),$(MOC_HEADERS)),$(eval $x))
-
-generate: $(MOC_SRC)
-	@echo $(MOC_SRC)
-
-print-%:
-	@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,145 +2,242 @@ TARGET := retroarch_3ds
 LIBRETRO =

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

-APP_TITLE            = RetroArch 3DS
-APP_DESCRIPTION      = RetroArch 3DS
+APP_TITLE            = Retroarch 3DS
+APP_DESCRIPTION      = Retroarch 3DS
 APP_AUTHOR           = Team Libretro
 APP_PRODUCT_CODE     = RETROARCH-3DS
 APP_UNIQUE_ID        = 0xBAC00
-APP_ICON             = pkg/ctr/assets/default.png
-APP_BANNER           = pkg/ctr/assets/libretro_banner.png
-APP_AUDIO            = pkg/ctr/assets/silent.wav
-APP_RSF              = pkg/ctr/tools/template.rsf
+APP_ICON             = ctr/assets/default.png
+APP_BANNER           = ctr/assets/libretro_banner.png
+APP_AUDIO            = ctr/assets/silent.wav
+APP_RSF              = ctr/tools/template.rsf
 APP_SYSTEM_MODE      = 64MB
 APP_SYSTEM_MODE_EXT  = 124MB
 APP_BIG_TEXT_SECTION = 0
-APP_USE_SVCHAX       = 0

-include pkg/ctr/Makefile.cores
+include ctr/Makefile.cores

-OBJ :=
-OBJ += gfx/drivers/ctr_shaders/ctr_sprite.o
-OBJ += ctr/ctr_system.o
-OBJ += ctr/ctr_memory.o
-OBJ += ctr/ctr_linear.o
-OBJ += ctr/gpu_old.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
+OBJS :=
+OBJS += gfx/drivers/ctr_sprite.o
+OBJS += ctr/ctr_system.o
+OBJS += ctr/ctr_memory.o
+OBJS += ctr/ctr_linear.o
+OBJS += ctr/ctr_svchax.o

-ifeq ($(APP_BIG_TEXT_SECTION), 1)
-	APP_USE_SVCHAX = 1
-	LDFLAGS  += -Wl,--defsym,__ctr_patch_services=__service_ptr
-endif
-
-ifeq ($(APP_USE_SVCHAX), 1)
-	OBJ += ctr/ctr_svchax.o
-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
-	#ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file
-	CFLAGS += -I. \
-		-Ideps \
-		-Ideps/7zip \
-		-Ideps/stb \
-		-Ideps/mbedtls \
-		-Ideps/rcheevos/include \
-		-Ilibretro-common/include \
-		-Ilibretro-common/include/compat/zlib
+	OBJS += griffin/griffin.o
 else
-	HAVE_CC_RESAMPLER = 1
-	HAVE_MENU_COMMON = 1
-	HAVE_RTGA = 1
-	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_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_CHEATS = 1
-	HAVE_VIDEO_FILTER = 1
-	HAVE_DSP_FILTER = 1
-	HAVE_CONFIGFILE = 1
-	HAVE_OVERLAY = 1
-	HAVE_GFX_WIDGETS = 1
-	HAVE_NETWORKING = 1
-	HAVE_IFINFO = 1
-	HAVE_CHEEVOS = 1
-	HAVE_THREADS = 1
-	HAVE_BUILTINMBEDTLS = 1
-	HAVE_CORE_INFO_CACHE = 1
-	HAVE_CLOUDSYNC = 1
-
-	include Makefile.common
-	CFLAGS += $(DEF_FLAGS) -I. $(INCLUDE_DIRS)
+	OBJS += libretro-common/file/file_extract.o
+	OBJS += verbosity.o
+	OBJS += performance.o
+	OBJS += libretro-common/compat/compat_getopt.o
+	OBJS += libretro-common/compat/compat_strcasestr.o
+	OBJS += libretro-common/compat/compat_strl.o
+	OBJS += libretro-common/compat/compat_fnmatch.o
+	OBJS += libretro-common/memmap/memalign.o
+	OBJS += libretro-common/file/config_file.o
+	OBJS += libretro-common/file/config_file_userdata.o
+	OBJS += core_options.o
+	OBJS += cheats.o
+	OBJS += libretro-common/hash/rhash.o
+	OBJS += gfx/video_context_driver.o
+	OBJS += gfx/drivers_context/gfx_null_ctx.o
+	OBJS += gfx/image/image.o
+	OBJS += libretro-common/formats/tga/rtga.o
+	OBJS += libretro-common/formats/png/rpng.o
+	OBJS += libretro-common/formats/png/rpng_encode.o
+	OBJS += libretro-common/formats/bmp/rbmp_encode.o
+	OBJS += libretro-common/gfx/math/matrix_4x4.o
+	OBJS += libretro-common/gfx/math/matrix_3x3.o
+	OBJS += gfx/drivers/ctr_gfx.o
+	OBJS += gfx/drivers/nullgfx.o
+	OBJS += gfx/font_driver.o
+	OBJS += gfx/drivers_font_renderer/bitmapfont.o
+	OBJS += input/input_autodetect.o
+	OBJS += input/input_joypad_driver.o
+	OBJS += input/input_hid_driver.o
+	OBJS += input/input_config.o
+	OBJS += input/input_keymaps.o
+	OBJS += input/input_remapping.o
+	OBJS += input/input_keyboard.o
+	OBJS += input/drivers/ctr_input.o
+	OBJS += input/drivers_joypad/ctr_joypad.o
+	OBJS += input/autoconf/builtin_ctr.o
+	OBJS += input/drivers/nullinput.o
+	OBJS += input/drivers_joypad/null_joypad.o
+	OBJS += input/drivers_joypad/hid_joypad.o
+	OBJS += input/drivers_hid/null_hid.o
+	OBJS += gfx/video_state_tracker.o
+	OBJS += libretro-common/queues/fifo_buffer.o
+	OBJS += audio/audio_resampler_driver.o
+	OBJS += audio/drivers_resampler/sinc.o
+	OBJS += audio/drivers_resampler/nearest.o
+	OBJS += audio/drivers_resampler/cc_resampler.o
+	OBJS += camera/drivers/nullcamera.o
+	OBJS += location/drivers/nulllocation.o
+	OBJS += audio/drivers/ctr_csnd_audio.o
+	OBJS += audio/drivers/ctr_dsp_audio.o
+	OBJS += audio/drivers/nullaudio.o
+	OBJS += gfx/video_driver.o
+	OBJS += gfx/video_common.o
+	OBJS += input/input_driver.o
+	OBJS += audio/audio_driver.o
+	OBJS += camera/camera_driver.o
+	OBJS += location/location_driver.o
+	OBJS += driver.o
+	OBJS += libretro-common/gfx/scaler/scaler_filter.o
+	OBJS += libretro-common/gfx/scaler/pixconv.o
+	OBJS += libretro-common/gfx/scaler/scaler.o
+	OBJS += libretro-common/gfx/scaler/scaler_int.o
+	OBJS += gfx/video_filters/2xsai.o
+	OBJS += gfx/video_filters/super2xsai.o
+	OBJS += gfx/video_filters/supereagle.o
+	OBJS += gfx/video_filters/2xbr.o
+	OBJS += gfx/video_filters/darken.o
+	OBJS += gfx/video_filters/epx.o
+	OBJS += gfx/video_filters/scale2x.o
+	OBJS += gfx/video_filters/blargg_ntsc_snes.o
+	OBJS += gfx/video_filters/lq2x.o
+	OBJS += gfx/video_filters/phosphor2x.o
+	OBJS += audio/audio_filters/echo.o
+	OBJS += audio/audio_filters/eq.o
+	OBJS += audio/audio_filters/chorus.o
+	OBJS += audio/audio_filters/iir.o
+	OBJS += audio/audio_filters/panning.o
+	OBJS += audio/audio_filters/phaser.o
+	OBJS += audio/audio_filters/reverb.o
+	OBJS += audio/audio_filters/wahwah.o
+	OBJS += libretro-common/dynamic/dylib.o
+	OBJS += dynamic.o
+	OBJS += gfx/video_filter.o
+	OBJS += audio/audio_dsp_filter.o
+	OBJS += cores/dynamic_dummy.o
+	OBJS += content.o
+	OBJS += libretro-common/file/file_path.o
+	OBJS += file_path_special.o
+	OBJS += libretro-common/file/dir_list.o
+	OBJS += libretro-common/file/retro_dirent.o
+	OBJS += libretro-common/file/retro_file.o
+	OBJS += libretro-common/file/retro_stat.o
+	OBJS += dir_list_special.o
+	OBJS += string_list_special.o
+	OBJS += libretro-common/string/string_list.o
+	OBJS += libretro-common/string/stdstring.o
+	OBJS += file_ops.o
+	OBJS += libretro-common/file/nbio/nbio_stdio.o
+	OBJS += libretro-common/file/file_list.o
+	OBJS += libretro-common/queues/message_queue.o
+	OBJS += patch.o
+	OBJS += configuration.o
+	OBJS += rewind.o
+	OBJS += frontend/frontend_driver.o
+	OBJS += frontend/drivers/platform_ctr.o
+	OBJS += frontend/drivers/platform_null.o
+	OBJS += core_info.o
+	OBJS += ui/ui_companion_driver.o
+	OBJS += ui/drivers/ui_null.o
+	OBJS += frontend/frontend.o
+	OBJS += libretro_version_1.o
+	OBJS += retroarch.o
+	OBJS += runloop.o
+	OBJS += tasks/tasks.o
+	OBJS += msg_hash.o
+	OBJS += intl/msg_hash_de.o
+	OBJS += intl/msg_hash_es.o
+	OBJS += intl/msg_hash_eo.o
+	OBJS += intl/msg_hash_fr.o
+	OBJS += intl/msg_hash_it.o
+	OBJS += intl/msg_hash_nl.o
+	OBJS += intl/msg_hash_pt.o
+	OBJS += intl/msg_hash_pl.o
+	OBJS += intl/msg_hash_us.o
+	OBJS += movie.o
+	OBJS += record/record_driver.o
+	OBJS += record/drivers/record_null.o
+	OBJS += tasks/task_decompress.o
+	OBJS += tasks/task_file_transfer.o
+	OBJS += screenshot.o
+	OBJS += playlist.o
+	OBJS += menu/menu_driver.o
+	OBJS += menu/menu_hash.o
+	OBJS += menu/menu_input.o
+	OBJS += menu/menu_entry.o
+	OBJS += menu/menu_entries.o
+	OBJS += menu/menu_setting.o
+	OBJS += menu/menu_cbs.o
+	OBJS += menu/cbs/menu_cbs_ok.o
+	OBJS += menu/cbs/menu_cbs_cancel.o
+	OBJS += menu/cbs/menu_cbs_select.o
+	OBJS += menu/cbs/menu_cbs_start.o
+	OBJS += menu/cbs/menu_cbs_info.o
+	OBJS += menu/cbs/menu_cbs_refresh.o
+	OBJS += menu/cbs/menu_cbs_left.o
+	OBJS += menu/cbs/menu_cbs_right.o
+	OBJS += menu/cbs/menu_cbs_title.o
+	OBJS += menu/cbs/menu_cbs_deferred_push.o
+	OBJS += menu/cbs/menu_cbs_scan.o
+	OBJS += menu/cbs/menu_cbs_get_value.o
+	OBJS += menu/cbs/menu_cbs_up.o
+	OBJS += menu/cbs/menu_cbs_down.o
+	OBJS += menu/cbs/menu_cbs_contentlist_switch.o
+	OBJS += menu/menu_shader.o
+	OBJS += menu/menu_navigation.o
+	OBJS += menu/menu_display.o
+	OBJS += menu/menu_displaylist.o
+	OBJS += menu/menu_animation.o
+	OBJS += menu/intl/menu_hash_de.o
+	OBJS += menu/intl/menu_hash_es.o
+	OBJS += menu/intl/menu_hash_eo.o
+	OBJS += menu/intl/menu_hash_fr.o
+	OBJS += menu/intl/menu_hash_it.o
+	OBJS += menu/intl/menu_hash_nl.o
+	OBJS += menu/intl/menu_hash_pl.o
+	OBJS += menu/intl/menu_hash_pt.o
+	OBJS += menu/intl/menu_hash_us.o
+	OBJS += menu/drivers/null.o
+	OBJS += menu/drivers/menu_generic.o
+	OBJS += menu/drivers_display/menu_display_null.o
+	OBJS += menu/drivers/rgui.o
+	OBJS += command_event.o
+	OBJS += deps/zlib/adler32.o
+	OBJS += deps/zlib/compress.o
+	OBJS += deps/zlib/crc32.o
+	OBJS += deps/zlib/deflate.o
+	OBJS += deps/zlib/gzclose.o
+	OBJS += deps/zlib/gzlib.o
+	OBJS += deps/zlib/gzread.o
+	OBJS += deps/zlib/gzwrite.o
+	OBJS += deps/zlib/inffast.o
+	OBJS += deps/zlib/inflate.o
+	OBJS += deps/zlib/inftrees.o
+	OBJS += deps/zlib/trees.o
+	OBJS += deps/zlib/uncompr.o
+	OBJS += deps/zlib/zutil.o
+	OBJS += deps/zlib/ioapi.o
+	OBJS += deps/zlib/unzip.o
+	OBJS += audio/audio_utils.o
 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")
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
 endif

 ifeq ($(strip $(CTRULIB)),)
-	CTRULIB = $(DEVKITPRO)/libctru
+$(error "Please set CTRULIB in your environment. export CTRULIB=<path to>ctrulib")
 endif

-ifeq ($(strip $(USE_CTRULIB_2)),1)
-	CFLAGS += -DUSE_CTRULIB_2
+ifeq ($(strip $(AEMSTRO)),)
+$(error "Please set AEMSTRO in your environment. export AEMSTRO=<path to>aemstro")
 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)
@@ -148,35 +245,26 @@ 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 $(ARCH)
-CFLAGS	+= -DARM11 -D_3DS
+CFLAGS	+=	-mword-relocations \
+			-fomit-frame-pointer -ffast-math \
+         -Werror=implicit-function-declaration \
+			$(ARCH)

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

 ifeq ($(DEBUG), 1)
   CFLAGS	+= -O0 -g
 else
-   CFLAGS	+= -fomit-frame-pointer -O3
-endif
-
-ifeq ($(CONSOLE_LOG), 1)
-   CFLAGS	+= -DCONSOLE_LOG
+   CFLAGS	+= -O3
 endif

 ifeq ($(LIBCTRU_NO_DEPRECATION), 1)
@@ -188,53 +276,50 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
   WHOLE_END := -Wl,--no-whole-archive
 endif

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

-CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
-CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
-CFLAGS += -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_CORES -DHAVE_UPDATE_CORE_INFO
+CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE -DSINC_LOWEST_QUALITY
+CFLAGS += -DHAVE_GRIFFIN=1 -DHAVE_FILTERS_BUILTIN -DHAVE_MENU -DHAVE_RGUI
+CFLAGS += -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_BUILTIN_AUTOCONFIG

-CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
-CFLAGS += -Werror=implicit-function-declaration
+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)
-CFLAGS   += -std=gnu99
+ASFLAGS	:=	-g $(ARCH) -O3
+LDFLAGS   =	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

-LIB_CORE      :=
-LIB_CORE_FULL :=
+CFLAGS   += -std=gnu99 -ffast-math

-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) -lctru -lm

-ifeq ($(DEBUG), 1)
-	LIBS	+= -lctrud
-else
-	LIBS	+= -lctru
-endif
-
-ifneq ($(V),1)
-	Q := @
-endif

 ifeq ($(BUILD_3DSX), 1)
-	TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
+TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
 endif

 ifeq ($(BUILD_3DS), 1)
-	TARGET_3DS := $(TARGET).3ds
+TARGET_3DS := $(TARGET).3ds
 endif

 ifeq ($(BUILD_CIA), 1)
-	TARGET_CIA := $(TARGET).cia
+TARGET_CIA := $(TARGET).cia
 endif

+.PHONY: $(BUILD) clean all
+
+all: $(TARGET)
+
+$(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
+$(TARGET).3dsx: $(TARGET).elf
+$(TARGET).elf: $(OBJS) libretro_ctr.a
+
+ctr_sprite_shader_shbin.h: gfx/drivers/ctr_sprite.o
+gfx/drivers/ctr_gfx.c: ctr_sprite_shader_shbin.h
+griffin/griffin.o: gfx/drivers/ctr_gfx.c
+
+
 PREFIX		:=	$(DEVKITARM)/bin/arm-none-eabi-
+
 CC      := $(PREFIX)gcc
 CXX     := $(PREFIX)g++
 AS      := $(PREFIX)as
@@ -244,112 +329,62 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)

-ifeq ($(strip $(CTRBANNERTOOL)),)
-	ifneq ($(findstring Linux,$(shell uname)),)
-		BANNERTOOL = pkg/ctr/tools/bannertool-linux
-	else ifneq ($(findstring Darwin,$(shell uname)),)
-		BANNERTOOL = pkg/ctr/tools/bannertool-mac
-	else
-		BANNERTOOL = pkg/ctr/tools/bannertool.exe
-	endif
+ifneq ($(findstring Linux,$(shell uname -a)),)
+	MAKEROM    = ctr/tools/makerom-linux
+	BANNERTOOL = ctr/tools/bannertool-linux
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+	MAKEROM    = ctr/tools/makerom-mac
+	BANNERTOOL = ctr/tools/bannertool-mac
 else
-	BANNERTOOL = $(CTRBANNERTOOL)
+	MAKEROM    = ctr/tools/makerom.exe
+	BANNERTOOL = ctr/tools/bannertool.exe
 endif

-ifeq ($(strip $(CTRMAKEROM)),)
-	ifneq ($(findstring Linux,$(shell uname)),)
-		MAKEROM    = pkg/ctr/tools/makerom-linux
-	else ifneq ($(findstring Darwin,$(shell uname)),)
-		MAKEROM    = pkg/ctr/tools/makerom-mac
-	else
-		MAKEROM    = pkg/ctr/tools/makerom.exe
-	endif
-else
-	MAKEROM = $(CTRMAKEROM)
-endif
+%.o: %.shader
+	python $(AEMSTRO)/aemstro_as.py $< $(notdir $<).shbin
+	$(DEVKITARM)/bin/bin2s $(notdir $<).shbin | $(PREFIX)as -o $@
+	echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(notdir $<).shbin | tr . _)`.h
+	echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(notdir $<).shbin | tr . _)`.h
+	echo "extern const u32" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(notdir $<).shbin | tr . _)`.h
+	rm $(notdir $<).shbin

-.PHONY: $(BUILD) clean all
-
-all: $(TARGET)
-
-define INFO
-AR: $(AR)
-ASFLAGS: $(ASFLAGS)
-CC: $(CC)
-CFLAGS: $(CFLAGS)
-CXX: $(CXX)
-CXXFLAGS: $(CXXFLAGS)
-INCDIRS: $(INCDIRS)
-LD: $(LD)
-LDFLAGS: $(LDFLAGS)
-LIBDIRS: $(LIBDIRS)
-LIBS: $(LIBS)
-OBJ: $(OBJ)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
-
-
-$(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
-$(TARGET).3dsx: $(TARGET).elf
-$(TARGET).elf: $(OBJ) $(LIB_CORE_FULL)
-
-%.o: %.vsh %.gsh
-	$(DEVKITTOOLS)/bin/picasso $^ -o $*.shbin
-	$(DEVKITTOOLS)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
-	rm $*.shbin
-
-%.o: %.vsh
-	$(DEVKITTOOLS)/bin/picasso $^ -o $*.shbin
-	$(DEVKITTOOLS)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
-	rm $*.shbin

 %.o: %.cpp
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS)
+	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS)

 %.o: %.c
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS)
+	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS)

 %.o: %.s
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) -c -o $@ $< $(ASFLAGS)
+	$(CC) -c -o $@ $< $(ASFLAGS)

 %.o: %.S
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) -c -o $@ $< $(ASFLAGS)
+	$(CC) -c -o $@ $< $(ASFLAGS)

 %.a:
-	@$(if $(Q), $(shell echo echo AR $<),)
-	$(Q)$(AR) -rc $@ $^
+	$(AR) -rc $@ $^

 %.vsh:

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

 $(TARGET).3dsx: $(TARGET).elf
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
-	cp pkg/ctr/big_text_section.xml $(TARGET).xml
+	cp ctr/big_text_section.xml $(TARGET).xml
 else
 	rm -f $(TARGET).xml
 endif
-	$(DEVKITTOOLS)/bin/3dsxtool $< $@ $(_3DSXFLAGS)
+	-3dsxtool $< $@ $(_3DSXFLAGS)

 $(TARGET).elf: ctr/3dsx_custom_crt0.o
-	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
+	$(LD) $(LDFLAGS) $(OBJS) $(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)
@@ -358,17 +393,19 @@ $(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:
-	@$(if $(Q), echo $@,)
-	$(Q)rm -f $(OBJ)
-	$(Q)rm -f $(TARGET).3dsx
-	$(Q)rm -f $(TARGET).elf
-	$(Q)rm -f $(TARGET).3ds
-	$(Q)rm -f $(TARGET).cia
-	$(Q)rm -f $(TARGET).smdh
-	$(Q)rm -f $(TARGET).bnr
-	$(Q)rm -f $(TARGET).icn
-	$(Q)rm -f ctr/ctr_config_*.o
-	$(Q)rm -f ctr/3dsx_custom_crt0.o
+	rm -f $(OBJS)
+	rm -f $(TARGET).3dsx
+	rm -f $(TARGET).elf
+	rm -f $(TARGET).3ds
+	rm -f $(TARGET).cia
+	rm -f $(TARGET).smdh
+	rm -f $(TARGET).bnr
+	rm -f $(TARGET).icn
+	rm -f *_shader_shbin.h
+	rm -f ctr/ctr_config_*.o
+	rm -f ctr/3dsx_custom_crt0.o

 .PHONY: clean
+
@@ -1,239 +0,0 @@
-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
-APP_AUTHOR           = Team Libretro
-APP_PRODUCT_CODE     = RETROARCH-3DS
-APP_UNIQUE_ID        = 0xBAC00
-APP_ICON             = pkg/ctr/assets/default.png
-APP_BANNER           = pkg/ctr/assets/libretro_banner.png
-APP_AUDIO            = pkg/ctr/assets/silent.wav
-APP_RSF              = pkg/ctr/tools/template.rsf
-APP_SYSTEM_MODE      = 64MB
-APP_SYSTEM_MODE_EXT  = 124MB
-
-OBJ := ctr/ctr_system.o \
-		 ctr/ctr_memory.o \
-		 ctr/ctr_linear.o \
-		 frontend/frontend_salamander.o \
-		 frontend/frontend_driver.o \
-		 frontend/drivers/platform_ctr.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 \
-		 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
-
-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
-
-APP_TITLE         := $(shell echo "$(APP_TITLE)" | cut -c1-128)
-APP_DESCRIPTION   := $(shell echo "$(APP_DESCRIPTION)" | cut -c1-256)
-APP_AUTHOR        := $(shell echo "$(APP_AUTHOR)" | cut -c1-128)
-APP_PRODUCT_CODE  := $(shell echo $(APP_PRODUCT_CODE) | cut -c1-16)
-APP_UNIQUE_ID     := $(shell echo $(APP_UNIQUE_ID) | cut -c1-7)
-
-MAKEROM_ARGS_COMMON = -rsf $(APP_RSF) -exefslogo -elf $(TARGET).elf -icon $(TARGET).icn -banner $(TARGET).bnr -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" -DAPP_UNIQUE_ID=$(APP_UNIQUE_ID) -DAPP_SYSTEM_MODE=$(APP_SYSTEM_MODE) -DAPP_SYSTEM_MODE_EXT=$(APP_SYSTEM_MODE_EXT)
-
-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 $(ARCH)
-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 += -DRARCH_INTERNAL
-CFLAGS += -DRARCH_CONSOLE -DIS_SALAMANDER
-
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
-CFLAGS += -Werror=implicit-function-declaration
-
-ASFLAGS	:=	-g $(ARCH) -O3
-LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
-
-CFLAGS   += -std=gnu99
-
-LIBS	:= -lctru -lm
-
-ifeq ($(BUILD_3DSX), 1)
-TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
-endif
-
-ifeq ($(BUILD_3DS), 1)
-TARGET_3DS := $(TARGET).3ds
-endif
-
-ifeq ($(BUILD_CIA), 1)
-TARGET_CIA := $(TARGET).cia
-endif
-
-.PHONY: $(BUILD) clean all
-
-all: $(TARGET)
-
-$(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
-$(TARGET).3dsx: $(TARGET).elf
-$(TARGET).elf: $(OBJ)
-
-PREFIX		:=	$(DEVKITARM)/bin/arm-none-eabi-
-
-CC      := $(PREFIX)gcc
-CXX     := $(PREFIX)g++
-AS      := $(PREFIX)as
-AR      := $(PREFIX)ar
-OBJCOPY := $(PREFIX)objcopy
-STRIP   := $(PREFIX)strip
-NM      := $(PREFIX)nm
-LD      := $(CXX)
-
-ifeq ($(strip $(CTRBANNERTOOL)),)
-	ifneq ($(findstring Linux,$(shell uname)),)
-		BANNERTOOL = pkg/ctr/tools/bannertool-linux
-	else ifneq ($(findstring Darwin,$(shell uname)),)
-		BANNERTOOL = pkg/ctr/tools/bannertool-mac
-	else
-		BANNERTOOL = pkg/ctr/tools/bannertool.exe
-	endif
-else
-	BANNERTOOL = $(CTRBANNERTOOL)
-endif
-
-ifeq ($(strip $(CTRMAKEROM)),)
-	ifneq ($(findstring Linux,$(shell uname)),)
-		MAKEROM    = pkg/ctr/tools/makerom-linux
-	else ifneq ($(findstring Darwin,$(shell uname)),)
-		MAKEROM    = pkg/ctr/tools/makerom-mac
-	else
-		MAKEROM    = pkg/ctr/tools/makerom.exe
-	endif
-else
-	MAKEROM = $(CTRMAKEROM)
-endif
-
-%.o: %.vsh %.gsh
-	$(DEVKITTOOLS)/bin/picasso $^ -o $*.shbin
-	$(DEVKITTOOLS)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
-	rm $*.shbin
-
-%.o: %.vsh
-	$(DEVKITTOOLS)/bin/picasso $^ -o $*.shbin
-	$(DEVKITTOOLS)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
-	rm $*.shbin
-
-%.o: %.cpp
-	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS)
-
-%.o: %.c
-	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS)
-
-%.o: %.s
-	$(CC) -c -o $@ $< $(ASFLAGS)
-
-%.o: %.S
-	$(CC) -c -o $@ $< $(ASFLAGS)
-
-%.a:
-	$(AR) -rc $@ $^
-
-%.vsh:
-
-$(TARGET).smdh: $(APP_ICON)
-	$(DEVKITTOOLS)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
-
-$(TARGET).3dsx: $(TARGET).elf
-ifeq ($(APP_BIG_TEXT_SECTION), 1)
-	cp pkg/ctr/big_text_section.xml $(TARGET).xml
-else
-	rm -f $(TARGET).xml
-endif
-	$(DEVKITTOOLS)/bin/3dsxtool $< $@ $(_3DSXFLAGS)
-
-$(TARGET).elf: ctr/3dsx_custom_crt0.o
-	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
-	$(NM) -CSn $@ > $(notdir $*.lst)
-
-$(TARGET).bnr: $(APP_BANNER) $(APP_AUDIO)
-	$(BANNERTOOL) makebanner -i "$(APP_BANNER)" -a "$(APP_AUDIO)" -o $@
-
-$(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)
-	$(MAKEROM) -f cci -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=true
-
-$(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
-	rm -f $(TARGET).elf
-	rm -f $(TARGET).3ds
-	rm -f $(TARGET).cia
-	rm -f $(TARGET).smdh
-	rm -f $(TARGET).bnr
-	rm -f $(TARGET).icn
-	rm -f ctr/ctr_config_*.o
-	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 -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,258 +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_STATIC_CORES = 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 = 1
-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 -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
-
-ifneq ($(V),1)
-        Q := @
-endif
-
-DEPENDS_TMP  := $(OFILES:.o=.d)
-DEPENDS      := $(filter-out libretro_libnx.a,$(DEPENDS_TMP))
-
-.PHONY: clean all
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-all: $(OUTPUT)
-
-define INFO
-CC: $(CC)
-CFLAGS: $(CFLAGS)
-CXX: $(CXX)
-DEPENDS: $(DEPENDS)
-LDFLAGS: $(LDFLAGS)
-LIBDIRS: $(LIBDIRS)
-LIBS: $(LIBS)
-LIB_CORE: $(LIB_CORE)
-OBJ: $(OBJ)
-OUTPUT: $(OUTPUT)
-PLATEXTRA: $(PLATEXTRA)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
-
-$(OUTPUT): $(OBJ)
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(PLATEXTRA) -L. $(LIB_CORE) $(LIBS)
-
-%.o: %.c
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) -c -o $@ $(CFLAGS) $<
-
-%.o: %.cpp
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) -c -o $@ $(CFLAGS) $<
-
-clean:
-	@$(if $(Q), $(shell echo echo RM),)
-	$(Q)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,325 +1,119 @@
-HAVE_STATIC_DUMMY ?= 0
-ifeq ($(TARGET),)
-ifeq ($(LIBRETRO),)
-TARGET := retroarch.js
-LIBRETRO = dummy
-else
-TARGET := $(LIBRETRO)_libretro.js
-endif
-endif
-TARGET_BASE := $(subst .js,,$(TARGET))
+TARGET = retroarch.js

 OS = Emscripten
 OBJ :=
-DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -DEMSCRIPTEN
-DEFINES += -DHAVE_FILTERS_BUILTIN -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORE_INFO
+DEFINES := -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_MAIN
+DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVERLAY -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN

-HAVE_STATESTREAM ?= 1
-HAVE_PATCH = 1
-HAVE_DSP_FILTER = 1
-HAVE_VIDEO_FILTER = 1
-HAVE_OVERLAY = 1
-HAVE_NETWORKING ?= 1
-HAVE_LIBRETRODB = 1
-HAVE_COMPRESSION = 1
-HAVE_UPDATE_ASSETS = 1
-HAVE_ONLINE_UPDATER = 1
-HAVE_GLSL = 1
-HAVE_SCREENSHOTS = 1
-HAVE_REWIND = 1
-HAVE_AUDIOMIXER = 1
-HAVE_CC_RESAMPLER ?= 1
-HAVE_EGL ?= 0
-HAVE_OPENGLES = 1
-HAVE_RJPEG = 0
-HAVE_RPNG = 1
+HAVE_EGL    = 1
+HAVE_OPENGL = 1
+HAVE_GLES = 1
 HAVE_EMSCRIPTEN = 1
-HAVE_MENU ?= 1
-HAVE_GFX_WIDGETS = 1
 HAVE_RGUI = 1
 HAVE_SDL = 0
-HAVE_SDL2 = 0
 HAVE_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_CHD ?= 0
-HAVE_NETPLAYDISCOVERY ?= 0
+HAVE_FBO = 1
+WANT_ZLIB = 1
+MEMORY = 268435456
+LTO = 0
+# XXX: setting this to 1/2 currently crashes Firefox nightly
+PRECISE_F32 = 2

-# enables pthreads, requires special headers on the web server:
-# see https://web.dev/articles/coop-coep
-HAVE_THREADS ?= 0
-
-# requires HAVE_THREADS
-HAVE_AUDIOWORKLET ?= 0
-
-# doesn't work on PROXY_TO_PTHREAD
-HAVE_RWEBAUDIO ?= 1
-
-# requires ASYNC or PROXY_TO_PTHREAD
-HAVE_AL ?= 0
-
-# whether the browser thread is allowed to block to wait for audio to play, not CPU usage-friendly!
-# currently this variable is only used by rwebaudio and audioworklet; openal will never busywait.
-ALLOW_AUDIO_BUSYWAIT ?= 0
-
-# minimal asyncify; better performance than full asyncify,
-# but sleeping on the main thread is only possible in some places.
-MIN_ASYNC ?= 0
-
-# runs RetroArch on a pthread instead of the browser thread; requires HAVE_THREADS
-PROXY_TO_PTHREAD ?= 0
-
-# recommended FS when using HAVE_THREADS
-HAVE_WASMFS ?= 0
-
-# enables OPFS (origin private file system) and FETCHFS, requires PROXY_TO_PTHREAD
-HAVE_EXTRA_WASMFS ?= 0
-
-# enable javascript filesystem tracking, incompatible with HAVE_WASMFS
-FS_DEBUG ?= 0
-
-# help diagnose GL problems (can cause issues in normal operation)
-GL_DEBUG ?= 0
-
-# does nothing on its own, but automatically selected by some other options
-WASM_WORKERS = 0
-
-HAVE_OPENGLES ?= 1
-HAVE_OPENGLES3 ?= 0
-
-ASYNC ?= 0
-LTO ?= 0
-PTHREAD_POOL_SIZE ?= 4
-
-ASYNCIFY_ADD ?= dynCall_*,emscripten_mainloop
-ASYNCIFY_REMOVE ?= threaded_worker
-
-STACK_SIZE ?= 4194304
-INITIAL_HEAP ?= 134217728
-
-# 4194304 ----- 4 MiB (Stack: recommended)
-# 8388608 ----- 8 MiB
-# 16777216 ---- 16 MiB
-# 33554432 ---- 32 MiB
-# 67108864 ---- 64 MiB
-# 134217728 --- 128 MiB (Heap: recommended) (Stack: recommended for some cores [mupen64plus_next])
-# 268435456 --- 256 MiB (Heap: recommended for some cores [mupen64plus_next])
-# 536870912 --- 512 MiB (Heap: needed for some cores [mednafen_psx(_hw)])
-# 1073741824 -- 1 GiB
-# 1610612736 -- 1.5 GiB
-# 2147483648 -- 2 GiB
-
-OBJDIR := obj-emscripten
-
-EXPORTED_FUNCTIONS = _main,_malloc,_free,_cmd_savefiles,_cmd_save_state,_cmd_load_state,_cmd_undo_save_state,_cmd_undo_load_state,_cmd_toggle_fullscreen,_cmd_take_screenshot,\
-_cmd_toggle_menu,_cmd_reload_config,_cmd_toggle_grab_mouse,_cmd_toggle_game_focus,_cmd_reset,_cmd_toggle_pause,_cmd_pause,_cmd_unpause,\
-_cmd_set_volume,_cmd_set_shader,_cmd_cheat_set_code,_cmd_cheat_get_code,_cmd_cheat_toggle_index,_cmd_cheat_get_code_state,_cmd_cheat_realloc,\
-_cmd_cheat_get_size,_cmd_cheat_apply_cheats,EmscriptenSendCommand,EmscriptenReceiveCommandReply
-
-EXPORTS := callMain,FS,PATH,ERRNO_CODES,ENV,stringToNewUTF8,UTF8ToString,Browser,EmscriptenSendCommand,EmscriptenReceiveCommandReply
-
-LIBS   := -s USE_ZLIB=1
-CFLAGS := -s USE_ZLIB=1
-
-ifeq ($(HAVE_EXTRA_WASMFS), 1)
-   LIBS += -lfetchfs.js -lopfs.js
-   DEFINES += -DHAVE_EXTRA_WASMFS
-   override HAVE_WASMFS = 1
-   ifeq ($(PROXY_TO_PTHREAD), 0)
-      $(error ERROR: HAVE_EXTRA_WASMFS requires PROXY_TO_PTHREAD)
-   endif
+ifneq ($(NATIVE_ZLIB),)
+   WANT_ZLIB = 0
 endif

-ifeq ($(HAVE_WASMFS), 1)
-   LIBS += -s WASMFS -s FORCE_FILESYSTEM=1
-endif
-
-# note: real PROXY_TO_PTHREAD is not used here; we do the pthread management ourselves
-ifeq ($(PROXY_TO_PTHREAD), 1)
-   LIBS += -s OFFSCREENCANVAS_SUPPORT
-   DEFINES += -DPROXY_TO_PTHREAD -DEMSCRIPTEN_STACK_SIZE=$(STACK_SIZE)
-   override HAVE_THREADS = 1
-   override WASM_WORKERS = 1
-   # use the default stack size for the browser thread; the RetroArch thread will be created with the specified stack size
-   override STACK_SIZE = 4194304
-else ifeq ($(HAVE_AL), 1)
-   override ASYNC = 1
-endif
-
-ifeq ($(HAVE_SDL2), 1)
-   LIBS += -s USE_SDL=2
-   DEFINES += -DHAVE_SDL2
-endif
-
-LDFLAGS := -L. --no-heap-copy -s STACK_SIZE=$(STACK_SIZE) -s INITIAL_MEMORY=$(INITIAL_HEAP) \
-           -s EXPORTED_RUNTIME_METHODS=$(EXPORTS) -s EXIT_RUNTIME=1 \
-           -s ALLOW_MEMORY_GROWTH=1 -s EXPORTED_FUNCTIONS="$(EXPORTED_FUNCTIONS)" \
-           -s MODULARIZE=1 -s EXPORT_ES6=1 -s EXPORT_NAME="libretro_$(subst -,_,$(LIBRETRO))" \
-           -s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=0 \
-           -s ENVIRONMENT=web,worker -s WASM_BIGINT=1 \
-           --extern-pre-js emscripten/pre.js \
-           --js-library emscripten/library_rwebcam.js \
-           --js-library emscripten/library_platform_emscripten.js
-
-ifeq ($(HAVE_OPENGLES), 1)
-   ifeq ($(HAVE_OPENGLES3), 1)
-      LDFLAGS += -s FULL_ES3=1 -s MIN_WEBGL_VERSION=2 -s MAX_WEBGL_VERSION=2
-   else
-      LDFLAGS += -s FULL_ES2=1 -s MIN_WEBGL_VERSION=1 -s MAX_WEBGL_VERSION=2
-   endif
-endif
-
-ifeq ($(GL_DEBUG), 1)
-   LDFLAGS += -s GL_ASSERTIONS=1 -s GL_DEBUG=1
-   DEFINES += -DHAVE_GL_DEBUG_ES=1
-endif
-
-ifeq ($(FS_DEBUG), 1)
-   LDFLAGS += -s FS_DEBUG=1
-endif
-
-ifeq ($(HAVE_RWEBAUDIO), 1)
-   LDFLAGS += --js-library emscripten/library_rwebaudio.js
-   DEFINES += -DHAVE_RWEBAUDIO
-   ifeq ($(PROXY_TO_PTHREAD), 1)
-      $(error ERROR: RWEBAUDIO is incompatible with PROXY_TO_PTHREAD)
-   endif
-endif
-
-ifeq ($(HAVE_AUDIOWORKLET), 1)
-   LDFLAGS += -s AUDIO_WORKLET=1
-   DEFINES += -DHAVE_AUDIOWORKLET
-   override WASM_WORKERS = 1
-   ifeq ($(HAVE_THREADS), 0)
-      $(error ERROR: AUDIOWORKLET requires HAVE_THREADS)
-   endif
-endif
-
-ifeq ($(HAVE_AL), 1)
-   LDFLAGS += -lopenal
-   DEFINES += -DHAVE_AL
-endif
-
-ifeq ($(PROXY_TO_PTHREAD), 1)
-else ifeq ($(ASYNC), 1)
-else
-   DEFINES += -DEMSCRIPTEN_AUDIO_EXTERNAL_BLOCK
-   ifeq ($(MIN_ASYNC), 1)
-      DEFINES += -DEMSCRIPTEN_AUDIO_ASYNC_BLOCK
-   else
-      DEFINES += -DEMSCRIPTEN_AUDIO_FAKE_BLOCK
-   endif
-   ifneq ($(ALLOW_AUDIO_BUSYWAIT), 1)
-      DEFINES += -DEMSCRIPTEN_AUDIO_EXTERNAL_WRITE_BLOCK
-   endif
-endif
-
-ifeq ($(ALLOW_AUDIO_BUSYWAIT), 1)
-   DEFINES += -DEMSCRIPTEN_AUDIO_BUSYWAIT
-endif
-
-# explanation of some of these defines:
-# EMSCRIPTEN_AUDIO_EXTERNAL_BLOCK: audio blocking occurs in the main loop instead of in the audio driver functions.
-# EMSCRIPTEN_AUDIO_EXTERNAL_WRITE_BLOCK: along with above, enables external blocking in the write function.
-# EMSCRIPTEN_AUDIO_BUSYWAIT: write function will busywait. init function may still use an external block.
-# EMSCRIPTEN_AUDIO_ASYNC_BLOCK: external block uses emscripten_sleep (requires MIN_ASYNC).
-# EMSCRIPTEN_AUDIO_FAKE_BLOCK: external block uses main loop timing (doesn't require asyncify).
-# when building with either PROXY_TO_PTHREAD or ASYNC (full asyncify), none of the above are required.
-
-ifeq ($(HAVE_THREADS), 1)
-   LDFLAGS += -pthread -s PTHREAD_POOL_SIZE=$(PTHREAD_POOL_SIZE)
-   CFLAGS += -pthread -s SHARED_MEMORY
-endif
-
-ifeq ($(WASM_WORKERS), 1)
-   LDFLAGS += -s WASM_WORKERS=1
-endif
-
-ifeq ($(ASYNC), 1)
-   DEFINES += -DEMSCRIPTEN_ASYNCIFY -DEMSCRIPTEN_FULL_ASYNCIFY
-   LDFLAGS += -s ASYNCIFY=1 -s ASYNCIFY_STACK_SIZE=8192
-   ifeq ($(DEBUG), 1)
-      #LDFLAGS += -s ASYNCIFY_DEBUG=1 # broken?
-   endif
-else ifeq ($(MIN_ASYNC), 1)
-   DEFINES += -DEMSCRIPTEN_ASYNCIFY -DEMSCRIPTEN_MIN_ASYNCIFY
-   LDFLAGS += -s ASYNCIFY=1 -s ASYNCIFY_STACK_SIZE=8192 -s ASYNCIFY_IGNORE_INDIRECT=1 -s ASYNCIFY_ADD='$(ASYNCIFY_ADD)' -s ASYNCIFY_REMOVE='$(ASYNCIFY_REMOVE)'
-   ifeq ($(DEBUG), 1)
-      LDFLAGS += -s ASYNCIFY_ADVISE #-s ASYNCIFY_DEBUG=1
-   endif
-endif
+LIBS    :=
+LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) -s OUTLINING_LIMIT=50000 \
+           -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_rwebinput.js \
+           --js-library emscripten/library_rwebcam.js

 include Makefile.common

-DEF_FLAGS += $(INCLUDE_DIRS) -Ideps -Ideps/stb
+OBJ += gfx/video_filters/2xsai.o
+OBJ += gfx/video_filters/super2xsai.o
+OBJ += gfx/video_filters/supereagle.o
+OBJ += gfx/video_filters/2xbr.o
+OBJ += gfx/video_filters/darken.o
+OBJ += gfx/video_filters/epx.o
+OBJ += gfx/video_filters/scale2x.o
+OBJ += gfx/video_filters/blargg_ntsc_snes.o
+OBJ += gfx/video_filters/lq2x.o
+OBJ += gfx/video_filters/phosphor2x.o

-CFLAGS += $(DEF_FLAGS)
-CXXFLAGS += $(DEF_FLAGS) -D__STDC_CONSTANT_MACROS
+OBJ += audio/audio_filters/echo.o
+OBJ += audio/audio_filters/eq.o
+OBJ += audio/audio_filters/chorus.o
+OBJ += audio/audio_filters/iir.o
+OBJ += audio/audio_filters/panning.o
+OBJ += audio/audio_filters/phaser.o
+OBJ += audio/audio_filters/reverb.o
+OBJ += audio/audio_filters/wahwah.o

-libretro     =
-libretro_new =
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  libretro     = libretro_emscripten.bc
-  libretro_new = libretro_emscripten.a
-endif
+CFLAGS += -Ideps/zlib/
+libretro = libretro_emscripten.bc

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

 ifeq ($(DEBUG), 1)
-   LDFLAGS += -O0 -g -gsource-map -s SAFE_HEAP=2 -s STACK_OVERFLOW_CHECK=2 -s ASSERTIONS=1
-   # -O0 in cflags gives "too many locals" errors
-   CFLAGS += -O1 -g -gsource-map
+   LDFLAGS += -O0 -g
+   CFLAGS += -O0 -g
 else
-   LDFLAGS += -O3
+   LDFLAGS += -O2
   # WARNING: some optimizations can break some cores (ex: LTO breaks tyrquake)
+   LDFLAGS += -s PRECISE_F32=$(PRECISE_F32)
   ifeq ($(LTO), 1)
-      LDFLAGS += -flto
+      LDFLAGS += --llvm-lto 3
   endif
-   CFLAGS += -O3
+   CFLAGS += -O2
 endif

-CFLAGS += -Wall -I. -Ilibretro-common/include -Ideps/7zip -std=gnu99
-
-RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
+CFLAGS += -DWANT_RPNG -Wall -Wno-unused-result -Wno-unused-variable -I. -Ilibretro-common/include -std=gnu99 -s USE_ZLIB=1 \
+          -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_take_screenshot']"

 all: $(TARGET)

-$(libretro_new): ;
+$(TARGET): $(OBJ)
+	@$(if $(Q), $(shell echo echo LD $@),)
+	$(Q)$(LD) -o $@ $(OBJ) $(libretro) $(LIBS) $(LDFLAGS)

-mv_libretro:
-	$(Q)mv -f $(libretro) $(libretro_new) || true
-
-$(TARGET): $(RARCH_OBJ) $(libretro_new) mv_libretro
-	@$(if $(Q), $(shell echo echo "LD $@ \<obj\> $(libretro_new) $(LIBS) $(LDFLAGS)"),)
-	$(Q)$(LD) -o $@ $(RARCH_OBJ) $(libretro_new) $(LIBS) $(LDFLAGS)
-
-$(OBJDIR)/%.o: %.c
-	@mkdir -p $(dir $@)
+%.o: %.c
 	@$(if $(Q), $(shell echo echo CC $<),)
 	$(Q)$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<

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

 clean:
-	rm -rf $(OBJDIR)
+	rm -f *.o
+	rm -f deps/zlib/*.o
+	rm -f frontend/*.o
+	rm -f menu/*.o
+	rm -f menu/disp/*.o
+	rm -f audio/*.o
+	rm -f compat/*.o
+	rm -f compat/rxml/*.o
+	rm -f conf/*.o
+	rm -f gfx/scaler/*.o
+	rm -f gfx/*.o
+	rm -f gfx/d3d/*.o
+	rm -f gfx/drivers_context/*.o
+	rm -f gfx/math/*.o
+	rm -f gfx/drivers_font/*.o
+	rm -f gfx/drivers_font_renderer/*.o
+	rm -f gfx/py_state/*.o
+	rm -f gfx/rpng/*.o
+	rm -f gfx/glsym/*.o
+	rm -f record/*.o
+	rm -f input/*.o
+	rm -f tools/*.o
+	rm -f libretro-common/*/*.o
 	rm -f $(TARGET)
+	rm -f *.d

-.PHONY: all clean mv_libretro
+.PHONY: all clean
@@ -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.metainfo.xml $(DESTDIR)$(DATA_DIR)/metainfo
-	cp com.libretro.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/com.libretro.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/com.libretro.RetroArch.desktop
-	chmod 644 $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.metainfo.xml
-	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
-	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
-	chmod 644 $(DESTDIR)$(DATA_DIR)/pixmaps/com.libretro.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,279 +0,0 @@
-include version.all
-
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
-endif
-
-TOPDIR ?= $(CURDIR)
-include $(DEVKITPRO)/libnx/switch_rules
-
-TARGET := retroarch_switch
-
-DEBUG                  ?= 0
-WHOLE_ARCHIVE_LINK      = 0
-GRIFFIN_BUILD           = 0
-
-OBJ :=
-
-DEFINES := -D__SWITCH__=1 -U__linux__ -U__linux -DGLM_FORCE_PURE=1 -DRARCH_CONSOLE -DRARCH_INTERNAL -DGLOBAL_CONFIG_DIR='"/switch"' -DHAVE_STB_VORBIS
-
-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_ZLIB = 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_STATIC_CORES = 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 = 1
-HAVE_STB_VORBIS = 1
-HAVE_IBXM = 1
-HAVE_CORE_INFO_CACHE = 1
-HAVE_CLOUD_SYNC = 1
-HAVE_SSL = 1
-
-# RetroArch libnx useful flags
-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 :=
-
-OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-
-#---------------------------------------------------------------------------------
-# 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
-#ROMFS := switch/romfs
-
-APP_TITLE := RetroArch
-APP_VERSION := $(RARCH_VERSION)
-APP_AUTHOR := libretro Team
-APP_ICON := pkg/libnx/retroarch.jpg
-
-#---------------------------------------------------------------------------------
-# 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 -ffunction-sections \
-          $(ARCH) $(DEFINES) $(INCLUDE_DIRS) -I$(LIBNX)/include -I$(PORTLIBS)/include/ -include $(LIBNX)/include/switch.h #$(shell $(PORTLIBS)/bin/freetype-config --cflags)
-
-CFLAGS += $(INCLUDE) -DSWITCH=1 -DHAVE_LIBNX=1 -DNXLINK=1 -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_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
-
-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 -lmbedtls -lmbedx509 -lmbedcrypto -lnx -lm
-
-ifeq ($(HAVE_OPENGL), 1)
-  LIBS := -lEGL -lglapi -ldrm_nouveau $(LIBS)
-endif
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS := $(PORTLIBS) $(LIBNX)
-
-#---------------------------------------------------------------------------------
-# 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)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CC)
-#---------------------------------------------------------------------------------
-else
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CXX)
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
-
-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)
-
-ifeq ($(strip $(ICON)),)
-	icons := $(wildcard *.jpg)
-	ifneq (,$(findstring $(TARGET).jpg,$(icons)))
-		export APP_ICON := $(TOPDIR)/$(TARGET).jpg
-	else
-		ifneq (,$(findstring icon.jpg,$(icons)))
-			export APP_ICON := $(TOPDIR)/icon.jpg
-		endif
-	endif
-else
-	export APP_ICON := $(TOPDIR)/$(ICON)
-endif
-
-ifeq ($(strip $(NO_ICON)),)
-	export NROFLAGS += --icon=$(APP_ICON)
-endif
-
-ifeq ($(strip $(NO_NACP)),)
-	export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
-endif
-
-ifneq ($(APP_TITLEID),)
-	export NACPFLAGS += --titleid=$(APP_TITLEID)
-endif
-
-ifneq ($(ROMFS),)
-	export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
-endif
-
-DEPENDS_TMP  := $(OFILES:.o=.d)
-DEPENDS      := $(filter-out libretro_libnx.a,$(DEPENDS_TMP))
-
-.PHONY: clean all
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-all	:	$(OUTPUT).pfs0 $(OUTPUT).nro
-
-$(OUTPUT).pfs0	:	$(OUTPUT).nso
-
-$(OUTPUT).nso	:	$(OUTPUT).elf
-
-ifeq ($(strip $(NO_NACP)),)
-$(OUTPUT).nro	:	$(OUTPUT).elf $(OUTPUT).nacp
-else
-$(OUTPUT).nro	:	$(OUTPUT).elf
-endif
-
-$(OUTPUT).elf	:	$(OBJ)
-
-clean:
-	rm -f $(DEPENDS) $(OBJ) $(OUTPUT).pfs0 $(OUTPUT).nro $(OUTPUT).elf
-
-#---------------------------------------------------------------------------------
-# you need a rule like this for each extension you use as binary data
-#---------------------------------------------------------------------------------
-%.bin.o	%_bin.h :	%.bin
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
-#---------------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------------
@@ -1,354 +0,0 @@
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro")
-endif
-
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-export PATH	:=	$(DEVKITPPC)/bin:$(PATH)
-
-ifeq ($(PLATFORM),)
-PLATFORM=wii
-endif
-
-#---------------------------------------------------------------------------------
-# change shell on Snow Leopard
-#---------------------------------------------------------------------------------
-UNAME_S	:=	$(shell uname -s)
-UNAME_R	:=	$(shell uname -r)
-
-ifneq (,$(findstring Darwin,$(UNAME_S)))
-	ifneq (,$(findstring 10.8.0,$(UNAME_R)))
-		export SHELL=/bin/bash
-	endif
-endif
-
-#---------------------------------------------------------------------------------
-# path to tools
-#---------------------------------------------------------------------------------
-export PORTLIBS	:=	$(DEVKITPRO)/portlibs/ppc
-export PATH	:=	$(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH)
-
-#---------------------------------------------------------------------------------
-# the prefix on the compiler executables
-#---------------------------------------------------------------------------------
-PREFIX	:=	powerpc-eabi-
-
-export AS	:=	$(PREFIX)as
-export CC	:=	$(PREFIX)gcc
-export CXX	:=	$(PREFIX)g++
-export AR	:=	$(PREFIX)ar
-export OBJCOPY	:=	$(PREFIX)objcopy
-
-ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))
-
-#---------------------------------------------------------------------------------
-%.a:
-#---------------------------------------------------------------------------------
-	@rm -f $@
-	$(AR) -rc $@ $^
-
-#---------------------------------------------------------------------------------
-%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $< -o $@
-
-#---------------------------------------------------------------------------------
-%.o: %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-#---------------------------------------------------------------------------------
-%.o: %.m
-	$(CC) $(OBJCFLAGS) -c $< -o $@
-
-#---------------------------------------------------------------------------------
-%.o: %.s
-	$(CC) -x assembler-with-cpp $(ASFLAGS) -c $< -o $@
-
-#---------------------------------------------------------------------------------
-%.o: %.S
-	$(CC) -x assembler-with-cpp $(ASFLAGS) -c $< -o $@
-
-#---------------------------------------------------------------------------------
-# canned command sequence for binary data
-#---------------------------------------------------------------------------------
-define bin2o
-	bin2s -a 32 $< | $(AS) -o $(@)
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h
-	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(<F) | tr . _)`.h
-endef
-
-BUILD		:=	build
-
-BUILD_LITE = 1
-CURDIR   = .
-
-export BASEDIR		:= $(CURDIR)
-export DEPSDIR    := $(BASEDIR)/wii/libogc/deps
-export LWIPDIR		:= $(BASEDIR)/wii/libogc/lwip
-export OGCDIR		:= $(BASEDIR)/wii/libogc/libogc
-export DBDIR		:= $(BASEDIR)/wii/libogc/libdb
-export BTEDIR		:= $(BASEDIR)/wii/libogc/lwbt
-export WIIUSEDIR	:= $(BASEDIR)/wii/libogc/wiiuse
-export LIBWIIKEYB	:= $(BASEDIR)/wii/libogc/libwiikeyboard
-export STUBSDIR	:= $(BASEDIR)/wii/libogc/lockstubs
-export LIBS			:=	$(BASEDIR)/wii/libogc/libs
-
-export INCDIR		:=	$(BASEDIR)/wii/libogc/include
-
-export LIBDIR		:= $(LIBS)/$(PLATFORM)
-
-#---------------------------------------------------------------------------------
-BBALIB		:= $(LIBDIR)/libbba
-OGCLIB		:= $(LIBDIR)/libogc
-DBLIB			:= $(LIBDIR)/libdb
-BTELIB		:= $(LIBDIR)/libbte
-WIIUSELIB	:= $(LIBDIR)/libwiiuse
-WIIKEYBLIB	:= $(LIBDIR)/libwiikeyboard
-STUBSLIB		:= $(LIBDIR)/libgclibstubs
-
-#---------------------------------------------------------------------------------
-DEFAULTINCDIR := $(BASEDIR)/wii/libogc/include
-DEFINCS		:= -I$(DEFAULTINCDIR)
-INCLUDES	:=	$(DEFINCS) \
-				-I$(BASEDIR)/wii/libogc \
-				-I$(DEFAULTINCDIR)/netif \
-				-I$(DEFAULTINCDIR)/ipv4 \
-				-I$(DEFAULTINCDIR)/sdcard \
-				-I$(DEFAULTINCDIR)/ogc \
-				-I$(DEFAULTINCDIR)/ogc/machine \
-				-I$(DEFAULTINCDIR)/bte \
-				-I$(DEFAULTINCDIR)/sdcard \
-				-I$(DEFAULTINCDIR)/wiikeyboard \
-				-I$(DEFAULTINCDIR)/wiiuse \
-				-I$(DEFAULTINCDIR)/di
-
-MACHDEP		:= -DBIGENDIAN -DGEKKO -mcpu=750 -meabi -msdata=eabi -mhard-float -ffunction-sections -fdata-sections
-
-ifeq ($(PLATFORM),wii)
-MACHDEP		+=	-DHW_RVL
-endif
-
-ifeq ($(PLATFORM),cube)
-MACHDEP		+=	-DHW_DOL
-endif
-
-CFLAGS		:= -DLIBOGC_INTERNAL -DNDEBUG -O2 -fno-strict-aliasing -mregnames -Wall $(MACHDEP) $(INCLUDES)
-ASFLAGS		:=	$(MACHDEP) -mregnames -D_LANGUAGE_ASSEMBLY $(INCLUDES)
-
-#---------------------------------------------------------------------------------
-VPATH :=	$(LWIPDIR)				\
-			$(LWIPDIR)/arch/gc		\
-			$(LWIPDIR)/arch/gc/netif	\
-			$(LWIPDIR)/core			\
-			$(LWIPDIR)/core/ipv4	\
-			$(LWIPDIR)/netif	\
-			$(OGCDIR)			\
-			$(DBDIR)			\
-			$(DBDIR)/uIP		\
-			$(BTEDIR)		\
-			$(WIIUSEDIR)		\
-			$(SDCARDDIR)			\
-			$(LIBWIIKEYB)		\
-			$(STUBSDIR)
-
-#---------------------------------------------------------------------------------
-SOURCES_LWIP := $(LWIPDIR)/network.c \
-					 $(LWIPDIR)/netio.c \
-					 $(LWIPDIR)/arch/gc/netif/gcif.c	\
-					 $(LWIPDIR)/core/inet.c \
-					 $(LWIPDIR)/core/mem.c \
-					 $(LWIPDIR)/core/dhcp.c \
-					 $(LWIPDIR)/core/raw.c	\
-					 $(LWIPDIR)/core/memp.c \
-					 $(LWIPDIR)/core/netif.c \
-					 $(LWIPDIR)/core/pbuf.c \
-					 $(LWIPDIR)/core/stats.c \
-					 $(LWIPDIR)/core/sys.c \
-					 $(LWIPDIR)/core/tcp.c \
-					 $(LWIPDIR)/core/tcp_in.c \
-					 $(LWIPDIR)/core/tcp_out.c	\
-					 $(LWIPDIR)/core/udp.c \
-					 $(LWIPDIR)/core/ipv4/icmp.c \
-					 $(LWIPDIR)/core/ipv4/ip.c \
-					 $(LWIPDIR)/core/ipv4/ip_frag.c \
-					 $(LWIPDIR)/core/ipv4/ip_addr.c \
-					 $(LWIPDIR)/netif/etharp.c \
-					 $(LWIPDIR)/netif/loopif.c
-
-LWIPOBJ := $(SOURCES_LWIP:.c=.o)
-
-#---------------------------------------------------------------------------------
-SOURCES_OGC		:=	\
-					$(OGCDIR)/console.c \
-					$(OGCDIR)/lwp_priority.c \
-					$(OGCDIR)/lwp_queue.c \
-					$(OGCDIR)/lwp_threadq.c \
-					$(OGCDIR)/lwp_threads.c \
-					$(OGCDIR)/lwp_sema.c	\
-					$(OGCDIR)/lwp_messages.c \
-					$(OGCDIR)/lwp.c \
-					$(OGCDIR)/lwp_stack.c \
-					$(OGCDIR)/lwp_mutex.c 	\
-					$(OGCDIR)/lwp_watchdog.c \
-					$(OGCDIR)/lwp_wkspace.c \
-					$(OGCDIR)/lwp_objmgr.c \
-					$(OGCDIR)/lwp_heap.c \
-					$(OGCDIR)/sys_state.c \
-					$(OGCDIR)/exception.c \
-					$(OGCDIR)/irq.c \
-					$(OGCDIR)/semaphore.c \
-					$(OGCDIR)/video.c \
-					$(OGCDIR)/pad.c \
-					$(OGCDIR)/exi.c \
-					$(OGCDIR)/mutex.c \
-					$(OGCDIR)/arqueue.c \
-					$(OGCDIR)/arqmgr.c	\
-					$(OGCDIR)/system.c \
-					$(OGCDIR)/cond.c \
-					$(OGCDIR)/gx.c \
-					$(OGCDIR)/gu.c \
-					$(OGCDIR)/audio.c \
-					$(OGCDIR)/cache.c \
-					$(OGCDIR)/decrementer.c			\
-					$(OGCDIR)/message.c \
-					$(OGCDIR)/card.c \
-					$(OGCDIR)/aram.c \
-					$(OGCDIR)/depackrnc1.c \
-					$(OGCDIR)/dsp.c \
-					$(OGCDIR)/si.c \
-					$(OGCDIR)/tpl.c \
-					$(OGCDIR)/ipc.c \
-					$(OGCDIR)/console_font_8x16.c \
-					$(OGCDIR)/timesupp.c \
-					$(OGCDIR)/lock_supp.c \
-					$(OGCDIR)/newlibc.c \
-					$(OGCDIR)/usbgecko.c \
-					$(OGCDIR)/usbmouse.c \
-					$(OGCDIR)/sbrk.c \
-					$(OGCDIR)/malloc_lock.c \
-					$(OGCDIR)/kprintf.c \
-					$(OGCDIR)/stm.c \
-					$(OGCDIR)/ios.c \
-					$(OGCDIR)/es.c \
-					$(OGCDIR)/isfs.c \
-					$(OGCDIR)/usb.c \
-					$(OGCDIR)/network_common.c \
-					$(OGCDIR)/sdgecko_io.c \
-					$(OGCDIR)/sdgecko_buf.c \
-					$(OGCDIR)/gcsd.c \
-					$(OGCDIR)/argv.c \
-					$(OGCDIR)/network_wii.c \
-					$(OGCDIR)/wiisd.c \
-					$(OGCDIR)/conf.c \
-					$(OGCDIR)/usbstorage.c \
-					$(OGCDIR)/texconv.c \
-					$(OGCDIR)/wiilaunch.c
-
-SOURCES_OGC_ASM := $(OGCDIR)/cache_asm.S \
-						 $(OGCDIR)/decrementer_handler.S \
-						 $(OGCDIR)/depackrnc.S \
-						 $(OGCDIR)/exception_handler.S \
-						 $(OGCDIR)/gu_psasm.S \
-						 $(OGCDIR)/irq_handler.S \
-						 $(OGCDIR)/lwp_handler.S \
-						 $(OGCDIR)/ogc_crt0.S \
-						 $(OGCDIR)/system_asm.S \
-						 $(OGCDIR)/video_asm.S
-
-ifneq ($(BUILD_LITE), 1)
-SOURCES_OGC += $(OGCDIR)/dvd.c
-endif
-
-OGCOBJ := $(SOURCES_OGC:.c=.o) $(SOURCES_OGC_ASM:.S=.o)
-
-#---------------------------------------------------------------------------------
-SOURCES_DB		:=	\
-				$(DBDIR)/uIP/uip_ip.c \
-				$(DBDIR)/uIP/uip_tcp.c \
-				$(DBDIR)/uIP/uip_pbuf.c \
-				$(DBDIR)/uIP/uip_netif.c \
-				$(DBDIR)/uIP/uip_arp.c \
-				$(DBDIR)/uIP/uip_arch.c \
-				$(DBDIR)/uIP/uip_icmp.c \
-				$(DBDIR)/uIP/memb.c \
-				$(DBDIR)/uIP/memr.c \
-				$(DBDIR)/uIP/bba.c \
-				$(DBDIR)/tcpip.c \
-				$(DBDIR)/debug.c \
-				$(DBDIR)/debug_handler.c \
-				$(DBDIR)/debug_supp.c \
-				$(DBDIR)/geckousb.c
-
-DBOBJ      := $(SOURCES_DB:.c=.o)
-
-#---------------------------------------------------------------------------------
-SOURCES_BTE		:=	\
-					$(BTEDIR)/bte.c \
-					$(BTEDIR)/hci.c \
-					$(BTEDIR)/l2cap.c \
-					$(BTEDIR)/btmemb.c \
-					$(BTEDIR)/btmemr.c \
-					$(BTEDIR)/btpbuf.c \
-					$(BTEDIR)/physbusif.c
-
-BTEOBJ      := $(SOURCES_BTE:.c=.o)
-
-#---------------------------------------------------------------------------------
-SOURCES_WIIUSE	:=	\
-					$(WIIUSEDIR)/classic.c \
-					$(WIIUSEDIR)/dynamics.c \
-					$(WIIUSEDIR)/events.c \
-					$(WIIUSEDIR)/io.c \
-					$(WIIUSEDIR)/io_wii.c \
-					$(WIIUSEDIR)/ir.c \
-					$(WIIUSEDIR)/nunchuk.c \
-					$(WIIUSEDIR)/wiiuse.c \
-					$(WIIUSEDIR)/speaker.c \
-					$(WIIUSEDIR)/wpad.c \
-					$(WIIUSEDIR)/motion_plus.c
-
-WIIUSEOBJ   := $(SOURCES_WIIUSE:.c=.o)
-
-#---------------------------------------------------------------------------------
-SOURCES_WIIKEYB = $(LIBWIIKEYB)/usbkeyboard.c \
-						$(LIBWIIKEYB)/keyboard.c \
-						$(LIBWIIKEYB)/ukbdmap.c \
-						$(LIBWIIKEYB)/wskbdutil.c
-
-WIIKEYBLIBOBJ	:=	$(SOURCES_WIIKEYB:.c=.o)
-
-LIBRARIES	:=	$(OGCLIB).a  $(DBLIB).a
-
-ifeq ($(PLATFORM),cube)
-LIBRARIES	+=	$(BBALIB).a
-endif
-ifeq ($(PLATFORM),wii)
-LIBRARIES	+=	$(BTELIB).a $(WIIUSELIB).a $(WIIKEYBLIB).a
-endif
-
-all: $(LIBRARIES)
-#---------------------------------------------------------------------------------
-$(BBALIB).a: $(LWIPOBJ)
-#---------------------------------------------------------------------------------
-$(OGCLIB).a: $(OGCOBJ)
-#---------------------------------------------------------------------------------
-$(DBLIB).a: $(DBOBJ)
-#---------------------------------------------------------------------------------
-$(WIIKEYBLIB).a: $(WIIKEYBLIBOBJ)
-#---------------------------------------------------------------------------------
-$(BTELIB).a: $(BTEOBJ)
-#---------------------------------------------------------------------------------
-$(WIIUSELIB).a: $(WIIUSEOBJ)
-#---------------------------------------------------------------------------------
-
-#---------------------------------------------------------------------------------
-clean:
-#---------------------------------------------------------------------------------
-	rm -fr $(LWIPOBJ) $(OGCOBJ) $(DBOBJ) $(BTEOBJ) $(WIIUSEOBJ) $(WIIKEYBLIBOBJ)
-	rm -f *.map
@@ -1,234 +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 -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)
-
-ifneq ($(V),1)
-        Q := @
-endif
-
-RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
-
-all: $(TARGET)
-
-define INFO
-ASFLAGS: $(ASFLAGS)
-CC: $(CC)
-CFLAGS: $(CFLAGS)
-CPPFLAGS: $(CPPFLAGS)
-CXX: $(CXX)
-CXXFLAGS: $(CXXFLAGS)
-DEFINES: $(DEFINES)
-LDFLAGS: $(LDFLAGS)
-LIBRARY_DIRS: $(LIBRARY_DIRS)
-LIBS: $(LIBS)
-LINK: $(LINK)
-OBJCFLAGS: $(OBJCFLAGS)
-RARCH_OBJ: $(RARCH_OBJ)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
-
-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:
-	@$(if $(Q), echo $@,)
-	$(Q)rm -rf $(OBJDIR_BASE)
-	$(Q)rm -f $(TARGET)
-	$(Q)rm -f *.d
-
-.PHONY: all clean
-
-print-%:
-	@echo '$*=$($*)'
@@ -1,288 +0,0 @@
-TARGET		    := retroarch.exe
-DEBUG           = 0
-GRIFFIN_BUILD   = 0
-OS              = Win32
-ARCH            = amd64
-#TARGET_ARCH     = x86
-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
-HAVE_D3D10               := 1
-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_THREAD_STORAGE      := 1
-HAVE_WINMM               := 1
-
-HAVE_RPNG                := 1
-HAVE_ZLIB                := 1
-HAVE_CONFIGFILE          := 1
-HAVE_PATCH               := 1
-HAVE_MENU                := 1
-HAVE_RGUI                := 1
-HAVE_XMB                 := 1
-HAVE_MATERIALUI          := 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_DINPUT              := 1
-HAVE_MENU_COMMON         := 1
-HAVE_BUILTINZLIB         := 1
-
-HAVE_RJPEG               := 1
-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))
-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))
-
-ifeq ($(ARCH),x64)
-   ARCH := amd64
-endif
-
-ARCH2 := $(ARCH)
-ifeq ($(ARCH),amd64)
-   ARCH2 := x64
-endif
-
-ifeq ($(TARGET_ARCH),)
-   TARGET_ARCH = $(ARCH)
-endif
-
-ifeq ($(TARGET_ARCH),x64)
-   TARGET_ARCH = amd64
-endif
-
-TARGET_ARCH2 = $(TARGET_ARCH)
-ifeq ($(TARGET_ARCH2),amd64)
-   TARGET_ARCH2 = x64
-endif
-
-CROSS = $(ARCH)
-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)
-export PATH    := $(PATH)
-
-#$(info WindowsSdkDir : $(WindowsSdkDir))
-#$(info WindowsSDKVersion : $(WindowsSDKVersion))
-#$(info VCINSTALLDIR : $(VCINSTALLDIR))
-#$(info INCLUDE : $(INCLUDE))
-#$(info LIB : $(LIB))
-#$(info LIBPATH : $(LIBPATH))
-#$(info PATH : $(PATH))
-#$(error end)
-
-DEFINES += -D__SSE__ -D__SSE2__
-ifeq ($(TARGET_ARCH2),x64)
-DEFINES += -D__x86_64__
-else
-#DEFINES += -D__i686__
-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 += -source-charset:utf-8
-
-CXXFLAGS += $(CFLAGS) -TP -EHsc
-ifeq ($(CXX_BUILD),1)
-   CFLAGS  := $(CXXFLAGS)
-   DEFINES += -DCXX_BUILD
-else
-   CFLAGS  += -TC
-endif
-
-WARNINGS += -WX -W3
-WARNINGS += -wd4101 -wd4996 -wd4244 -wd4267 -wd4090 -wd4305 -wd4146 -wd4334 -wd4018 -wd4800 -wd4838
-
-CC = cl.exe
-CXX = cl.exe
-LD = link.exe
-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
-   LDFLAGS += -DEBUG
-   DEFINES += -DDEBUG -D_DEBUG
-else
-   FLAGS += -GS- -Gy- -O2 -Ob2 -GF -GT -Oy -Ot -D_SECURE_SCL=0
-   FLAGS += -MD
-endif
-
-ifeq ($(DEBUG),1)
-   BUILD_DIR := $(BUILD_DIR)-debug
-endif
-
-ifeq ($(GRIFFIN_BUILD),1)
-   BUILD_DIR := $(BUILD_DIR)-griffin
-endif
-
-BUILD_DIR := $(BUILD_DIR)-$(TARGET_ARCH2)
-
-ifneq ($(V), 1)
-   Q := @
-endif
-
-ifeq ($(GRIFFIN_BUILD), 1)
-   OBJ       := griffin/griffin.o griffin/griffin_cpp.o
-   DEFINES   += -DHAVE_GRIFFIN -DUSE_MATH_DEFINES
-else
-   BLACKLIST :=
-   OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-endif
-
-DEFINES += -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DHAVE_DYNAMIC -DJSON_STATIC
-INCLUDE_DIRS += -I. -Igfx/include
-
-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))
-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))
-#$(info CXXFLAGS : $(CXXFLAGS))
-#$(info LDFLAGS : $(LDFLAGS))
-#$(info LIBS : $(LIBS))
-#$(info OBJ : $(OBJ))
-#$(info target : $(TARGET))
-#$(info flags : $(FLAGS))
-#$(info INCLUDE : $(INCLUDE))
-#$(info LIB : $(LIB))
-#$(info LIBPATH : $(LIBPATH))
-#$(error end)
-
-$(info os     : $(OS))
-$(info host   : $(ARCH))
-$(info target : $(TARGET_ARCH))
-
-all: $(TARGET)
-
-%: $(BUILD_DIR)/%
-	cp $< $@
-
-ifeq ($(DEBUG),1)
-%.exe: $(BUILD_DIR)/%.exe
-	cp $< $@
-	cp $(BUILD_DIR)/$*.pdb $*.pbd
-endif
-
-SHELL:=$(SHELL) -o pipefail
-
-DEPFLAGS = -showIncludes | tee $(BUILD_DIR)/$*.dtemp | sed /'Note: including file:'/d
-MAKEDEPS = echo $@: $< \\ > $(BUILD_DIR)/$*.depend && \
-           grep 'Note: including file:' $(BUILD_DIR)/$*.dtemp \
-           | sed '/$(subst \,\\,$(WindowsSdkDir))/Id; /$(subst \,\\,$(VCINSTALLDIR))/Id; s/Note: including file:[ ]*//g; s/\\/\//g; s/ /\\ /g; s/.*/   & \\/g' \
-           >> $(BUILD_DIR)/$*.depend && \
-           rm -f $(BUILD_DIR)/$*.dtemp
-
-#DEPFLAGS :=
-#MAKEDEPS :=
-
-$(BUILD_DIR)/%.obj: %.cpp
-	@mkdir -p $(dir $@)
-	$(Q)$(CXX) -c -Fo:$@ $< $(FLAGS) $(CXXFLAGS) $(DEFINES) $(INCLUDE_DIRS) $(WARNINGS) $(DEPFLAGS)
-	@$(MAKEDEPS)
-
-$(BUILD_DIR)/%.obj: %.c
-	@mkdir -p $(dir $@)
-	$(Q)$(CC) -c -Fo:$@ $< $(FLAGS) $(CFLAGS) $(DEFINES) $(INCLUDE_DIRS) $(WARNINGS) $(DEPFLAGS)
-	@$(MAKEDEPS)
-
-$(BUILD_DIR)/%.res: %.rc
-	@mkdir -p $(dir $@)
-	$(Q)$(RC) $<
-	$(Q)mv $*.res $@
-
-$(BUILD_DIR)/$(TARGET): $(OBJ) .$(TARGET).last
-	@touch .$(TARGET).last
-	$(Q)$(LD) $(OBJ) $(LDFLAGS) $(LIBS) -out:$(BUILD_DIR)/$(TARGET)
-
-%.h %.hpp %.depend %.last: ;
-
-clean:
-	rm -f $(OBJ) $(TARGET)
-	rm -f $(BUILD_DIR)/$(TARGET)
-	rm -f .$(TARGET).last
-	rm -f $(OBJ:.obj=.depend)
-
-.PHONY: clean all
-.PRECIOUS: %.depend %.last
-
-include $(patsubst %.obj,%.depend,$(filter %.obj,$(OBJ)))
@@ -1,304 +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
-HAVE_OGG_OGC      ?= 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 ($(HAVE_OGG_OGC), 1)
-   LIBS += -L$(DEVKITPRO)/portlibs/ppc/lib -lvorbisfile -lvorbis -logg
-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
-
-ifneq ($(V),1)
-	Q := @
-endif
-
-OBJOUT   = -o
-LINKOUT  = -o
-LINK = $(CXX)
-
-all: $(EXT_TARGET)
-
-define INFO
-CC: $(CC)
-CFLAGS: $(CFLAGS)
-CXX: $(CXX)
-LD: $(LD)
-LDFLAGS: $(LDFLAGS)
-LIBDIRS: $(LIBDIRS)
-LIBS: $(LIBS)
-LINK: $(LINK)
-LINKOUT: $(LINKOUT)
-OBJ: $(OBJ)
-OBJOUT: $(OBJOUT)
-PLATEXTRA: $(PLATEXTRA)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
-
-%.dol: %.elf
-	$(ELF2DOL) $< $@
-
-$(EXT_INTER_TARGET): $(OBJ)
-	@$(if $(Q), $(shell echo echo LINK $@),)
-	$(Q)$(LINK) $(LINKOUT)$@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(PLATEXTRA) $(LIBS)
-
-%.o: %.c
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.cpp
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.S
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.binobj: %.bin
-	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(LD) -r -b binary $(OBJOUT)$@ $<
-
-clean:
-	@$(if $(Q), echo $@,)
-	$(Q)rm -f $(EXT_TARGET)
-	$(Q)rm -f $(EXT_INTER_TARGET)
-	$(Q)rm -f $(OBJ)
-
-.PHONY: clean
-
-print-%:
-	@echo '$*=$($*)'
@@ -1,45 +1,23 @@
-include version.all
+RARCH_VERSION		= "0.9.9.3"

-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 audio/audio_utils_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__ -DSINC_LOWER_QUALITY -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DWANT_RPNG -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,242 +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
-
-ifneq ($(V),1)
-        Q := @
-endif
-
-TARGETS := $(TARGET).self
-
-all: $(TARGETS)
-
-define INFO
-CC: $(CC)
-CFLAGS: $(CFLAGS)
-CXX: $(CXX)
-CXXFLAGS: $(CXXFLAGS)
-LD: $(LD)
-LDFLAGS: $(LDFLAGS)
-LIBS: $(LIBS)
-OBJ: $(OBJ)
-OBJOUT: $(OBJOUT)
-ORBISDEV: $(ORBISDEV)
-TARGET: $(TARGET)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
-
-OBJOUT   = -o
-
-%.o: %.c
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.cpp
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) $(CXXFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.S
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.s
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) -c $(OBJOUT)$@ $<
-
-$(TARGET).elf: $(OBJ)
-	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(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:
-	$(Q)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,166 +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
-
-ifneq ($(V),1)
-        Q := @
-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 -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)
-
-define INFO
-EE_BIN: $(EE_BIN)
-EE_CC: $(EE_CC)
-EE_CFLAGS: $(EE_CFLAGS)
-EE_CXX: $(EE_CXX)
-EE_CXXFLAGS: $(EE_CXXFLAGS)
-EE_INCS: $(EE_INCS)
-EE_OBJS: $(EE_OBJS)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
-
-clean:
-	@$(if $(Q), $(shell echo echo RM $<),)
-	$(Q)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:
-ifeq ($(shell uname), Darwin)
-	/Applications/PCSX2.app/Contents/MacOS/PCSX2 -elf $(PWD)/$(EE_BIN)
-else
-	PCSX2 -elf $(PWD)/$(EE_BIN) -nogui
-endif
-
-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
-
-%.o: %.c
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(EE_CC) $(EE_CFLAGS) $(EE_INCS) -c $< -o $@
-
-%.o: %.cc
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(EE_CXX) $(EE_CXXFLAGS) $(EE_INCS) -c $< -o $@
-
-%.o: %.cpp
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(EE_CXX) $(EE_CXXFLAGS) $(EE_INCS) -c $< -o $@
@@ -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) -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,194 @@
+RARCH_VERSION		= "0.9.9.3"
+
+#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	= ultra-opt
+
+ASSETS_DIR  := media/assets
+
+# options
+DOWNLOAD_SHADERS	= 1
+STRIPPING_ENABLE	= 0
+DEBUG			      = 0
+HAVE_GCMGL	      = 0
+HAVE_LOGGER		   = 0
+HAVE_FREETYPE	   = 0
+HAVE_RLAUNCH      = 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/zlib -Ilibretro-common/include
+
+# 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
+
+ifeq ($(HAVE_RLAUNCH), 1)
+	DEFINES += -DHAVE_RLAUNCH
+endif
+
+DEFINES += -DHAVE_MENU -DHAVE_RGUI -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY
+
+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_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_7Z -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -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_BUILTIN_AUTOCONFIG
+
+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.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-$(RARCH_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-$(RARCH_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-$(RARCH_VERSION)-kmeaw.pkg
+	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_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-$(RARCH_VERSION).pkg
+	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_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,192 @@
+RARCH_VERSION		= "0.9.9.3"
+
+#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	= ultra-opt
+
+# options
+DOWNLOAD_SHADERS	= 1
+STRIPPING_ENABLE	= 0
+DEBUG			      = 0
+HAVE_GCMGL	      = 1
+HAVE_LOGGER		   = 0
+HAVE_FREETYPE	   = 0
+HAVE_RLAUNCH      = 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
+
+# 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
+
+ifeq ($(HAVE_RLAUNCH), 1)
+	DEFINES += -DHAVE_RLAUNCH
+endif
+
+DEFINES += -DHAVE_RGUI -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_MENU -DRARCH_INTERNAL
+
+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_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=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)
+
+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-$(RARCH_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-$(RARCH_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-$(RARCH_VERSION)-kmeaw.pkg
+	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_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-$(RARCH_VERSION).pkg
+	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_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,64 @@
+CELL_BUILD_TOOLS	= SNC
+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
+
+STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
+
+PPU_CFLAGS		+= -I. -Ilibretro-common/include -Ideps/zlib -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
+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/file/dir_list.c \
+				  libretro-common/file/retro_dirent.c \
+				  libretro-common/file/retro_stat.c \
+				  libretro-common/hash/rhash.c \
+				  libretro-common/string/stdstring.c \
+				  libretro-common/string/string_list.c \
+				  libretro-common/compat/compat_strl.c \
+				  libretro-common/file/retro_file.c \
+				  libretro-common/file/config_file.c \
+				  verbosity.c
+
+ifeq ($(HAVE_LOGGER), 1)
+PPU_CFLAGS		+= -DHAVE_LOGGER 
+PPU_SRCS		   += netlogger.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
+
+PPU_OPTIMIZE_LV		:= -O2
+
+MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe
+
+include $(CELL_MK_DIR)/sdk.target.mk
@@ -1,46 +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
+RARCH_VERSION		= "0.9.9.3"

 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

-ifeq ($(HAVE_STATIC_DUMMY),1)
-   DEFINES += -DHAVE_STATIC_DUMMY
-   LIBS :=
-else
-   LIBS := -lretro_psl1ght
-endif
+INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ideps/zlib -Ips3/gcmgl/include/export -Ips3/include
+LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.

-MACHDEP := -D__PSL1GHT__ -D__PS3__ -mcpu=cell
-CFLAGS += -Wall $(DEFINES) $(MACHDEP) $(INCLUDE)
+MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__
+CFLAGS += -Wall $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP)
-LIBS += -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
@@ -55,112 +38,95 @@ 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
+CFLAGS		+= -Ilogger/netlogger
 endif

 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_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB   -DHAVE_GRIFFIN=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts
 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

-ifneq ($(V),1)
-	Q := @
-endif
-
-all: $(SELF_TARGET)
-
-define INFO
-CXX: $(CXX)
-LDFLAGS: $(LDFLAGS)
-LIBDIRS: $(LIBDIRS)
-LIBS: $(LIBS)
-OBJ: $(OBJ)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
+all: $(ELF_TARGET)

 $(ELF_TARGET): $(OBJ)
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)
+	$(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-$(RARCH_VERSION).pkg

 clean:
-	@$(if $(Q), echo $@,)
-	$(Q)rm -f $(ELF_TARGET)
-	$(Q)rm -f $(OBJ)
+	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,65 +1,43 @@
-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          = 1
+DEBUG              = 0
+HAVE_KERNEL_PRX    = 1
+HAVE_FILE_LOGGER   = 0
+HAVE_THREADS       = 0
+BIG_STACK          = 0
+WHOLE_ARCHIVE_LINK = 0
+
 TARGET = retroarchpsp

 ifeq ($(DEBUG), 1)
   OPTIMIZE_LV	:= -O0 -g
 else
-   OPTIMIZE_LV	:= -O3
+   OPTIMIZE_LV	:= -O3 -g
 endif

-INCDIR = deps deps/stb deps/7zip libretro-common/include libretro-common/include/compat/zlib
-CFLAGS = $(OPTIMIZE_LV) -fsingle-precision-constant
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+
+INCDIR = deps/zlib deps/7zip libretro-common/include
+CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
 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_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DWANT_RPNG -DSINC_LOWEST_QUALITY -DHAVE_BUILTIN_AUTOCONFIG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP

 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 +45,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,5 @@
-BUILD_PRX         = 0
-PSP_LARGE_MEMORY  = 1
-HAVE_KERNEL_PRX   = 1
+BUILD_PRX         = 1
+HAVE_FILE_LOGGER  = 0
 DEBUG             = 0

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

 INCDIR = $(PSPPATH)/include libretro-common/include
-CFLAGS = $(OPTIMIZE_LV) -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
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS		+= -DHAVE_FILE_LOGGER
+endif

 CFLAGS += $(RARCH_DEFINES)

@@ -31,28 +34,19 @@ 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/string/string_list.o \
+		 libretro-common/file/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/file/retro_file.o \
+		 libretro-common/file/retro_stat.o \
+		 libretro-common/hash/rhash.o \
+		 verbosity.o \
+		 bootstrap/psp1/kernel_functions.o 

 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak
@@ -1,261 +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 -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)
-
-ifneq ($(V),1)
-        Q := @
-endif
-
-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
-
-define INFO
-ASFLAGS: $(ASFLAGS)
-CC: $(CC)
-CFLAGS: $(CFLAGS)
-CPPFLAGS: $(CPPFLAGS)
-CXX: $(CXX)
-CXXFLAGS: $(CXXFLAGS)
-DEFINES: $(DEFINES)
-LDFLAGS: $(LDFLAGS)
-LIBRARY_DIRS: $(LIBRARY_DIRS)
-LIBS: $(LIBS)
-LINK: $(LINK)
-OBJCFLAGS: $(OBJCFLAGS)
-RARCH_OBJ: $(RARCH_OBJ)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
-
-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:
-	@$(if $(Q), echo $@,)
-	$(Q)rm -rf $(OBJDIR_BASE)
-	$(Q)rm -f $(TARGET)
-	$(Q)rm -f *.d
-	$(Q)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,261 +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)
-
-ifneq ($(V),1)
-        Q := @
-endif
-
-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
-
-define INFO
-ASFLAGS: $(ASFLAGS)
-CC: $(CC)
-CFLAGS: $(CFLAGS)
-CPPFLAGS: $(CPPFLAGS)
-CXX: $(CXX)
-CXXFLAGS: $(CXXFLAGS)
-DEFINES: $(DEFINES)
-LDFLAGS: $(LDFLAGS)
-LIBRARY_DIRS: $(LIBRARY_DIRS)
-LIBS: $(LIBS)
-LINK: $(LINK)
-OBJCFLAGS: $(OBJCFLAGS)
-RARCH_OBJ: $(RARCH_OBJ)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
-
-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:
-	@$(if $(Q), echo $@,)
-	$(Q)rm -rf $(OBJDIR_BASE)
-	$(Q)rm -f $(TARGET)
-	$(Q)rm -f *.d
-	$(Q)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 '$*=$($*)'
@@ -1,81 +0,0 @@
-TARGET := retroarch_switch
-
-DEBUG                  ?= 0
-GRIFFIN_BUILD           = 0
-WHOLE_ARCHIVE_LINK      = 0
-
-OBJ :=
-
-DEFINES := -DSWITCH=1 -U__linux__ -U__linux -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_DYNAMIC -DHAVE_REWIND
-
-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_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
-	HAVE_RPNG = 1
-	HAVE_RJPEG = 1
-	HAVE_RBMP = 1
-	HAVE_RGUI = 1
-	HAVE_ZLIB = 1
-	HAVE_DSP_FILTER = 1
-	HAVE_VIDEO_FILTER = 1
-	HAVE_BUILTINZLIB = 1
-	HAVE_LIBRETRODB = 1
-	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 += input/input_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/
-LIBDIRS := -L.
-
-TARGETS := $(TARGET).nro
-
-CFLAGS += $(INCDIRS) $(DEFINES) -Wno-unused-command-line-argument -Werror-implicit-function-declaration
-
-all: $(TARGETS)
-
-$(TARGET).nro.so: $(OBJ) libretro_switch.a fs.squashfs.o $(LIBTRANSISTOR_NRO_LIB) $(LIBTRANSISTOR_COMMON_LIBS)
-	$(LD) $(LD_FLAGS) --allow-multiple-definition -o $@ $(OBJ) libretro_switch.a fs.squashfs.o $(LIBTRANSISTOR_NRO_LDFLAGS) -lm
-
-%.squashfs.o: %.squashfs
-	$(LD) -s -r -b binary -m aarch64elf -T $(LIBTRANSISTOR_HOME)/fs.T -o $@ $<
-
-fs.squashfs: fs/*
-	mksquashfs $^ $@ -comp lz4 -nopad -noappend
-
-clean:
-	rm -f $(OBJ) $(TARGET).nro.so $(TARGET).nro
-
-.PHONY: clean all
@@ -1,296 +0,0 @@
-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
-
-PC_DEVELOPMENT_IP_ADDRESS  =
-PC_DEVELOPMENT_UDP_PORT	   =
-
-OBJ :=
-
-SCE_LIBC_SIZE := 4194304
-DEFINES := -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_STB_VORBIS
-INCDIRS :=
-
-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
-	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
-	HAVE_RJPEG		:= 1
-	HAVE_RBMP		:= 1
-	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
-	HAVE_RGUI		:= 1
-	HAVE_STB_FONT		:= 1
-	HAVE_THREADS		:= 1
-	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
-	endif
-
-	include Makefile.common
-	CFLAGS			+= $(DEF_FLAGS)
-	BLACKLIST 		:=
-	OBJ			:= $(filter-out $(BLACKLIST),$(OBJ))
-	INCDIRS			+= $(INCLUDE_DIRS)
-endif
-
-ifeq ($(strip $(VITASDK)),)
-$(error "Please set VITASDK in your environment. export VITASDK=<path to>vitasdk")
-endif
-
-export PATH := $(PATH):$(VITASDK)/bin
-
-PREFIX := arm-vita-eabi-
-
-CC      := $(PREFIX)gcc
-CXX     := $(PREFIX)g++
-AS      := $(PREFIX)as
-AR      := $(PREFIX)ar
-OBJCOPY := $(PREFIX)objcopy
-STRIP   := $(PREFIX)strip
-NM      := $(PREFIX)nm
-LD      := $(CXX)
-
-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
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -g -Og
-else
-   CFLAGS += -O2
-endif
-
-ASFLAGS := $(CFLAGS)
-LDFLAGS := -Wl,-q,--pic-veneer
-
-CFLAGS += -Wall
-CFLAGS += -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DRARCH_CONSOLE
-CFLAGS += -DHAVE_DSP_FILTER
-CFLAGS += -DHAVE_VIDEO_FILTER
-CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
-
-ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
-   CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
-endif
-
-ifneq ($(PC_DEVELOPMENT_UDP_PORT),)
-   CFLAGS += -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-endif
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
-
-VITA_LIBS := -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub -lSceAppUtil_stub \
-	-lSceSysmodule_stub -lSceCtrl_stub -lSceHid_stub -lSceTouch_stub -lSceAudio_stub \
-	-lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub -lSceMotion_stub \
-	-lSceFiber_stub -lSceMotion_stub -lSceAppMgr_stub -lpthread -lpng -lz -lSceShaccCg_stub
-
-ifeq ($(HAVE_VITAGLES), 1)
-   VITA_LIBS += -llibScePiglet_stub -ltaihen_stub
-   FSELF_FLAGS := -ss
-else
-   VITA_LIBS += -lvitaGL -lvitashark
-   FSELF_FLAGS := -s
-endif
-
-LIBS	:= $(WHOLE_START) 
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIBS += -lretro_vita
-endif
-
-ifneq ($(V),1)
-   Q := @
-endif
-
-LIBS    += $(WHOLE_END) $(VITA_LIBS) -lm -lc
-
-TARGETS := $(TARGET).vpk
-
-DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
-POSTCOMPILE = mv -f $*.Tdepend $*.depend
-
-all: $(TARGETS)
-
-define INFO
-ASFLAGS: $(ASFLAGS)
-CC: $(CC)
-CFLAGS: $(CFLAGS)
-CXX: $(CXX)
-CXXFLAGS: $(CXXFLAGS)
-DEPFLAGS: $(DEPFLAGS)
-INCDIRS: $(INCDIRS)
-LD: $(LD)
-LDFLAGS: $(LDFLAGS)
-LIBDIRS: $(LIBDIRS)
-LIBS: $(LIBS)
-OBJ: $(OBJ)
-POSTCOMPILE: $(POSTCOMPILE)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
-
-%.o: %.cpp
-%.o: %.cpp %.depend
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(Q)$(POSTCOMPILE)
-
-%.o: %.c
-%.o: %.c %.depend
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(Q)$(POSTCOMPILE)
-
-%.o: %.S
-%.o: %.S %.depend
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(Q)$(POSTCOMPILE)
-
-%.o: %.s
-%.o: %.s %.depend
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(Q)$(POSTCOMPILE)
-
-%.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
-	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(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) $< $@
-
-%.vpk: %.self
-	vita-mksfoex -s TITLE_ID=$(VITA_TITLE_ID) "$(VITA_TITLE_NAME)" -d ATTRIBUTE2=12 param.sfo
-	vita-pack-vpk -s param.sfo -b $< $@
-
-clean:
-	@$(if $(Q), echo $@,)
-	$(Q)rm -f $(OBJ) $(TARGET).elf $(TARGET).elf.unstripped.elf $(TARGET).velf $(TARGET).self param.sfo $(TARGET).vpk 
-	$(Q)rm -rf  deps/Pigs-In-A-Blanket/piglet_stub/libScePiglet
-	$(Q)rm -f $(OBJ:.o=.depend)
-
-# Useful for developers
-vpksend: $(TARGET).vpk
-	curl -T $< ftp://$(PSVITAIP):1337/ux0:/
-
-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
-
-include $(OBJ:.o=.depend)
@@ -1,86 +0,0 @@
-HAVE_FILE_LOGGER  = 0
-DEBUG             = 0
-
-TARGET = retroarchvita_salamander
-TITLE_ID = RETROVITA
-
-ifeq ($(DEBUG), 1)
-   OPTIMIZE_LV	:= -O0 -g
-else
-   OPTIMIZE_LV	:= -O2
-endif
-
-PREFIX  = arm-vita-eabi
-CC      = $(PREFIX)-gcc
-
-INCDIR = libretro-common/include
-CFLAGS = -Wl,-q $(OPTIMIZE_LV) -I$(INCDIR) -std=gnu99 -mfloat-abi=hard -fsingle-precision-constant -mword-relocations
-ASFLAGS = $(CFLAGS)
-
-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 \
-     -lSceMotion_stub -lSceAppMgr_stub -lfreetype -lpng -lm -lc
-
-ifeq ($(HAVE_FILE_LOGGER), 1)
-CFLAGS		+= -DHAVE_FILE_LOGGER
-endif
-
-CFLAGS += $(RARCH_DEFINES)
-
-OBJS = frontend/frontend_salamander.o \
-		 frontend/frontend_driver.o \
-		 frontend/drivers/platform_psp.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 \
-		 verbosity.o
-
-all: $(TARGET).vpk
-
-%.vpk: eboot.bin
-	vita-mksfoex -s TITLE_ID=$(TITLE_ID) "RetroArch" -d ATTRIBUTE2=12 param.sfo
-	vita-pack-vpk -s param.sfo -b eboot.bin $@
-
-eboot.bin: $(TARGET).velf
-	vita-make-fself $< $@
-
-%.velf: %.elf
-	vita-elf-create $< $@
-
-$(TARGET).elf: $(OBJS)
-	$(CC) $(CFLAGS) $^ $(LIBS) -o $@
-
-%.o: %.png
-	$(PREFIX)-ld -r -b binary -o $@ $^
-
-clean:
-	@rm -rf $(TARGET).vpk $(TARGET).velf $(TARGET).elf $(OBJS) \
-		eboot.bin param.sfo
-
-vpksend: $(TARGET).vpk
-	curl -T $(TARGET).vpk ftp://$(PSVITAIP):1337/ux0:/
-	@echo "Sent."
-
-PSVITAIP = 192.168.1.15
-
-send: eboot.bin
-	curl -T eboot.bin ftp://$(PSVITAIP):1337/ux0:/app/$(TITLE_ID)/
-	@echo "Sent."
@@ -1,327 +0,0 @@
-include version.all
-
-ifneq ($(filter $(CROSS_COMPILE),arm-webos-linux-gnueabi- aarch64-webos-linux-gnu-),$(CROSS_COMPILE))
-  $(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_USR_LIB_DIR     ?= $(STAGING_DIR)/usr/lib
-WEBOS_LIB_DIR         ?= $(STAGING_DIR)/lib
-
-ADD_SDL2_LIB          ?= 0
-SDL2_PREBUILT_ARCHIVE ?= https://github.com/webosbrew/SDL-webOS/releases/download/release-2.30.12-webos.1/SDL2-2.30.12-webos-abi.tar.gz
-
-#########################
-#########################
-
-APP_PACKAGE_NAME ?= com.retroarch.webos
-IPK_VERSION := $(shell grep '#define PACKAGE_VERSION' version.all | sed -E 's/.*"([0-9]+\.[0-9]+\.[0-9]+)".*/\1/')
-
-DEBUG ?= 0
-
-HAVE_CLOUDSYNC = 1
-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 = 1
-HAVE_GDI = 0
-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 = 0
-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 = 0
-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_ZSTD = 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
-ifeq ($(findstring arm64,$(ARCH)),arm64)
-  ARCHFLAGS := -mcpu=cortex-a53
-else
-  ARCHFLAGS := -mcpu=cortex-a9 -mtune=cortex-a53 -mfloat-abi=softfp
-  HAVE_NEON = 1
-endif
-CFLAGS := $(ARCHFLAGS)
-CXXFLAGS := $(ARCHFLAGS) -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
-ASFLAGS := $(ARCHFLAGS)
-LDFLAGS := -Wl,-rpath=\$$ORIGIN/lib,--gc-sections
-INCLUDE_DIRS = -I$(WEBOS_INC_DIR)
-LIBRARY_DIRS = -L$(WEBOS_USR_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_NETWORKGAMEPAD
-DEFINES += -DHAVE_FREETYPE
-DEFINES += -DHAVE_UPDATE_CORE_INFO
-ifneq (,$(filter 1,$(HAVE_OPENGLES3) $(HAVE_OPENGLES3_1) $(HAVE_OPENGLES3_2)))
-  DEFINES += -DHAVE_OPENGLES3
-endif
-ifeq ($(HAVE_OPENGLES3_1),1)
-DEFINES += -DHAVE_OPENGLES3_1
-endif
-ifeq ($(HAVE_OPENGLES3_2),1)
-DEFINES += -DHAVE_OPENGLES3_2
-endif
-
-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)
-FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
-FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
-FONTCONFIG_CFLAGS := $(shell $(PKG_CONFIG) --cflags fontconfig)
-FONTCONFIG_LIBS := $(shell $(PKG_CONFIG) --libs fontconfig)
-MMAP_LIBS = -lc
-ifeq ($(HAVE_NEON),1)
-  NEON_CFLAGS  += -mfpu=neon
-  NEON_ASFLAGS += -mfpu=neon
-endif
-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)
-
-ifneq ($(V),1)
-        Q := @
-endif
-
-RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
-
-define APPINFO
-{
-    "id": "$(APP_PACKAGE_NAME)",
-    "version": "$(IPK_VERSION)",
-    "vendor": "webosbrew.org",
-    "title": "RetroArch",
-    "icon": "icon160.png",
-    "main": "retroarch",
-    "iconColor": "#333333",
-    "type": "native",
-    "appDescription": "Emulation frontend",
-    "cloudgame_active": true,
-    "useAllMouseButtons": true,
-    "useAllKeyboardKeys": true
-}
-endef
-export APPINFO
-
-all: $(TARGET) ipk
-
-define INFO
-ASFLAGS: $(ASFLAGS)
-CC: $(CC)
-CFLAGS: $(CFLAGS)
-CPPFLAGS: $(CPPFLAGS)
-CXX: $(CXX)
-CXXFLAGS: $(CXXFLAGS)
-DEFINES: $(DEFINES)
-LDFLAGS: $(LDFLAGS)
-LIBRARY_DIRS: $(LIBRARY_DIRS)
-LIBS: $(LIBS)
-LINK: $(LINK)
-OBJCFLAGS: $(OBJCFLAGS)
-RARCH_OBJ: $(RARCH_OBJ)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
-
-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:
-	@$(if $(Q), echo $@,)
-	$(Q)rm -rf $(OBJDIR_BASE)
-	$(Q)rm -f $(TARGET)
-	$(Q)rm -f *.d
-	$(Q)rm -rf SDL
-	$(Q)rm -rf webos/*.ipk
-	$(Q)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_USR_LIB_DIR)/libstdc++.so.6
-	cp -t webos/dist/lib -vf $(WEBOS_LIB_DIR)/libatomic.so.1
-ifeq ($(ADD_SDL2_LIB), 1)
-	cp -t webos/dist/lib -vf SDL/lib/libSDL2-2.0.so.0
-endif
-ifneq ($(DEBUG), 1)
-	$(STRIP) webos/dist/$(TARGET)
-endif
-	cd webos && ares-package dist
-
-install: ipk
-	ares-install webos/$(APP_PACKAGE_NAME)_$(IPK_VERSION)_$(ARCH).ipk
-
-launch: install
-	ares-launch $(APP_PACKAGE_NAME)
-
-.PHONY: all clean ipk
-
-print-%:
-	@echo '$*=$($*)'
@@ -1,329 +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
-HAVE_OGG_OGC      ?= 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 ($(HAVE_OGG_OGC), 1)
-   LIBS += -L$(DEVKITPRO)/portlibs/ppc/lib -lvorbisfile -lvorbis -logg
-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
-
-ifneq ($(V),1)
-   Q := @
-endif
-
-OBJOUT   = -o
-LINKOUT  = -o
-LINK = $(CXX)
-
-all: $(EXT_TARGET)
-
-define INFO
-CC: $(CC)
-CFLAGS: $(CFLAGS)
-OBJOUT: $(OBJOUT)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
-
-%.dol: %.elf
-	$(ELF2DOL) $< $@
-
-$(EXT_INTER_TARGET): $(OBJ)
-	$(LINK) $(LINKOUT)$@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(PLATEXTRA) $(LIBS)
-
-%.o: %.c
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.cpp
-	$(CXX) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.S
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(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:
-	@$(if $(Q), echo $@,)
-	$(Q)rm -f $(EXT_TARGET)
-	$(Q)rm -f $(EXT_INTER_TARGET)
-	$(Q)rm -f $(OBJ)
-	$(Q)$(MAKE) -C $(APP_BOOTER_DIR) clean
-
-.PHONY: clean
-
-print-%:
-	@echo '$*=$($*)'
@@ -3,11 +3,9 @@
 # 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

 # system platform
 system_platform = unix
@@ -28,38 +26,16 @@ 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
-ifeq ($(EXTERNAL_LIBOGC), 1)
-INCLUDE += -I$(DEVKITPRO)/libogc/include
+INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -Ilibretro-common/include -Ideps/zlib
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
-else
-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
-
-ifeq ($(EXTERNAL_LIBOGC), 1)
-LIBS := -lfat
-endif
-
-LIBS += -lwiiuse -logc -lbte
+LIBS := -lfat -lwiiuse -logc -lbte

 APP_BOOTER_DIR = wii/app_booter

@@ -67,45 +43,24 @@ 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 \
-		libretro-common/streams/file_stream.o \
-		libretro-common/vfs/vfs_implementation.o \
+		libretro-common/string/string_list.o \
+		libretro-common/file/dir_list.o \
+		libretro-common/file/retro_file.o \
 		libretro-common/file/retro_dirent.o \
-		libretro-common/encodings/encoding_utf.o \
+		libretro-common/file/retro_stat.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 \
 		verbosity.o \
 		$(APP_BOOTER_DIR)/app_booter.binobj

-ifeq ($(EXTERNAL_LIBOGC), 1)
-else
-OBJ += wii/libogc/libfat/cache.o \
-		wii/libogc/libfat/directory.o \
-		wii/libogc/libfat/disc.o \
-		wii/libogc/libfat/fatdir.o \
-		wii/libogc/libfat/fatfile.o \
-		wii/libogc/libfat/file_allocation_table.o \
-		wii/libogc/libfat/filetime.o \
-		wii/libogc/libfat/libfat.o \
-		wii/libogc/libfat/lock.o \
-		wii/libogc/libfat/partition.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)
-OBJ             += network/net_logger.o \
-						 libretro-common/net/net_compat.o \
-						 libretro-common/net/net_socket.o
+OBJ             += logger/netlogger.o
 endif

 ifeq ($(HAVE_FILE_LOGGER), 1)
@@ -140,7 +95,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,402 +0,0 @@
-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
-
-ifeq ($(SALAMANDER_BUILD),1)
-   BUILD_DIR := $(BUILD_DIR)-salamander
-   TARGET    := $(TARGET)_salamander
-else ifeq ($(GRIFFIN_BUILD),1)
-   BUILD_DIR := $(BUILD_DIR)-griffin
-endif
-
-ifeq ($(DEBUG),1)
-   BUILD_DIR := $(BUILD_DIR)-debug
-endif
-
-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
-OBJ += wiiu/system/exception_handler.o
-OBJ += wiiu/system/missing_libc_functions.o
-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
-
-ifeq ($(SALAMANDER_BUILD),1)
-   DEFINES += -DRARCH_CONSOLE -DIS_SALAMANDER
-
-   OBJ += frontend/frontend_salamander.o
-   OBJ += frontend/frontend_driver.o
-   OBJ += frontend/drivers/platform_wiiu.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 += 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
-endif
-
-   OBJ += wiiu/shader_utils.o
-   OBJ += gfx/drivers/gx2_shaders/tex.o
-   OBJ += gfx/drivers/gx2_shaders/sprite.o
-   OBJ += gfx/drivers/gx2_shaders/frame.o
-   OBJ += gfx/drivers/gx2_shaders/ribbon.o
-   OBJ += gfx/drivers/gx2_shaders/ribbon_simple.o
-   OBJ += gfx/drivers/gx2_shaders/bokeh.o
-   OBJ += gfx/drivers/gx2_shaders/snow.o
-   OBJ += gfx/drivers/gx2_shaders/snow_simple.o
-   OBJ += gfx/drivers/gx2_shaders/snowflake.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
-   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
-
-      include Makefile.common
-      DEFINES += $(DEF_FLAGS)
-      INCDIRS += $(INCLUDE_DIRS)
-   endif
-endif
-
-OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))
-
-#-----------------------------
-# Compile flags
-
-DEFINES += -DWIIU -D__WUT__ -DHW_WUP -D__wiiu__
-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  += -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
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPRO")
-endif
-
-export PATH   := $(PATH):$(DEVKITPPC)/bin
-
-PREFIX := powerpc-eabi-
-
-CC      := $(PREFIX)gcc
-CXX     := $(PREFIX)g++
-AS      := $(PREFIX)as
-AR      := $(PREFIX)ar
-OBJCOPY := $(PREFIX)objcopy
-STRIP   := $(PREFIX)strip
-NM      := $(PREFIX)nm
-LD      := $(CXX)
-
-ELF2RPL   := wiiu/wut/elf2rpl/elf2rpl
-
-ifneq ($(findstring Linux,$(shell uname -a)),)
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-else
-   ELF2RPL   := $(ELF2RPL).exe
-endif
-
-#-----------------------------
-# Targets and build rules
-
-TARGETS :=
-ifeq ($(BUILD_RPX), 1)
-TARGETS += $(TARGET).rpx
-endif
-
-ifeq ($(BUILD_HBL_ELF), 1)
-TARGETS += $(TARGET).elf
-endif
-
-DEPFLAGS    = -MT $@ -MMD -MP -MF $(BUILD_DIR)/$*.depend
-
-all: $(TARGETS)
-
-define INFO
-AR: $(AR)
-ASFLAGS: $(ASFLAGS)
-BUILD_DIR: $(BUILD_DIR)
-CC: $(CC)
-CFLAGS: $(CFLAGS)
-CXX: $(CXX)
-CXXFLAGS: $(CXXFLAGS)
-DEFINES: $(DEFINES)
-DEPFLAGS: $(DEPFLAGS)
-ELF2RPL: $(ELF2RPL)
-HBL_ELF_LDFLAGS: $(HBL_ELF_LDFLAGS)
-HBL_ELF_OBJ: $(HBL_ELF_OBJ)
-INCDIRS: $(INCDIRS)
-LD: $(LD)
-LDFLAGS: $(LDFLAGS)
-LIBDIRS: $(LIBDIRS)
-LIBS: $(LIBS)
-MAKE: $(MAKE)
-OBJ: $(OBJ)
-RPX_LDFLAGS: $(RPX_LDFLAGS)
-RPX_OBJ: $(RPX_OBJ)
-TARGET: $(TARGET)
-endef
-export INFO
-
-info:
-ifneq ($(V),1)
-	@echo "$$INFO"
-endif
-
-%: $(BUILD_DIR)/%
-	cp $< $@
-
-$(BUILD_DIR)/%.o: %.cpp %.depend
-	@$(if $(Q), echo CXX $<,)
-	@mkdir -p $(dir $@)
-	$(Q)$(CXX) -c -o $@ $< $(CXXFLAGS) $(DEFINES) $(INCDIRS) $(DEPFLAGS)
-
-$(BUILD_DIR)/%.o: %.c %.depend
-	@$(if $(Q), echo CC $<,)
-	@mkdir -p $(dir $@)
-	$(Q)$(CC) -c -o $@ $< $(CFLAGS) $(DEFINES) $(INCDIRS) $(DEPFLAGS)
-
-$(BUILD_DIR)/%.o: %.S %.depend
-	@$(if $(Q), echo AS $<,)
-	@mkdir -p $(dir $@)
-	$(Q)$(CC) -c -o $@ $< $(ASFLAGS) $(DEFINES) $(INCDIRS) $(DEPFLAGS)
-
-$(BUILD_DIR)/%.o: %.s %.depend
-	@$(if $(Q), echo AS $<,)
-	@mkdir -p $(dir $@)
-	$(Q)$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-%.a:
-	@$(if $(Q), echo AR $<,)
-	@mkdir -p $(dir $@)
-	$(Q)$(AR) -rc $@ $^
-
-%.depend: ;
-%.last: ;
-
-$(ELF2RPL):
-	@$(if $(Q), echo MAKE $@,)
-	$(Q)$(MAKE) -C wiiu/wut/elf2rpl/
-
-$(BUILD_DIR)/$(TARGET).elf: $(OBJ) $(HBL_ELF_OBJ) libretro_wiiu.a wiiu/link_elf.ld .$(TARGET).elf.last
-	@$(if $(Q), echo LD $@,)
-	@touch .$(TARGET).elf.last
-	$(Q)$(LD) $(OBJ) $(HBL_ELF_OBJ) $(LDFLAGS) $(HBL_ELF_LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
-
-$(BUILD_DIR)/$(TARGET).rpx.elf: $(OBJ) $(RPX_OBJ) libretro_wiiu.a wiiu/link_elf.ld
-	@$(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
-	@$(if $(Q), echo ELF2RPL $@,)
-	@touch .$(TARGET).rpx.large.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
-
-.PHONY: clean all
-.PRECIOUS: %.depend %.last
-
-include $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
@@ -1,48 +1,39 @@
 TARGET = retroarch.exe

-HAVE_SCREENSHOTS = 1
-HAVE_AUDIOMIXER = 1
-HAVE_RWAV = 1
 HAVE_DINPUT = 1
 HAVE_XAUDIO = 1
 HAVE_DSOUND = 1
-HAVE_WASAPI = 1
 HAVE_OPENGL = 1
+HAVE_FBO = 1
 HAVE_DYLIB = 1
 HAVE_D3D9 = 1
+HAVE_NETPLAY = 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_ZLIB_DEFLATE = 1
+HAVE_PYTHON = 0
 DYNAMIC = 1
-HAVE_CORE_INFO_CACHE = 1

 HAVE_XINPUT = 1
-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
-HAVE_CC_RESAMPLER := 1
+WANT_ZLIB     := 1

 ifeq ($(HAVE_CG), 1)
 CG_LIBS          := -lcg -lcgGL
@@ -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,32 +60,22 @@ 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
 SWSCALE_LIBS     := -lswscale
 AVFORMAT_LIBS    := -lavformat
 SWRESAMPLE_LIBS  := -lswresample
-AVDEVICE_LIBS    := -lavdevice
 FFMPEG_LIBS      := -lws2_32 -lz
 endif

@@ -98,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
@@ -116,6 +101,7 @@ else
   WINDRES = windres
 endif

+
 libretro ?= -lretro

 ifeq ($(DYNAMIC), 1)
@@ -132,12 +118,13 @@ ifeq ($(DEBUG), 1)
   CFLAGS += -O0 -g
   CXXFLAGS += -O0 -g
 else
-   CFLAGS += -O3
-   CXXFLAGS += -O3
+   CFLAGS += -O3 -ffast-math
+   CXXFLAGS += -O3 -ffast-math
+   LDCXXFLAGS += -s
 endif

-CFLAGS += $(DEF_FLAGS) -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
+CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I.
+CXXFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -std=c++98 -D__STDC_CONSTANT_MACROS
 ifeq ($(CXX_BUILD), 1)
   CFLAGS += -std=c++98 -xc++ -D__STDC_CONSTANT_MACROS
 else
@@ -162,6 +149,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 $<),)
@@ -170,7 +164,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)
@@ -178,3 +172,4 @@ clean:
 	rm -f *.d

 .PHONY: all install uninstall clean
+
@@ -1,12 +1,12 @@
 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
 be used on an Odroid X2/U2/U3 where a superior solution (RetroArch exynos video driver) is available.
-Fbdev implementation on Odroid hardware is missing WAITFORVSYNC ioctl, so use Exynos driver there.
+Fbdev implementation on Odroid harware is missing WAITFORVSYNC ioctl, so use Exynos driver there.

 This driver requires MALI r4p0 binary blobs for fbdev, and a kernel compatible with r4p0 binaries.

@@ -18,8 +18,8 @@ So we will use
 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);
+Now we edit drivers/video/sunxi/disp/dev_fb.c, and uncoment the line 1074:
+// 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,117 +1,65 @@
-[![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

 RetroArch is the reference frontend for the libretro API.
-Popular examples of implementations for this API includes video game system emulators and game engines as well as
+Popular examples of implementations for this API includes videogame system emulators and game engines, but also
 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")
-
-![rgui menu driver](docs/rgui-main-menu.jpg "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")
-
 ## 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.
+A libretro core written in portable C or C++ can run seamlessly on many platforms with very little/no porting effort.

 While RetroArch is the reference frontend for libretro, several other projects have used the libretro
 interface to include support for emulators and/or game engines. libretro is completely open and free for anyone to use.

-[libretro API header](https://github.com/libretro/RetroArch/blob/master/libretro-common/include/libretro.h)
+[libretro API header](https://github.com/libretro/RetroArch/blob/master/libretro.h)

 ## Binaries

-Latest binaries are currently hosted on the [buildbot](http://buildbot.libretro.com/).
+Latest Windows binaries are currently hosted on the buildbot -(http://buildbot.libretro.com/).

 ## 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/),
+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/).
+See our [wiki](https://github.com/libretro/RetroArch/wiki). On Unix, man-pages are provided.
+More developer-centric stuff is found [here](https://github.com/libretro/libretro.github.com/wiki/Documentation-devs).

 ## Related projects

   - Cg/HLSL shaders: [common-shaders](https://github.com/libretro/common-shaders)
-   - slang shaders: [slang-shaders](https://github.com/libretro/slang-shaders)
-   - GLSL shaders: [glsl-shaders](https://github.com/libretro/glsl-shaders)
   - Helper scripts to build libretro implementations: [libretro-super](https://github.com/libretro/libretro-super)
-   - GitHub mirrors of projects, useful for generating diff files: [libretro-mirrors](https://github.com/libretro-mirrors/)

 ## Philosophy

-RetroArch attempts to be small and lean
+RetroArch attempts to be small and lean,
 while still having all the useful core features expected from an emulator.
-It is designed to be very portable and features a gamepad-centric and touchscreen UI.
+It is designed to be very portable and features a gamepad-centric UI.
 It also has a full-featured command-line interface.

 In some areas, RetroArch goes beyond and emphasizes on not-so-common technical features such as multi-pass shader support,
-real-time rewind (Braid-style), video recording (using FFmpeg), run-ahead input latency removal, etc.
+real-time rewind (Braid-style), video recording (using FFmpeg), etc.

-RetroArch also emphasizes being easy to integrate into various launcher frontends.
+RetroArch also emphasizes on being easy to integrate into various launcher frontends.

 ## 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
-   - Emscripten (WebAssembly and JavaScript)
-   - FreeBSD
-   - Haiku
-   - LG webOS
-   - Linux
-   - Original Microsoft Xbox
-   - Microsoft Xbox 360 (Libxenon/XeXDK)
-   - Microsoft Xbox One
-   - Microsoft Xbox Series S/X
-   - Miyoo
-   - NetBSD
-   - Nintendo NES/SNES Classic Edition
-   - Nintendo GameCube
-   - Nintendo Wii
-   - Nintendo Switch
-   - Nintendo Wii U
-   - Nintendo 3DS/2DS
-   - OpenBSD
-   - OpenDingux
-   - PlayStation2
+RetroArch has been ported to the following platforms outside PC:
+
   - PlayStation3
-   - PlayStation4
-   - PlayStation Portable
-   - PlayStation Vita
+   - Xbox 360 (Libxenon/XeXDK)
+   - Xbox 1
+   - Wii, Gamecube (Libogc)
+   - Nintendo 3DS
   - Raspberry Pi
-   - ReactOS
-   - Redox OS
-   - RetroFW
-   - RS90
-   - SerenityOS
-   - Solaris
-   - Windows NT 3.5
-   - Windows 95
-   - Windows 98
-   - Windows 2000
-   - Windows XP
-   - Windows Millennium
-   - Windows Vista
-   - Windows 7
-   - Windows 8
-   - Windows 10
-   - Windows 11
+   - Android
+   - iOS
+   - Blackberry

 ## Dependencies (PC)

@@ -125,11 +73,12 @@ following dependencies come as recommended:
   - GL headers / Vulkan headers
   - X11 headers and libs, or EGL/KMS/GBM

-OSX port of RetroArch requires latest versions of Xcode to build.
+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:
@@ -142,12 +91,11 @@ RetroArch needs at least one of these audio driver libraries:
   - JACK
   - SDL
   - PulseAudio
-   - PipeWire
   - XAudio2 (Win32, Xbox 360)
   - DirectSound (Win32, Xbox 1)
   - CoreAudio (OSX, iOS)

-To run properly, RetroArch requires a libretro implementation present; however, as it's typically loaded
+To run properly, RetroArch requires a libretro implementation present, however, as it's typically loaded
 dynamically, it's not required at build time.

 ## Dependencies (Console ports, mobile)
@@ -155,191 +103,104 @@ 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`.
+The default configuration is defined in config.def.h.
 It is not recommended to change this unless you know what you're doing.
 These can later be tweaked by using a config file.
-A sample configuration file is installed to `/etc/retroarch.cfg`. This is the system-wide config file.
+A sample configuration file is installed to /etc/retroarch.cfg. This is the system-wide config file.

-RetroArch will on startup create a config file in `$XDG\_CONFIG\_HOME/retroarch/retroarch.cfg` if it does not exist.
+RetroArch will on startup create a config file in $XDG\_CONFIG\_HOME/retroarch/retroarch.cfg if doesn't 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 <tt>retroarch-joyconfig</tt> command-line tool.

 ## Compiling and installing
+<b>Linux</b><br/>
+- Prerequisites:
+```bash
+sudo apt-get install -y make git-core curl g++ 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
+```
+- Compiling:
+```bash
+./configure
+make
+```

-Instructions for compiling and installing RetroArch can be found in the [Libretro/RetroArch Documentation Center](https://docs.libretro.com/).
+<b>Mac</b><br/>
+- Prerequisites: [XCode](https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CB4QFjAA&url=https%3A%2F%2Fitunes.apple.com%2Fus%2Fapp%2Fxcode%2Fid497799835%3Fmt%3D12&ei=ZmfeVNPtIILVoASBnoCYBw&usg=AFQjCNGrxKmVtXUdvUU3MhqZhP4MHT6Gtg&sig2=RIXKsWQ79YTQBt_lK5fdKA&bvm=bv.85970519,d.cGU), [Cg](https://developer.nvidia.com/cg-toolkit-download).
+- You can open the project (**pkg/apple/RetroArch.xcodeproj**) in the Xcode IDE and build (**&#8984;-B**) and run (**&#8984;-R**) it there. Or you can use the command line...
+- Debug:
+```bash
+# Build
+xcodebuild -target RetroArch -configuration Debug -project pkg/apple/RetroArch.xcodeproj
+# Run
+open ./pkg/apple/build/Debug/RetroArch.app/
+```
+- Release:
+```bash
+# Build
+xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
+# Run
+open ./pkg/apple/build/Release/RetroArch.app/
+```

-## CRT 15Khz Resolution Switching
+<b>PC</b><br/>
+Instructions for compiling on PC can be found in the [wiki](https://github.com/Themaister/RetroArch/wiki).

-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.
+<b>PlayStation3</b><br/>

-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:
+RetroArch PS3 needs to be compiled in the following order:

- 2560 x 192 @ 60.000000
- 2560 x 200 @ 60.000000
- 2560 x 240 @ 60.000000
- 2560 x 224 @ 60.000000
- 2560 x 237 @ 60.000000
- 2560 x 256 @ 50.000000
- 2560 x 254 @ 55.000000
- 2560 x 448 @ 60.000000
- 2560 x 480 @ 60.000000
+1) Compile RetroArch Salamander

-Install these modelines replacing 2560 with your desired super resolution. The above resolutions are NTSC only so if you would be playing any PAL content please add PAL modelines:
+<tt>make -f Makefile.ps3.salamander</tt>

- 2560 x 192 @ 50.000000
- 2560 x 200 @ 50.000000
- 2560 x 240 @ 50.000000
- 2560 x 224 @ 50.000000
- 2560 x 288 @ 50.000000
- 2560 x 237 @ 50.000000
- 2560 x 254 @ 55.000000
- 2560 x 448 @ 50.000000
- 2560 x 480 @ 50.000000
+2) Finally, compile RetroArch packed together with the GUI:

-Some games will require higher PAL resolutions which should also be installed:
+<tt>make -f Makefile.ps3</tt>

- 2560 x 512 @ 50.000000
- 2560 x 576 @ 50.000000
+<b>PlayStation3 - Creating a PKG installable file</b><br />

-Ideally install all these modelines and everything will work great.
+You can add `pkg` as a parameter in order to make a PKG file - for example:

-## Super Resolutions
+<tt>make -f Makefile.ps3 pkg</tt>

-The default super resolution is 2560. It is displayed just under the CRT switch option, which can be found in video settings. This can be changed within the retroarch.cfg. The only compatible resolutions are 1920, 2560 and 3840. Any other resolutions will be ignored and native switching will be activated.
+This creates an NPDRM package. This can be installed on debug PS3s.

-## Native Resolutions
+To make a non-NPDRM package that can be installed on a jailbroken/CFW PS3 (such as PSGroove or PS3 CFWs and other 3.55 CFW derivatives), do:

-If native resolutions are activated you will need a whole new set of modelines:
+<tt>make -f Makefile.ps3 pkg-signed</tt>

- 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 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
- 320 x 240 @ 59.922745 MDntsc
- 320 x 448 @ 59.922745 MDntsc
- 320 x 480 @ 59.922745 MDntsc
- 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 288 @ 49.701458 MSYSpal
- 256 x 240 @ 60.098812 NESntsc
- 256 x 240 @ 50.006977 NESpal
+If you're using Kmeaw 3.55 firmware, the package needs to be signed:

- 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
+<tt>make -f Makefile.ps3 pkg-signed-cfw</tt>

- 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
+NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch PS3. This file needs to be called <em><b>`libretro_ps3.a`</b></em>.

- 384 x 240 @ 59.941002 PSXntsc
- 256 x 480 @ 59.941002 PSXntsc
+<b> Xbox 360 (XeXDK)</b><br />

- 352 x 240 @ 59.820000 Saturn/SGFX_NTSCp
- 704 x 240 @ 59.820000 SaturnNTSCp
- 352 x 480 @ 59.820000 SaturnNTSCi
- 704 x 480 @ 59.820000 SaturnNTSCi
- 352 x 288 @ 49.701458 SaturnPALp
- 704 x 288 @ 49.701458 SaturnPALp
- 352 x 576 @ 49.701458 SaturnPALi
- 704 x 576 @ 49.701458 SaturnPALi
+You will need Microsoft Visual Studio 2010 installed (or higher) in order to compile RetroArch 360.

- 240 x 160 @ 59.730000 GBA
- 320 x 200 @ 60.000000 Doom
+The solution file can be found at the following location:

-// Arcade
+<tt>pkg/msvc-360/RetroArch-360.sln</tt>

- 400 x 254 @ 54.706841 MK
- 384 x 224 @ 59.637405 CPS1
+NOTE: A pre-existing libretro library needs to be present in the `pkg/msvc-360/RetroArch-360/Release` directory in order to link RetroArch 360. This file needs to be
+called <em><b>`libretro_xdk360.lib`</b></em>.

-These modelines are more accurate giving exact hz. However, some games may have unwanted results. This is due to mid-scanline resolution changes on the original hardware. For the best results super resolutions are the way to go.
+<b> Xbox 360 (Libxenon)</b><br />

-## CRT resolution switching & MAME
+You will need to have the libxenon libraries and a working Devkit Xenon toolchain installed in order to compile RetroArch 360 Libxenon.

-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.
+<tt>make -f Makefile.xenon</tt>

-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.
+NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch 360 Libxenon. This file needs to be called <em><b>`libretro_xenon360.a`</b></em>.

-## Socials
+<b> Wii</b><br >

-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.
+You will need to have the libogc libraries and a working Devkit PPC toolchain installed in order to compile RetroArch Wii.

- [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/)
+<tt>make -f Makefile.griffin platform=wii</tt>
+
+NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch Wii. This file needs to be called <em><b>`libretro_wii.a`</b></em>.
@@ -1,26 +0,0 @@
-# Security Policy
-
-## Reasonable expectations
-
-RetroArch is a frontend for the libretro API. The main functionality is fulfilled by invoking other binary libraries ("cores") which are not restricted by RetroArch in any way. Cores are able to read/write/delete files, spawn processes, communicate over the network. Also, source for cores is not necessarily in control by libretro team, and core binaries / RetroArch binaries are not signed. For this reason, it is a bad idea to use RetroArch or any other libretro frontend on security critical systems.
-
-Also, RetroArch and cores have been packaged in several ways. Content on the [official download site](https://buildbot.libretro.com/) is built from a direct mirror of the original RetroArch and core repositories, no binaries are reused. Note that source for the core repositories may be outside libretro team control.
-
-## Supported Versions
-
-For most delivery channels, libretro team does not have control over the version. The exceptions are:
- [official download site](https://buildbot.libretro.com/)
- Steam release
- Apple App Store release
- various Android app store releases
- note that Google Play Store version is years behind and can not be updated
-
-You may report vulnerability against any recent version, but be reasonable.
-
-## Reporting a Vulnerability
-
-Please report security vulnerabilities at libretro@gmail.com
-
-## Possible remediation
-
-Due to the variety of delivery channels, RetroArch team can not recall any given version universally. Security fixes are accepted for next release, and notice may be posted in the channels controlled by RetroArch team, depending on the severity assessed by RetroArch team.
@@ -1,92 +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"
-
-typedef struct
-{
-   int ai_service_auto;
-   /* Is text-to-speech accessibility turned on? */
-   bool enabled;
-} access_state_t;
-
-bool is_accessibility_enabled(bool accessibility_enable, bool accessibility_enabled);
-
-#ifdef HAVE_TRANSLATE
-bool is_narrator_running(bool accessibility_enable);
-#endif
-
-/*
-   This function does all the stuff needed to translate the game screen,
-   using the URL given in the settings.  Once the image from the frame
-   buffer is sent to the server, the callback will write the translated
-   image to the screen.
-
-   Supported client/services (thus far)
-   -VGTranslate client ( www.gitlab.com/spherebeaker/vg_translate )
-   -Ztranslate client/service ( www.ztranslate.net/docs/service )
-
-   To use a client, download the relevant code/release, configure
-   them, and run them on your local machine, or network.  Set the
-   retroarch configuration to point to your local client (usually
-   listening on localhost:4404 ) and enable translation service.
-
-   If you don't want to run a client, you can also use a service,
-   which is basically like someone running a client for you.  The
-   downside here is that your retroarch device will have to have
-   an internet connection, and you may have to sign up for it.
-
-   To make your own server, it must listen for a POST request, which
-   will consist of a JSON body, with the "image" field as a base64
-   encoded string of a 24bit-BMP/PNG that the will be translated.
-   The server must output the translated image in the form of a
-   JSON body, with the "image" field also as a base64 encoded
-   24bit-BMP, or as an alpha channel png.
-
-  "paused" boolean is passed in to indicate if the current call
-   was made during a paused frame.  Due to how the menu widgets work,
-   if the ai service is called in "auto" mode, then this call will
-   be made while the menu widgets unpause the core for a frame to update
-   the on-screen widgets.  To tell the ai service what the pause
-   mode is honestly, we store the runloop_paused variable from before
-   the handle_translation_cb wipes the widgets, and pass that in here.
-*/
-bool run_translation_service(settings_t *settings, bool paused);
-
-bool accessibility_speak_priority(
-      bool accessibility_enable,
-      unsigned accessibility_narrator_speech_speed,
-      const char* speak_text, int priority);
-
-access_state_t *access_state_get_ptr(void);
-
-#endif
@@ -1,216 +0,0 @@
-#include "game_ai.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <dlfcn.h>
-#endif
-
-#include <retro_assert.h>
-#include <compat/strl.h>
-
-#include "../deps/game_ai_lib/GameAI.h"
-
-#define GAME_AI_MAX_PLAYERS 2
-
-void *                     ga = NULL;
-volatile void *            g_ram_ptr = NULL;
-volatile int               g_ram_size = 0;
-volatile signed short int  g_buttons_bits[GAME_AI_MAX_PLAYERS] = {0};
-volatile int               g_frameCount = 0;
-volatile char              game_ai_lib_path[1024] = {0};
-volatile char              g_game_name[1024] = {0};
-retro_log_printf_t         g_log = NULL;
-
-#ifdef _WIN32
-HINSTANCE                  g_lib_handle = NULL;
-#else
-void *                     g_lib_handle = NULL;
-#endif
-
-/* GameAI Lib API*/
-create_game_ai_t              create_game_ai = NULL;
-destroy_game_ai_t             destroy_game_ai = NULL;
-game_ai_lib_init_t            game_ai_lib_init = NULL;
-game_ai_lib_think_t           game_ai_lib_think = NULL;
-game_ai_lib_set_show_debug_t  game_ai_lib_set_show_debug = NULL;
-game_ai_lib_set_debug_log_t   game_ai_lib_set_debug_log = NULL;
-
-/* Helper functions */
-void game_ai_debug_log(int level, const char *fmt, ...)
-{
-   va_list vp;
-   va_start(vp, fmt);
-
-   if (g_log)
-      g_log((enum retro_log_level)level, fmt, vp);
-
-   va_end(vp);
-}
-
-void array_to_bits_16(volatile signed short *result, const bool b[16])
-{
-   for (int bit = 0; bit <= 15; bit++)
-      *result |= b[bit] ? (1 << bit) : 0;
-}
-
-/* Interface to RA */
-
-signed short int game_ai_input(unsigned int port, unsigned int device,
-      unsigned int idx, unsigned int id, signed short int result)
-{
-   if (ga && (port < GAME_AI_MAX_PLAYERS))
-      return g_buttons_bits[port];
-   return 0;
-}
-
-void game_ai_init(void)
-{
-   if (!create_game_ai)
-   {
-#ifdef _WIN32
-      BOOL fFreeResult, fRunTimeLinkSuccess = FALSE;
-
-      g_lib_handle = LoadLibrary(TEXT("game_ai.dll"));
-      retro_assert(hinstLib);
-
-      char full_module_path[MAX_PATH];
-      DWORD dwLen = GetModuleFileNameA(g_lib_handle, static_cast<char*>(&full_module_path), MAX_PATH);
-
-      if (hinstLib)
-      {
-         create_game_ai = (create_game_ai_t) GetProcAddress(hinstLib, "create_game_ai");
-         retro_assert(create_game_ai);
-
-         destroy_game_ai = (destroy_game_ai_t) GetProcAddress(hinstLib, "destroy_game_ai");
-         retro_assert(destroy_game_ai);
-
-         game_ai_lib_init = (game_ai_lib_init_t) GetProcAddress(hinstLib, "game_ai_lib_init");
-         retro_assert(game_ai_lib_init);
-
-         game_ai_lib_think = (game_ai_lib_think_t) GetProcAddress(hinstLib, "game_ai_lib_think");
-         retro_assert(game_ai_lib_think);
-
-         game_ai_lib_set_show_debug = (game_ai_lib_set_show_debug_t) GetProcAddress(hinstLib, "game_ai_lib_set_show_debug");
-         retro_assert(game_ai_lib_set_show_debug);
-
-         game_ai_lib_set_debug_log = (game_ai_lib_set_debug_log_t) GetProcAddress(hinstLib, "game_ai_lib_set_debug_log");
-         retro_assert(game_ai_lib_set_debug_log);
-      }
-#else
-      g_lib_handle = dlopen("./libgame_ai.so", RTLD_NOW);
-      retro_assert(g_lib_handle);
-
-      if (g_lib_handle)
-      {
-         dlinfo(g_lib_handle, RTLD_DI_ORIGIN, (void *) &game_ai_lib_path);
-
-         create_game_ai = (create_game_ai_t)(dlsym(g_lib_handle, "create_game_ai"));
-         retro_assert(create_game_ai);
-
-         destroy_game_ai = (destroy_game_ai_t)(dlsym(g_lib_handle, "destroy_game_ai"));
-         retro_assert(destroy_game_ai);
-
-         game_ai_lib_init = (game_ai_lib_init_t)(dlsym(g_lib_handle, "game_ai_lib_init"));
-         retro_assert(game_ai_lib_init);
-
-         game_ai_lib_think = (game_ai_lib_think_t)(dlsym(g_lib_handle, "game_ai_lib_think"));
-         retro_assert(game_ai_lib_think);
-
-         game_ai_lib_set_show_debug = (game_ai_lib_set_show_debug_t)(dlsym(g_lib_handle, "game_ai_lib_set_show_debug"));
-         retro_assert(game_ai_lib_set_show_debug);
-
-         game_ai_lib_set_debug_log  = (game_ai_lib_set_debug_log_t)(dlsym(g_lib_handle, "game_ai_lib_set_debug_log"));
-         retro_assert(game_ai_lib_set_debug_log);
-      }
-#endif
-   }
-}
-
-void game_ai_shutdown(void)
-{
-   if (g_lib_handle)
-   {
-      if (ga)
-      {
-         destroy_game_ai(ga);
-         ga = NULL;
-      }
-#ifdef _WIN32
-      FreeLibrary(g_lib_handle);
-#else
-      dlclose(g_lib_handle);
-#endif
-   }
-}
-
-void game_ai_load(const char * name, void * ram_ptr, int ram_size, retro_log_printf_t log)
-{
-   strcpy((char *) &g_game_name[0], name);
-
-   g_ram_ptr  = ram_ptr;
-   g_ram_size = ram_size;
-
-   g_log      = log;
-
-   if (ga)
-   {
-      destroy_game_ai(ga);
-      ga = NULL;
-   }
-}
-
-void game_ai_think(bool override_p1, bool override_p2, bool show_debug,
-      const void *frame_data, unsigned int frame_width, unsigned int frame_height,
-      unsigned int frame_pitch, unsigned int pixel_format)
-{
-   if (ga)
-      game_ai_lib_set_show_debug(ga, show_debug);
-
-   if (!ga && g_ram_ptr)
-   {
-      ga = create_game_ai((char *) &g_game_name[0]);
-      retro_assert(ga);
-
-      if (ga)
-      {
-         char data_path[1024] = {0};
-         strcpy(&data_path[0], (char *)game_ai_lib_path);
-         strcat(&data_path[0], "/data/");
-         strcat(&data_path[0], (char *)g_game_name);
-
-         game_ai_lib_init(ga, (void *) g_ram_ptr, g_ram_size);
-         game_ai_lib_set_debug_log(ga, game_ai_debug_log);
-      }
-   }
-
-   if (g_frameCount >= (GAMEAI_SKIPFRAMES - 1))
-   {
-      if (ga)
-      {
-         bool b[GAMEAI_MAX_BUTTONS] = {0};
-
-         g_buttons_bits[0]=0;
-         g_buttons_bits[1]=0;
-
-         if (override_p1)
-         {
-            game_ai_lib_think(ga, b, 0, frame_data, frame_width, frame_height, frame_pitch, pixel_format);
-            array_to_bits_16(&g_buttons_bits[0], b);
-         }
-
-         if (override_p2)
-         {
-            game_ai_lib_think(ga, b, 1, frame_data, frame_width, frame_height, frame_pitch, pixel_format);
-            array_to_bits_16(&g_buttons_bits[1], b);
-         }
-      }
-      g_frameCount=0;
-   }
-   else
-      g_frameCount++;
-}
@@ -1,44 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
- *  Copyright (C) 2021      - David G.F.
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RARCH_GAME_AI_H__
-#define RARCH_GAME_AI_H__
-
-#include <boolean.h>
-#include <retro_common_api.h>
-
-#include <libretro.h>
-
-RETRO_BEGIN_DECLS
-
-signed short int game_ai_input(unsigned int port, unsigned int device,
-      unsigned int idx, unsigned int id, signed short int result);
-
-void game_ai_init(void);
-
-void game_ai_shutdown(void);
-
-void game_ai_load(const char * name, void * ram_ptr,
-      int ram_size, retro_log_printf_t log);
-
-void game_ai_think(bool override_p1, bool override_p2, bool show_debug,
-      const void *frame_data, unsigned int frame_w, unsigned int frame_h,
-      unsigned int frame_pitch, unsigned int pixel_format);
-
-RETRO_END_DECLS
-
-#endif
@@ -1,172 +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_MIXER_MAX_STREAMS        16
-
-#define AUDIO_MIXER_MAX_SYSTEM_STREAMS (AUDIO_MIXER_MAX_STREAMS + 8)
-
-/* 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),
-
-   /**
-    * Indicates that the audio driver is forcing gain to 0.
-    * Used for temporary rewind and fast-forward muting.
-    */
-   AUDIO_FLAG_MUTED        = (1 << 6)
-};
-
-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
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
+ *  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.
@@ -18,63 +18,48 @@
 #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>
+#include "audio_dsp_filter.h"

-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif /* HAVE_CONFIG_H */
-
-#ifdef HAVE_DSP_FILTER
-#include <audio/dsp_filter.h>
+#ifdef __cplusplus
+extern "C" {
 #endif
-#ifdef HAVE_AUDIOMIXER
-#include <audio/audio_mixer.h>
-#endif
-#include <audio/audio_resampler.h>

-#include "audio_defines.h"
-
-#define AUDIO_BUFFER_FREE_SAMPLES_COUNT (8 * 1024)
-
-RETRO_BEGIN_DECLS
-
-#ifdef HAVE_AUDIOMIXER
-typedef struct audio_mixer_stream
+enum rarch_audio_ctl_state
 {
-   audio_mixer_sound_t *handle;
-   audio_mixer_voice_t *voice;
-   audio_mixer_stop_cb_t stop_cb;
-   void *buf;
-   char *name;
-   size_t bufsize;
-   float volume;
-   enum audio_mixer_stream_type stream_type;
-   enum audio_mixer_type type;
-   enum audio_mixer_state state;
-} audio_mixer_stream_t;
-
-typedef struct audio_mixer_stream_params
-{
-   void *buf;
-   char *basename;
-   audio_mixer_stop_cb_t cb;
-   size_t bufsize;
-   unsigned slot_selection_idx;
-   float volume;
-   enum audio_mixer_slot_selection_type slot_selection_type;
-   enum audio_mixer_stream_type stream_type;
-   enum audio_mixer_type type;
-   enum audio_mixer_state state;
-} audio_mixer_stream_params_t;
-#endif
+   RARCH_AUDIO_CTL_NONE = 0,
+   RARCH_AUDIO_CTL_INIT,
+   RARCH_AUDIO_CTL_DEINIT,
+   RARCH_AUDIO_CTL_DESTROY,
+   RARCH_AUDIO_CTL_DESTROY_DATA,
+   RARCH_AUDIO_CTL_START,
+   RARCH_AUDIO_CTL_STOP,
+   RARCH_AUDIO_CTL_FIND_DRIVER,
+   RARCH_AUDIO_CTL_SETUP_REWIND,
+   /* Sets audio monitor refresh rate to new value. */
+   RARCH_AUDIO_CTL_MONITOR_SET_REFRESH_RATE,
+   RARCH_AUDIO_CTL_MONITOR_ADJUST_SYSTEM_RATES,
+   RARCH_AUDIO_CTL_MUTE_TOGGLE,
+   RARCH_AUDIO_CTL_SET_CALLBACK_ENABLE,
+   RARCH_AUDIO_CTL_SET_CALLBACK_DISABLE,
+   RARCH_AUDIO_CTL_SET_CALLBACK,
+   RARCH_AUDIO_CTL_UNSET_CALLBACK,
+   RARCH_AUDIO_CTL_CALLBACK,
+   RARCH_AUDIO_CTL_HAS_CALLBACK,
+   RARCH_AUDIO_CTL_ALIVE,
+   RARCH_AUDIO_CTL_FRAME_IS_REVERSE,
+   RARCH_AUDIO_CTL_SET_OWN_DRIVER,
+   RARCH_AUDIO_CTL_UNSET_OWN_DRIVER,
+   RARCH_AUDIO_CTL_OWNS_DRIVER,
+   RARCH_AUDIO_CTL_SET_ACTIVE,
+   RARCH_AUDIO_CTL_UNSET_ACTIVE,
+   RARCH_AUDIO_CTL_IS_ACTIVE,
+   RARCH_AUDIO_CTL_RESAMPLER_DEINIT,
+   RARCH_AUDIO_CTL_RESAMPLER_INIT,
+   RARCH_AUDIO_CTL_RESAMPLER_PROCESS
+};

 typedef struct audio_driver
 {
@@ -82,8 +67,7 @@ typedef struct audio_driver
    *
    * Returns: audio driver handle on success, otherwise NULL.
    **/
-   void *(*init)(const char *device, unsigned rate,
-         unsigned latency, unsigned block_frames, unsigned *new_rate);
+   void *(*init)(const char *device, unsigned rate, unsigned latency);

   /*
    * @data         : Pointer to audio data handle.
@@ -91,313 +75,89 @@ typedef struct audio_driver
    * @size         : Size of audio buffer.
    *
    * Write samples to audio driver.
-    *
-    * Write data in buffer to audio driver.
-    * A frame here is defined as one combined sample of left and right
-    * channels. (I.e. 44.1kHz, 16-bit stereo has 88.2k samples/s, and
-    * 44.1k frames/s.)
-    *
-    * Samples are interleaved in format LRLRLRLRLR ...
-    * If the driver returns true in use_float(), a floating point
-    * format will be used, with range [-1.0, 1.0].
-    * If not, signed 16-bit samples in native byte ordering will be used.
-    *
-    * This function returns the number of frames successfully written.
-    * If an error occurs, -1 should be returned.
-    * Note that non-blocking behavior that cannot write at this time
-    * should return 0 as returning -1 will terminate the driver.
-    *
-    * Unless said otherwise with set_nonblock_state(), all writes
-    * are blocking, and it should block till it has written all frames.
-    */
-   ssize_t (*write)(void *data, const void *s, size_t len);
-
-   /**
-    * 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.
    **/
+   ssize_t (*write)(void *data, const void *buf, size_t size);
+
+   /* Stops driver. */
   bool (*stop)(void *data);

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

   /* Is the audio driver currently running? */
   bool (*alive)(void *data);

-   /* Should we care about blocking in audio thread? Fast forwarding.
-    *
-    * If state is true, nonblocking operation is assumed.
-    * This is typically used for fast-forwarding. If driver cannot
-    * implement nonblocking writes, this can be disregarded, but should
-    * log a message to stderr.
-    * */
+   /* Should we care about blocking in audio thread? Fast forwarding. */
   void (*set_nonblock_state)(void *data, bool toggle);

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

   /* Defines if driver will take standard floating point samples,
-    * or int16_t samples.
-    *
-    * If true is returned, the audio driver is capable of using
-    * floating point data. This will likely increase performance as the
-    * resampler unit uses floating point. The sample range is
-    * [-1.0, 1.0].
-    * */
+    * or int16_t samples. */
   bool (*use_float)(void *data);

   /* Human-readable identifier. */
   const char *ident;

-   /* Optional. Get audio device list (allocates, caller has to free this) */
-   void *(*device_list_new)(void *data);
-
-   /* Optional. Frees audio device list */
-   void (*device_list_free)(void *data, void *data2);
-
   /* Optional. */
   size_t (*write_avail)(void *data);

   size_t (*buffer_size)(void *data);
 } audio_driver_t;

-typedef struct
-{
-   double src_ratio_orig;
-   double src_ratio_curr;

-   uint64_t free_samples_count;
+bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data);

-   struct string_list *devices_list;
+/**
+ * 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);

-   /**
-    * 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
+/**
+ * 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);

-   /**
-    * 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_set_nonblocking_state(bool enable);

-   void *resampler_data;
+/**
+ * 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);

-   /**
-    * The current audio driver.
-    */
-   const audio_driver_t *current_audio;
+void audio_driver_sample(int16_t left, int16_t right);

-   void *context_audio_data;
+size_t audio_driver_sample_batch(const int16_t *data, size_t frames);

-   /**
-    * 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;
+void audio_driver_sample_rewind(int16_t left, int16_t right);

-#ifdef HAVE_REWIND
-   size_t rewind_ptr;
-   size_t rewind_size;
-#endif
-   size_t buffer_size;
-   size_t data_ptr;
+size_t audio_driver_sample_batch_rewind(const int16_t *data, size_t frames);

-   unsigned free_samples_buf[AUDIO_BUFFER_FREE_SAMPLES_COUNT];
-
-#ifdef HAVE_AUDIOMIXER
-   float mixer_volume_gain;
-#endif
-
-   float rate_control_delta;
-   float input;
-   float volume_gain;
-
-   enum resampler_quality resampler_quality;
-
-   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_enable_callback(void);
-
-bool audio_driver_disable_callback(void);
-
-bool audio_driver_mixer_extension_supported(const char *ext);
+void audio_driver_set_volume_gain(float gain);

 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);

-bool audio_driver_get_devices_list(void **ptr);
-
-void audio_driver_setup_rewind(void);
-
-bool audio_driver_callback(void);
-
-bool audio_driver_has_callback(void);
-
-void audio_driver_frame_is_reverse(void);
-
-void audio_set_float(enum audio_action action, float val);
-
-float *audio_get_float_ptr(enum audio_action action);
-
-bool *audio_get_bool_ptr(enum audio_action action);
-
-#ifdef HAVE_AUDIOMIXER
-audio_mixer_stream_t *audio_driver_mixer_get_stream(unsigned i);
-
-bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params);
-
-void audio_driver_mixer_play_stream(unsigned i);
-
-void audio_driver_mixer_play_menu_sound(unsigned i);
-
-void audio_driver_mixer_play_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);
-
-void audio_driver_mixer_stop_stream(unsigned i);
-
-float audio_driver_mixer_get_stream_volume(unsigned i);
-
-void audio_driver_mixer_set_stream_volume(unsigned i, float vol);
-
-void audio_driver_mixer_remove_stream(unsigned i);
-
-enum audio_mixer_state audio_driver_mixer_get_stream_state(unsigned i);
-
-const char *audio_driver_mixer_get_stream_name(unsigned i);
-
-void audio_driver_load_system_sounds(void);
-
-#endif
-
-bool audio_driver_start(bool is_shutdown);
-
-bool audio_driver_stop(void);
-
-#ifdef HAVE_TRANSLATE
-/* TODO/FIXME - Doesn't currently work.  Fix this. */
-bool audio_driver_is_ai_service_speech_running(void);
-#endif
-
-/**
- * audio_compute_buffer_statistics:
- *
- * Computes audio buffer statistics.
- *
- **/
-bool audio_compute_buffer_statistics(audio_statistics_t *stats);
-
-bool audio_driver_init_internal(void *data, bool audio_cb_inited);
-
-bool audio_driver_deinit(void);
-
-bool audio_driver_find_driver(const char *audio_drv,
-      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
-
 extern audio_driver_t audio_rsound;
-extern audio_driver_t audio_audioio;
 extern audio_driver_t audio_oss;
 extern audio_driver_t audio_alsa;
 extern audio_driver_t audio_alsathread;
-extern audio_driver_t audio_tinyalsa;
 extern audio_driver_t audio_roar;
 extern audio_driver_t audio_openal;
 extern audio_driver_t audio_opensl;
@@ -405,35 +165,19 @@ extern audio_driver_t audio_jack;
 extern audio_driver_t audio_sdl;
 extern audio_driver_t audio_xa;
 extern audio_driver_t audio_pulse;
-extern audio_driver_t audio_pipewire;
 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;
-extern audio_driver_t audio_audioworklet;
+extern audio_driver_t audio_null;

-audio_driver_state_t *audio_state_get_ptr(void);
+#ifdef __cplusplus
+}
+#endif

-const char *audio_driver_get_ident(void);
-
-extern audio_driver_t *audio_drivers[];
-
-RETRO_END_DECLS
-
-#endif /* __AUDIO_DRIVER__H */
+#endif
@@ -0,0 +1,323 @@
+/*  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/>.
+ */
+
+#include <stdlib.h>
+
+#include <retro_miscellaneous.h>
+
+#include <compat/posix_string.h>
+#include <dynamic/dylib.h>
+
+#include <file/file_path.h>
+#include <file/config_file_userdata.h>
+#include <file/dir_list.h>
+
+#include "audio_dsp_filter.h"
+#include "audio_filters/dspfilter.h"
+
+#include "../frontend/frontend_driver.h"
+#include "../performance.h"
+#include "../dynamic.h"
+
+struct rarch_dsp_plug
+{
+#ifdef HAVE_DYLIB
+   dylib_t lib;
+#endif
+   const struct dspfilter_implementation *impl;
+};
+
+struct rarch_dsp_instance
+{
+   const struct dspfilter_implementation *impl;
+   void *impl_data;
+};
+
+struct rarch_dsp_filter
+{
+   config_file_t *conf;
+
+   struct rarch_dsp_plug *plugs;
+   unsigned num_plugs;
+
+   struct rarch_dsp_instance *instances;
+   unsigned num_instances;
+};
+
+static const struct dspfilter_implementation *find_implementation(
+      rarch_dsp_filter_t *dsp, const char *ident)
+{
+   unsigned i;
+   for (i = 0; i < dsp->num_plugs; i++)
+   {
+      if (!strcmp(dsp->plugs[i].impl->short_ident, ident))
+         return dsp->plugs[i].impl;
+   }
+
+   return NULL;
+}
+
+static const struct dspfilter_config dspfilter_config = {
+   config_userdata_get_float,
+   config_userdata_get_int,
+   config_userdata_get_float_array,
+   config_userdata_get_int_array,
+   config_userdata_get_string,
+   config_userdata_free,
+};
+
+static bool create_filter_graph(rarch_dsp_filter_t *dsp, float sample_rate)
+{
+   unsigned i, filters = 0;
+
+   if (!config_get_uint(dsp->conf, "filters", &filters))
+      return false;
+
+   dsp->instances = (struct rarch_dsp_instance*)
+      calloc(filters, sizeof(*dsp->instances));
+   if (!dsp->instances)
+      return false;
+
+   dsp->num_instances = filters;
+
+   for (i = 0; i < filters; i++)
+   {
+      struct config_file_userdata userdata;
+      struct dspfilter_info info;
+      char key[64]                         = {0};
+      char name[64]                        = {0};
+
+      info.input_rate = sample_rate;
+
+      snprintf(key, sizeof(key), "filter%u", i);
+
+      if (!config_get_array(dsp->conf, key, name, sizeof(name)))
+         return false;
+
+      dsp->instances[i].impl = find_implementation(dsp, name);
+      if (!dsp->instances[i].impl)
+         return false;
+
+      userdata.conf = dsp->conf;
+      /* Index-specific configs take priority over ident-specific. */
+      userdata.prefix[0] = key;
+      userdata.prefix[1] = dsp->instances[i].impl->short_ident;
+
+      dsp->instances[i].impl_data = dsp->instances[i].impl->init(&info, &dspfilter_config, &userdata);
+      if (!dsp->instances[i].impl_data)
+         return false;
+   }
+
+   return true;
+}
+
+#if defined(HAVE_FILTERS_BUILTIN)
+extern const struct dspfilter_implementation *panning_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
+extern const struct dspfilter_implementation *iir_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
+extern const struct dspfilter_implementation *echo_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
+extern const struct dspfilter_implementation *phaser_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
+extern const struct dspfilter_implementation *wahwah_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
+extern const struct dspfilter_implementation *eq_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
+extern const struct dspfilter_implementation *chorus_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
+
+static const dspfilter_get_implementation_t dsp_plugs_builtin[] = {
+   panning_dspfilter_get_implementation,
+   iir_dspfilter_get_implementation,
+   echo_dspfilter_get_implementation,
+   phaser_dspfilter_get_implementation,
+   wahwah_dspfilter_get_implementation,
+   eq_dspfilter_get_implementation,
+   chorus_dspfilter_get_implementation,
+};
+
+static bool append_plugs(rarch_dsp_filter_t *dsp, struct string_list *list)
+{
+   unsigned i;
+   dspfilter_simd_mask_t mask = retro_get_cpu_features();
+
+   (void)list;
+
+   dsp->plugs = (struct rarch_dsp_plug*)
+      calloc(ARRAY_SIZE(dsp_plugs_builtin), sizeof(*dsp->plugs));
+   if (!dsp->plugs)
+      return false;
+
+   dsp->num_plugs = ARRAY_SIZE(dsp_plugs_builtin);
+
+   for (i = 0; i < ARRAY_SIZE(dsp_plugs_builtin); i++)
+   {
+      dsp->plugs[i].impl = dsp_plugs_builtin[i](mask);
+      if (!dsp->plugs[i].impl)
+         return false;
+   }
+
+   return true;
+}
+#elif defined(HAVE_DYLIB)
+static bool append_plugs(rarch_dsp_filter_t *dsp, struct string_list *list)
+{
+   unsigned i;
+   dspfilter_simd_mask_t mask = retro_get_cpu_features();
+
+   for (i = 0; i < list->size; i++)
+   {
+      const struct dspfilter_implementation *impl = NULL;
+      struct rarch_dsp_plug *new_plugs = NULL;
+      dylib_t lib = dylib_load(list->elems[i].data);
+      dspfilter_get_implementation_t cb;
+
+      if (!lib)
+         continue;
+
+      cb = (dspfilter_get_implementation_t)dylib_proc(lib, "dspfilter_get_implementation");
+      if (!cb)
+      {
+         dylib_close(lib);
+         continue;
+      }
+
+      impl = cb(mask);
+      if (!impl)
+      {
+         dylib_close(lib);
+         continue;
+      }
+
+      if (impl->api_version != DSPFILTER_API_VERSION)
+      {
+         dylib_close(lib);
+         continue;
+      }
+
+      new_plugs = (struct rarch_dsp_plug*)
+         realloc(dsp->plugs, sizeof(*dsp->plugs) * (dsp->num_plugs + 1));
+      if (!new_plugs)
+      {
+         dylib_close(lib);
+         return false;
+      }
+
+      /* Found plug. */
+      
+      dsp->plugs = new_plugs;
+      dsp->plugs[dsp->num_plugs].lib = lib;
+      dsp->plugs[dsp->num_plugs].impl = impl;
+      dsp->num_plugs++;
+   }
+
+   return true;
+}
+#endif
+
+rarch_dsp_filter_t *rarch_dsp_filter_new(
+      const char *filter_config, float sample_rate)
+{
+#if !defined(HAVE_FILTERS_BUILTIN) && defined(HAVE_DYLIB)
+   char basedir[PATH_MAX_LENGTH];
+   char ext_name[PATH_MAX_LENGTH];
+#endif
+   struct string_list *plugs     = NULL;
+   rarch_dsp_filter_t *dsp       = NULL;
+
+   dsp = (rarch_dsp_filter_t*)calloc(1, sizeof(*dsp));
+   if (!dsp)
+      return NULL;
+
+   dsp->conf = config_file_new(filter_config);
+   if (!dsp->conf)   /* Did not find config. */
+      goto error;
+
+#if !defined(HAVE_FILTERS_BUILTIN) && defined(HAVE_DYLIB)
+   fill_pathname_basedir(basedir, filter_config, sizeof(basedir));
+
+   if (!frontend_driver_get_core_extension(ext_name, sizeof(ext_name)))
+         goto error;
+
+   plugs = dir_list_new(basedir, ext_name, false, false);
+   if (!plugs)
+      goto error;
+#endif
+
+#if defined(HAVE_DYLIB) || defined(HAVE_FILTERS_BUILTIN)
+   if (!append_plugs(dsp, plugs))
+      goto error;
+#endif
+
+   if (plugs)
+      string_list_free(plugs);
+   plugs = NULL;
+
+   if (!create_filter_graph(dsp, sample_rate))
+      goto error;
+
+   return dsp;
+
+error:
+   if (plugs)
+      string_list_free(plugs);
+   rarch_dsp_filter_free(dsp);
+   return NULL;
+}
+
+void rarch_dsp_filter_free(rarch_dsp_filter_t *dsp)
+{
+   unsigned i;
+   if (!dsp)
+      return;
+
+   for (i = 0; i < dsp->num_instances; i++)
+   {
+      if (dsp->instances[i].impl_data && dsp->instances[i].impl)
+         dsp->instances[i].impl->free(dsp->instances[i].impl_data);
+   }
+   free(dsp->instances);
+
+#ifdef HAVE_DYLIB
+   for (i = 0; i < dsp->num_plugs; i++)
+   {
+      if (dsp->plugs[i].lib)
+         dylib_close(dsp->plugs[i].lib);
+   }
+   free(dsp->plugs);
+#endif
+
+   if (dsp->conf)
+      config_file_free(dsp->conf);
+
+   free(dsp);
+}
+
+void rarch_dsp_filter_process(rarch_dsp_filter_t *dsp,
+      struct rarch_dsp_data *data)
+{
+   unsigned i;
+   struct dspfilter_output output = {0};
+   struct dspfilter_input input   = {0};
+
+   output.samples = data->input;
+   output.frames  = data->input_frames;
+
+   for (i = 0; i < dsp->num_instances; i++)
+   {
+      input.samples = output.samples;
+      input.frames  = output.frames;
+      dsp->instances[i].impl->process(
+            dsp->instances[i].impl_data, &output, &input);
+   }
+
+   data->output        = output.samples;
+   data->output_frames = output.frames;
+}
Author	SHA1	Message	Date
twinaphex	28c7ae5007	Bump version code	2016-03-16 19:45:57 +01:00
twinaphex	0a613c04a6	Bump up to 1.3.2	2016-03-15 23:16:12 +01:00
Alcaro	f12092a09f	Fix missing linebreak.	2016-03-15 13:44:46 +01:00
twinaphex	21aa1cdbe6	(menu_setting.c) Update paths	2016-03-14 22:58:25 +01:00
twinaphex	5e18a5513c	(menu_setting.c) Update menu paths	2016-03-14 22:47:59 +01:00
twinaphex	1188650a3f	(menu_setting.c) Update paths	2016-03-14 22:44:43 +01:00
twinaphex	f64a01c5d4	(menu_setting.c) Update more paths	2016-03-14 22:07:18 +01:00
twinaphex	42e803435f	(menu_setting.c) Update paths	2016-03-14 21:51:02 +01:00
Twinaphex	5e1486d92a	Remove some unused variables	2016-03-14 21:23:45 +01:00
twinaphex	f03a0cedca	(menu_setting.c) Updates	2016-03-14 16:49:01 +01:00
twinaphex	75a134a578	(menu_setting.c) Updates	2016-03-14 16:42:16 +01:00
twinaphex	a9b9435e0b	(menu_setting.c) Update	2016-03-14 16:37:33 +01:00
twinaphex	b674457671	More menu settings refactoring	2016-03-14 16:27:52 +01:00
twinaphex	7752c73abc	Start using temporary copies for menu_settings	2016-03-14 16:11:59 +01:00