Fixed accessibility for menu start actions.

.editorconfig

@@ -1,4 +1,4 @@
-# EditorConfig: https://EditorConfig.org
+# EditorConfig: http://EditorConfig.org
 
 # Top-most EditorConfig file
 root = true
@@ -15,11 +15,6 @@ charset = utf-8
 indent_style = space
 indent_size = 3
 
-# 2 space indentation
-[*.{json,xml,yaml,yml}]
-indent_style = space
-indent_size = 2
-
 # Tab indentation
 [Makefile*]
 indent_style = tab

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/3DS.yml

@@ -1,39 +0,0 @@
-name: CI 3DS
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-devkitpro:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile Salamander
-      run: |
-        make -f Makefile.ctr.salamander -j$(getconf _NPROCESSORS_ONLN) USE_CTRULIB_2=1 clean
-        make -f Makefile.ctr.salamander -j$(getconf _NPROCESSORS_ONLN) USE_CTRULIB_2=1
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.ctr -j$(getconf _NPROCESSORS_ONLN) USE_CTRULIB_2=1 clean
-        make -f Makefile.ctr -j$(getconf _NPROCESSORS_ONLN) USE_CTRULIB_2=1 HAVE_STATIC_DUMMY=1
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-3DS-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_3ds.cia

.github/workflows/DOS-DJGPP.yml

@@ -1,35 +0,0 @@
-name: CI DOS/DJGPP
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-djgpp-build-container:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.dos -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.dos -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-DOS-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retrodos.exe

.github/workflows/Emscripten.yml

@@ -1,35 +0,0 @@
-name: CI Emscripten
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-emscripten:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        emmake make -f Makefile.emscripten -j$(getconf _NPROCESSORS_ONLN) clean
-        emmake make -f Makefile.emscripten -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-Emscripten-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch.js

.github/workflows/GameCube.yml

@@ -1,34 +0,0 @@
-name: CI GameCube
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-devkitpro:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.ngc -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.ngc -j$(getconf _NPROCESSORS_ONLN) EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0 HAVE_STATIC_DUMMY=1
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-GameCube-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_ngc.dol

.github/workflows/Miyoo.yml

@@ -1,35 +0,0 @@
-name: CI Miyoo ARM32
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-dingux:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.miyoo clean
-        make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.miyoo
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: retroarch_miyoo_arm32${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch

.github/workflows/PS2.yml

@@ -1,41 +0,0 @@
-name: CI PS2
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-ps2:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile Salamander
-      run: |
-        make -f Makefile.ps2.salamander -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.ps2.salamander -j$(getconf _NPROCESSORS_ONLN) release
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.ps2 -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.ps2 -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 release
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-PS2-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          raboot.elf
-          retroarchps2.elf

.github/workflows/PS4-ORBIS.yml

@@ -1,46 +0,0 @@
-name: CI PS4/ORBIS
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: orbisdev/orbisdev:latest
-    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 && make -f Makefile.orbis oelf eboot
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: bin-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_orbis.elf
-          homebrew.oelf
-          homebrew.self
-
-
-    - name: Version of binaries
-      run: |
-        clang --version
-        orbis-ld --version

.github/workflows/PSP.yml

@@ -1,47 +0,0 @@
-name: CI PSP
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-psp:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile bootstrap
-      run: |
-        cd bootstrap/psp1/kernel_functions_prx
-        make -j$(getconf _NPROCESSORS_ONLN) clean
-        make -j$(getconf _NPROCESSORS_ONLN)
-
-    - name: Compile Salamander
-      run: |
-        make -f Makefile.psp1.salamander -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.psp1.salamander -j$(getconf _NPROCESSORS_ONLN)
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.psp1 -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.psp1 -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-PSP-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          kernel_functions.prx
-          EBOOT.PBP

.github/workflows/PSVita.yml

@@ -1,39 +0,0 @@
-name: CI PSVita
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-vita:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile Salamander
-      run: |
-        make -f Makefile.vita.salamander -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.vita.salamander -j$(getconf _NPROCESSORS_ONLN)
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.vita -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.vita -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 HAVE_VITAGLES=1
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-PSVita-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          eboot.bin

.github/workflows/RS90.yml

@@ -1,35 +0,0 @@
-name: CI RS90 Odbeta MIPS32
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-dingux:odbeta
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.rs90 clean
-        make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.rs90
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: retroarch_rs90_mips32${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_rs90_odbeta.opk

.github/workflows/RetroFW.yml

@@ -1,35 +0,0 @@
-name: CI RetroFW MIPS32
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-dingux:odbeta
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.retrofw clean
-        make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.retrofw
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: retroarch_retrofw_mips32${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_retrofw.opk

.github/workflows/Switch-libnx.yml

@@ -1,34 +0,0 @@
-name: CI Switch/libnx
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-libnx-devkitpro:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.libnx -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.libnx -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-libnx-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_switch.nro

.github/workflows/Wii.yml

@@ -1,39 +0,0 @@
-name: CI Wii
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-devkitpro:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile Salamander
-      run: |
-        make -f Makefile.wii.salamander -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.wii.salamander -j$(getconf _NPROCESSORS_ONLN) EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.wii -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.wii -j$(getconf _NPROCESSORS_ONLN) EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0 HAVE_STATIC_DUMMY=1
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-Wii-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch_wii.dol

.github/workflows/WiiU.yml

@@ -1,39 +0,0 @@
-name: CI WiiU
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-wiiu:latest
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile Salamander
-      run: |
-        make -f Makefile.wiiu -j$(getconf _NPROCESSORS_ONLN) SALAMANDER_BUILD=1 clean
-        make -f Makefile.wiiu -j$(getconf _NPROCESSORS_ONLN) SALAMANDER_BUILD=1
-    
-    - name: Compile RA
-      run: |
-        make -f Makefile.wiiu -j$(getconf _NPROCESSORS_ONLN) clean
-        make -f Makefile.wiiu -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: RA-WiiU-dummy-${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch.rpx

.github/workflows/Windows-i686-MXE.yml

@@ -1,37 +0,0 @@
-name: CI Windows i686 (MXE)
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-mxe-win32-cross:gcc10
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        export MOC=/usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/bin/moc
-        ./configure --host=i686-w64-mingw32.shared
-        make clean
-        make -j$(getconf _NPROCESSORS_ONLN)
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: retroarch${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch.exe

.github/workflows/Windows-x64-MXE.yml

@@ -1,37 +0,0 @@
-name: CI Windows x64 (MXE)
-
-on:
-  push:
-  pull_request:
-  repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: 
-      image: git.libretro.com:5050/libretro-infrastructure/libretro-build-mxe-win64-cross:gcc10
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Compile RA
-      run: |
-        export MOC=/usr/lib/mxe/usr/x86_64-w64-mingw32.shared/qt5/bin/moc
-        ./configure --host=x86_64-w64-mingw32.shared
-        make clean
-        make -j$(getconf _NPROCESSORS_ONLN)
-
-    - name: Get short SHA
-      id: slug
-      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: retroarch${{ steps.slug.outputs.sha8 }}
-        path: |
-          retroarch.exe

.github/workflows/crowdin-daily.yml

@@ -1,38 +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@v1
-        with:
-          java-version: 1.8
-      - name: Setup Python
-        uses: actions/setup-python@v2
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Crowdin Sync
-        shell: bash
-        env:
-          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
-        run: |
-          cd intl
-          python3 -m pip install requests 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

.github/workflows/crowdin.yml

@@ -1,34 +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@v1
-        with:
-          java-version: 1.8
-      - name: Setup Python
-        uses: actions/setup-python@v2
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Crowdin Sync
-        shell: bash
-        env:
-          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
-        run: |
-          cd intl
-          python3 crowdin_sync.py "$CROWDIN_API_KEY"

.github/workflows/retroarch.yml

@@ -1,33 +0,0 @@
-# Validates compilation of RetroArch binary
-
-name: RetroArch CI
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-permissions:
-  contents: read
-
-jobs:
-  linux-c89: # Smoketest build using most restrictive compiler and default options
-    runs-on: ubuntu-latest
-    steps:
-      - name: Dependencies
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install build-essential libxkbcommon-dev libx11-xcb-dev zlib1g-dev libfreetype6-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev nvidia-cg-toolkit nvidia-cg-dev libavcodec-dev libsdl2-dev libsdl-image1.2-dev libxml2-dev yasm
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Configure
-        run: ./configure
-      - name: Build
-        run: make C89_BUILD=1
-      - name: Build Debug
-        run: |
-          make clean # making sure we don't have leftovers from previous build
-          make DEBUG=1 GL_DEBUG=1 C89_BUILD=1

.gitignore

@@ -8,9 +8,6 @@
 *.dol
 *.map
 *.swp
-*.cache
-*.gcda
-*.gcno
 .tmp
 .tmp.c
 .tmp.cxx
@@ -36,7 +33,6 @@ Release
 ipch
 *.user
 /bootstrap/gx/wii/app_booter/app_booter.bin
-/wii/app_booter/app_booter.bin
 *.zip
 RetroArch-w32/
 RetroArch-w64/
@@ -71,7 +67,6 @@ apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
 /rsound.h
 .pc
 /media/shaders_glsl/
-/media/shaders_slang/
 /obj-w32/
 .cproject
 .settings
@@ -81,30 +76,10 @@ convert_rumble.awk
 *~
 assets
 info
-content_favorites.lpl
-content_history.lpl
 content_image_history.lpl
-content_music_history.lpl
-content_video_history.lpl
 saves
 screenshots
-autoconfig
-config
-database
-overlays
-playlists
-states
-shaders/shaders_cg
-shaders/shaders_glsl
-shaders/shaders_slang
 
-# Qt Creator
-*.cflags
-*.cxxflags
-*.creator*
-*.config
-*.files
-*.includes
 
 # Wii U
 *.depend
@@ -198,7 +173,8 @@ retroarch_switch.nro
 retroarch_switch.nso
 
 # PS2
-*_irx.c
+ps2/irx/*.c
+ps2/libcdvd/lib/
 
 # Wayland
 gfx/common/wayland/idle-inhibit-unstable-v1.c
@@ -209,21 +185,3 @@ gfx/common/wayland/xdg-decoration-unstable-v1.h
 gfx/common/wayland/xdg-decoration-unstable-v1.c
 gfx/common/wayland/xdg-shell.c
 gfx/common/wayland/xdg-shell.h
-
-# libretro-common samples
-libretro-common/samples/streams/rzip/rzip
-
-# DINGUX
-*.opk
-
-#VITA
-param.sfo
-*.wo
-*.elf
-*.self
-*.vpk
-/.vs
-/deps/SPIRV-Cross/out/build/x64-Debug
-
-# Visual Studio Code
-.vscode/

.travis.yml

@@ -40,16 +40,12 @@ matrix:
       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
@@ -70,14 +66,37 @@ matrix:
       script:
         - ./configure --enable-opengl --disable-metal
         - make
+    - os: osx
+      osx_image: xcode8
+      script:
+        - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
+    - os: osx
+      osx_image: xcode11.2
+      script:
+        - brew update-reset
+        - brew install --force-bottle qt5
+        - security create-keychain -p travis build.keychain
+        - security default-keychain -s build.keychain
+        - security unlock-keychain -p travis build.keychain
+        - echo $OSX_CERT | base64 --decode > dev.p12
+        - security import dev.p12 -k build.keychain -P $OSX_CERT_PASS -T /usr/bin/codesign
+        - rm dev.p12
+        - security set-key-partition-list -S "apple-tool:,apple:,codesign:" -s -k travis build.keychain
+        - xcodebuild -target RetroArchQt -configuration Release -project pkg/apple/RetroArch_Metal.xcodeproj
+      deploy:
+        skip_cleanup: true
+        provider: script
+        script: bash travis_metal_deploy.sh
+        on:
+          branch: master
     - language: android
       # Android builds are only supported on Trusty
       dist: trusty
       android:
         components:
           - tools
-          - build-tools-29.0.3
-          - android-29
+          - build-tools-28.0.3
+          - android-28
       install:
         - echo y | sdkmanager "ndk-bundle"
       before_script:
@@ -117,10 +136,6 @@ before_script:
      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"
@@ -129,10 +144,6 @@ before_script:
      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"

.vscode/c_cpp_properties.json

@@ -1,191 +1,155 @@
 {
-    "configurations": [
-        {
-            "name": "Mac",
-            "includePath": [
-                "/usr/include",
-                "/usr/local/include",
-                "${workspaceRoot}",
-                "${workspaceRoot}/libretro-common/include"
+   "configurations": [
+      {
+         "name": "Mac",
+         "includePath": [
+            "/usr/include",
+            "/usr/local/include",
+            "${workspaceRoot}",
+            "${workspaceRoot}/libretro-common/include"
+         ],
+         "defines": [],
+         "intelliSenseMode": "clang-x64",
+         "browse": {
+            "path": [
+               "/usr/include",
+               "/usr/local/include",
+               "${workspaceRoot}"
             ],
-            "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "macFrameworkPath": [
-                "/System/Library/Frameworks",
-                "/Library/Frameworks"
-            ]
-        },
-        {
-            "name": "Linux",
-            "includePath": [
-                "/usr/include",
-                "/usr/local/include",
-                "${workspaceRoot}",
-                "${workspaceFolder}/libretro-common/include",
-                "${workspaceRoot}/libretro-common/include"
+            "limitSymbolsToIncludedHeaders": true,
+            "databaseFilename": ""
+         },
+         "macFrameworkPath": [
+            "/System/Library/Frameworks",
+            "/Library/Frameworks"
+         ]
+      },
+      {
+         "name": "Linux",
+         "includePath": [
+            "/usr/include",
+            "/usr/local/include",
+            "${workspaceRoot}",
+            "${workspaceFolder}/libretro-common/include",
+            "${workspaceRoot}/libretro-common/include"
+         ],
+         "defines": [],
+         "intelliSenseMode": "clang-x64",
+         "browse": {
+            "path": [
+               "/usr/include",
+               "/usr/local/include",
+               "${workspaceRoot}"
             ],
-            "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        },
-        {
-            "name": "Win32",
-            "includePath": [
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-                "${workspaceRoot}",
-                "${workspaceFolder}/libretro-common/include"
+            "limitSymbolsToIncludedHeaders": true,
+            "databaseFilename": ""
+         }
+      },
+      {
+         "name": "Win32",
+         "includePath": [
+            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
+            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
+            "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
+            "${workspaceRoot}",
+            "${workspaceFolder}/libretro-common/include"
+         ],
+         "defines": [
+            "_DEBUG",
+            "UNICODE"
+         ],
+         "intelliSenseMode": "msvc-x64",
+         "browse": {
+            "path": [
+               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
+               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
+               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
+               "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
+               "${workspaceRoot}"
             ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE"
+            "limitSymbolsToIncludedHeaders": true,
+            "databaseFilename": ""
+         },
+         "cStandard": "c11",
+         "cppStandard": "c++17"
+      },
+      {
+         "name": "msys2-mingw32",
+         "includePath": [
+            "C:/msys64/mingw32/include",
+            "C:/msys64/mingw32/i686-w64-mingw32/include",
+            "${workspaceRoot}/libretro-common/include",
+            "${workspaceRoot}/include",
+            "${workspaceRoot}"
+         ],
+         "defines": [
+            "_DEBUG",
+            "UNICODE"
+         ],
+         "intelliSenseMode": "msvc-x64",
+         "browse": {
+            "path": [
+               "C:/msys64/mingw32/include",
+               "C:/msys64/mingw32/i686-w64-mingw32/include",
+               "${workspaceRoot}/libretro-common/include",
+               "${workspaceRoot}/include",
+               "${workspaceRoot}"
             ],
-            "intelliSenseMode": "msvc-x64",
-            "browse": {
-                "path": [
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "cStandard": "c11",
-            "cppStandard": "c++17",
-            "configurationProvider": "ms-vscode.makefile-tools"
-        },
-        {
-            "name": "msys2-mingw32",
-            "includePath": [
-                "C:/msys64/mingw32/include",
-                "C:/msys64/mingw32/i686-w64-mingw32/include",
-                "${workspaceRoot}/libretro-common/include",
-                "${workspaceRoot}/include",
-                "${workspaceRoot}"
+            "limitSymbolsToIncludedHeaders": true,
+            "databaseFilename": ""
+         }
+      },
+      {
+         "name": "msys2-mingw64",
+         "includePath": [
+            "C:/msys64/mingw64/include",
+            "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+            "${workspaceRoot}/libretro-common/include",
+            "${workspaceRoot}/include",
+            "${workspaceRoot}"
+         ],
+         "defines": [
+            "_DEBUG",
+            "UNICODE"
+         ],
+         "intelliSenseMode": "msvc-x64",
+         "browse": {
+            "path": [
+               "C:/msys64/mingw64/include",
+               "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+               "${workspaceRoot}/libretro-common/include",
+               "${workspaceRoot}/include",
+               "${workspaceRoot}"
             ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE"
-            ],
-            "intelliSenseMode": "msvc-x64",
-            "browse": {
-                "path": [
-                    "C:/msys64/mingw32/include",
-                    "C:/msys64/mingw32/i686-w64-mingw32/include",
-                    "${workspaceRoot}/libretro-common/include",
-                    "${workspaceRoot}/include",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        },
-        {
-            "name": "msys2-mingw64",
-            "includePath": [
-                "C:/msys64/mingw64/include",
-                "C:/msys64/mingw64/x86_64-w64-mingw32/include",
-                "${workspaceRoot}/libretro-common/include",
-                "${workspaceRoot}/include",
-                "${workspaceRoot}"
-            ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE"
-            ],
-            "intelliSenseMode": "msvc-x64",
-            "browse": {
-                "path": [
-                    "C:/msys64/mingw64/include",
-                    "C:/msys64/mingw64/x86_64-w64-mingw32/include",
-                    "${workspaceRoot}/libretro-common/include",
-                    "${workspaceRoot}/include",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        },
-        {
-            "name": "Switch",
-            "includePath": [
-                "/opt/devkitpro/devkitA64/aarch64-none-elf/include",
-                "/opt/devkitpro/devkitA64/lib/gcc/aarch64-none-elf/8.3.0/include",
-                "/opt/devkitpro/libnx/include",
-                "/opt/devkitpro/portlibs/switch/include",
-                "/opt/devkitpro/portlibs/switch/include/freetype2",
-                "${workspaceFolder}/**"
-            ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE",
-                "_UNICODE",
-                "__aarch64__",
-                "__SWITCH__",
-                "HAVE_LIBNX"
-            ],
-            "windowsSdkVersion": "10.0.17763.0",
-            "compilerPath": "/opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc",
-            "cStandard": "c11",
-            "cppStandard": "c++11",
-            "intelliSenseMode": "gcc-x64"
-        },
-        {
-            "name": "WiiU",
-            "includePath": [
-                "/opt/devkitpro/devkitPPC/powerpc-eabi/include",
-                "/opt/devkitpro/devkitPPC/lib/gcc/powerpc-eabi/6.3.0/include",
-                "/opt/devkitpro/portlibs/ppc/include",
-                "${workspaceFolder}/**"
-            ],
-            "defines": [
-                "WIIU",
-                "WIIU_HID"
-            ],
-            "windowsSdkVersion": "10.0.17763.0",
-            "compilerPath": "/opt/devkitpro/devkitPPC/bin/powerpc-eabi-gcc",
-            "cStandard": "c11",
-            "cppStandard": "c++11",
-            "intelliSenseMode": "gcc-x64"
-        },
-        {
-            "name": "ps2sdk-ee",
-            "includePath": [
-                "${env:PS2DEV}/ps2sdk/common/include",
-                "${env:PS2DEV}/ps2sdk/ee/include",
-                "${env:PS2DEV}/gsKit/include",
-                "${workspaceFolder}/**"
-            ],
-            "defines": [
-                "PS2",
-                "_EE"
-            ],
-            "compilerPath": "${env:PS2DEV}/ee/bin/mips64r5900el-ps2-elf-gcc",
-            "cStandard": "c11",
-            "cppStandard": "c++11",
-            "intelliSenseMode": "gcc-x64"
-        }
-    ],
-    "version": 4
+            "limitSymbolsToIncludedHeaders": true,
+            "databaseFilename": ""
+         }
+      },
+      {
+         "name": "Switch",
+         "includePath": [
+            "/opt/devkitpro/devkitA64/aarch64-none-elf/include",
+            "/opt/devkitpro/devkitA64/lib/gcc/aarch64-none-elf/8.3.0/include",
+            "/opt/devkitpro/libnx/include",
+            "/opt/devkitpro/portlibs/switch/include",
+            "/opt/devkitpro/portlibs/switch/include/freetype2",
+            "${workspaceFolder}/**"
+         ],
+         "defines": [
+            "_DEBUG",
+            "UNICODE",
+            "_UNICODE",
+            "__aarch64__",
+            "__SWITCH__",
+            "HAVE_LIBNX"
+         ],
+         "windowsSdkVersion": "10.0.17763.0",
+         "compilerPath": "/opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc",
+         "cStandard": "c11",
+         "cppStandard": "c++11",
+         "intelliSenseMode": "gcc-x64"
+      }
+   ],
+   "version": 4
 }

.vscode/settings.json

@@ -1,26 +1,30 @@
 {
-   /*"terminal.integrated.shell.windows": "C:\\msys64\\usr\\bin\\bash.exe",
+   "terminal.integrated.shell.windows":    "C:\\msys64\\usr\\bin\\bash.exe",
    "terminal.integrated.env.windows": {
       "PATH": "/mingw64/lib/ccache/bin:/mingw64/lib/ccache/bin:/mingw64/lib/ccache/bin:/mingw64/bin:/usr/local/bin:/usr/bin:/bin:$PATH",
       "MSYSTEM": "MINGW64",
-   },*/
+   },
    "terminal.integrated.cursorBlinking": true,
+
    "editor.tabSize": 3,
    "editor.detectIndentation": false,
    "editor.renderWhitespace": "all",
    "editor.insertSpaces": true,
-   "editor.formatOnSave": false,
-   "editor.ruler": [80],
    "files.associations": {
-      "*.h": "c",
+      "frontend_driver.h": "c",
       "*.in": "c",
       "*.rh": "c",
       "array": "c",
+      "file_stream.h": "c",
+      "driver.h": "c",
       "iosfwd": "c",
       "xlocbuf": "c",
       "xmemory0": "c",
       "ios": "c",
       "list": "c",
+      "input_driver.h": "c",
+      "menu_driver.h": "c",
+      "file_path.h": "c",
       "unordered_map": "c",
       "unordered_set": "c",
       "sstream": "cpp",
@@ -29,15 +33,40 @@
       "initializer_list": "c",
       "string_view": "c",
       "utility": "c",
+      "menu_input.h": "c",
+      "tasks_internal.h": "c",
+      "ozone.h": "c",
+      "ozone_theme.h": "c",
+      "ozone_texture.h": "c",
+      "string_list.h": "c",
+      "core_info.h": "c",
       "thread": "c",
       "xlocale": "c",
+      "gfx_widgets.h": "c",
+      "message_queue.h": "c",
+      "task_queue.h": "c",
+      "fifo_queue.h": "c",
+      "file_list.h": "c",
+      "strl.h": "c",
+      "configuration.h": "c",
+      "ozone_display.h": "c",
+      "verbosity.h": "c",
+      "retroarch.h": "c",
+      "gfx_animation.h": "c",
+      "netplay.h": "c",
+      "scaler.h": "c",
       "deque": "c",
       "vector": "c",
       "xhash": "c",
       "xiosbase": "c",
       "xstring": "c",
       "xtree": "c",
-      "xutility": "c"
+      "xutility": "c",
+      "menu_input_dialog.h": "c",
+      "menu_filebrowser.h": "c",
+      "ozone_sidebar.h": "c",
+      "menu_thumbnail_path.h": "c",
+      "badges.h": "c"
    },
    "C_Cpp.dimInactiveRegions": false,
 }

AUTHORS.h

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

CODE_OF_CONDUCT.md

@@ -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

CODING-GUIDELINES

@@ -1,109 +0,0 @@
-Struct ordering
----------------
-
-For POD-types, try to order structs as follows (first to last):
-
-   * long double     (8 bytes, 16 bytes [64bit x86], 12 bytes [32bit x86])
-   * double          (8 bytes)
-   * int64_t         (8 bytes,         8 bytes [32bit ARM], 
-                      4 bytes [32bit x86])
-   * uint64_t        (4 bytes [32bit], 8 bytes [32bit ARM], 8 bytes [64bit])
-   * pointer         (4 bytes [32bit], 8 bytes [64bit] [1])
-   * intptr_t        (4 bytes [32bit], 8 bytes [64bit] [1])
-   * uintptr_t       (4 bytes [32bit], 8 bytes [64bit] [1])
-   * ptrdiff_t       (4 bytes [32bit], 8 bytes [64bit] [1])
-   * ssize_t         (4 bytes [32bit], 8 bytes [64bit])
-   * size_t          (4 bytes [32bit], 8 bytes [64bit])
-   * jmp_buf         (4 bytes)
-   * long            (4 bytes [64bit Win], 8 bytes [64bit non-Win], 
-                      4 bytes [32bit])
-   * int32_t         (4 bytes)
-   * unsigned        (4 bytes)
-   * float           (4 bytes)
-   * int             (4 bytes)
-   * enum            (4 bytes)
-   * int16_t         (2 bytes)
-   * char            (1 byte)
-* bool            (1 byte)
-
-   [1] PS3 uses 4 byte pointers despite having a 64bit processor
-
-   Struct members should be sorted by alignment. Therefore, structs
-   should be sorted by the largest type inside them.
-
-   For example, take a struct like this:
-
-   typedef struct
-   {
-      size_t capacity;
-      bool old_format;
-      bool compress;
-      bool fuzzy_archive_match;
-      bool autofix_paths;   
-      char path[PATH_MAX_LENGTH];
-      char base_content_directory[PATH_MAX_LENGTH];
-   } playlist_config_t;
-
-size_t has the biggest alignment here, so 'struct playlist_config_t' 
-inside a struct should come before or after size_t.
-
-*** BEST PRACTICES ***
-
-* If we have pointers and size variable pairs, it's best to 
-interleave them to increase the probability they go in the 
-same cacheline. It also makes the code more readable, that 
-these two variables are connected.
-
-Example:
-
-   struct a
-   {
-      char* b;
-      size_t b_len;
-      char* c;
-      size_t c_len;
-   };
-
-Stack size
-----------
-
-You have to assume that stack size is going to be limited in 
-RetroArch. Some game consoles (and other embedded systems) 
-might have a default stack size as low as 128Kb or less. 
-Be conservative with stack size but don't try to put very 
-small structs on heap either [to avoid memory fragmentation 
-among other things]. 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.

CONTRIBUTING.md

@@ -1,93 +1,58 @@
 # Contributing to RetroArch
 
-If you are a developer who wishes to contribute to the development of _RetroArch_; or if you have
-found a bug and wish to submit a minor patch and/or bug report, please read this document.
+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.
 
-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.
+# 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.
 
-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.
+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.
 
-## Submitting Bug Reports
+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.
 
-Bug reports in _RetroArch_ may fall into one of two categories:
+# 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.
 
- * _RetroArch_ itself, the user interface and API around all of the various cores.
- * Individual _Core_, of which interact with _RetroArch_.
-
-When submitting a bug report, ensure that the report is submitted to the correct repository.
-For _RetroArch_ itself, it is done by reporting a bug within the
-[RetroArch](https://github.com/libretro/RetroArch) repository. For other cores, please use
-the search function within the [libretro Organization](https://github.com/libretro) on
-GitHub. Issues that are specific to a core and not _RetroArch_ are likely to be closed very
-quickly. If an issue is suspected with _RetroArch_, please make sure to test with multiple
-cores to be sure that is is not isolated.
-
-If the issue occurs during runtime, please paste the verbose log output:
-
- * If using the _Pheonix_ interface, the log will be in _File_ -> _Show Log_.
- * If using the main interface, enable verbose logging with _Settings_ -> _Logging_ ->
-   _Logging Verbosity_. Ensure both _Log to File_ and _Timestamp log Files_ is enabled.
- * Otherwise, run _RetroArch_ with the verbose (`-v`) flag.
-
-If the error happens during compilation and/or building, paste the output of `./configure`
-and `make` accordingly. If using an IDE, please paste any of the errors and log output.
-
-## Submitting Pull Requests
-
-Any and all contributions should be submitted through Pull Requests on
-[GitHub](https://github.com/libretro/RetroArch/pulls). The process requires that you fork the
-repository, make the appropriate changes, and then open a pull request on _GitHub_. If your
-pull request is for a proof-of-concept then please indicate as such.
-
-Your pull request will then be reviewed. There may be comments and requests for additional
-changes to be made. It may also be possible that the changes will not be accepted. Otherwise, it
-may be merged in when it is fully approved. The final approval of merge requests is at the
-discretion of the project.
-
-If you want to develop a larger feature or make broad changes, please do join our
-[Discord](https://discordapp.com/invite/27Xxm2h) server to discuss. The discussion is
-necessary to prevent the possibility of major work being done which will not be accepted at all.
+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.
 
-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.
+# 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".
 
-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.
+## Non-obvious things:
+  - Code should be both C89 and ISO C++ compatible. This dual requirement is for XBox360 and MSVC in general. Think of it as a C++ compatible subset of C99.
+  - Warnings are not allowed (-Wall). Make sure your code is warning-free. Note that warning sensitivity differs a bit across compiler versions.
+  - Using deprecated APIs is discouraged.
 
-## Coding style
+# 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.
 
-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.
+# IRC
+Active development happens on IRC. (#retroarch @ irc.freenode.org)
+We value discussing things in "real-time".
 
-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.
+# 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.

Makefile

@@ -22,7 +22,7 @@ endif
 
 OBJ :=
 LIBS :=
-DEF_FLAGS := -I.
+DEF_FLAGS :=
 ASFLAGS :=
 DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
@@ -110,7 +110,7 @@ endif
 
 ifneq ($(CXX_BUILD), 1)
    ifneq ($(C89_BUILD),)
-      CFLAGS += -std=c89 -ansi -pedantic -Werror=pedantic -Wno-long-long -Werror=declaration-after-statement
+      CFLAGS += -std=c89 -ansi -pedantic -Werror=pedantic -Wno-long-long
    else ifeq ($(HAVE_C99), 1)
       CFLAGS += $(C99_CFLAGS)
    endif
@@ -118,7 +118,7 @@ ifneq ($(CXX_BUILD), 1)
    CFLAGS += -D_GNU_SOURCE
 endif
 
-DEF_FLAGS += $(INCLUDE_DIRS) -Ideps -Ideps/stb
+DEF_FLAGS += $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb
 
 CFLAGS += $(DEF_FLAGS)
 CXXFLAGS += $(DEF_FLAGS) -D__STDC_CONSTANT_MACROS
@@ -215,6 +215,13 @@ $(OBJDIR)/%.o: %.m
 	@$(if $(Q), $(shell echo echo OBJC $<),)
 	$(Q)$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<
 
+.FORCE:
+
+$(OBJDIR)/git_version.o: git_version.c .FORCE
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<
+
 $(OBJDIR)/%.o: %.S config.h config.mk $(HEADERS)
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo AS $<),)
@@ -226,17 +233,16 @@ $(OBJDIR)/%.o: %.rc $(HEADERS)
 	$(Q)$(WINDRES) -o $@ $<
 
 install: $(TARGET)
+	rm -f $(OBJDIR)/git_version.o
 	mkdir -p $(DESTDIR)$(BIN_DIR) 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(DATA_DIR)/applications 2>/dev/null || /bin/true
-	mkdir -p $(DESTDIR)$(DATA_DIR)/metainfo 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(DOC_DIR) 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(DATA_DIR)/pixmaps 2>/dev/null || /bin/true
 	cp $(TARGET) $(DESTDIR)$(BIN_DIR)
 	cp tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	cp retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)
-	cp com.libretro.RetroArch.appdata.xml $(DESTDIR)$(DATA_DIR)/metainfo
 	cp retroarch.desktop $(DESTDIR)$(DATA_DIR)/applications
 	cp docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
 	cp docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
@@ -247,7 +253,6 @@ install: $(TARGET)
 	chmod 755 $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	chmod 644 $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 	chmod 644 $(DESTDIR)$(DATA_DIR)/applications/retroarch.desktop
-	chmod 644 $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.appdata.xml
 	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
 	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
 	chmod 644 $(DESTDIR)$(DATA_DIR)/pixmaps/retroarch.svg
@@ -272,7 +277,6 @@ uninstall:
 	rm -f $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
 	rm -f $(DESTDIR)$(DATA_DIR)/applications/retroarch.desktop
-	rm -f $(DESTDIR)$(DATA_DIR)/metainfo/com.libretro.RetroArch.appdata.xml
 	rm -f $(DESTDIR)$(DATA_DIR)/pixmaps/retroarch.svg
 	rm -f $(DESTDIR)$(DOC_DIR)/COPYING
 	rm -f $(DESTDIR)$(DOC_DIR)/COPYING.assets

Makefile.ctr

@@ -2,16 +2,12 @@ TARGET := retroarch_3ds
 LIBRETRO =
 
 DEBUG                   = 0
-CONSOLE_LOG             = 0
 GRIFFIN_BUILD           = 1
-HAVE_STATIC_DUMMY ?= 0
 WHOLE_ARCHIVE_LINK      = 0
 BUILD_3DSX              = 1
 BUILD_3DS               = 0
 BUILD_CIA               = 1
 LIBCTRU_NO_DEPRECATION  = 1
-USE_CTRULIB_2          ?= 0
-LOAD_WITHOUT_CORE_INFO ?= 0
 
 APP_TITLE            = RetroArch 3DS
 APP_DESCRIPTION      = RetroArch 3DS
@@ -39,7 +35,8 @@ OBJ += ctr/exec-3dsx/exec_cia.o \
 	ctr/exec-3dsx/exec_3dsx.o \
 	ctr/exec-3dsx/mini-hb-menu/launch.o \
 	ctr/exec-3dsx/mini-hb-menu/loaders/rosalina.o \
-	ctr/exec-3dsx/mini-hb-menu/loaders/hax2.o
+	ctr/exec-3dsx/mini-hb-menu/loaders/hax2.o \
+	ctr/exec-3dsx/mini-hb-menu/loaders/ninjhax1.o
 
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
 	APP_USE_SVCHAX = 1
@@ -54,17 +51,8 @@ DEFINES :=
 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
-	DEFINES += -DHAVE_ZLIB -DHAVE_7ZIP -D_7ZIP_ST -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA
-	DEFINES += -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_CORES
-	#DEFINES += -DHAVE_UPDATE_ASSETS
-	DEFINES += -DHAVE_PATCH -DHAVE_RWAV
-	DEFINES += -DHAVE_SCREENSHOTS
-	DEFINES += -DHAVE_REWIND
-	DEFINES += -DHAVE_THREADS
-	DEFINES += -DHAVE_GFX_WIDGETS
-	DEFINES += -DHAVE_OVERLAY
-	DEFINES += -DHAVE_CORE_INFO_CACHE
-	#DEFINES += -DHAVE_SOCKET_LEGACY
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA
+	#DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_SOCKET_LEGACY -DHAVE_THREADS
 	#-DHAVE_SSL -DHAVE_BUILTINMBEDTLS -DMBEDTLS_SSL_DEBUG_ALL
 	#ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file
 else
@@ -84,19 +72,12 @@ else
 	HAVE_XMB = 1
 	HAVE_STATIC_VIDEO_FILTERS = 1
 	HAVE_STATIC_AUDIO_FILTERS = 1
-	HAVE_PATCH = 1
-	HAVE_SCREENSHOTS = 1
-	HAVE_REWIND = 1
-	HAVE_AUDIOMIXER = 1
-	HAVE_RWAV = 1
 	#HAVE_NETWORKING = 1
-	#HAVE_IFINFO = 1
 	#HAVE_CHEEVOS = 1
 	#HAVE_SOCKET_LEGACY = 1
-	HAVE_THREADS = 1
+	#HAVE_THREADS = 1
 	#HAVE_SSL = 1
 	#HAVE_BUILTINMBEDTLS = 1
-	HAVE_CORE_INFO_CACHE = 1
 
 	include Makefile.common
 	CFLAGS += $(DEF_FLAGS)
@@ -109,61 +90,31 @@ endif
 ifeq ($(strip $(DEVKITPRO)),)
 	$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitpro")
 endif
-ifeq ($(strip $(DEVKITARM)),)
-	$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitarm")
-endif
 
 ifeq ($(strip $(CTRULIB)),)
 	CTRULIB = $(DEVKITPRO)/libctru
 endif
 
-ifeq ($(strip $(USE_CTRULIB_2)),1)
-	CFLAGS += -DUSE_CTRULIB_2
-endif
-
-ifeq ($(LOAD_WITHOUT_CORE_INFO),1)
-	CFLAGS += -DLOAD_WITHOUT_CORE_INFO
-endif
-
-ifeq ($(strip $(DEVKITTOOLS)),)
-	ifeq ($(strip $(USE_CTRULIB_2)),1)
-		DEVKITTOOLS = $(DEVKITPRO)/tools
-	else
-		DEVKITTOOLS = $(DEVKITARM)
-	endif
-endif
-
 APP_TITLE         := $(shell echo "$(APP_TITLE)" | cut -c1-128)
 APP_DESCRIPTION   := $(shell echo "$(APP_DESCRIPTION)" | cut -c1-256)
 APP_AUTHOR        := $(shell echo "$(APP_AUTHOR)" | cut -c1-128)
 APP_PRODUCT_CODE  := $(shell echo $(APP_PRODUCT_CODE) | cut -c1-16)
 APP_UNIQUE_ID     := $(shell echo $(APP_UNIQUE_ID) | cut -c1-7)
 
-APP_VERSION_MAJOR := $(shell shuf -i 0-63 -n 1)
-APP_VERSION_MINOR := $(shell shuf -i 0-63 -n 1)
-APP_VERSION_MICRO := $(shell shuf -i 0-15 -n 1)
-
-MAKEROM_ARGS_COMMON = -rsf $(APP_RSF) -exefslogo -elf $(TARGET).elf -icon $(TARGET).icn -banner $(TARGET).bnr \
-	-DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" -DAPP_UNIQUE_ID=$(APP_UNIQUE_ID) \
-	-DAPP_SYSTEM_MODE=$(APP_SYSTEM_MODE) -DAPP_SYSTEM_MODE_EXT=$(APP_SYSTEM_MODE_EXT) \
-	-major "$(APP_VERSION_MAJOR)" -minor "$(APP_VERSION_MINOR)" -micro "$(APP_VERSION_MICRO)"
+MAKEROM_ARGS_COMMON = -rsf $(APP_RSF) -exefslogo -elf $(TARGET).elf -icon $(TARGET).icn -banner $(TARGET).bnr -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" -DAPP_UNIQUE_ID=$(APP_UNIQUE_ID) -DAPP_SYSTEM_MODE=$(APP_SYSTEM_MODE) -DAPP_SYSTEM_MODE_EXT=$(APP_SYSTEM_MODE_EXT)
 
 INCDIRS := -I$(CTRULIB)/include
 LIBDIRS := -L. -L$(CTRULIB)/lib
 
 ARCH     := -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
 
-CFLAGS	+= -mword-relocations \
-	   -fomit-frame-pointer -ffast-math \
-	   -Werror=implicit-function-declaration \
-	   $(ARCH)
+CFLAGS	+=	-mword-relocations \
+			-fomit-frame-pointer -ffast-math \
+         -Werror=implicit-function-declaration \
+			$(ARCH)
 
 #CFLAGS	+= -Wall
-CFLAGS	+= -DARM11 -D_3DS
-
-ifeq ($(strip $(USE_CTRULIB_2)),1)
-   CFLAGS	+= -D__3DS__
-endif
+CFLAGS	+=	-DARM11 -D_3DS
 
 ifeq ($(DEBUG), 1)
    CFLAGS	+= -O0 -g
@@ -171,10 +122,6 @@ else
    CFLAGS	+= -O3
 endif
 
-ifeq ($(CONSOLE_LOG), 1)
-   CFLAGS	+= -DCONSOLE_LOG
-endif
-
 ifeq ($(LIBCTRU_NO_DEPRECATION), 1)
    CFLAGS	+= -DLIBCTRU_NO_DEPRECATION
 endif
@@ -185,36 +132,23 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
 endif
 
 CFLAGS += -I. \
-	  -Ideps \
-	  -Ideps/7zip \
-	  -Ideps/stb \
-	  -Ideps/rcheevos/include \
-	  -Ilibretro-common/include \
-	  -Ilibretro-common/include/compat/zlib
+			 -Ideps \
+			 -Ideps/7zip \
+			 -Ideps/stb \
+			 -Ilibretro-common/include \
+			 -Ilibretro-common/include/compat/zlib
 
 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
-CFLAGS += -DHAVE_DSP_FILTER
-CFLAGS += -DHAVE_VIDEO_FILTER
 CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
-CFLAGS += -DHAVE_CHEATS
 
-CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
+
+ASFLAGS	:=	-g $(ARCH) -O3
+LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
-ASFLAGS	 := -g $(ARCH) -O3
-LDFLAGS  += -specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 CFLAGS   += -std=gnu99 -ffast-math
 
-LIB_CORE      :=
-LIB_CORE_FULL :=
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIB_CORE      += -lretro_ctr
-  LIB_CORE_FULL += libretro_ctr.a
-endif
-
-LIBS	:= $(WHOLE_START) $(LIB_CORE) $(WHOLE_END) -lm
+LIBS	:= $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lm
 
 ifeq ($(DEBUG), 1)
 	LIBS	+= -lctrud
@@ -240,7 +174,7 @@ all: $(TARGET)
 
 $(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
 $(TARGET).3dsx: $(TARGET).elf
-$(TARGET).elf: $(OBJ) $(LIB_CORE_FULL)
+$(TARGET).elf: $(OBJ) libretro_ctr.a
 
 PREFIX		:=	$(DEVKITARM)/bin/arm-none-eabi-
 
@@ -278,13 +212,13 @@ else
 endif
 
 %.o: %.vsh %.gsh
-	$(DEVKITTOOLS)/bin/picasso $^ -o $*.shbin
-	$(DEVKITTOOLS)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
+	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin
 
 %.o: %.vsh
-	$(DEVKITTOOLS)/bin/picasso $^ -o $*.shbin
-	$(DEVKITTOOLS)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
+	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin
 
 %.o: %.cpp
@@ -304,8 +238,8 @@ endif
 
 %.vsh:
 
-$(TARGET).smdh: $(TARGET).elf $(APP_ICON)
-	$(DEVKITTOOLS)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
+$(TARGET).smdh: $(APP_ICON)
+	$(DEVKITARM)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
 
 $(TARGET).3dsx: $(TARGET).elf
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
@@ -313,16 +247,16 @@ ifeq ($(APP_BIG_TEXT_SECTION), 1)
 else
 	rm -f $(TARGET).xml
 endif
-	$(DEVKITTOOLS)/bin/3dsxtool $< $@ $(_3DSXFLAGS)
+	$(DEVKITARM)/bin/3dsxtool $< $@ $(_3DSXFLAGS)
 
 $(TARGET).elf: ctr/3dsx_custom_crt0.o
 	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
 	$(NM) -CSn $@ > $(notdir $*.lst)
 
-$(TARGET).bnr: $(TARGET).elf $(APP_BANNER) $(APP_AUDIO)
+$(TARGET).bnr: $(APP_BANNER) $(APP_AUDIO)
 	$(BANNERTOOL) makebanner -i "$(APP_BANNER)" -a "$(APP_AUDIO)" -o $@
 
-$(TARGET).icn: $(TARGET).elf $(APP_ICON)
+$(TARGET).icn: $(APP_ICON)
 	$(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_TITLE)" -p "$(APP_AUTHOR)" -i $(APP_ICON) -o $@
 
 $(TARGET).3ds: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)

Makefile.ctr.salamander

@@ -2,11 +2,9 @@ TARGET := retroarch_3ds_salamander
 LIBRETRO =
 
 DEBUG                   = 0
-CONSOLE_LOG             = 0
 BUILD_3DSX              = 1
 BUILD_3DS               = 0
 BUILD_CIA               = 1
-USE_CTRULIB_2          ?= 0
 
 APP_TITLE            = RetroArch 3DS
 APP_DESCRIPTION      = RetroArch 3DS
@@ -36,36 +34,24 @@ OBJ := ctr/ctr_system.o \
 		 libretro-common/lists/dir_list.o \
 		 libretro-common/file/retro_dirent.o \
 		 libretro-common/compat/compat_strl.o \
-		 libretro-common/compat/compat_strldup.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/vfs/vfs_implementation.o \
-		 libretro-common/hash/lrc_hash.o \
-		 libretro-common/time/rtime.o \
+		 libretro-common/hash/rhash.o \
+		 file_path_str.o \
 		 verbosity.o
 
 OBJ += ctr/exec-3dsx/exec_cia.o \
 	ctr/exec-3dsx/exec_3dsx.o \
 	ctr/exec-3dsx/mini-hb-menu/launch.o \
 	ctr/exec-3dsx/mini-hb-menu/loaders/rosalina.o \
-	ctr/exec-3dsx/mini-hb-menu/loaders/hax2.o
+	ctr/exec-3dsx/mini-hb-menu/loaders/hax2.o \
+	ctr/exec-3dsx/mini-hb-menu/loaders/ninjhax1.o
 
 ifeq ($(strip $(DEVKITPRO)),)
 	$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitpro")
 endif
 
-ifeq ($(strip $(USE_CTRULIB_2)),1)
-	CFLAGS += -DUSE_CTRULIB_2
-endif
-
-ifeq ($(strip $(DEVKITTOOLS)),)
-	ifeq ($(strip $(USE_CTRULIB_2)),1)
-		DEVKITTOOLS = $(DEVKITPRO)/tools
-	else
-		DEVKITTOOLS = $(DEVKITARM)
-	endif
-endif
-
 ifeq ($(strip $(CTRULIB)),)
 	CTRULIB = $(DEVKITPRO)/libctru
 endif
@@ -91,20 +77,12 @@ CFLAGS	+=	-mword-relocations \
 #CFLAGS	+= -Wall
 CFLAGS	+=	-DARM11 -D_3DS
 
-ifeq ($(strip $(USE_CTRULIB_2)),1)
-   CFLAGS	+= -D__3DS__
-endif
-
 ifeq ($(DEBUG), 1)
    CFLAGS	+= -O0 -g
 else
    CFLAGS	+= -O3
 endif
 
-ifeq ($(CONSOLE_LOG), 1)
-   CFLAGS	+= -DCONSOLE_LOG
-endif
-
 CFLAGS += -I. -Ideps/7zip -Ideps/stb -Ilibretro-common/include -Ilibretro-common/include/compat/zlib
 
 #CFLAGS += -DRARCH_INTERNAL
@@ -175,13 +153,13 @@ else
 endif
 
 %.o: %.vsh %.gsh
-	$(DEVKITTOOLS)/bin/picasso $^ -o $*.shbin
-	$(DEVKITTOOLS)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
+	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin
 
 %.o: %.vsh
-	$(DEVKITTOOLS)/bin/picasso $^ -o $*.shbin
-	$(DEVKITTOOLS)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
+	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
+	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
 	rm $*.shbin
 
 %.o: %.cpp
@@ -202,7 +180,7 @@ endif
 %.vsh:
 
 $(TARGET).smdh: $(APP_ICON)
-	$(DEVKITTOOLS)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
+	$(DEVKITARM)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
 
 $(TARGET).3dsx: $(TARGET).elf
 ifeq ($(APP_BIG_TEXT_SECTION), 1)
@@ -210,7 +188,7 @@ ifeq ($(APP_BIG_TEXT_SECTION), 1)
 else
 	rm -f $(TARGET).xml
 endif
-	$(DEVKITTOOLS)/bin/3dsxtool $< $@ $(_3DSXFLAGS)
+	$(DEVKITARM)/bin/3dsxtool $< $@ $(_3DSXFLAGS)
 
 $(TARGET).elf: ctr/3dsx_custom_crt0.o
 	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@

Makefile.dingux

@@ -1,47 +1,13 @@
-#########################
-## 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
-
-#########################
-#########################
-
+CC = /opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc-gcc
+CXX = /opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc-g++
 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
@@ -49,7 +15,7 @@ HAVE_CC = 1
 HAVE_CC_RESAMPLER = 1
 HAVE_CHD = 1
 HAVE_CHEEVOS = 1
-HAVE_COMMAND = 0
+HAVE_COMMAND = 1
 HAVE_CXX = 1
 HAVE_DR_MP3 = 1
 HAVE_DYNAMIC = 1
@@ -69,7 +35,6 @@ 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
@@ -88,7 +53,7 @@ HAVE_SHADERPIPELINE = 1
 HAVE_STB_FONT = 1
 HAVE_STB_IMAGE = 1
 HAVE_STB_VORBIS = 1
-HAVE_STDIN_CMD = 0
+HAVE_STDIN_CMD = 1
 HAVE_STRCASESTR = 1
 HAVE_THREADS = 1
 HAVE_TRANSLATE = 1
@@ -97,10 +62,6 @@ HAVE_VIDEO_LAYOUT = 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
@@ -108,9 +69,7 @@ OPK_NAME = retroarch.opk
 
 OBJ :=
 LINK := $(CXX)
-DEF_FLAGS := -march=mips32 -mtune=mips32r2 -mhard-float -ffast-math -fomit-frame-pointer
-DEF_FLAGS += -mplt -mno-shared
-DEF_FLAGS += -ffunction-sections -fdata-sections
+DEF_FLAGS := -march=mips32 -mtune=mips32r2 -mhard-float -ffast-math -fomit-frame-pointer -fdata-sections
 DEF_FLAGS += -I. -Ideps -Ideps/stb -DDINGUX=1 -MMD
 DEF_FLAGS += -Wall -Wno-unused-variable
 DEF_FLAGS += -std=gnu99 -D_GNU_SOURCE
@@ -118,9 +77,9 @@ LIBS := -ldl -lz -lrt -lcrypto -lssl -ludev -pthread
 CFLAGS :=
 CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
 ASFLAGS :=
-LDFLAGS := -flto -Wl,--gc-sections
-INCLUDE_DIRS = -I$(GCW0_INC_DIR)
-LIBRARY_DIRS = -L$(GCW0_LIB_DIR)
+LDFLAGS := -flto
+INCLUDE_DIRS = -I/opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include
+LIBRARY_DIRS = -L/opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/lib
 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
@@ -129,10 +88,10 @@ 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)
+SDL_DINGUX_CFLAGS := $(shell /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/sdl-config --cflags)
+SDL_DINGUX_LIBS := $(shell /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/sdl-config --libs)
+FREETYPE_CFLAGS := $(shell /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/freetype-config --cflags)
+FREETYPE_LIBS := $(shell /opt/gcw0-toolchain/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/freetype-config --libs)
 AL_LIBS := -lopenal
 OPENGLES_CFLAGS := -DMESA_EGL_NO_X11_HEADERS
 OPENGLES_LIBS := -lGLESv2 -lEGL
@@ -162,8 +121,8 @@ RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
 
 define DESKTOP_ENTRY
 [Desktop Entry]
-Name=RetroArch
-Comment=Frontend for emulators, game engines
+Name=retroarch
+Comment=Retroarch
 Exec=retroarch
 Terminal=false
 Type=Application
@@ -182,27 +141,34 @@ SYMBOL_MAP := -Wl,-Map=output.map
 
 $(TARGET): $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
+	$(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 $@ $<
+	$(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 $@ $<
+	$(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 $@ $<
+	$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<
+
+.FORCE:
+
+$(OBJDIR)/git_version.o: git_version.c .FORCE
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<
 
 $(OBJDIR)/%.o: %.S $(HEADERS)
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo AS $<),)
-	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
+	$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
 
 clean:
 	rm -rf $(OBJDIR_BASE)
@@ -214,7 +180,7 @@ 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
+	mksquashfs 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

Makefile.dos

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

Makefile.emscripten

@@ -1,11 +1,4 @@
-HAVE_STATIC_DUMMY ?= 0
-ifeq ($(TARGET),)
-ifeq ($(LIBRETRO),)
 TARGET := retroarch.js
-else
-TARGET := $(LIBRETRO)_libretro.js
-endif
-endif
 
 EOPT = USE_ZLIB=1 # Emscripten specific options
 EOPTS = $(addprefix -s $(EMPTY), $(EOPT)) # Add '-s ' to each option
@@ -16,12 +9,8 @@ OBJ :=
 DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD)
 DEFINES += -DHAVE_FILTERS_BUILTIN
 
-HAVE_DSP_FILTER = 1
-HAVE_VIDEO_FILTER = 1
 HAVE_OVERLAY = 1
 HAVE_GLSL = 1
-HAVE_SCREENSHOTS = 1
-HAVE_REWIND = 1
 HAVE_AUDIOMIXER = 1
 HAVE_VIDEO_LAYOUT = 0
 HAVE_CC_RESAMPLER = 1
@@ -41,22 +30,8 @@ HAVE_STATIC_VIDEO_FILTERS = 1
 HAVE_STATIC_AUDIO_FILTERS = 1
 HAVE_STB_FONT = 1
 HAVE_CONFIGFILE = 1
-HAVE_CHEATS = 1
-HAVE_IBXM = 1
-HAVE_CORE_INFO_CACHE = 1
-HAVE_7ZIP = 1
 
-ASYNC ?= 0
-ifeq ($(LIBRETRO), mupen64plus)
-   ASYNC = 1
-endif
-
-LTO ?= 0
-ifeq ($(LIBRETRO), tyrquake)
-   LTO = 0
-endif
-
-MEMORY ?= 134217728
+MEMORY = 134217728
 
 PRECISE_F32 = 1
 
@@ -86,14 +61,7 @@ endif
 include Makefile.common
 
 CFLAGS += $(DEF_FLAGS) -Ideps -Ideps/stb
-
-libretro :=
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  libretro += libretro_emscripten.bc
-endif
+libretro = libretro_emscripten.bc
 
 ifneq ($(V), 1)
    Q := @

Makefile.griffin

@@ -66,6 +66,7 @@ SHADER_CG_DIR      := media/shaders_cg
 OVERLAY_DIR        := media/overlays
 SHADER_GLSL_DIR    := media/shaders_glsl
 
+PYTHON2            := python2$(EXE_EXT)
 PYTHON3            := python3$(EXE_EXT)
 GIT                := git$(EXE_EXT)
 
@@ -115,26 +116,19 @@ else ifeq ($(platform), ps3-cobra)
 
 # NGC/Wii - libogc
 else ifeq ($(libogc_platform), 1)
-   EXTERNAL_LIBOGC   ?= 0
-   GX_PTHREAD_LEGACY ?= 1
+   EXTERNAL_LIBOGC=0
    CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
    CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
    LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
    ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
-   # Check whether ELF2DOL executable exists
-   # (path has changed in more recent toolchains)
-   ifeq ("$(wildcard $(ELF2DOL))","")
-     ELF2DOL = $(DEVKITPRO)/tools/bin/elf2dol$(EXE_EXT)
-   endif
    EXT_TARGET := $(TARGET_NAME)_$(platform).dol
    EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
 
-   INCLUDE += -I.
+   INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Iwii/libogc/include
 
    ifeq ($(EXTERNAL_LIBOGC), 1)
       CFLAGS   += -DEXTERNAL_LIBOGC
       CXXFLAGS += -DEXTERNAL_LIBOGC
-      INCLUDE += -I$(DEVKITPRO)/libogc/include
 
       ifeq ($(platform), ngc)
          LIBDIRS += -L$(DEVKITPRO)/libogc/lib/cube
@@ -145,7 +139,6 @@ else ifeq ($(libogc_platform), 1)
    else
       CFLAGS   += -DINTERNAL_LIBOGC
       CXXFLAGS += -DINTERNAL_LIBOGC
-      INCLUDE += -Iwii/libogc/include
 
       ifeq ($(platform), ngc)
          LIBDIRS += -Lwii/libogc/libs/cube
@@ -155,11 +148,6 @@ else ifeq ($(libogc_platform), 1)
 
    endif
 
-   ifeq ($(GX_PTHREAD_LEGACY), 1)
-      CFLAGS   += -DGX_PTHREAD_LEGACY
-      CXXFLAGS += -DGX_PTHREAD_LEGACY
-   endif
-
    ifeq ($(platform), ngc)
       MACHDEP := -DHW_DOL -mogc
    else ifeq ($(platform), wii)
@@ -167,7 +155,7 @@ else ifeq ($(libogc_platform), 1)
    endif
 
    LIBDIRS += -L.
-   MACHDEP += -DGEKKO -mcpu=750 -meabi -mhard-float
+   MACHDEP += -DGEKKO -mcpu=750 -meabi -mhard-float -DMSB_FIRST
 
    ifeq ($(platform), ngc)
       LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_TARGET)).map
@@ -203,9 +191,8 @@ else ifeq ($(libogc_platform), 1)
 
    CFLAGS += -DGEKKO -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
 
+	HAVE_AUDIOMIXER			 := 1
    HAVE_RUNAHEAD            := 1
-   HAVE_DSP_FILTER          := 1
-   HAVE_VIDEO_FILTER        := 1
    HAVE_FILTERS_BUILTIN     := 1
    HAVE_THREADS             := 1
    HAVE_RPNG                := 1
@@ -217,17 +204,11 @@ else ifeq ($(libogc_platform), 1)
    HAVE_VIDEO_LAYOUT        := 0
    HAVE_ZLIB                := 1
    HAVE_7ZIP                := 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_SCREENSHOTS         := 1
-   HAVE_REWIND              := 1
-   HAVE_AUDIOMIXER          := 1
-   HAVE_RWAV                := 1
+	HAVE_CONFIGFILE          := 1
    RARCH_CONSOLE             = 1
-   HAVE_CORE_INFO_CACHE     := 1
 
    ifeq ($(platform), wii)
+		HAVE_AUDIOMIXER			 := 1
       #HAVE_LANGEXTRA          := 1
       HAVE_WIIUSB_HID          := 1
       HAVE_RARCH_EXEC          := 1
@@ -263,9 +244,7 @@ else ifeq ($(platform), xenon360)
    HAVE_THREADS             := 1
    HAVE_GETOPT_LONG         := 1
    RARCH_CONSOLE             = 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
+	HAVE_CONFIGFILE          := 1
 
 # PSP
 else ifeq ($(platform), psp1)
@@ -290,10 +269,7 @@ else ifeq ($(platform), psp1)
    HAVE_KERNEL_PRX          := 1
    #HAVE_LANGEXTRA          := 1
    RARCH_CONSOLE             = 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_CORE_INFO_CACHE     := 1
+	HAVE_CONFIGFILE          := 1
 
    ifeq ($(BUILD_PRX), 1)
       LDFLAGS += $(addprefix -L,$(PSPSDK)/lib) -specs=$(PSPSDK)/lib/prxspecs -Wl,-q,-T$(PSPSDK)/lib/linkfile.prx $(LDFLAGS)
@@ -333,8 +309,6 @@ else ifeq ($(platform), vita)
    LIBDIRS += -L.
    LDFLAGS +=  -Wl,-q
 
-   HAVE_DSP_FILTER          := 1
-   HAVE_VIDEO_FILTER        := 1
    HAVE_FILTERS_BUILTIN     := 1
    HAVE_LANGEXTRA           := 1
    HAVE_RPNG                := 1
@@ -345,8 +319,6 @@ else ifeq ($(platform), vita)
    HAVE_7ZIP                := 1
    HAVE_VITA2D              := 1
    HAVE_NETWORKING          := 1
-   HAVE_IFINFO              := 1
-   HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
    HAVE_VIDEO_LAYOUT        := 0
    HAVE_MATERIALUI          := 1
@@ -355,10 +327,7 @@ else ifeq ($(platform), vita)
    HAVE_THREADS             := 1
    HAVE_LIBRETRODB          := 1
    RARCH_CONSOLE             = 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_CORE_INFO_CACHE     := 1
+	HAVE_CONFIGFILE          := 1
 else ifeq ($(platform), windows_msvc6_x86)
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
@@ -367,9 +336,8 @@ else ifeq ($(platform), windows_msvc6_x86)
    HAVE_ZLIB                := 1
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 0
-   HAVE_IFINFO              := 0
-   HAVE_NETWORK_CMD         := 0
-   HAVE_NETPLAYDISCOVERY    := 0
+   HAVE_NETWORK_CMD         := 1
+   HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
    HAVE_VIDEO_LAYOUT        := 0
    HAVE_MATERIALUI          := 1
@@ -383,10 +351,7 @@ else ifeq ($(platform), windows_msvc6_x86)
    HAVE_DYLIB               := 1
    HAVE_DYNAMIC             := 1
    HAVE_GRIFFIN_CPP         := 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_CORE_INFO_CACHE     := 1
+	HAVE_CONFIGFILE          := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -415,7 +380,6 @@ else ifeq ($(platform), windows_msvc2003_x86)
    HAVE_ZLIB                := 1
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
-   HAVE_IFINFO              := 0
    HAVE_NETWORK_CMD         := 1
    HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
@@ -431,11 +395,7 @@ else ifeq ($(platform), windows_msvc2003_x86)
    HAVE_DYLIB               := 1
    HAVE_DYNAMIC             := 1
    HAVE_GRIFFIN_CPP         := 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_GFX_WIDGETS         := 1
-   HAVE_CORE_INFO_CACHE     := 1
+	HAVE_CONFIGFILE          := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -444,7 +404,6 @@ else ifeq ($(platform), windows_msvc2003_x86)
    LD = link.exe
 
    PLATCFLAGS += -D_WIN32 -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -D__STDC_CONSTANT_MACROS -D_MBCS -D_VC80_UPGRADE=0x0710
-   PLATCFLAGS += -DHAVE_GFX_WIDGETS
    LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib
 
    PATH := $(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../../Vc7/bin"):$(PATH)
@@ -463,7 +422,6 @@ else ifeq ($(platform), windows_msvc2003_x86)
    endif
 else ifeq ($(platform), windows_msvc2005_x86)
    HAVE_GDI                 := 1
-   HAVE_REWIND              := 1
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
    HAVE_RBMP                := 1
@@ -471,14 +429,12 @@ else ifeq ($(platform), windows_msvc2005_x86)
    HAVE_ZLIB                := 1
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
-   HAVE_IFINFO              := 0
    HAVE_NETWORK_CMD         := 1
    HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
    HAVE_VIDEO_LAYOUT        := 0
    HAVE_MATERIALUI          := 1
    HAVE_XMB                 := 1
-   HAVE_OZONE               := 1
    HAVE_STB_FONT            := 1
    HAVE_THREADS             := 1
    HAVE_LIBRETRODB          := 1
@@ -488,18 +444,8 @@ else ifeq ($(platform), windows_msvc2005_x86)
    HAVE_DYLIB               := 1
    HAVE_DYNAMIC             := 1
    HAVE_GRIFFIN_CPP         := 1
-   HAVE_RUNAHEAD            := 1
    HAVE_DIRECTX             ?= 1
-   HAVE_OPENGL              := 1
-   HAVE_OPENGL1             := 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_DSP_FILTER          := 1
-   HAVE_VIDEO_FILTER        := 1
-   HAVE_FILTERS_BUILTIN     := 1
-   HAVE_GFX_WIDGETS         := 1
-   HAVE_CORE_INFO_CACHE     := 1
+	HAVE_CONFIGFILE          := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -507,32 +453,16 @@ else ifeq ($(platform), windows_msvc2005_x86)
    CXX = cl.exe
    LD = link.exe
 
-   PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_OZONE -DHAVE_GFX_WIDGETS -DHAVE_CC_RESAMPLER
-   PLATCFLAGS += -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_CDROM
-   PLATCFLAGS += -bigobj
-
-   LDFLAGS += -MANIFEST shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib msimg32.lib
+   PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE
+   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib msimg32.lib
 
    PATH := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin"):$(PATH)
    PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE")
    INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/include")
    LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/lib")
 
-   WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\MicrosoftSDK\InstalledSDKs\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3" -v "Install Dir" | grep -o '[A-Z]:\\.*')
-
-   WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
-   WindowsSDKAtlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\atl")
-   WindowsSDKCrtIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\crt")
-   WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
-   WindowsSDKMfcIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\mfc")
-   WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib")
-
-   INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKAtlIncludeDir);$(WindowsSDKCrtIncludeDir);$(WindowsSDKGlIncludeDir);$(WindowsSDKMfcIncludeDir);libretro/msvc/msvc-2005
-   LIB := $(LIB);$(WindowsSDKLibDir)
-
    ifeq ($(HAVE_DIRECTX), 1)
-      PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D8
+      PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND
       DXSDK_DIR := $(DXSDK_DIR:\=)
       export INCLUDE := $(INCLUDE);$(INETSDK)\Include;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
       export LIB := $(LIB);$(INETSDK)\Lib;$(DXSDK_DIR)\Lib\x86
@@ -542,11 +472,7 @@ else ifeq ($(platform), windows_msvc2005_x86)
    endif
 else ifneq (,$(findstring windows_msvc2010,$(platform)))
    HAVE_GDI                 := 1
-   HAVE_CHEEVOS             := 1
-   HAVE_SCREENSHOTS         := 1
-   HAVE_REWIND              := 1
    HAVE_AUDIOMIXER          := 1
-   HAVE_RWAV                := 1
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
    HAVE_RBMP                := 1
@@ -554,14 +480,12 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
    HAVE_ZLIB                := 1
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
-   HAVE_IFINFO              := 1
    HAVE_NETWORK_CMD         := 1
    HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
    HAVE_VIDEO_LAYOUT        := 0
    HAVE_MATERIALUI          := 1
    HAVE_XMB                 := 1
-   HAVE_OZONE               := 1
    HAVE_STB_FONT            := 1
    HAVE_THREADS             := 1
    HAVE_LIBRETRODB          := 1
@@ -573,16 +497,7 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
    HAVE_GRIFFIN_CPP         := 1
    HAVE_RUNAHEAD            := 1
    HAVE_DIRECTX             ?= 1
-   HAVE_OPENGL              := 1
-   HAVE_OPENGL1             := 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_DSP_FILTER          := 1
-   HAVE_VIDEO_FILTER        := 1
-   HAVE_FILTERS_BUILTIN     := 1
-   HAVE_GFX_WIDGETS         := 1
-   HAVE_CORE_INFO_CACHE     := 1
+	HAVE_CONFIGFILE          := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -591,14 +506,8 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
    LD = link.exe
 
    PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS
-   PLATCFLAGS += -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA
-   PLATCFLAGS += -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_OZONE
-   PLATCFLAGS += -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DWIN32 -DHAVE_CDROM
-   PLATCFLAGS += -DHAVE_GFX_WIDGETS
-   PLATCFLAGS += -bigobj
-
-   LDFLAGS += -MANIFEST shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib msimg32.lib
+   PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DWIN32 -DHAVE_CDROM
+   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib msimg32.lib
 
    PlatformSuffix = $(subst windows_msvc2010_,,$(platform))
 
@@ -623,12 +532,12 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
    PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
    INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS100COMNTOOLS)../../VC/include")
 
-   WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -io '[A-Z]:\\.*')
    WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -io '[A-Z]:\\.*')
+   WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -io '[A-Z]:\\.*')
    WindowsSdkDir := $(WindowsSdkDir:\=)
 
    ifeq ($(HAVE_DIRECTX), 1)
-      PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D8 -DHAVE_XAUDIO -DHAVE_XINPUT
+      PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D9 -DHAVE_XAUDIO -DHAVE_XINPUT
       DXSDK_DIR := $(DXSDK_DIR:\=)
       export INCLUDE := $(INCLUDE);$(WindowsSdkDir)\Include;$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
       export LIB := $(LIB);$(WindowsSdkDir)\$(PlatLib);$(DXSDK_DIR)\Lib\$(WinArch)
@@ -638,10 +547,7 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
    endif
 else ifneq (,$(findstring windows_msvc2012,$(platform)))
    HAVE_GDI                 := 1
-   HAVE_SCREENSHOTS         := 1
-   HAVE_REWIND              := 1
    HAVE_AUDIOMIXER          := 1
-   HAVE_RWAV                := 1
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
    HAVE_RBMP                := 1
@@ -649,7 +555,6 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
    HAVE_ZLIB                := 1
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
-   HAVE_IFINFO              := 1
    HAVE_NETWORK_CMD         := 1
    HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
@@ -667,10 +572,7 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
    HAVE_GRIFFIN_CPP         := 1
    HAVE_RUNAHEAD            := 1
    HAVE_DIRECTX             ?= 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_CORE_INFO_CACHE     := 1
+	HAVE_CONFIGFILE          := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -724,10 +626,7 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
    endif
 else ifneq (,$(findstring windows_msvc2013,$(platform)))
    HAVE_GDI                 := 1
-   HAVE_SCREENSHOTS         := 1
-   HAVE_REWIND              := 1
    HAVE_AUDIOMIXER          := 1
-   HAVE_RWAV                := 1
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
    HAVE_RBMP                := 1
@@ -735,7 +634,6 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
    HAVE_ZLIB                := 1
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
-   HAVE_IFINFO              := 1
    HAVE_NETWORK_CMD         := 1
    HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
@@ -753,10 +651,7 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
    HAVE_GRIFFIN_CPP         := 1
    HAVE_RUNAHEAD            := 1
    HAVE_DIRECTX             ?= 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_CORE_INFO_CACHE     := 1
+	HAVE_CONFIGFILE          := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -810,10 +705,7 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
    endif
 else ifneq (,$(findstring windows_msvc2015,$(platform)))
    HAVE_GDI                 := 1
-   HAVE_SCREENSHOTS         := 1
-   HAVE_REWIND              := 1
    HAVE_AUDIOMIXER          := 1
-   HAVE_RWAV                := 1
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
    HAVE_RBMP                := 1
@@ -821,7 +713,6 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
    HAVE_ZLIB                := 1
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
-   HAVE_IFINFO              := 1
    HAVE_NETWORK_CMD         := 1
    HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
@@ -839,10 +730,7 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
    HAVE_GRIFFIN_CPP         := 1
    HAVE_RUNAHEAD            := 1
    HAVE_DIRECTX             ?= 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_CORE_INFO_CACHE     := 1
+	HAVE_CONFIGFILE          := 1
 
    EXT_TARGET := $(TARGET_NAME).exe
    EXT_INTER_TARGET := $(TARGET_NAME).exe
@@ -911,10 +799,7 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
       export LIB := $(LIB)
    endif
 else ifeq (qnx,$(platform))
-   HAVE_SCREENSHOTS         := 1
-   HAVE_REWIND              := 1
    HAVE_AUDIOMIXER          := 1
-   HAVE_RWAV                := 1
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
    HAVE_RBMP                := 1
@@ -922,7 +807,6 @@ else ifeq (qnx,$(platform))
    HAVE_ZLIB                := 1
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
-   HAVE_IFINFO              := 1
    HAVE_NETWORK_CMD         := 1
    HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
@@ -939,11 +823,7 @@ else ifeq (qnx,$(platform))
    HAVE_DYNAMIC             := 1
    HAVE_GRIFFIN_CPP         := 0
    WANT_GLSLANG             := 0
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_CORE_INFO_CACHE     := 1
-
+	HAVE_CONFIGFILE          := 1
    CC=qcc -Vgcc_ntoarmv7le
    CXX=QCC -Vgcc_ntoarmv7le
 
@@ -951,16 +831,13 @@ else ifeq (qnx,$(platform))
       LDFLAGS += -g
    endif
 
-   PLATCFLAGS += -DHAVE_SHADERPIPELINE -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_GL_SYNC -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_XCB -DHAVE_EGL -DHAVE_BB10 -DHAVE_GLSL -DHAVE_AL -DHAVE_BSV_MOVIE -DRARCH_MOBILE
+   PLATCFLAGS += -DHAVE_SHADERPIPELINE -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_FBO -DHAVE_GL_SYNC -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_XCB -DHAVE_EGL -DHAVE_BB10 -DHAVE_GLSL -DHAVE_AL -DRARCH_MOBILE
    EXT_TARGET := $(TARGET_NAME)
    EXT_INTER_TARGET := $(TARGET_NAME)
    INCLUDE += -Ilibretro-common/include -Igfx/include -Ideps -Ideps/stb -Ideps/rcheevos/include -Ideps/SPIRV-Cross -Ideps/glslang -I.
    LIBS += -lEGL -lbps -lscreen -lsocket -lm -lGLESv2 -lOpenAL
 else ifneq (,$(findstring unix,$(platform)))
-   HAVE_SCREENSHOTS         := 1
-   HAVE_REWIND              := 1
    HAVE_AUDIOMIXER          := 1
-   HAVE_RWAV                := 1
    HAVE_RPNG                := 1
    HAVE_RJPEG               := 1
    HAVE_RBMP                := 1
@@ -968,7 +845,6 @@ else ifneq (,$(findstring unix,$(platform)))
    HAVE_ZLIB                := 1
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
-   HAVE_IFINFO              := 1
    HAVE_NETWORK_CMD         := 1
    HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
@@ -985,12 +861,9 @@ else ifneq (,$(findstring unix,$(platform)))
    HAVE_DYNAMIC             := 1
    HAVE_GRIFFIN_CPP         := 1
    WANT_GLSLANG             := 1
-   HAVE_CONFIGFILE          := 1
-   HAVE_PATCH               := 1
-   HAVE_CHEATS              := 1
-   HAVE_CORE_INFO_CACHE     := 1
+	HAVE_CONFIGFILE          := 1
 
-   PLATCFLAGS += -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_GL_SYNC -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_VULKAN -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_X11 -DHAVE_XCB -DHAVE_UDEV -DHAVE_BSV_MOVIE -DHAVE_PULSE
+   PLATCFLAGS += -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_FBO -DHAVE_GL_SYNC -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_GFX_WIDGETS -DHAVE_CONFIGFILE -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_VULKAN -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_X11 -DHAVE_XCB -DHAVE_UDEV -DHAVE_PULSE
    EXT_TARGET := $(TARGET_NAME)
    EXT_INTER_TARGET := $(TARGET_NAME)
    INCLUDE += -Ilibretro-common/include -Igfx/include -Ideps -Ideps/stb -Ideps/rcheevos/include -Ideps/SPIRV-Cross -Ideps/glslang -I.
@@ -1082,34 +955,18 @@ ifeq ($(HAVE_IMAGEVIEWER), 1)
    CFLAGS      += -DHAVE_IMAGEVIEWER
 endif
 
-ifeq ($(HAVE_BSV_MOVIE), 1)
-   CFLAGS      += -DHAVE_BSV_MOVIE
-endif
-
 ifeq ($(HAVE_RUNAHEAD), 1)
    CFLAGS      += -DHAVE_RUNAHEAD
 endif
 
 ifeq ($(HAVE_7ZIP), 1)
-   CFLAGS      += -DHAVE_7ZIP -D_7ZIP_ST
-endif
-
-ifeq ($(HAVE_SCREENSHOTS), 1)
-	CFLAGS      += -DHAVE_SCREENSHOTS
-endif
-
-ifeq ($(HAVE_REWIND), 1)
-	CFLAGS      += -DHAVE_REWIND
+   CFLAGS      += -DHAVE_7ZIP
 endif
 
 ifeq ($(HAVE_AUDIOMIXER), 1)
    CFLAGS      += -DHAVE_AUDIOMIXER
 endif
 
-ifeq ($(HAVE_RWAV), 1)
-   CFLAGS      += -DHAVE_RWAV
-endif
-
 ifeq ($(HAVE_OVERLAY), 1)
    CFLAGS      += -DHAVE_OVERLAY
 endif
@@ -1122,10 +979,6 @@ ifeq ($(HAVE_NETWORKING), 1)
    CFLAGS      += -DHAVE_NETWORKING
 endif
 
-ifeq ($(HAVE_IFINFO), 1)
-   CFLAGS      += -DHAVE_IFINFO
-endif
-
 ifeq ($(HAVE_NETPLAYDISCOVERY), 1)
    CFLAGS      += -DHAVE_NETPLAYDISCOVERY
 endif
@@ -1134,10 +987,6 @@ ifeq ($(RARCH_CONSOLE), 1)
    CFLAGS += -DRARCH_CONSOLE
 endif
 
-ifeq ($(HAVE_CORE_INFO_CACHE), 1)
-   CFLAGS += -DHAVE_CORE_INFO_CACHE
-endif
-
 ifeq ($(RARCH_MOBILE), 1)
    CFLAGS += -DRARCH_MOBILE
 endif
@@ -1164,22 +1013,10 @@ ifeq ($(HAVE_LANGEXTRA), 1)
    CFLAGS += -DHAVE_LANGEXTRA
 endif
 
-ifeq ($(HAVE_DSP_FILTER), 1)
-   CFLAGS += -DHAVE_DSP_FILTER
-endif
-
-ifeq ($(HAVE_VIDEO_FILTER), 1)
-   CFLAGS += -DHAVE_VIDEO_FILTER
-endif
-
 ifeq ($(HAVE_FILTERS_BUILTIN), 1)
    CFLAGS += -DHAVE_FILTERS_BUILTIN
 endif
 
-ifeq ($(HAVE_WINDOW_OFFSET), 1)
-   CFLAGS += -DHAVE_WINDOW_OFFSET
-endif
-
 ifeq ($(HAVE_THREADS), 1)
    CFLAGS += -DHAVE_THREADS
 
@@ -1196,14 +1033,6 @@ ifeq ($(HAVE_CONFIGFILE), 1)
    CFLAGS += -DHAVE_CONFIGFILE
 endif
 
-ifeq ($(HAVE_PATCH), 1)
-   CFLAGS += -DHAVE_PATCH
-endif
-
-ifeq ($(HAVE_CHEATS), 1)
-	CFLAGS += -DHAVE_CHEATS
-endif
-
 ifeq ($(HAVE_RSOUND), 1)
    CFLAGS += -DHAVE_RSOUND
 endif

Makefile.libnx

@@ -23,8 +23,6 @@ DEFINES := -D__SWITCH__=1 -U__linux__ -U__linux -DGLM_FORCE_PURE=1 -DRARCH_CONSO
 
 HAVE_DR_MP3 = 1
 HAVE_TRANSLATE = 1
-HAVE_SCREENSHOTS = 1
-HAVE_REWIND = 1
 HAVE_AUDIOMIXER = 1
 HAVE_CC_RESAMPLER = 1
 HAVE_MENU_COMMON = 1
@@ -32,30 +30,20 @@ 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_FILTERS_BUILTIN = 1
 HAVE_MENU = 1
 HAVE_CONFIGFILE = 1
-HAVE_PATCH = 1
-HAVE_CHEATS = 1
 HAVE_RUNAHEAD = 1
 HAVE_NETWORKING = 1
-HAVE_IFINFO = 1
 HAVE_NETPLAYDISCOVERY = 1
 HAVE_STB_FONT = 1
 HAVE_CHEEVOS = 1
 HAVE_CHD = 0 # disabled due to static libretro-common and libchdr conflicts between different cores
 HAVE_STB_VORBIS = 1
-HAVE_IBXM = 1
-HAVE_CORE_INFO_CACHE = 1
 
 # RetroArch libnx useful flags
 HAVE_THREADS = 1
@@ -82,6 +70,7 @@ else
   HAVE_MATERIALUI = 0
   HAVE_XMB = 0
   HAVE_OZONE = 0
+  HAVE_STRIPES = 0
 endif
 
 include Makefile.common
@@ -127,15 +116,11 @@ APP_ICON := pkg/libnx/retroarch.jpg
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -mcpu=cortex-a57+crc+fp+simd
 
-CFLAGS := -g -Wall -O3 -fcommon -ffast-math -ffunction-sections \
+CFLAGS := -g -Wall -O3 -ffast-math -ffunction-sections \
           $(ARCH) $(DEFINES) $(INCLUDE_DIRS) -I$(LIBNX)/include -I$(PORTLIBS)/include/ -include $(LIBNX)/include/switch.h #$(shell $(PORTLIBS)/bin/freetype-config --cflags)
 
 CFLAGS += $(INCLUDE) -DSWITCH=1 -DHAVE_LIBNX=1 -DNXLINK=1 -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_STB_FONT #-DHAVE_FREETYPE
 
-ifeq ($(HAVE_FILTERS_BUILTIN), 1)
-  CFLAGS += -DHAVE_FILTERS_BUILTIN
-endif
-
 ifeq ($(strip $(HAVE_STATIC_DUMMY)),1)
   CFLAGS	+=	-DHAVE_STATIC_DUMMY=1
 endif

Makefile.miyoo

@@ -1,208 +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_CHEATS = 1
-HAVE_CHEEVOS = 0
-HAVE_LIBSHAKE = 0
-HAVE_CORE_INFO_CACHE = 1
-#HAVE_TINYALSA = 1
-HAVE_NEAREST_RESAMPLER = 1
-
-OS = Linux
-TARGET = retroarch
-
-OBJ :=
-LINK := $(CXX)
-DEF_FLAGS := -march=armv5te -mtune=arm926ej-s -ffast-math -fomit-frame-pointer
-DEF_FLAGS += -ffunction-sections -fdata-sections
-DEF_FLAGS += -I. -Ideps -Ideps/stb -DMIYOO=1 -DDINGUX -MMD
-DEF_FLAGS += -Wall -Wno-unused-variable -flto
-DEF_FLAGS += -std=gnu99 -D_GNU_SOURCE
-LIBS := -ldl -lz -lrt -pthread -lasound
-CFLAGS :=
-CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
-ASFLAGS :=
-LDFLAGS := -Wl,--gc-sections
-INCLUDE_DIRS = -I$(GCW0_INC_DIR)
-LIBRARY_DIRS = -L$(GCW0_LIB_DIR)
-DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY
-DEFINES += -DHAVE_C99=1 -DHAVE_CXX=1
-DEFINES += -DHAVE_GETOPT_LONG=1 -DHAVE_STRCASESTR=1 -DHAVE_DYNAMIC=1
-DEFINES += -DHAVE_FILTERS_BUILTIN -DHAVE_ALSA
-
-SDL_DINGUX_CFLAGS := $(shell $(GCW0_SDL_CONFIG) --cflags)
-SDL_DINGUX_LIBS := $(shell $(GCW0_SDL_CONFIG) --libs)
-FREETYPE_CFLAGS := $(shell $(GCW0_FREETYPE_CONFIG) --cflags)
-FREETYPE_LIBS := $(shell $(GCW0_FREETYPE_CONFIG) --libs)
-MMAP_LIBS = -lc
-
-OBJDIR_BASE := obj-unix
-
-ifeq ($(DEBUG), 1)
-   OBJDIR := $(OBJDIR_BASE)/debug
-   DEF_FLAGS += -O0 -g -DDEBUG -D_DEBUG
-else
-   OBJDIR := $(OBJDIR_BASE)/release
-   DEF_FLAGS += -O2 -DNDEBUG
-endif
-
-include Makefile.common
-
-DEF_FLAGS += $(INCLUDE_DIRS)
-LDFLAGS += $(CFLAGS) $(CXXFLAGS) $(DEF_FLAGS)
-CFLAGS += $(DEF_FLAGS)
-CXXFLAGS += $(DEF_FLAGS)
-
-HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
-
-Q := @
-
-RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
-
-all: $(TARGET)
-
--include $(RARCH_OBJ:.o=.d)
-
-SYMBOL_MAP := -Wl,-Map=output.map
-
-$(TARGET): $(RARCH_OBJ)
-	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
-
-ifeq ($(STRIP_BIN),1)
-	$(STRIP) --strip-unneeded $(TARGET)
-endif
-
-$(OBJDIR)/%.o: %.c
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c -o $@ $<
-
-$(OBJDIR)/%.o: %.cpp
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(OBJDIR)/%.o: %.m
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo OBJC $<),)
-	$(Q)$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(OBJDIR)/%.o: %.S $(HEADERS)
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo AS $<),)
-	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
-
-clean:
-	rm -rf $(OBJDIR_BASE)
-	rm -f $(TARGET)
-	rm -f *.d
-
-.PHONY: all clean
-
-print-%:
-	@echo '$*=$($*)'

Makefile.msvc

@@ -11,10 +11,6 @@ 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
@@ -36,7 +32,6 @@ HAVE_WINMM               := 1
 HAVE_RPNG                := 1
 HAVE_ZLIB                := 1
 HAVE_CONFIGFILE          := 1
-HAVE_PATCH               := 1
 HAVE_MENU                := 1
 HAVE_RGUI                := 1
 HAVE_XMB                 := 1
@@ -58,7 +53,6 @@ HAVE_RBMP                := 1
 HAVE_RTGA                := 1
 HAVE_7ZIP                := 1
 HAVE_NETWORKING          := 1
-HAVE_IFINFO              := 1
 HAVE_NETWORK_CMD         := 1
 HAVE_OVERLAY             := 1
 HAVE_VIDEO_LAYOUT        := 0
@@ -66,9 +60,6 @@ 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
@@ -201,9 +192,11 @@ else
    OBJ := $(filter-out $(BLACKLIST),$(OBJ))
 endif
 
-DEFINES += -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DHAVE_DYNAMIC -DJSON_STATIC
+DEFINES += -DRARCH_INTERNAL -DHAVE_DYNAMIC -DJSON_STATIC
 INCLUDE_DIRS += -I. -Igfx/include
 
+#OBJ := version_git.o
+
 OBJ := $(patsubst %rarch.o,%rarch.res,$(OBJ))
 OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))
 OBJ := $(OBJ:.o=.obj)

Makefile.ngc

@@ -1,268 +0,0 @@
-ROOT_DIR                  := .
-DEPS_DIR                  := $(ROOT_DIR)/deps
-DEBUG                     ?= 0
-HAVE_LOGGER                = 0
-HAVE_FILE_LOGGER           = 0
-HAVE_CC_RESAMPLER          = 1
-WHOLE_ARCHIVE_LINK         = 0
-BIG_STACK                  = 1
-PC_DEVELOPMENT_IP_ADDRESS  = 255.255.255.255
-PC_DEVELOPMENT_UDP_PORT    = 3490
-RARCH_CONSOLE              = 0
-USBGECKO                   = 0
-HAVE_STATIC_DUMMY ?= 0
-
-SPACE      :=
-SPACE      := $(SPACE) $(SPACE)
-BACKSLASH  :=
-BACKSLASH  := \$(BACKSLASH)
-filter_out1 = $(filter-out $(firstword $1),$1)
-filter_out2 = $(call filter_out1,$(call filter_out1,$1))
-
-# system platform
-system_platform = unix
-ifeq ($(shell uname -s),)
-   EXE_EXT = .exe
-   system_platform = win
-else ifneq ($(findstring Darwin,$(shell uname -s)),)
-   system_platform = osx
-else ifneq ($(findstring MINGW,$(shell uname -s)),)
-   system_platform = win
-endif
-
-TARGET_NAME        := retroarch
-
-INCLUDE            :=
-LDFLAGS            :=
-LIBDIRS            :=
-
-ifeq ($(LIBRETRO), nxengine)
-   WHOLE_ARCHIVE_LINK = 1
-endif
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START     := -Wl,--whole-archive
-   WHOLE_END       := -Wl,--no-whole-archive
-endif
-
-LIB_CORE :=
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIB_CORE += -lretro_ngc
-endif
-
-LIBS               := $(WHOLE_START) $(LIB_CORE) $(WHOLE_END)
-
-libogc_platform    := 1
-
-EXTERNAL_LIBOGC   ?= 0
-GX_PTHREAD_LEGACY ?= 1
-CC                 = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
-CXX                = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
-LD                 = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
-ELF2DOL            = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
-EXT_TARGET        := $(TARGET_NAME)_ngc.dol
-EXT_INTER_TARGET  := $(TARGET_NAME)_ngc.elf
-
-# Check whether ELF2DOL executable exists
-# (path has changed in more recent toolchains)
-ifeq ("$(wildcard $(ELF2DOL))","")
-   ELF2DOL = $(DEVKITPRO)/tools/bin/elf2dol$(EXE_EXT)
-endif
-
-INCLUDE += -I.
-
-ifeq ($(EXTERNAL_LIBOGC), 1)
-   CFLAGS   += -DEXTERNAL_LIBOGC
-   CXXFLAGS += -DEXTERNAL_LIBOGC
-   LIBDIRS += -L$(DEVKITPRO)/libogc/lib/cube
-   INCLUDE += -I$(DEVKITPRO)/libogc/include
-else
-   CFLAGS   += -DINTERNAL_LIBOGC
-   CXXFLAGS += -DINTERNAL_LIBOGC
-   LIBDIRS += -Lwii/libogc/libs/cube
-   INCLUDE += -Iwii/libogc/include
-endif
-
-ifeq ($(GX_PTHREAD_LEGACY), 1)
-   CFLAGS   += -DGX_PTHREAD_LEGACY
-   CXXFLAGS += -DGX_PTHREAD_LEGACY
-endif
-
-MACHDEP := -DHW_DOL -mogc
-
-LIBDIRS += -L.
-MACHDEP += -DGEKKO -mcpu=750 -meabi -mhard-float
-
-LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_TARGET)).map
-
-ifeq ($(BIG_STACK), 1)
-   LDFLAGS += -T bootstrap/gx/ogc.ld
-endif
-
-ifeq ($(EXTERNAL_LIBOGC), 1)
-   LIBS += -lfat
-endif
-
-ifeq ($(HAVE_LOGGER), 1)
-  LIBS += -lbba
-endif
-
-LIBS += -logc
-
-CFLAGS += -DGEKKO -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
-
-HAVE_RUNAHEAD            := 1
-HAVE_DSP_FILTER          := 1
-HAVE_VIDEO_FILTER        := 1
-HAVE_FILTERS_BUILTIN     := 1
-HAVE_THREADS             := 1
-HAVE_RPNG                := 1
-HAVE_RJPEG               := 1
-HAVE_RBMP                := 1
-HAVE_RTGA                := 1
-HAVE_IBXM                := 1
-HAVE_OVERLAY             := 1
-HAVE_VIDEO_LAYOUT        := 0
-HAVE_ZLIB                := 1
-HAVE_7ZIP                := 1
-HAVE_CONFIGFILE          := 1
-HAVE_PATCH               := 1
-HAVE_CHEATS              := 1
-HAVE_SCREENSHOTS         := 1
-HAVE_REWIND              := 1
-HAVE_AUDIOMIXER          := 1
-HAVE_RWAV                := 1
-RARCH_CONSOLE             = 1
-HAVE_CHEATS              := 1
-HAVE_CORE_INFO_CACHE     := 1
-HAVE_MENU_COMMON         := 1
-HAVE_MENU                := 1
-HAVE_BUILTINZLIB         := 1
-HAVE_STATIC_AUDIO_FILTERS := 1
-HAVE_STATIC_VIDEO_FILTERS := 1
-HAVE_XMB                 := 0
-HAVE_OZONE               := 0
-HAVE_RGUI                := 1
-HAVE_MATERIALUI          := 0
-
-INCLUDE += -I./libretro-common/include \
-           -Ideps \
-           -Ideps/stb
-CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE)
-
-OBJ =  $(PLATOBJS) audio/drivers/gx_audio.o gfx/drivers/gx_gfx.o input/drivers/gx_input.o frontend/drivers/platform_gx.o input/drivers_joypad/gx_joypad.o
-
-ifeq ($(EXTERNAL_LIBOGC), 0)
-   OBJ += wii/libogc/libfat/libfat.o wii/libogc/libfat/fatfile.o wii/libogc/libfat/file_allocation_table.o wii/libogc/libfat/cache.o wii/libogc/libfat/fatdir.o wii/libogc/libfat/partition.o wii/libogc/libfat/directory.o wii/libogc/libfat/filetime.o wii/libogc/libfat/disc.o
-endif
-
-include Makefile.common
-
-CFLAGS += $(DEFINES)
-
-ifeq ($(WANT_GLSLANG), 1)
-	OBJ += griffin/griffin_glslang.o
-endif
-
-ifeq ($(HAVE_LOGGER), 1)
-   CFLAGS      += -DHAVE_LOGGER
-   CFLAGS      += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-endif
-
-ifeq ($(HAVE_KERNEL_PRX), 1)
-   CFLAGS      += -DHAVE_KERNEL_PRX
-endif
-
-ifeq ($(HAVE_WIIUSB_HID), 1)
-   CFLAGS      += -DHAVE_WIIUSB_HID -DHAVE_HID
-endif
-
-ifeq ($(BIG_STACK),1)
-   CFLAGS      += -DBIG_STACK
-endif
-
-ifeq ($(HAVE_FILE_LOGGER), 1)
-   CFLAGS      += -DHAVE_FILE_LOGGER
-endif
-
-ifeq ($(HAVE_RARCH_EXEC), 1)
-   CFLAGS      += -DHAVE_RARCH_EXEC
-endif
-
-ifeq ($(HAVE_ZLIB), 1)
-   CFLAGS      += -DHAVE_ZLIB
-   CFLAGS      += -I./libretro-common/include/compat/zlib
-endif
-
-ifeq ($(RARCH_CONSOLE), 1)
-   CFLAGS += -DRARCH_CONSOLE
-endif
-
-ifeq ($(RARCH_MOBILE), 1)
-   CFLAGS += -DRARCH_MOBILE
-endif
-
-CFLAGS += -std=gnu99 -DHAVE_RGUI -DHAVE_MENU -DHAVE_GRIFFIN=1 -Wno-char-subscripts -DRARCH_INTERNAL
-
-ifeq ($(HAVE_FILTERS_BUILTIN), 1)
-   CFLAGS += -DHAVE_FILTERS_BUILTIN
-endif
-
-ifeq ($(HAVE_RSOUND), 1)
-   CFLAGS += -DHAVE_RSOUND
-endif
-
-ifeq ($(HAVE_GETOPT_LONG), 1)
-   CFLAGS += -DHAVE_GETOPT_LONG=1
-endif
-
-ifeq ($(HAVE_NETWORK_CMD), 1)
-   CFLAGS += -DHAVE_NETWORK_CMD
-endif
-
-ifeq ($(HAVE_DYNAMIC), 1)
-   CFLAGS += -DHAVE_DYNAMIC
-endif
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -g -DDEBUG
-else
-   CFLAGS += -O3
-endif
-
-OBJOUT   = -o
-LINKOUT  = -o
-LINK = $(CXX)
-
-all: $(EXT_TARGET)
-
-%.dol: %.elf
-	$(ELF2DOL) $< $@
-
-$(EXT_INTER_TARGET): $(OBJ)
-	$(LINK) $(LINKOUT)$@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(PLATEXTRA) $(LIBS)
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.cpp
-	$(CXX) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.S
-	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.binobj: %.bin
-	$(LD) -r -b binary $(OBJOUT)$@ $<
-
-clean:
-	rm -f $(EXT_TARGET)
-	rm -f $(EXT_INTER_TARGET)
-	rm -f $(OBJ)
-
-.PHONY: clean
-
-print-%:
-	@echo '$*=$($*)'

Makefile.openpandora

@@ -1,46 +1,23 @@
 include version.all
 
-DEBUG    = 0
+DEBUG = 0
 
-CC       = $(PNDSDK)/bin/arm-none-linux-gnueabi-gcc
-LD       = $(PNDSDK)/bin/arm-none-linux-gnueabi-gcc -o
+CC = $(PNDSDK)/bin/arm-none-linux-gnueabi-gcc
+LD = $(PNDSDK)/bin/arm-none-linux-gnueabi-gcc -o
 
-TARGET  := retroarch-pandora
+TARGET := retroarch-pandora
 
-LDDIRS   = -L. -L$(PNDSDK)/usr/lib
-INCDIRS  = -I. -I$(PNDSDK)/usr/include
+LDDIRS = -L. -L$(PNDSDK)/usr/lib
+INCDIRS = -I. -I$(PNDSDK)/usr/include
 
-OBJ      = griffin/griffin.o audio/resamplers/sinc_resampler_neon.o libretro-common/conversion/s16_to_float_neon.o libretro-common/conversion/float_to_s16_neon.o
-LDFLAGS  = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib
+OBJ = griffin/griffin.o audio/resamplers/sinc_resampler_neon.o libretro-common/conversion/s16_to_float_neon.o libretro-common/conversion/float_to_s16_neon.o
+LDFLAGS = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib
 
-LIBS     = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound
-DEFINES  = -std=gnu99
-DEFINES += -DHAVE_THREADS \
-	   -DHAVE_GETOPT_LONG=1 \
-	   -DHAVE_GRIFFIN \
-	   -DRARCH_INTERNAL \
-	   -DHAVE_CONFIGFILE \
-	   -DHAVE_PATCH \
-	   -DHAVE_SCREENSHOTS \
-	   -DHAVE_REWIND \
-	   -D__ARM_ARCH_6__ \
-	   -DHAVE_OPENGL \
-	   -DHAVE_OPENGLES \
-	   -DHAVE_OPENGLES2 \
-	   -DHAVE_GLSL \
-	   -DHAVE_DYNAMIC \
-	   -DHAVE_RPNG \
-	   -DHAVE_RJPEG \
-	   -DHAVE_OVERLAY \
-	   -DHAVE_VIDEO_LAYOUT \
-	   -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 += -DHAVE_CONFIGFILE -D__ARM_ARCH_6__ -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_OVERLAY -DHAVE_VIDEO_LAYOUT -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
 DEFINES += $(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)

Makefile.orbis

@@ -3,95 +3,55 @@ 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
+PC_DEVELOPMENT_IP_ADDRESS  =
+PC_DEVELOPMENT_UDP_PORT	   =
 
-AUTH_INFO = 000000000000000000000000001C004000FF000000000080000000000000000000000000000000000000008000400040000000000000008000000000000000080040FFFF000000F000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+OBJ :=
 
-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
+DEFINES :=
 
 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_VIDEO_LAYOUT 		:= 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					:= 1
-	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_CONFIGFILE 			:= 1
-	HAVE_CHD 							:= 1
+	HAVE_LANGEXTRA		:= 0
+	HAVE_RPNG		:= 1
+	HAVE_RJPEG		:= 1
+	HAVE_RBMP		:= 1
+	HAVE_RTGA		:= 1
+	HAVE_ZLIB		:= 1
+	HAVE_OVERLAY		:= 1
+	HAVE_VIDEO_LAYOUT := 0
+	HAVE_7ZIP		:= 1
+	HAVE_EGL 		:= 1
+	HAVE_GFX_WIDGETS := 1
+	HAVE_GLSL      := 1
+	HAVE_OPENGLES  		:= 1
+	HAVE_NETWORKING		:= 0
+	HAVE_SOCKET_LEGACY	:= 0
+	HAVE_MENU		:= 1
+	HAVE_MENU_COMMON	:= 1
+	HAVE_CONFIGFILE := 1
+	HAVE_RGUI		:= 0
+	HAVE_MATERIALUI 	:= 0
+	HAVE_XMB		:= 1
+	HAVE_THREADS		:= 1
+	HAVE_LIBRETRODB		:= 1
+	HAVE_CC_RESAMPLER	:= 1
+	HAVE_CHEEVOS		:= 1
+	RARCH_CONSOLE		:= 1
 	HAVE_STATIC_VIDEO_FILTERS = 1
 	HAVE_STATIC_AUDIO_FILTERS = 1
-	HAVE_CORE_INFO_CACHE	:= 1
 
 	ifeq ($(DEBUG), 1)
 		HAVE_NETLOGGER = 1
@@ -99,113 +59,107 @@ else
 
 	include Makefile.common
 	CFLAGS += $(DEF_FLAGS)
+	BLACKLIST :=
 	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
 endif
 
-ifeq ($(strip $(ORBISDEV)),)
-$(error "Please set ORBISDEV in your environment. export ORBISDEV=<path to>orbisdev")
+ifeq ($(strip $(PS4SDK)),)
+$(error "Please set PS4SDK in your environment. export PS4SDK=<path to>ps4sdk")
 endif
 
-PREFIX := orbis-
-CC      := clang
-CXX     := clang++
-AS      := $(PREFIX)as
+export PATH := $(PATH):$(PS4SDK)/bin
+
+PREFIX :=
+
+CC      := $(PREFIX)clang
+CXX     := $(PREFIX)clang
+AS      := $(PREFIX)clang
 AR      := $(PREFIX)ar
 OBJCOPY := $(PREFIX)objcopy
 STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
-LD      := clang
+LD      := $(CXX)
 
-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
+INCDIRS := -I. -Ideps/7zip -Ilibretro-common/include -Ideps/stb -Ilibretro-common/include/compat/zlib
+LIBDIRS := -L.
 
-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_ASSETS \
+ARCHFLAGS := -m64 -DORBIS
+CFLAGS    += $(ARCHFLAGS) -std=c11 -mcmodel=large -ffreestanding -nostdlib -nostdinc -fno-builtin -fno-stack-protector
 
-# 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
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O2 -g
+else
+   CFLAGS += -O3
 endif
 
-ifeq ($(HAVE_MOUSE),1)
-  DEFINES += -DHAVE_MOUSE
-  PS4_LIBS += -lSceMouse_stub
-endif
+ASFLAGS := $(ARCHFLAGS) -I$(PS4SDK)/include -target x86_64-scei-ps4-elf -fPIE
+LDFLAGS := -O3 -Wall -m64 -nostartfiles -nostdlib -L$(PS4SDK)/lib -pie
+ARFLAGS := rcs
+
+CRTFILE ?= $(PS4SDK)/crt0.s
+
+CFLAGS += -Wall -pedantic -Wno-zero-length-array -Wno-format-pedantic
+CFLAGS += -D__PS4__ -I$(PS4SDK)/include -I $(PS4SDK)/include/sce
+CFLAGS += -target x86_64-scei-ps4-elf -fPIE
+CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
+CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
 
 ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
-  DEFINES += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
+   CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
 endif
 
 ifneq ($(PC_DEVELOPMENT_UDP_PORT),)
-  DEFINES += -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+   CFLAGS += -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
 endif
 
 ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-  WHOLE_START := --whole-archive
-  WHOLE_END := --no-whole-archive
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
 endif
+CXXFLAGS := $(CFLAGS)
 
-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
+PS4_LIBS := -lps4link -ldebugnet -lorbisFile -lelfloader -lorbisKeyboard -lorbis2d -lpng -lz -lorbisGl -lorbisPad -lorbisAudio -lmod -lorbisFileBrowser -lorbisXbmFont -lSceNet_stub -lScePigletv2VSH_stub -lSceSystemService_stub -lSceUserService_stub -lScePad_stub -lSceAudioOut_stub -lSceIme_stub -lSceSysmodule_stub \
+	-lPs4_extension_kernel_call_standard -lPs4_extension_kernel_execute_dynlib_prepare_dlclose -lPs4_common_kernel -lPs4_common_user -lPs4_common_generic -lPs4LibCInternalAdaptive_stub -lPs4LibKernelAdaptive_stub -lSceLibcInternal_stub -lkernel_stub -lps4Kernel_stub -lPs4_base_stub_resolve_minimal -lPs4_base_kernel_dlsym_standard -lPs4_base_kernel_seek_elf_address_standard -lPs4_base_assembler_register_parameter_standard -lPs4_base_assembler_system_call_standard
 
-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
+LIBS	:= $(WHOLE_START) -lretro_orbis $(WHOLE_END) $(PS4_LIBS)
 
 TARGETS := $(TARGET).elf
 
+DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
+POSTCOMPILE = mv -f $*.Tdepend $*.depend
+
 all: $(TARGETS)
 
-OBJOUT   = -o
+%.o: %.cpp
+%.o: %.cpp %.depend
+	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
 
 %.o: %.c
-	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(OBJOUT)$@ $<
+%.o: %.c %.depend
+	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
 
 %.o: %.S
-	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
+%.o: %.S %.depend
+	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
 
 %.o: %.s
-	$(CC) -c $(OBJOUT)$@ $<
+%.o: %.s %.depend
+	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
+	$(POSTCOMPILE)
 
-$(TARGET).elf: $(OBJ)
-	$(LD) $(ORBISDEV)/usr/lib/crt0.o $(OBJ) $(LDFLAGS) $(LIBS) -o $(TARGET).elf
+%.depend: ;
 
-install:
-	@cp homebrew.self $(SELF_PATH_INSTALL)
-	@echo "Installed!"
-oelf:
-	@orbis-elf-create $(TARGET).elf homebrew.oelf
-eboot:
-	python $(ORBISDEV)/bin/make_fself.py --auth-info $(AUTH_INFO) homebrew.oelf homebrew.self
+$(TARGET).elf: $(OBJ) libretro_orbis.a
+	$(LD) $(CRTFILE) $(OBJ) $(LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
 
 clean:
-	rm -f $(OBJ) $(TARGET).elf $(TARGET).oelf
+	rm -f $(OBJ) $(TARGET).elf
+	rm -f $(OBJ:.o=.depend)
 
 .PHONY: clean all
+.PRECIOUS: %.depend
+
+-include $(OBJ:.o=.depend)

Makefile.pandora

@@ -14,7 +14,7 @@ pnd: retroarch.pnd
 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

Makefile.ps2

@@ -1,113 +1,84 @@
-TARGET := retroarch_ps2
-TARGET_RELEASE = retroarchps2.elf
-
 BUILD_FOR_PCSX2    = 0
 DEBUG              = 0
-SCREEN_DEBUG       = 0
-GRIFFIN_BUILD      = 0
+HAVE_KERNEL_PRX    = 0
+HAVE_LOGGER        = 0
+HAVE_FILE_LOGGER   = 0
 HAVE_THREADS       = 0
+BIG_STACK          = 0
 MUTE_WARNINGS      = 1
-WHOLE_ARCHIVE_LINK = 0
-HAVE_STATIC_DUMMY ?= 0
-PS2_IP = 192.168.1.10
+PS2_IP = 192.168.1.150
+
+TARGET = retroarchps2.elf
+TARGET_RELEASE = retroarchps2-release.elf
+
+# Lib CDVD
+CDVD_DIR = ps2/libcdvd
+
+# Compile the IRXs first
+IRX_DIR = ps2/irx
+IRX_FILES = $(wildcard ps2/irx/*.c)
 
 ifeq ($(DEBUG), 1)
    OPTIMIZE_LV	:= -O0 -g
-	DEFINES += -DDEBUG
+	RARCH_DEFINES += -DDEBUG
 else
-   OPTIMIZE_LV	:= -O3
-	# LDFLAGS :=  -s
+   OPTIMIZE_LV	:= -O2
+	LDFLAGS :=  -s
 endif
 
 ifeq ($(MUTE_WARNINGS), 1)
-   DISABLE_WARNINGS := -Wno-unused -Wno-format -Wno-format-truncation
+   DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses
 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_CHEATS = 1
-	HAVE_RGUI = 1
-	HAVE_MATERIALUI = 0
-	HAVE_XMB = 0
-	HAVE_OZONE = 0
-	HAVE_ZLIB = 1
-	HAVE_NO_BUILTINZLIB = 1
-	HAVE_7ZIP = 1
-	HAVE_SCREENSHOTS = 1
-	HAVE_REWIND = 1
-	HAVE_AUDIOMIXER = 1
-	HAVE_RWAV = 1
-	HAVE_DSP_FILTER = 1
-	HAVE_VIDEO_FILTER = 1
-	HAVE_FILTERS_BUILTIN = 1
-	HAVE_WINDOW_OFFSET = 1
-
-	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
-	BLACKLIST :=
-	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-	INCDIRS += $(INCLUDE_DIRS)
-endif
-
-ifeq ($(strip $(PS2SDK)),)
-$(error "Please set PS2SDK in your environment. export PS2SDK=<path to>ps2sdk")
-endif
-
-INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include
-INCDIR += -Ips2/include -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 -laudsrv -lmtap -lpadx -lz -lcdvd -lelf-loader -lfileXio -lpoweroff
-
-
-CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) $(DEFINES) -DPS2 -ffast-math -fsingle-precision-constant
+INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include -I$(CDVD_DIR)/ee
+INCDIR += -Ips2 -Ips2/include -Ilibretro-common/include -Ideps -Ideps/stb -Ideps/7zip
+INCDIR += -Ideps/pthreads -Ideps/pthreads/platform/ps2 -Ideps/pthreads/platform/helper
+GPVAL = -G0
+CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) -ffast-math -fsingle-precision-constant
 ASFLAGS = $(CFLAGS)
 
-# IRX libs
-IRX_FILES += sio2man.irx iomanX.irx fileXio.irx
-IRX_FILES += mcman.irx mcserv.irx
-IRX_FILES += usbd.irx bdm.irx bdmfs_vfat.irx usbmass_bd.irx
-IRX_FILES += libsd.irx audsrv.irx
-IRX_FILES += cdfs.irx
-IRX_FILES += ps2dev9.irx ps2atad.irx ps2hdd.irx ps2fs.irx poweroff.irx
-IRX_FILES += mtapman.irx padman.irx
-EE_OBJS += $(IRX_FILES:.irx=_irx.o)
+RARCH_DEFINES += -DPS2 -DUSE_IOP_CTYPE_MACRO -D_MIPS_ARCH_R5900 -DHAVE_ZLIB -DHAVE_NO_BUILTINZLIB -DHAVE_RPNG -DHAVE_RJPEG
+RARCH_DEFINES += -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_RGUI -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
+
+LIBDIR =
+LDFLAGS += -L$(PS2SDK)/ports/lib -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ee/lib -L$(CDVD_DIR)/lib -L.
+LIBS += -lretro_ps2 -lgskit -ldmakit -lgskit_toolkit -laudsrv -lmf -lpadx -lmtap -lmc -lhdd -lsdl -lfileXio -lz
+LIBS += -lcdvdfs -lpatches -lpoweroff
+
+ifeq ($(BUILD_FOR_PCSX2), 1)
+RARCH_DEFINES += -DBUILD_FOR_PCSX2
+endif
+
+ifeq ($(HAVE_THREADS), 1)
+RARCH_DEFINES += -DHAVE_THREADS
+endif
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS += -DHAVE_FILE_LOGGER
+endif
+
+ifeq ($(HAVE_KERNEL_PRX), 1)
+CFLAGS += -DHAVE_KERNEL_PRX
+endif
+
+ifeq ($(BIG_STACK), 1)
+CFLAGS += -DBIG_STACK
+endif
+
+CFLAGS += $(RARCH_DEFINES)
+
+# All the IRX objects
+EE_OBJS += $(IRX_DIR)/freemtap_irx.o $(IRX_DIR)/freepad_irx.o $(IRX_DIR)/freesio2_irx.o $(IRX_DIR)/iomanX_irx.o
+EE_OBJS += $(IRX_DIR)/fileXio_irx.o $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o $(IRX_DIR)/usbd_irx.o
+EE_OBJS += $(IRX_DIR)/usbhdfsd_irx.o $(IRX_DIR)/freesd_irx.o $(IRX_DIR)/audsrv_irx.o $(IRX_DIR)/poweroff_irx.o
+EE_OBJS += $(IRX_DIR)/cdvd_irx.o
 
 # Missing objecst on the PS2SDK
-EE_OBJS += ps2/compat_files/ps2_devices.o
+EE_OBJS += ps2/compat_files/compat_ctype.o ps2/compat_files/time.o ps2/compat_files/ps2_devices.o 
+EE_OBJS += ps2/compat_files/fileXio_cdvd.o ps2/compat_files/ps2_descriptor.o
 
-EE_OBJS += $(OBJ)
+#EE_OBJS = griffin/griffin.o bootstrap/ps2/kernel_functions.o
+EE_OBJS += griffin/griffin.o
 
 EE_CFLAGS = $(CFLAGS)
 EE_CXXFLAGS = $(CFLAGS)
@@ -115,14 +86,18 @@ EE_LDFLAGS = $(LDFLAGS)
 EE_LIBS = $(LIBS)
 EE_ASFLAGS = $(ASFLAGS)
 EE_INCS = $(INCDIR)
-EE_BIN = $(TARGET).elf
+EE_BIN = $(TARGET)
 EE_GPVAL = $(GPVAL)
 
 
-all: $(EE_BIN)
+all: irxdir $(EE_BIN)
+
+irxdir:
+	$(MAKE) -C $(IRX_DIR)
 
 clean:
 	rm -f $(EE_BIN) $(EE_OBJS)
+	$(MAKE) -C $(IRX_DIR) clean
 
 prepare:
 	ps2client -h $(PS2_IP) reset
@@ -131,18 +106,18 @@ prepare:
 run:
 	ps2client -h $(PS2_IP) execee host:$(EE_BIN)
 
-sim:
-	PCSX2 --elf=$(PWD)/$(EE_BIN) --nogui
+debug: clean prepare all run
 
-debug: clean all run
-
-release: all
+package:
 	ps2-packer $(EE_BIN) $(TARGET_RELEASE)
 
-# IRX files
-%_irx.c:
-	$(PS2SDK)/bin/bin2c $(PS2SDK)/iop/irx/$*.irx $@ $*_irx
+release: clean all package
 
 #Include preferences
 include $(PS2SDK)/samples/Makefile.pref
-include $(PS2SDK)/samples/Makefile.eeglobal_cpp
+include $(PS2SDK)/samples/Makefile.eeglobal
+
+#Linking with C++
+$(EE_BIN): $(EE_OBJS) $(PS2SDK)/ee/startup/crt0.o
+	$(EE_CXX) $(EE_NO_CRT) -T$(PS2SDK)/ee/startup/linkfile $(EE_CXXFLAGS) \
+		-o $(EE_BIN) $(PS2SDK)/ee/startup/crt0.o $(CRTI_OBJ) $(CRTBEGIN_OBJ) $(EE_OBJS) $(CRTEND_OBJ) $(CRTN_OBJ) $(EE_LDFLAGS) $(EE_LIBS)

Makefile.ps2.salamander

@@ -1,102 +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 += -Ips2/include
-CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) -ffast-math -fsingle-precision-constant
-ASFLAGS = $(CFLAGS)
-
-RARCH_DEFINES += -DPS2 -DIS_SALAMANDER -DRARCH_CONSOLE
-
-LIBDIR =
-LDFLAGS =
-LIBS = -lelf-loader -lpatches -lfileXio -lpoweroff
-
-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 \
-		 ps2/compat_files/ps2_devices.o
-
-# IRX libs
-IRX_FILES += sio2man.irx iomanX.irx fileXio.irx
-IRX_FILES += mcman.irx mcserv.irx
-IRX_FILES += usbd.irx bdm.irx bdmfs_vfat.irx usbmass_bd.irx
-IRX_FILES += cdfs.irx
-IRX_FILES += ps2dev9.irx ps2atad.irx ps2hdd.irx ps2fs.irx poweroff.irx
-EE_OBJS += $(IRX_FILES:.irx=_irx.o)
-
-EE_CFLAGS = $(CFLAGS)
-EE_CXXFLAGS = $(CFLAGS)
-EE_LDFLAGS = $(LDFLAGS)
-EE_LIBS = $(LIBS)
-EE_ASFLAGS = $(ASFLAGS)
-EE_INCS = $(INCDIR)
-EE_BIN = $(TARGET)
-EE_GPVAL = $(GPVAL)
-
-all: $(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)
-
-# IRX files
-%_irx.c:
-	$(PS2SDK)/bin/bin2c $(PS2SDK)/iop/irx/$*.irx $@ $*_irx
-
-#Include preferences
-include $(PS2SDK)/samples/Makefile.pref
-include $(PS2SDK)/samples/Makefile.eeglobal_cpp

Makefile.ps3

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

Makefile.ps3.cobra

@@ -0,0 +1,196 @@
+include version.all
+
+#which compiler to build  with - GCC or SNC
+#set to GCC for debug builds for use with debugger
+CELL_BUILD_TOOLS	= GCC
+CELL_GPU_TYPE	   	= RSX
+CELL_PSGL_VERSION	= ultra-opt
+
+# options
+DOWNLOAD_SHADERS	= 1
+STRIPPING_ENABLE	= 0
+DEBUG			      = 0
+HAVE_GCMGL	      = 1
+HAVE_LOGGER		   = 0
+HAVE_FREETYPE	   = 0
+WHOLE_ARCHIVE_LINK = 0
+
+CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001
+CONTENT_ID		= SSNE10000
+
+PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
+PC_DEVELOPMENT_UDP_PORT		= 3490
+
+CELL_MK_DIR		?= $(CELL_SDK)/samples/mk
+include $(CELL_MK_DIR)/sdk.makedef.mk
+
+PPU_TARGET		= retroarch_ps3.elf
+SALAMANDER_TARGET	= retroarch-salamander_ps3.elf
+
+EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
+CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF
+
+LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
+INCDIRS = -I. -Idefines -Ideps -Ideps/stb
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
+ifeq ($(shell uname), Linux)
+PKG_FINALIZE         	= package_finalize
+MAKE_SELF_WC		= make_self_wc
+MAKE_SELF		= make_self_npdrm
+PYTHON2			= python2
+GIT			= git
+else
+PKG_FINALIZE         	= package_finalize.exe
+MAKE_SELF_WC		= make_self_wc.exe
+MAKE_SELF		= make_self_npdrm.exe
+PYTHON2			= python2.exe
+GIT			= git.exe
+endif
+
+PPU_SRCS		= griffin/griffin.c
+
+DEFINES += -DHAVE_RGUI -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_MENU -DRARCH_INTERNAL
+
+ifeq ($(DEX_BUILD), 1)
+DEFINES += -DDEX_BUILD
+endif
+
+ifeq ($(CEX_BUILD), 1)
+DEFINES += -DCEX_BUILD
+endif
+
+ifeq ($(ODE_BUILD), 1)
+DEFINES += -DODE_BUILD
+endif
+
+ifeq ($(HAVE_GCMGL), 1)
+DEFINES			+= -DHAVE_GCMGL
+GL_LIBS			:= -L. -lrgl_ps3
+else
+GL_LIBS			:= -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc
+endif
+
+ifeq ($(HAVE_FREETYPE), 1)
+DEFINES			+= -DHAVE_FREETYPE
+FONT_LIBS		:= -lfontFT_stub -lfreetype_stub
+endif
+
+ifeq ($(CELL_BUILD_TOOLS), SNC)
+	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
+	PPU_CXX	= $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
+	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
+else ifneq($(system_platform), win)
+	PPU_CXX	= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
+	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
+	PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
+	PPU_CCLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
+endif
+
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+WHOLE_START := -Wl, --whole-archive
+WHOLE_END := -Wl, --no-whole-archive
+endif
+
+PPU_LDLIBS =  $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -lcgc -lgcm_cmdasm -lgcm_sys_stub -lresc_stub -lm -lio_stub -lfs_stub -lsysutil_stub -lsysutil_game_stub -lsysutil_screenshot_stub -lsysutil_np_stub -lpngdec_stub -ljpgdec_stub -lsysmodule_stub -laudio_stub -lnet_stub -lnetctl_stub -lpthread
+
+PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe
+
+#DEFINES += -DHAVE_VIDEO_LAYOUT
+DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_STB_VORBIS
+
+ifeq ($(DEBUG), 1)
+   PPU_OPTIMIZE_LV	:= -O0 -g
+else
+   PPU_OPTIMIZE_LV	:= -O3 -g
+endif
+
+ifeq ($(HAVE_LOGGER), 1)
+DEFINES			+= -DHAVE_LOGGER
+endif
+
+PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
+PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
+
+EXIST_EBOOT_WILDCARD := $(wildcard $(EBOOT_PATH))
+EXIST_CORE_WILDCARD := $(wildcard $(CORE_PATH))
+
+EBOOT_EXISTS		= 1
+CORE_EXISTS		= 1
+
+ifneq ($(strip $(EXIST_EBOOT_WILDCARD)),)
+EBOOT_EXISTS		= 0
+endif
+
+ifneq ($(strip $(EXIST_CORE_WILDCARD)),)
+CORE_EXISTS		= 0
+endif
+
+include $(CELL_MK_DIR)/sdk.target.mk
+
+MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe
+MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe
+MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe
+
+.PHONY: create-npdrm-core create-core create-npdrm-salamander create-shaders clean-selfs create-salamander
+
+create-npdrm-core:
+	$(MAKE_FSELF_NPDRM) $(PPU_TARGET) $(CORE_PATH)
+
+create-core:
+	$(MAKE_SELF_WC) $(PPU_TARGET) $(CORE_PATH)
+
+create-npdrm-salamander:
+	$(MAKE_FSELF_NPDRM) $(SALAMANDER_TARGET) $(EBOOT_PATH)
+
+create-salamander:
+	$(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL)
+
+copy-media-files:
+	@cp -r $(ASSETS_DIR)/glui pkg/ps3/USRDIR/cores/assets
+	@cp -r $(ASSETS_DIR)/xmb  pkg/ps3/USRDIR/cores/assets
+
+create-shaders:
+	make -f Makefile.shaders deploy-ps3
+
+pkg: $(PPU_TARGET)  create-shaders copy-media-files create-npdrm-salamander create-npdrm-core
+	$(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf pkg/ps3
+
+pkg-signed: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
+
+pkg-signed-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
+	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
+
+pkg-signed-cfw: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
+	$(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
+
+pkg-signed-cfw-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
+	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
+	$(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
+
+clean-selfs:
+ifeq ($(EBOOT_EXISTS),1)
+	@echo "WARNING: Couldn't find file to delete: [$(EBOOT_PATH)], skipping this step."
+else
+	rm $(EBOOT_PATH)
+endif
+ifeq ($(CORE_EXISTS),1)
+	@echo "WARNING: Couldn't find file to delete: [$(CORE_PATH)], skipping this step."
+else
+	rm $(CORE_PATH)
+endif

Makefile.ps3.salamander

@@ -0,0 +1,91 @@
+CELL_BUILD_TOOLS	= GCC
+CELL_SDK		?= /usr/local/cell
+HAVE_LOGGER		= 0
+CELL_MK_DIR ?= $(CELL_SDK)/samples/mk
+
+include $(CELL_MK_DIR)/sdk.makedef.mk
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+ifeq ($(DEBUG), 1)
+	PPU_OPTIMIZE_LV := -O0 -g
+else
+	PPU_OPTIMIZE_LV := -O2 -DNDEBUG
+endif
+
+STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
+
+INCFLAGS    = -I. -Idefines -Ilibretro-common/include -Ilibretro-common/include/compat/zlib
+DEFINES     = -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
+
+ifeq ($(DEX_BUILD), 1)
+DEFINES += -DDEX_BUILD
+endif
+
+ifeq ($(CEX_BUILD), 1)
+DEFINES += -DCEX_BUILD
+endif
+
+ifeq ($(ODE_BUILD), 1)
+DEFINES += -DODE_BUILD
+endif
+
+PPU_CFLAGS	:= $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
+PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
+
+PPU_SRCS		= frontend/frontend_salamander.c \
+				  frontend/frontend_driver.c \
+				  frontend/drivers/platform_ps3.c \
+				  libretro-common/file/file_path.c \
+				  libretro-common/file/file_path_io.c \
+				  libretro-common/lists/dir_list.c \
+				  libretro-common/lists/string_list.c \
+				  libretro-common/file/retro_dirent.c \
+				  libretro-common/hash/rhash.c \
+				  libretro-common/string/stdstring.c \
+				  libretro-common/encodings/encoding_utf.c \
+				  libretro-common/compat/compat_strl.c \
+				  libretro-common/compat/compat_strcasestr.c \
+				  libretro-common/compat/fopen_utf8.c \
+				  libretro-common/streams/file_stream.c \
+				  libretro-common/vfs/vfs_implementation.c \
+				  libretro-common/file/config_file.c \
+				  file_path_str.c \
+				  verbosity.c
+
+ifeq ($(HAVE_LOGGER), 1)
+PPU_CFLAGS		+= -DHAVE_LOGGER
+PPU_SRCS		   += network/net_logger.c \
+						libretro-common/net/net_compat.c \
+						libretro-common/net/net_socket.c
+endif
+
+PPU_TARGET		= retroarch-salamander_ps3.elf
+
+ifeq ($(CELL_BUILD_TOOLS),SNC)
+	PPU_CFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1
+	PPU_CXXFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1
+	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
+	PPU_CLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
+	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
+else
+	PPU_CFLAGS += -std=gnu99
+	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
+	PPU_CLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
+	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
+endif
+
+PPU_LDLIBS		+= -lm -lnet_stub -lnetctl_stub -lio_stub -lsysmodule_stub -lsysutil_stub -lsysutil_game_stub -lfs_stub -lsysutil_np_stub
+
+MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe
+
+include $(CELL_MK_DIR)/sdk.target.mk

Makefile.psl1ght

@@ -27,13 +27,13 @@ ELF_TARGET := retroarch_psl1ght.elf
 SELF_TARGET := $(ELF_TARGET:.elf=.self)
 CORE_PATH		= pkg/psl1ght/pkg/USRDIR/cores/CORE.SELF
 
-INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude -Idefines
+INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude
 LIBDIRS += -L.
 
-MACHDEP := -D__PSL1GHT__ -D__PS3__ -mcpu=cell
+MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__ -mcpu=cell
 CFLAGS += -Wall $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP)
-LIBS := -lretro_psl1ght -laudio -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl -lsysfs -lfreetype -lcamera -lgem -lspurs
+LIBS := -lretro_psl1ght -laudio -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule  -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl
 
 # system platform
 system_platform = unix
@@ -53,12 +53,7 @@ else
 GIT			= git.exe
 endif
 
-SHADER_OBJS = gfx/drivers/rsx_shaders/vpshader_basic.vpo.o \
-              gfx/drivers/rsx_shaders/fpshader_basic.fpo.o
-
-LIBCO_OBJ = libretro-common/libco/ps3.o
-
-OBJ = $(SHADER_OBJS) $(LIBCO_OBJ) griffin/griffin.o
+OBJ = griffin/griffin.o
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
@@ -71,36 +66,7 @@ endif
 SHARED_FLAGS :=
 
 SHARED_FLAGS += -DHAVE_VIDEO_LAYOUT
-SHARED_FLAGS += -DHAVE_MENU \
-		-DHAVE_CONFIGFILE \
-		-DHAVE_PATCH \
-		-DHAVE_CHEATS \
-		-DRARCH_CONSOLE \
-		-DHAVE_OVERLAY \
-		-DHAVE_HEADSET \
-		-DHAVE_CG \
-		-DHAVE_CG_RUNTIME_COMPILER \
-		-DHAVE_SYSMODULES \
-		-DHAVE_SYSUTILS \
-		-DHAVE_RARCH_EXEC \
-		-DHAVE_MOUSE \
-		-DHAVE_ZLIB \
-		-DHAVE_RPNG \
-		-DHAVE_GRIFFIN=1 \
-		-DHAVE_NETWORKING=1 \
-		-DHAVE_SOCKET_LEGACY=1 \
-		-DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" \
-		-DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) \
-		-Wno-char-subscripts \
-		-DHAVE_CC_RESAMPLER \
-		-DRARCH_INTERNAL \
-		-DHAVE_SCREENSHOTS \
-		-DHAVE_REWIND \
-		-DHAVE_MULTIMAN \
-		-DHAVE_MEMINFO \
-		-DHAVE_RGUI \
-		-DHAVE_FREETYPE \
-		-DHAVE_CORE_INFO_CACHE
+SHARED_FLAGS += -DHAVE_MENU -DHAVE_CONFIGFILE -DRARCH_CONSOLE -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts -DHAVE_CC_RESAMPLER -DRARCH_INTERNAL -DHAVE_MULTIMAN -DHAVE_RGUI
 CFLAGS += -std=gnu99 $(SHARED_FLAGS)
 CXXFLAGS += $(SHARED_FLAGS)
 

Makefile.psl1ght.salamander

@@ -27,14 +27,13 @@ ELF_TARGET := retroarch_psl1ght_salamander.elf
 ELF_TARGET_NONSTRIPPED := retroarch_psl1ght_salamander_nonstripped.elf
 EBOOT_PATH		= pkg/psl1ght/pkg/USRDIR/EBOOT.BIN
 
-INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib \
-			-Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude -Idefines
+INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude
 LIBDIRS += -L.
 
-MACHDEP := -D__PS3__ -D__PSL1GHT__ -mcpu=cell -mhard-float -fmodulo-sched -ffunction-sections -fdata-sections
+MACHDEP := -D__CELLOS_LV2__ -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
+LIBS :=  -lgcm_sys -lrsx -lsysutil -lio -lnet -lsysmodule -lrt -llv2 -lm
 
 # system platform
 system_platform = unix
@@ -62,18 +61,17 @@ OBJ		= frontend/frontend_salamander.o \
 				  libretro-common/lists/dir_list.o \
 				  libretro-common/lists/string_list.o \
 				  libretro-common/file/retro_dirent.o \
-				  libretro-common/hash/lrc_hash.o \
+				  libretro-common/hash/rhash.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
+				  file_path_str.o \
+				   verbosity.o
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER

Makefile.psp1

@@ -1,11 +1,12 @@
-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
+BUILD_PRX          = 0
+PSP_LARGE_MEMORY   = 1
+DEBUG              = 0
+HAVE_KERNEL_PRX    = 1
+HAVE_LOGGER        = 0
+HAVE_FILE_LOGGER   = 0
+HAVE_THREADS       = 1
+BIG_STACK          = 0
+WHOLE_ARCHIVE_LINK = 0
 
 TARGET = retroarchpsp
 
@@ -15,51 +16,30 @@ else
    OPTIMIZE_LV	:= -O3
 endif
 
-INCDIR = deps deps/stb deps/7zip libretro-common/include libretro-common/include/compat/zlib
-CFLAGS = $(OPTIMIZE_LV) -ffast-math -fsingle-precision-constant
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+
+INCDIR = deps deps/stb deps/7zip deps/pthreads deps/pthreads/platform/psp deps/pthreads/platform/helper libretro-common/include libretro-common/include/compat/zlib
+CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math -fsingle-precision-constant
 ASFLAGS = $(CFLAGS)
 
-RARCH_DEFINES = -DPSP \
-		-D_MIPS_ARCH_ALLEGREX \
-		-DHAVE_ZLIB \
-		-DHAVE_AUDIOMIXER \
-		-DHAVE_RWAV \
-		-DHAVE_RPNG \
-		-DHAVE_RJPEG \
-		-DHAVE_GRIFFIN=1 \
-		-DRARCH_INTERNAL \
-		-DHAVE_SCREENSHOTS \
-		-DHAVE_REWIND \
-		-DRARCH_CONSOLE \
-		-DHAVE_MENU \
-		-DHAVE_CONFIGFILE \
-		-DHAVE_PATCH \
-		-DHAVE_CHEATS \
-		-DHAVE_RGUI \
-		-DHAVE_FILTERS_BUILTIN \
-		-DHAVE_DSP_FILTER \
-		-DHAVE_VIDEO_FILTER \
-		-DHAVE_7ZIP \
-		-D_7ZIP_ST \
-		-DHAVE_CC_RESAMPLER \
-		-DHAVE_CORE_INFO_CACHE
+RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LANGEXTRA -DHAVE_ZLIB -DHAVE_AUDIOMIXER -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_RGUI -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
 
 LIBDIR =
-LDFLAGS = -L$(shell psp-config --psp-prefix)
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  RARCH_DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIBS += -lretro_psp1
-endif
-LIBS += -lstdc++ -lpspgu -lpspgum -lpspaudio -lpspfpu -lpsppower -lpsprtc -lpthread
+LDFLAGS =
+LIBS = $(WHOLE_START) -lretro_psp1 $(WHOLE_END) -lstdc++ -lpspgu -lpspgum -lm -lpspaudio -lpspfpu -lpsppower -lpsprtc
 
 ifeq ($(HAVE_THREADS), 1)
 RARCH_DEFINES += -DHAVE_THREADS
 endif
 
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS += -DHAVE_FILE_LOGGER
+endif
+
 ifeq ($(HAVE_KERNEL_PRX), 1)
-OBJS += bootstrap/psp1/kernel_functions.o
 CFLAGS += -DHAVE_KERNEL_PRX
 endif
 
@@ -67,16 +47,14 @@ 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
@@ -95,6 +73,3 @@ pspsh-run:
 debug: clean all pspsh-debug
 
 run: clean all pspsh-run
-
-sim:
-	/Applications/PPSSPPSDL.app/Contents/MacOS/PPSSPPSDL $(shell pwd)/EBOOT.PBP

Makefile.psp1.salamander

@@ -1,6 +1,6 @@
 BUILD_PRX         = 0
 PSP_LARGE_MEMORY  = 1
-HAVE_KERNEL_PRX   = 1
+HAVE_FILE_LOGGER  = 0
 DEBUG             = 0
 
 TARGET = retroarchpsp_salamander
@@ -8,18 +8,22 @@ TARGET = retroarchpsp_salamander
 ifeq ($(DEBUG), 1)
    OPTIMIZE_LV	:= -O0 -g
 else
-   OPTIMIZE_LV	:= -O3
+   OPTIMIZE_LV	:= -O2
 endif
 
 INCDIR = $(PSPPATH)/include libretro-common/include
-CFLAGS = $(OPTIMIZE_LV) -ffast-math -fsingle-precision-constant
+CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
 ASFLAGS = $(CFLAGS)
 
 RARCH_DEFINES = -DPSP -DIS_SALAMANDER -DRARCH_CONSOLE
 
 LIBDIR =
 LDFLAGS =
-LIBS = -lstdc++ -lpsppower
+LIBS = -lstdc++ -lm -lpsppower
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS		+= -DHAVE_FILE_LOGGER
+endif
 
 CFLAGS += $(RARCH_DEFINES)
 
@@ -40,19 +44,14 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/encodings/encoding_utf.o \
 		 libretro-common/compat/fopen_utf8.o \
 		 libretro-common/compat/compat_strl.o \
-		 libretro-common/compat/compat_strldup.o \
 		 libretro-common/compat/compat_strcasestr.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/vfs/vfs_implementation.o \
-		 libretro-common/hash/lrc_hash.o \
-		 libretro-common/time/rtime.o \
-		 verbosity.o
-
-ifeq ($(HAVE_KERNEL_PRX), 1)
-OBJS += bootstrap/psp1/kernel_functions.o
-CFLAGS += -DHAVE_KERNEL_PRX
-endif
+		 libretro-common/hash/rhash.o \
+		 file_path_str.o \
+		 verbosity.o \
+		 bootstrap/psp1/kernel_functions.o
 
 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak

Makefile.retrofw

@@ -1,236 +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_CHEATS = 1
-HAVE_CHEEVOS = 0
-HAVE_LIBSHAKE = 0
-HAVE_CORE_INFO_CACHE = 1
-HAVE_OSS =1
-
-OS = Linux
-TARGET = retroarch
-OPK_NAME = retroarch_retrofw.opk
-
-OBJ :=
-LINK := $(CXX)
-DEF_FLAGS := -march=mips32 -mtune=mips32 -mhard-float -ffast-math -fomit-frame-pointer
-DEF_FLAGS += -mplt -mno-shared
-DEF_FLAGS += -ffunction-sections -fdata-sections
-DEF_FLAGS += -I. -Ideps -Ideps/stb -DDINGUX=1 -DRETROFW=1 -MMD
-DEF_FLAGS += -Wall -Wno-unused-variable -flto
-DEF_FLAGS += -std=gnu99 -D_GNU_SOURCE
-LIBS := -ldl -lz -lrt -pthread
-CFLAGS :=
-CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
-ASFLAGS :=
-LDFLAGS := -Wl,--gc-sections
-INCLUDE_DIRS = -I$(GCW0_INC_DIR)
-LIBRARY_DIRS = -L$(GCW0_LIB_DIR)
-DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY
-DEFINES += -DHAVE_C99=1 -DHAVE_CXX=1
-DEFINES += -DHAVE_GETOPT_LONG=1 -DHAVE_STRCASESTR=1 -DHAVE_DYNAMIC=1
-DEFINES += -DHAVE_FILTERS_BUILTIN
-DEFINES += -DHAVE_OSS=1
-
-SDL_DINGUX_CFLAGS := $(shell $(GCW0_SDL_CONFIG) --cflags)
-SDL_DINGUX_LIBS := $(shell $(GCW0_SDL_CONFIG) --libs)
-FREETYPE_CFLAGS := $(shell $(GCW0_FREETYPE_CONFIG) --cflags)
-FREETYPE_LIBS := $(shell $(GCW0_FREETYPE_CONFIG) --libs)
-MMAP_LIBS = -lc
-
-OBJDIR_BASE := obj-unix
-
-ifeq ($(DEBUG), 1)
-   OBJDIR := $(OBJDIR_BASE)/debug
-   DEF_FLAGS += -O0 -g -DDEBUG -D_DEBUG
-else
-   OBJDIR := $(OBJDIR_BASE)/release
-   DEF_FLAGS += -O2 -DNDEBUG
-endif
-
-include Makefile.common
-
-DEF_FLAGS += $(INCLUDE_DIRS)
-LDFLAGS += $(CFLAGS) $(CXXFLAGS) $(DEF_FLAGS)
-CFLAGS += $(DEF_FLAGS)
-CXXFLAGS += $(DEF_FLAGS)
-
-HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
-
-Q := @
-
-RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
-
-define DESKTOP_ENTRY
-[Desktop Entry]
-Name=RetroArch
-Comment=Frontend for emulators, game engines
-Exec=retroarch
-Terminal=false
-Type=Application
-StartupNotify=true
-Icon=retroarch
-Categories=emulators;
-X-OD-NeedsDownscaling=true
-endef
-export DESKTOP_ENTRY
-
-
-all: $(TARGET) opk
-
--include $(RARCH_OBJ:.o=.d)
-
-SYMBOL_MAP := -Wl,-Map=output.map
-
-$(TARGET): $(RARCH_OBJ)
-	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
-
-$(OBJDIR)/%.o: %.c
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c -o $@ $<
-
-$(OBJDIR)/%.o: %.cpp
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(OBJDIR)/%.o: %.m
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo OBJC $<),)
-	$(Q)$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(OBJDIR)/%.o: %.S $(HEADERS)
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo AS $<),)
-	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
-
-clean:
-	rm -rf $(OBJDIR_BASE)
-	rm -f $(TARGET)
-	rm -f *.d
-	rm -rf $(OPK_NAME)
-
-opk: $(TARGET)
-	echo "$$DESKTOP_ENTRY" > default.retrofw.desktop
-	rm -f $(OPK_NAME)
-	cp media/ico_src/icon32.png retroarch.png
-	chmod +x retroarch
-	chmod 777 retroarch
-ifeq ($(STRIP_BIN),1)
-	$(STRIP) --strip-unneeded retroarch
-endif
-	$(GCW0_MK_SQUASH_FS) retroarch default.retrofw.desktop retroarch.png $(OPK_NAME) -all-root -no-xattrs -noappend -no-exports
-	rm -f default.retrofw.desktop retroarch.png
-
-.PHONY: all clean opk
-
-print-%:
-	@echo '$*=$($*)'

Makefile.rg350

@@ -1,232 +0,0 @@
-#########################
-## Toolchain variables ##
-#########################
-
-# Default toolchain directory
-TOOLCHAIN_DIR=/opt/gcw0-toolchain
-
-# All toolchain-related variables may be
-# overridden via the command line
-ifdef GCW0_CC
-CC                    = $(GCW0_CC)
-else
-CC                    = $(TOOLCHAIN_DIR)/usr/bin/mipsel-gcw0-linux-uclibc-gcc
-endif
-
-ifdef GCW0_CXX
-CXX                   = $(GCW0_CXX)
-else
-CXX                   = $(TOOLCHAIN_DIR)/usr/bin/mipsel-gcw0-linux-uclibc-g++
-endif
-
-ifdef GCW0_STRIP
-STRIP                 = $(GCW0_STRIP)
-else
-STRIP                 = $(TOOLCHAIN_DIR)/usr/bin/mipsel-gcw0-linux-uclibc-strip
-endif
-
-GCW0_SDL_CONFIG      ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/sdl-config
-GCW0_FREETYPE_CONFIG ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/freetype-config
-GCW0_MK_SQUASH_FS    ?= $(TOOLCHAIN_DIR)/usr/bin/mksquashfs
-
-GCW0_INC_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/include
-GCW0_LIB_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/lib
-
-#########################
-#########################
-
-PACKAGE_NAME = retroarch
-
-DEBUG ?= 0
-
-DINGUX = 1
-HAVE_SCREENSHOTS = 0
-HAVE_REWIND = 1
-HAVE_7ZIP = 1
-HAVE_AL = 1
-# ALSA freezes when switching back from menu
-HAVE_ALSA = 0
-HAVE_DSP_FILTER = 1
-HAVE_VIDEO_FILTER = 1
-HAVE_STATIC_VIDEO_FILTERS = 1
-HAVE_STATIC_AUDIO_FILTERS = 1
-HAVE_FILTERS_BUILTIN	= 1
-HAVE_BUILTINMBEDTLS = 0
-HAVE_BUILTINZLIB = 1
-HAVE_C99 = 1
-HAVE_CC = 1
-HAVE_CC_RESAMPLER = 1
-HAVE_CHD = 1
-HAVE_COMMAND = 0
-HAVE_CXX = 1
-HAVE_DR_MP3 = 1
-HAVE_DYNAMIC = 1
-HAVE_EGL = 0
-HAVE_FREETYPE = 0
-HAVE_GDI = 1
-HAVE_GETADDRINFO = 0
-HAVE_GETOPT_LONG = 1
-HAVE_GLSL = 0
-HAVE_HID = 1
-HAVE_IBXM = 1
-HAVE_IMAGEVIEWER = 1
-HAVE_LANGEXTRA = 0
-HAVE_LIBRETRODB = 1
-HAVE_MENU = 1
-HAVE_MENU_COMMON = 1
-HAVE_GFX_WIDGETS = 0
-HAVE_MMAP = 1
-HAVE_OPENDINGUX_FBDEV = 0
-HAVE_OPENGL = 0
-HAVE_OPENGL1 = 0
-HAVE_OPENGLES = 0
-HAVE_OPENGLES3 = 0
-HAVE_OPENGL_CORE = 0
-HAVE_OPENSSL = 1
-HAVE_OVERLAY = 0
-HAVE_RBMP = 1
-HAVE_RJPEG = 1
-HAVE_RPILED = 0
-HAVE_RPNG = 1
-HAVE_RUNAHEAD = 1
-HAVE_SDL_DINGUX = 1
-HAVE_SHADERPIPELINE = 0
-HAVE_STB_FONT = 0
-HAVE_STB_IMAGE = 1
-HAVE_STB_VORBIS = 1
-HAVE_STDIN_CMD = 0
-HAVE_STRCASESTR = 1
-HAVE_THREADS = 1
-HAVE_UDEV = 1
-HAVE_RGUI = 1
-HAVE_MATERIALUI = 0
-HAVE_XMB = 0
-HAVE_OZONE = 0
-HAVE_ZLIB = 1
-HAVE_CONFIGFILE = 1
-HAVE_PATCH = 1
-HAVE_CHEATS = 1
-HAVE_CHEEVOS = 0
-HAVE_LIBSHAKE = 1
-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 '$*=$($*)'

Makefile.rg350_odbeta

@@ -1,234 +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_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 '$*=$($*)'

Makefile.rs90

@@ -1,235 +0,0 @@
-#########################
-## Toolchain variables ##
-#########################
-
-# Alpha toolchain
-TOOLCHAIN_DIR=/opt/rs90-toolchain
-
-# All toolchain-related variables may be
-# overridden via the command line
-ifdef GCW0_CC
-CC                    = $(GCW0_CC)
-else
-CC                    = $(TOOLCHAIN_DIR)/usr/bin/mipsel-rs90-linux-musl-gcc
-endif
-
-ifdef GCW0_CXX
-CXX                   = $(GCW0_CXX)
-else
-CXX                   = $(TOOLCHAIN_DIR)/usr/bin/mipsel-rs90-linux-musl-g++
-endif
-
-ifdef GCW0_STRIP
-STRIP                 = $(GCW0_STRIP)
-else
-STRIP                 = $(TOOLCHAIN_DIR)/usr/bin/mipsel-rs90-linux-musl-strip
-endif
-
-GCW0_SDL_CONFIG      ?= $(TOOLCHAIN_DIR)/usr/mipsel-rs90-linux-musl/sysroot/usr/bin/sdl-config
-GCW0_FREETYPE_CONFIG ?= $(TOOLCHAIN_DIR)/usr/mipsel-rs90-linux-musl/sysroot/usr/bin/freetype-config
-GCW0_MK_SQUASH_FS    ?= $(TOOLCHAIN_DIR)/usr/bin/mksquashfs
-
-GCW0_INC_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-rs90-linux-musl/sysroot/usr/include
-GCW0_LIB_DIR         ?= $(TOOLCHAIN_DIR)/usr/mipsel-rs90-linux-musl/sysroot/usr/lib
-
-#########################
-#########################
-
-PACKAGE_NAME = retroarch
-
-DEBUG ?= 0
-
-RS90 = 1
-DINGUX = 1
-DINGUX_BETA = 1
-HAVE_SCREENSHOTS = 0
-HAVE_REWIND = 0
-HAVE_7ZIP = 1
-HAVE_AL = 0
-HAVE_ALSA = 1
-HAVE_DSP_FILTER = 1
-HAVE_VIDEO_FILTER = 1
-HAVE_STATIC_VIDEO_FILTERS = 1
-HAVE_STATIC_AUDIO_FILTERS = 1
-HAVE_FILTERS_BUILTIN	= 1
-HAVE_BUILTINMBEDTLS = 0
-HAVE_BUILTINZLIB = 1
-HAVE_C99 = 1
-HAVE_CC = 1
-HAVE_CC_RESAMPLER = 1
-
-HAVE_CHD = 0
-HAVE_COMMAND = 0
-HAVE_CXX = 1
-HAVE_DR_MP3 = 0
-HAVE_DYNAMIC = 1
-HAVE_EGL = 0
-HAVE_FREETYPE = 0
-HAVE_GDI = 0
-HAVE_GETADDRINFO = 0
-HAVE_GETOPT_LONG = 1
-HAVE_GLSL = 0
-HAVE_HID = 0
-HAVE_IBXM = 0
-HAVE_IMAGEVIEWER = 0
-HAVE_LANGEXTRA = 0
-HAVE_LIBRETRODB = 1
-HAVE_MENU = 1
-HAVE_MENU_COMMON = 1
-HAVE_GFX_WIDGETS = 0
-HAVE_MMAP = 1
-HAVE_OPENDINGUX_FBDEV = 0
-HAVE_OPENGL = 0
-HAVE_OPENGL1 = 0
-HAVE_OPENGLES = 0
-HAVE_OPENGLES3 = 0
-HAVE_OPENGL_CORE = 0
-HAVE_OPENSSL = 0
-HAVE_OVERLAY = 0
-HAVE_RBMP = 1
-HAVE_RJPEG = 1
-HAVE_RPILED = 0
-HAVE_RPNG = 1
-HAVE_RUNAHEAD = 0
-HAVE_SDL_DINGUX = 1
-HAVE_SHADERPIPELINE = 0
-HAVE_STB_FONT = 0
-HAVE_STB_IMAGE = 0
-HAVE_STB_VORBIS = 0
-HAVE_STDIN_CMD = 0
-HAVE_STRCASESTR = 1
-HAVE_THREADS = 1
-HAVE_UDEV = 1
-HAVE_RGUI = 1
-HAVE_MATERIALUI = 0
-HAVE_XMB = 0
-HAVE_OZONE = 0
-HAVE_ZLIB = 1
-HAVE_CONFIGFILE = 1
-HAVE_PATCH = 1
-HAVE_CHEATS = 1
-HAVE_CHEEVOS = 0
-HAVE_LIBSHAKE = 0
-HAVE_TINYALSA = 1
-HAVE_NEAREST_RESAMPLER = 1
-HAVE_CORE_INFO_CACHE = 1
-
-OS = Linux
-TARGET = retroarch
-OPK_NAME = retroarch_rs90_odbeta.opk
-
-OBJ :=
-LINK := $(CXX)
-DEF_FLAGS := -mplt -mno-shared
-DEF_FLAGS += -ffunction-sections -fdata-sections
-DEF_FLAGS += -I. -Ideps -Ideps/stb -DRS90=1 -DDINGUX=1 -DDINGUX_BETA=1 -MMD
-DEF_FLAGS += -Wall -Wno-unused-variable
-DEF_FLAGS += -std=gnu99 -D_GNU_SOURopendinguxCE -flto -lasound
-LIBS := -ldl -lz -lrt -ludev -pthread
-CFLAGS :=
-CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
-ASFLAGS :=
-LDFLAGS := -Wl,--gc-sections
-INCLUDE_DIRS = -I$(GCW0_INC_DIR)
-LIBRARY_DIRS = -L$(GCW0_LIB_DIR)
-DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY
-DEFINES += -DHAVE_C99=1 -DHAVE_CXX=1
-DEFINES += -DHAVE_GETOPT_LONG=1 -DHAVE_STRCASESTR=1 -DHAVE_DYNAMIC=1
-DEFINES += -DHAVE_FILTERS_BUILTIN
-DEFINES += -DHAVE_UDEV=1
-DEFINES += -DHAVE_ALSA
-DEFINES += -DCC_RESAMPLER_PRECISION=0
-
-SDL_DINGUX_CFLAGS := $(shell $(GCW0_SDL_CONFIG) --cflags)
-SDL_DINGUX_LIBS := $(shell $(GCW0_SDL_CONFIG) --libs)
-FREETYPE_CFLAGS := $(shell $(GCW0_FREETYPE_CONFIG) --cflags)
-FREETYPE_LIBS := $(shell $(GCW0_FREETYPE_CONFIG) --libs)
-MMAP_LIBS = -lc
-
-OBJDIR_BASE := obj-unix
-
-ifeq ($(DEBUG), 1)
-   OBJDIR := $(OBJDIR_BASE)/debug
-   DEF_FLAGS += -O0 -g -DDEBUG -D_DEBUG
-else
-   OBJDIR := $(OBJDIR_BASE)/release
-   DEF_FLAGS += -Ofast -DNDEBUG
-endif
-
-include Makefile.common
-
-DEF_FLAGS += $(INCLUDE_DIRS)
-LDFLAGS += $(CFLAGS) $(CXXFLAGS) $(DEF_FLAGS)
-CFLAGS += $(DEF_FLAGS)
-CXXFLAGS += $(DEF_FLAGS)
-
-HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
-
-Q := @
-
-RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
-
-define DESKTOP_ENTRY
-[Desktop Entry]
-Name=RetroArch
-Comment=Frontend for emulators, game engines
-Exec=retroarch
-Terminal=false
-Type=Application
-StartupNotify=true
-Icon=retroarch
-Categories=emulators;
-X-OD-NeedsDownscaling=true
-endef
-export DESKTOP_ENTRY
-
-all: $(TARGET) opk
-
--include $(RARCH_OBJ:.o=.d)
-
-SYMBOL_MAP := -Wl,-Map=output.map
-
-$(TARGET): $(RARCH_OBJ)
-	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
-
-$(OBJDIR)/%.o: %.c
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c -o $@ $<
-
-$(OBJDIR)/%.o: %.cpp
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(OBJDIR)/%.o: %.m
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo OBJC $<),)
-	$(Q)$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(OBJDIR)/%.o: %.S $(HEADERS)
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo AS $<),)
-	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
-
-clean:
-	rm -rf $(OBJDIR_BASE)
-	rm -f $(TARGET)
-	rm -f *.d
-	rm -rf $(OPK_NAME)
-
-opk: $(TARGET)
-	echo "$$DESKTOP_ENTRY" > default.rs90.desktop
-	rm -f $(OPK_NAME)
-	cp media/ico_src/icon32.png retroarch.png
-ifeq ($STRIP_BIN, 1)
-	$(STRIP) --strip-unneeded retroarch
-endif
-	$(GCW0_MK_SQUASH_FS) retroarch default.rs90.desktop retroarch.png $(OPK_NAME) -all-root -no-xattrs -noappend -no-exports
-	rm -f default.rs90.desktop retroarch.png
-
-.PHONY: all clean opk
-
-print-%:
-	@echo '$*=$($*)'

Makefile.switch

@@ -6,18 +6,16 @@ WHOLE_ARCHIVE_LINK      = 0
 
 OBJ :=
 
-DEFINES := -DSWITCH=1 -U__linux__ -U__linux -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_DYNAMIC -DHAVE_REWIND
+DEFINES := -DSWITCH=1 -U__linux__ -U__linux -DRARCH_INTERNAL -DHAVE_DYNAMIC
 
 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_NEON -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
 	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA
 	DEFINES += -DHAVE_RUNAHEAD -DHAVE_DYNAMIC
-	DEFINES += -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS
+	DEFINES += -DHAVE_CONFIGFILE
 else
-	HAVE_REWIND = 1
 	HAVE_AUDIOMIXER = 1
-	HAVE_RWAV       = 1
 	HAVE_CC_RESAMPLER = 1
 	HAVE_MENU_COMMON = 1
 	HAVE_RTGA = 1
@@ -26,8 +24,6 @@ else
 	HAVE_RBMP = 1
 	HAVE_RGUI = 1
 	HAVE_ZLIB = 1
-	HAVE_DSP_FILTER = 1
-	HAVE_VIDEO_FILTER = 1
 	HAVE_BUILTINZLIB = 1
 	HAVE_LIBRETRODB = 1
 	HAVE_MATERIALUI = 0 # enable later?
@@ -38,10 +34,6 @@ else
 	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)

Makefile.vita

@@ -1,9 +1,7 @@
 TARGET		    := retroarch_vita
 DEBUG               ?= 0
-HAVE_FILE_LOGGER	= 1
 GRIFFIN_BUILD        = 0
 WHOLE_ARCHIVE_LINK   = 0
-HAVE_STATIC_DUMMY ?= 0
 
 VITA_TITLE_ID	:= RETROARCH
 VITA_TITLE_NAME	:= RetroArch
@@ -13,46 +11,24 @@ PC_DEVELOPMENT_UDP_PORT	   =
 
 OBJ :=
 
-SCE_LIBC_SIZE := 4194304
-DEFINES := -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_STB_VORBIS
+DEFINES := -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS
 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
+	DEFINES += -DHAVE_GRIFFIN=1
+	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB DEFINES -DHAVE_KEYMAPPER
+	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_CC_RESAMPLER
 	ifeq ($(DEBUG), 1)
 		DEFINES += -DHAVE_NETLOGGER
 	endif
-	INCDIRS += -I. \
-		   -Ideps/7zip \
-		   -Ilibretro-common/include \
-		   -Ilibretro-common/include/compat/zlib \
-		   -Ideps/stb
+	INCDIRS += -I. -Ideps/7zip -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -Ideps/stb
 else
-	HAVE_REWIND		:= 1
-	HAVE_UPDATE_ASSETS      := 1
-	HAVE_ONLINE_UPDATER     := 1
+
+   HAVE_UPDATE_ASSETS      := 1
+   HAVE_ONLINE_UPDATER     := 1
 	HAVE_NEON		:= 1
-	HAVE_DSP_FILTER		:= 1
-	HAVE_VIDEO_FILTER	:= 1
-	HAVE_SCREENSHOTS	:= 1
+   HAVE_MATH_NEON := 1
 	HAVE_FILTERS_BUILTIN	:= 1
 	HAVE_LANGEXTRA		:= 1
 	HAVE_RPNG		:= 1
@@ -61,32 +37,16 @@ else
 	HAVE_RTGA		:= 1
 	HAVE_ZLIB		:= 1
 	HAVE_7ZIP		:= 1
-   ifeq ($(HAVE_VITAGLES), 1)
-	HAVE_VITA2D		:= 0
-	HAVE_VITAGL		:= 0
-	HAVE_VITAGLES 		:= 1
-	HAVE_OPENGL 		:= 1
-	HAVE_OPENGLES 		:= 1
-	HAVE_OPENGLES2 		:= 1
-	HAVE_EGL 		:= 1
-	HAVE_GLSL 		:= 1
-	HAVE_SHADERPIPELINE 	:= 1
-   else
 	HAVE_VITA2D		:= 1
-	HAVE_VITAGL		:= 0
-   endif
+	HAVE_VITAGL		:= 1
 	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_CHEATS     	:= 1
+	HAVE_GFX_WIDGETS := 1
+	HAVE_CONFIGFILE := 1
 	HAVE_OVERLAY		:= 1
-	HAVE_VIDEO_LAYOUT 	:= 0
+	HAVE_VIDEO_LAYOUT := 0
 	HAVE_MATERIALUI		:= 1
 	HAVE_XMB		:= 1
 	HAVE_RGUI		:= 1
@@ -100,18 +60,16 @@ else
 	HAVE_STATIC_VIDEO_FILTERS = 1
 	HAVE_STATIC_AUDIO_FILTERS = 1
 	HAVE_AUDIOMIXER 	:= 1
-	HAVE_RWAV       	:= 1
-	HAVE_CORE_INFO_CACHE    := 1
 
 	ifeq ($(DEBUG), 1)
-		HAVE_NETLOGGER	= 1
+		HAVE_NETLOGGER = 1
 	endif
 
 	include Makefile.common
-	CFLAGS			+= $(DEF_FLAGS)
-	BLACKLIST 		:=
-	OBJ			:= $(filter-out $(BLACKLIST),$(OBJ))
-	INCDIRS			+= $(INCLUDE_DIRS)
+	CFLAGS += $(DEF_FLAGS)
+	BLACKLIST :=
+	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
+	INCDIRS += $(INCLUDE_DIRS)
 endif
 
 ifeq ($(strip $(VITASDK)),)
@@ -134,25 +92,17 @@ 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 -fno-optimize-sibling-calls
+CFLAGS    += $(ARCHFLAGS) -mword-relocations -fno-optimize-sibling-calls -O2
 
 ifeq ($(DEBUG), 1)
-   CFLAGS += -g -Og
-else
-   CFLAGS += -O2
+   CFLAGS += -g
 endif
 
 ASFLAGS := $(CFLAGS)
 LDFLAGS := -Wl,-q
 
-CFLAGS += -Wall -ffast-math
-CFLAGS += -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DRARCH_CONSOLE
-CFLAGS += -DHAVE_DSP_FILTER
-CFLAGS += -DHAVE_VIDEO_FILTER
+CFLAGS += -Wall -ffast-math -g
+CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
 CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
 
 ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
@@ -172,25 +122,9 @@ 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
+	-lSceFiber_stub -lSceMotion_stub -lSceAppMgr_stub -lpthread -lpng -lz
 
-ifeq ($(HAVE_VITAGLES), 1)
-   VITA_LIBS += -llibScePiglet_stub -ltaihen_stub
-   FSELF_FLAGS := -ss
-else
-   VITA_LIBS += -lvitaGL -lvitashark
-   FSELF_FLAGS := -s
-endif
-
-LIBS	:= $(WHOLE_START) 
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIBS += -lretro_vita
-endif
-
-LIBS    += $(WHOLE_END) $(VITA_LIBS) -lm -lc
+LIBS	:= $(WHOLE_START) -lretro_vita $(WHOLE_END) $(VITA_LIBS) -lm -lc
 
 TARGETS := $(TARGET).vpk
 
@@ -221,13 +155,7 @@ all: $(TARGETS)
 
 %.depend: ;
 
-liblibScePiglet_stub.a:
-	mkdir -p deps/Pigs-In-A-Blanket/piglet_stub/libScePiglet
-	vita-libs-gen deps/Pigs-In-A-Blanket/piglet_stub/nids.yml deps/Pigs-In-A-Blanket/piglet_stub/libScePiglet
-	make -C deps/Pigs-In-A-Blanket/piglet_stub/libScePiglet ARCH=arm-vita-eabi
-	cp deps/Pigs-In-A-Blanket/piglet_stub/libScePiglet/liblibScePiglet_stub.a .
-
-$(TARGET).elf: $(OBJ) liblibScePiglet_stub.a
+$(TARGET).elf: $(OBJ) libretro_vita.a
 	$(LD) $(OBJ) $(LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
 
 %.velf: %.elf
@@ -236,15 +164,14 @@ $(TARGET).elf: $(OBJ) liblibScePiglet_stub.a
 	vita-elf-create $< $@
 
 %.self: %.velf
-	vita-make-fself -c $(FSELF_FLAGS) $< $@
+	vita-make-fself -c -s $< $@
 
 %.vpk: %.self
 	vita-mksfoex -s TITLE_ID=$(VITA_TITLE_ID) "$(VITA_TITLE_NAME)" -d ATTRIBUTE2=12 param.sfo
 	vita-pack-vpk -s param.sfo -b $< $@
 
 clean:
-	rm -f $(OBJ) $(TARGET).elf $(TARGET).elf.unstripped.elf $(TARGET).velf $(TARGET).self param.sfo $(TARGET).vpk 
-	rm -rf  deps/Pigs-In-A-Blanket/piglet_stub/libScePiglet
+	rm -f $(OBJ) $(TARGET).elf $(TARGET).elf.unstripped.elf $(TARGET).velf $(TARGET).self param.sfo $(TARGET).vpk
 	rm -f $(OBJ:.o=.depend)
 
 # Useful for developers
@@ -254,10 +181,6 @@ vpksend: $(TARGET).vpk
 send: $(TARGET).self
 	curl -T $< ftp://$(PSVITAIP):1337/ux0:/app/$(VITA_TITLE_ID)/eboot.bin
 
-launch: $(TARGET).self
-	curl -T $< ftp://$(PSVITAIP):1337/ux0:/app/$(VITA_TITLE_ID)/eboot.bin
-	echo "launch $(VITA_TITLE_ID)" | nc ${PSVITAIP} 1338
-
 .PHONY: clean all send vpksend
 .PRECIOUS: %.depend
 

Makefile.vita.salamander

@@ -43,20 +43,19 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/file/retro_dirent.o \
 		 libretro-common/encodings/encoding_utf.o \
 		 libretro-common/compat/compat_strl.o \
-		 libretro-common/compat/compat_strldup.o \
 		 libretro-common/compat/compat_strcasestr.o \
 		 libretro-common/compat/fopen_utf8.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
 		 libretro-common/vfs/vfs_implementation.o \
-		 libretro-common/hash/lrc_hash.o \
-		 libretro-common/time/rtime.o \
+		 libretro-common/hash/rhash.o \
+		 file_path_str.o \
 		 verbosity.o
 
 all: $(TARGET).vpk
 
 %.vpk: eboot.bin
-	vita-mksfoex -s TITLE_ID=$(TITLE_ID) "RetroArch" -d ATTRIBUTE2=12 param.sfo
+	vita-mksfoex -s TITLE_ID=$(TITLE_ID) "$(TARGET)" -d ATTRIBUTE2=12 param.sfo
 	vita-pack-vpk -s param.sfo -b eboot.bin $@
 
 eboot.bin: $(TARGET).velf

Makefile.webos

@@ -1,243 +0,0 @@
-include version.all
-
-$(call assert,$(call seq,$(TARGET_PREFIX),arm-webos-linux-gnueabi-),webOS SDK isn't setup properly. See https://github.com/webosbrew/meta-lg-webos-ndk#compile-program-by-command-line)
-
-WEBOS_FREETYPE_CONFIG ?= $(SDKTARGETSYSROOT)/usr/bin/freetype-config
-
-WEBOS_INC_DIR         ?= $(SDKTARGETSYSROOT)/usr/include
-WEBOS_LIB_DIR         ?= $(SDKTARGETSYSROOT)/usr/lib
-
-#########################
-#########################
-
-PACKAGE_NAME = com.retroarch
-PACKAGE_VERSION := $(patsubst "%",%,$(RARCH_VERSION))
-
-DEBUG ?= 0
-
-HAVE_SCREENSHOTS = 1
-HAVE_REWIND = 1
-HAVE_7ZIP = 1
-HAVE_ACCESSIBILITY = 1
-HAVE_AL = 0
-# ALSA freezes when switching back from menu
-HAVE_ALSA = 0
-HAVE_ANGLE = 0
-HAVE_AUDIOIO = 0
-HAVE_AUDIOMIXER = 1
-HAVE_BLISSBOX = 0
-HAVE_BSV_MOVIE = 1
-HAVE_BUILTINBEARSSL = 0
-HAVE_BUILTINFLAC = 1
-HAVE_DSP_FILTER = 1
-HAVE_VIDEO_FILTER = 1
-HAVE_STATIC_VIDEO_FILTERS = 1
-HAVE_STATIC_AUDIO_FILTERS = 1
-HAVE_FILTERS_BUILTIN	= 1
-HAVE_BUILTINMBEDTLS = 1
-HAVE_BUILTINZLIB = 1
-HAVE_C99 = 1
-HAVE_CC = 1
-HAVE_CC_RESAMPLER = 1
-HAVE_NEAREST_RESAMPLER = 1
-HAVE_CHD = 1
-HAVE_COMMAND = 1
-HAVE_CXX = 1
-HAVE_DR_MP3 = 1
-HAVE_DYNAMIC = 1
-HAVE_DYLIB = 1
-HAVE_EGL = 0
-HAVE_FREETYPE = 0
-HAVE_GDI = 1
-HAVE_GETADDRINFO = 1
-HAVE_GETOPT_LONG = 1
-HAVE_GLSL = 1
-HAVE_GLSLANG = 0
-HAVE_GLSLANG_HLSL = 0
-HAVE_GLSLANG_OGLCOMPILER = 0
-HAVE_GLSLANG_OSDEPENDENT = 0
-HAVE_GLSLANG_SPIRV = 0
-HAVE_GLSLANG_SPIRV_TOOLS = 0
-HAVE_GLSLANG_SPIRV_TOOLS_OPT = 0
-HAVE_HID = 1
-HAVE_IBXM = 1
-HAVE_IMAGEVIEWER = 1
-HAVE_LANGEXTRA = 1
-HAVE_LIBRETRODB = 1
-HAVE_MENU = 1
-HAVE_MENU_COMMON = 1
-HAVE_NEON = 1
-HAVE_NETWORKING = 1
-HAVE_IFINFO = 1
-HAVE_NETWORK_CMD = 1
-HAVE_NETPLAYDISCOVERY = 1
-HAVE_NETWORKGAMEPAD = 1
-HAVE_GFX_WIDGETS = 1
-HAVE_MMAP = 1
-HAVE_ONLINE_UPDATER = 1
-HAVE_OPENDINGUX_FBDEV = 0
-HAVE_OPENGL = 0
-HAVE_OPENGL1 = 0
-HAVE_OPENGL_CORE = 0
-HAVE_OPENGLES = 1
-HAVE_OPENGLES3 = 0
-HAVE_OPENGLES3_1 = 0
-HAVE_OPENGLES3_2 = 0
-HAVE_OPENSSL = 0
-HAVE_OVERLAY = 1
-HAVE_PULSE = 1
-HAVE_RBMP = 1
-HAVE_RJPEG = 1
-HAVE_RPILED = 0
-HAVE_RPNG = 1
-HAVE_RUNAHEAD = 1
-HAVE_SDL = 0
-HAVE_SDL2 = 1
-HAVE_SHADERPIPELINE = 1
-HAVE_STB_FONT = 1
-HAVE_STB_IMAGE = 1
-HAVE_STB_VORBIS = 1
-HAVE_STDIN_CMD = 1
-HAVE_STRCASESTR = 1
-HAVE_THREADS = 1
-HAVE_UDEV = 0
-HAVE_RGUI = 1
-HAVE_MATERIALUI = 0
-HAVE_XMB = 1
-HAVE_OZONE = 1
-HAVE_ZLIB = 1
-HAVE_CONFIGFILE = 1
-HAVE_PATCH = 1
-HAVE_CHEATS = 1
-HAVE_CHEEVOS = 1
-HAVE_LIBSHAKE = 1
-HAVE_UPDATE_ASSETS = 1
-HAVE_UPDATE_CORES = 1
-HAVE_CORE_INFO_CACHE = 1
-
-OS = Linux
-TARGET = retroarch
-
-OBJ :=
-LINK := $(CXX)
-DEF_FLAGS += -ffunction-sections -fdata-sections
-DEF_FLAGS += -I. -Ideps -Ideps/stb -DWEBOS=1 -MMD
-DEF_FLAGS += -Wall -Wno-unused-variable
-LIBS := -ldl -lz -lrt -pthread
-CFLAGS :=
-CXXFLAGS := -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
-ASFLAGS :=
-LDFLAGS := -Wl,--gc-sections
-INCLUDE_DIRS = -I$(WEBOS_INC_DIR)
-LIBRARY_DIRS = -L$(WEBOS_LIB_DIR)
-DEFINES := -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64 -UHAVE_STATIC_DUMMY
-DEFINES += -DHAVE_C99=1 -DHAVE_CXX=1 -D_GNU_SOURCE
-DEFINES += -DHAVE_GETOPT_LONG=1 -DHAVE_STRCASESTR=1 -DHAVE_DYNAMIC=1
-DEFINES += -DHAVE_FILTERS_BUILTIN
-DEFINES += -DHAVE_SDL2
-DEFINES += -DHAVE_PULSE
-DEFINES += -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES
-
-SDL2_CFLAGS := $(shell pkg-config --cflags sdl2)
-SDL2_LIBS := $(shell pkg-config --libs sdl2)
-OPENGLES_LIBS = -lGLESv2
-PULSE_LIBS = $(shell pkg-config --libs libpulse)
-MMAP_LIBS = -lc
-NEON_CFLAGS = -mfpu=neon
-NEON_ASFLAGS = -mfpu=neon
-NETWORKING_LIBS = -lc
-
-OBJDIR_BASE := obj-unix
-
-ifeq ($(DEBUG), 1)
-   OBJDIR := $(OBJDIR_BASE)/debug
-   DEF_FLAGS += -O0 -g -DDEBUG -D_DEBUG
-else
-   OBJDIR := $(OBJDIR_BASE)/release
-   DEF_FLAGS += -O2 -DNDEBUG
-endif
-
-include Makefile.common
-
-DEF_FLAGS += $(INCLUDE_DIRS)
-LDFLAGS += $(CFLAGS) $(CXXFLAGS) $(DEF_FLAGS)
-CFLAGS += $(DEF_FLAGS)
-CXXFLAGS += $(DEF_FLAGS)
-
-HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)
-
-Q := @
-
-RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
-
-define APPINFO
-{
-    "id": "$(PACKAGE_NAME)",
-    "version": "$(PACKAGE_VERSION)",
-    "vendor": "webosbrew.org",
-    "title": "RetroArch",
-    "icon": "icon160.png",
-    "main": "retroarch",
-    "iconColor": "#333333",
-    "type": "native",
-    "appDescription": "Emulation frontend"
-}
-endef
-export APPINFO
-
-all: $(TARGET) ipk
-
--include $(RARCH_OBJ:.o=.d)
-
-SYMBOL_MAP := -Wl,-Map=output.map
-
-$(TARGET): $(RARCH_OBJ)
-	@$(if $(Q), $(shell echo echo LD $@),)
-	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
-
-$(OBJDIR)/%.o: %.c
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CC $<),)
-	$(Q)$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c -o $@ $<
-
-$(OBJDIR)/%.o: %.cpp
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(OBJDIR)/%.o: %.m
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo OBJC $<),)
-	$(Q)$(CXX) $(OBJCFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(OBJDIR)/%.o: %.S $(HEADERS)
-	@mkdir -p $(dir $@)
-	@$(if $(Q), $(shell echo echo AS $<),)
-	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
-
-clean:
-	rm -rf $(OBJDIR_BASE)
-	rm -f $(TARGET)
-	rm -f *.d
-	rm -rf webos/*.ipk
-	rm -rf webos/dist
-
-ipk: $(TARGET)
-	rm -rf webos/dist
-	mkdir -p webos/dist/lib
-	echo "$$APPINFO" > webos/dist/appinfo.json
-	cp -t webos/dist -vf $(TARGET) webos/icon160.png
-	cp -t webos/dist/lib -vf $(WEBOS_LIB_DIR)/libstdc++.so.6
-	$(STRIP) webos/dist/$(TARGET)
-	cd webos && ares-package dist
-
-install: ipk
-	ares-install webos/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(ARCH).ipk
-
-launch: install
-	ares-launch com.retroarch
-
-.PHONY: all clean ipk
-
-print-%:
-	@echo '$*=$($*)'

Makefile.wii

@@ -1,298 +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
-HAVE_NETWORKING            = 1
-HAVE_IFINFO                = 1
-PC_DEVELOPMENT_IP_ADDRESS  = 255.255.255.255
-PC_DEVELOPMENT_UDP_PORT    = 3490
-RARCH_CONSOLE              = 0
-USBGECKO                   = 0
-HAVE_STATIC_DUMMY ?= 0
-
-SPACE      :=
-SPACE      := $(SPACE) $(SPACE)
-BACKSLASH  :=
-BACKSLASH  := \$(BACKSLASH)
-filter_out1 = $(filter-out $(firstword $1),$1)
-filter_out2 = $(call filter_out1,$(call filter_out1,$1))
-
-# system platform
-system_platform = unix
-ifeq ($(shell uname -s),)
-   EXE_EXT = .exe
-   system_platform = win
-else ifneq ($(findstring Darwin,$(shell uname -s)),)
-   system_platform = osx
-else ifneq ($(findstring MINGW,$(shell uname -s)),)
-   system_platform = win
-endif
-
-TARGET_NAME        := retroarch
-
-INCLUDE            :=
-LDFLAGS            :=
-LIBDIRS            :=
-
-ifeq ($(LIBRETRO), nxengine)
-   WHOLE_ARCHIVE_LINK = 1
-endif
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START     := -Wl,--whole-archive
-   WHOLE_END       := -Wl,--no-whole-archive
-endif
-
-LIB_CORE :=
-
-ifeq ($(HAVE_STATIC_DUMMY),1)
-  DEFINES += -DHAVE_STATIC_DUMMY
-else
-  LIB_CORE += -lretro_wii
-endif
-
-LIBS               := $(WHOLE_START) $(LIB_CORE) $(WHOLE_END)
-
-libogc_platform    := 1
-
-EXTERNAL_LIBOGC   ?= 0
-GX_PTHREAD_LEGACY ?= 1
-CC                 = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
-CXX                = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
-LD                 = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
-ELF2DOL            = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
-EXT_TARGET        := $(TARGET_NAME)_wii.dol
-EXT_INTER_TARGET  := $(TARGET_NAME)_wii.elf
-
-# Check whether ELF2DOL executable exists
-# (path has changed in more recent toolchains)
-ifeq ("$(wildcard $(ELF2DOL))","")
-   ELF2DOL = $(DEVKITPRO)/tools/bin/elf2dol$(EXE_EXT)
-endif
-
-INCLUDE += -I.
-
-ifeq ($(EXTERNAL_LIBOGC), 1)
-   CFLAGS   += -DEXTERNAL_LIBOGC
-   CXXFLAGS += -DEXTERNAL_LIBOGC
-   LIBDIRS += -L$(DEVKITPRO)/libogc/lib/wii
-   INCLUDE +=  -I$(DEVKITPRO)/libogc/include
-else
-   CFLAGS   += -DINTERNAL_LIBOGC
-   CXXFLAGS += -DINTERNAL_LIBOGC
-   LIBDIRS += -Lwii/libogc/libs/wii
-   INCLUDE += -Iwii/libogc/include
-endif
-
-ifeq ($(GX_PTHREAD_LEGACY), 1)
-   CFLAGS   += -DGX_PTHREAD_LEGACY
-   CXXFLAGS += -DGX_PTHREAD_LEGACY
-endif
-
-MACHDEP := -DHW_RVL -mrvl
-
-LIBDIRS += -L.
-MACHDEP += -DGEKKO -mcpu=750 -meabi -mhard-float
-
-LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_TARGET)).map,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,strdup,-wrap,strndup,-wrap,malloc_usable_size
-
-ifeq ($(BIG_STACK), 1)
-   LDFLAGS += -T bootstrap/gx/rvl.ld
-endif
-
-ifeq ($(EXTERNAL_LIBOGC), 1)
-   LIBS += -lfat
-endif
-
-LIBS += -lwiiuse -lbte
-
-ifeq ($(USBGECKO), 1)
-  LIBS += -ldb
-endif
- 
-ifeq ($(HAVE_LOGGER), 1)
-  LIBS += -lbba
-endif
-
-LIBS += -logc
-
-CFLAGS += -DGEKKO -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
-
-HAVE_RUNAHEAD            := 1
-HAVE_DSP_FILTER          := 1
-HAVE_VIDEO_FILTER        := 1
-HAVE_FILTERS_BUILTIN     := 1
-HAVE_THREADS             := 1
-HAVE_RPNG                := 1
-HAVE_RJPEG               := 1
-HAVE_RBMP                := 1
-HAVE_RTGA                := 1
-HAVE_IBXM                := 1
-HAVE_OVERLAY             := 1
-HAVE_VIDEO_LAYOUT        := 0
-HAVE_ZLIB                := 1
-HAVE_7ZIP                := 1
-HAVE_CONFIGFILE          := 1
-HAVE_PATCH               := 1
-HAVE_CHEATS              := 1
-HAVE_SCREENSHOTS         := 1
-HAVE_REWIND              := 1
-HAVE_AUDIOMIXER          := 1
-HAVE_RWAV                := 1
-RARCH_CONSOLE             = 1
-HAVE_CHEATS              := 1
-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
-
-CFLAGS      += -DHAVE_SOCKET_LEGACY
-
-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/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
-
-OBJOUT   = -o
-LINKOUT  = -o
-LINK = $(CXX)
-
-all: $(EXT_TARGET)
-
-%.dol: %.elf
-	$(ELF2DOL) $< $@
-
-$(EXT_INTER_TARGET): $(OBJ)
-	$(LINK) $(LINKOUT)$@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(PLATEXTRA) $(LIBS)
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.cpp
-	$(CXX) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.o: %.S
-	$(CC) $(CFLAGS) -c $(OBJOUT)$@ $<
-
-%.binobj: %.bin
-	$(LD) -r -b binary $(OBJOUT)$@ $<
-
-$(APP_BOOTER_DIR)/app_booter.bin:
-	export EXTERNAL_LIBOGC
-	$(MAKE) -C $(APP_BOOTER_DIR)
-
-clean:
-	rm -f $(EXT_TARGET)
-	rm -f $(EXT_INTER_TARGET)
-	rm -f $(OBJ)
-	$(MAKE) -C $(APP_BOOTER_DIR) clean
-
-.PHONY: clean
-
-print-%:
-	@echo '$*=$($*)'

Makefile.wii.salamander

@@ -3,11 +3,10 @@
 # Makefile for RetroArch Wii.
 ##
 
-DEBUG              = 0
-HAVE_LOGGER        = 0
-HAVE_FILE_LOGGER   = 0
-EXTERNAL_LIBOGC   ?= 0
-GX_PTHREAD_LEGACY ?= 1
+DEBUG			= 0
+HAVE_LOGGER		= 0
+HAVE_FILE_LOGGER	= 0
+EXTERNAL_LIBOGC = 0
 
 # system platform
 system_platform = unix
@@ -28,12 +27,6 @@ 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
 
@@ -46,11 +39,6 @@ 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
@@ -69,7 +57,7 @@ OBJ = frontend/frontend_salamander.o \
 		frontend/drivers/platform_wii.o \
 		libretro-common/file/file_path.o \
 		libretro-common/file/file_path_io.o \
-		libretro-common/hash/lrc_hash.o \
+		libretro-common/hash/rhash.o \
 		libretro-common/string/stdstring.o \
 		libretro-common/lists/string_list.o \
 		libretro-common/lists/dir_list.o \
@@ -78,11 +66,10 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/file/retro_dirent.o \
 		libretro-common/encodings/encoding_utf.o \
 		libretro-common/compat/compat_strl.o \
-		libretro-common/compat/compat_strldup.o \
 		libretro-common/compat/compat_strcasestr.o \
 		libretro-common/compat/fopen_utf8.o \
 		libretro-common/file/config_file.o \
-		libretro-common/time/rtime.o \
+		file_path_str.o \
 		verbosity.o \
 		$(APP_BOOTER_DIR)/app_booter.binobj
 
@@ -140,7 +127,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

Makefile.wiiu

@@ -5,15 +5,12 @@ 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
@@ -66,18 +63,16 @@ ifeq ($(SALAMANDER_BUILD),1)
    OBJ += libretro-common/lists/dir_list.o
    OBJ += libretro-common/file/retro_dirent.o
    OBJ += libretro-common/compat/compat_strl.o
-   OBJ += libretro-common/compat/compat_strldup.o
    OBJ += libretro-common/file/config_file.o
    OBJ += libretro-common/streams/file_stream.o
    OBJ += libretro-common/vfs/vfs_implementation.o
-   OBJ += libretro-common/hash/lrc_hash.o
-   OBJ += libretro-common/time/rtime.o
+   OBJ += libretro-common/hash/rhash.o
+   OBJ += file_path_str.o
    OBJ += verbosity.o
 
 # $(SALAMANDER_BUILD),0
 else
    DEFINES += -DRARCH_INTERNAL
-   DEFINES += -DHAVE_SCREENSHOTS
    DEFINES += -DHAVE_KEYMAPPER
    DEFINES += -DHAVE_ONLINE_UPDATER
    DEFINES += -DHAVE_UPDATE_ASSETS
@@ -89,9 +84,6 @@ else
 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
@@ -105,45 +97,36 @@ endif
    OBJ += gfx/drivers/gx2_shaders/snowflake.o
 
    ifeq ($(GRIFFIN_BUILD), 1)
-      OBJ += griffin/griffin.o griffin/griffin_cpp.o
+      OBJ += griffin/griffin.o
 
       INCDIRS += -Ilibretro-common/include/compat/zlib
       # for stb, libfat, iosuhax
-      INCDIRS += -Ideps -Ideps/libfat/include -Ideps/libiosuhax/include
+      INCDIRS += -Ideps -Ideps/libfat/include -Ideps/libiosuhax
       # 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_GRIFFIN=1 -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_RGUI -DHAVE_LIBRETRODB
       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 += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY
       #DEFINES += -DWANT_IFADDRS
       #DEFINES += -DHAVE_FREETYPE
       DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
       DEFINES += -DHAVE_HID
       DEFINES += -DWANT_LIBFAT -DHAVE_LIBFAT -DWANT_IOSUHAX -DHAVE_IOSUHAX
-      DEFINES += -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_REWIND     = 1
-      HAVE_CHEATS     = 1
       HAVE_MENU = 1
       HAVE_RGUI = 1
       HAVE_7ZIP = 1
@@ -157,7 +140,6 @@ endif
       HAVE_LANGEXTRA = 1
       HAVE_LIBRETRODB = 1
       HAVE_NETWORKING = 1
-      HAVE_IFINFO = 1
       HAVE_NETPLAYDISCOVERY = 1
       HAVE_CHEEVOS = 1
       #WANT_IFADDRS = 1
@@ -165,13 +147,10 @@ endif
       HAVE_SPIRV_CROSS = 1
       HAVE_SLANG = 1
       HAVE_VIDEO_LAYOUT = 0
-      HAVE_DSP_FILTER = 1
-      HAVE_VIDEO_FILTER = 1
       HAVE_STATIC_VIDEO_FILTERS = 1
       HAVE_STATIC_AUDIO_FILTERS = 1
       WANT_LIBFAT = 1
       WANT_IOSUHAX = 1
-      HAVE_CORE_INFO_CACHE = 1
 
       include Makefile.common
       DEFINES += $(DEF_FLAGS)
@@ -184,7 +163,7 @@ OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))
 #-----------------------------
 # Compile flags
 
-DEFINES += -DWIIU -D__WUT__ -DHW_WUP -D__wiiu__
+DEFINES += -DWIIU -DMSB_FIRST -D__WUT__ -DHW_WUP -D__wiiu__
 DEFINES += -DHAVE_MAIN
 DEFINES += -DRARCH_CONSOLE
 
@@ -205,7 +184,7 @@ CFLAGS  := -mcpu=750 -meabi -mhard-float
 CFLAGS  += -ffast-math -Werror=implicit-function-declaration
 CFLAGS  += -ffunction-sections -fdata-sections
 #CFLAGS += -fomit-frame-pointer -mword-relocations
-CFLAGS += -Wall
+#CFLAGS += -Wall
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g
@@ -226,16 +205,7 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
    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
+LIBS := $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm
 
 # Use portlibs zlib if deps/ isn't being used
 ifeq ($(HAVE_ZLIB),1)
@@ -346,23 +316,17 @@ $(BUILD_DIR)/$(TARGET).rpx.elf: $(OBJ) $(RPX_OBJ) libretro_wiiu.a wiiu/link_elf.
 	@$(if $(Q), echo LD $@,)
 	$(Q)$(LD) $(OBJ) $(RPX_OBJ) $(LDFLAGS) $(RPX_LDFLAGS) $(LIBDIRS)  $(LIBS) -o $@
 
-$(BUILD_DIR)/$(TARGET).large.rpx: $(BUILD_DIR)/$(TARGET).rpx.elf $(ELF2RPL) .$(TARGET).rpx.large.last
+$(BUILD_DIR)/$(TARGET).rpx: $(BUILD_DIR)/$(TARGET).rpx.elf $(ELF2RPL) .$(TARGET).rpx.last
 	@$(if $(Q), echo ELF2RPL $@,)
-	@touch .$(TARGET).rpx.large.last
+	@touch .$(TARGET).rpx.last
 	$(Q)-$(ELF2RPL) $< $@
 
-$(BUILD_DIR)/$(TARGET).rpx: $(BUILD_DIR)/$(TARGET).large.rpx .$(TARGET).rpx.last
-	@$(if $(Q), echo COMPRESS $@,)
-	@touch .$(TARGET).rpx.large.last
-	$(Q)wiiurpxtool -c $< $@
-
 clean:
 	@$(if $(Q), echo $@,)
 	$(Q)rm -f $(OBJ) $(RPX_OBJ) $(HBL_ELF_OBJ) $(TARGET).elf $(TARGET).rpx.elf $(TARGET).rpx
-	$(Q)rm -f $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).rpx.elf $(BUILD_DIR)/$(TARGET).large.rpx $(BUILD_DIR)/$(TARGET).rpx
-	$(Q)rm -f .$(TARGET).elf.last .$(TARGET).rpx.elf.last .$(TARGET).rpx.large.last .$(TARGET).rpx.last
+	$(Q)rm -f $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).rpx.elf $(BUILD_DIR)/$(TARGET).rpx
+	$(Q)rm -f .$(TARGET).elf.last .$(TARGET).rpx.elf.last .$(TARGET).rpx.last
 	$(Q)rm -f $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
-	$(Q)$(MAKE) -C wiiu/wut/elf2rpl/ clean
 
 .PHONY: clean all
 .PRECIOUS: %.depend %.last

Makefile.win

@@ -1,8 +1,6 @@
 TARGET = retroarch.exe
 
-HAVE_SCREENSHOTS = 1
 HAVE_AUDIOMIXER = 1
-HAVE_RWAV = 1
 HAVE_DINPUT = 1
 HAVE_XAUDIO = 1
 HAVE_DSOUND = 1
@@ -11,23 +9,17 @@ HAVE_OPENGL = 1
 HAVE_DYLIB = 1
 HAVE_D3D9 = 1
 HAVE_NETWORKING = 1
-HAVE_IFINFO = 1
 HAVE_NETPLAYDISCOVERY = 1
 HAVE_STDIN_CMD = 1
 HAVE_COMMAND = 1
 HAVE_THREADS = 1
 HAVE_MENU = 1
 HAVE_CONFIGFILE = 1
-HAVE_PATCH      = 1
-HAVE_REWIND     = 1
-HAVE_CHEATS     = 1
 HAVE_RGUI = 1
 HAVE_MATERIALUI = 1
-HAVE_DSP_FILTER = 1
-HAVE_VIDEO_FILTER = 1
 HAVE_7ZIP = 1
+HAVE_PYTHON = 0
 DYNAMIC = 1
-HAVE_CORE_INFO_CACHE = 1
 
 HAVE_XINPUT = 1
 HAVE_WINMM = 1
@@ -35,6 +27,7 @@ HAVE_WINMM = 1
 HAVE_SDL      := 0
 HAVE_SDL2     := 0
 HAVE_RSOUND   := 0
+HAVE_PYTHON   := 0
 
 HAVE_STB_FONT := 1
 HAVE_FREETYPE := 1
@@ -83,6 +76,11 @@ 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
@@ -98,7 +96,7 @@ 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 -Ilibretro-common/include/compat/zlib -DRARCH_INTERNAL -DHAVE_OVERLAY
 #DEFINES			  += -DHAVE_VIDEO_LAYOUT
 LDFLAGS          := -L. -static-libgcc
 
@@ -162,6 +160,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 $<),)

README-mali_fbdev_r4p0.md

@@ -76,11 +76,11 @@ In the end you should have this on your system:
       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
 
 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.

README.md

@@ -1,6 +1,5 @@
 [![Build Status](https://travis-ci.org/libretro/RetroArch.svg?branch=master)](https://travis-ci.org/libretro/RetroArch)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/8936/badge.svg)](https://scan.coverity.com/projects/retroarch)
-[![Crowdin](https://badges.crowdin.net/retroarch/localized.svg)](https://crowdin.com/project/retroarch)
 
 # RetroArch
 
@@ -66,17 +65,7 @@ RetroArch also emphasizes being easy to integrate into various launcher frontend
 RetroArch has been ported to the following platforms:
 
    - DOS
-   - Windows 11
-   - Windows 10
-   - Windows 8
-   - Windows 7
-   - Windows Vista
-   - Windows XP
-   - Windows Millennium
-   - Windows 2000
-   - Windows NT 3.5
-   - Windows 98
-   - Windows 95
+   - Windows
    - Linux
    - Emscripten (WebAssembly and JavaScript)
    - FreeBSD
@@ -84,19 +73,13 @@ RetroArch has been ported to the following platforms:
    - OpenBSD
    - Haiku
    - Solaris
-   - Apple macOS (PPC, x86-32 and x86-64)
-   - Apple iOS
-   - Apple tvOS
-   - Android (2.x to most recent version)
-   - PlayStation2
-   - PlayStation3
-   - PlayStation4
+   - macOS (PPC, x86-32 and x86-64)
+   - PlayStation 2
+   - PlayStation 3
    - PlayStation Portable
    - PlayStation Vita
    - Original Microsoft Xbox
    - Microsoft Xbox 360 (Libxenon/XeXDK)
-   - Microsoft Xbox One
-   - Microsoft Xbox Series S/X
    - Nintendo GameCube
    - Nintendo Wii
    - Nintendo Wii U
@@ -104,11 +87,9 @@ RetroArch has been ported to the following platforms:
    - Nintendo Switch
    - Nintendo NES/SNES Classic Edition
    - Raspberry Pi
+   - Android
+   - iOS
    - Blackberry
-   - OpenDingux
-   - Miyoo
-   - RS90
-   - RetroFW
 
 ## Dependencies (PC)
 
@@ -151,47 +132,6 @@ dynamically, it's not required at build time.
 Console ports have their own dependencies, but generally do not require
 anything other than what the respective SDKs provide.
 
-## Requirements
-
-### OpenGL1 ###
-Your videocard needs to at least support the OpenGL 1.1 spec.
-
-***Shaders***: N/A
-
-**Menu driver support**: MaterialUI, XMB, Ozone and RGUI should all work correctly.
-XMB won't have shader pipeline effects because of the aforementioned lack of shader
-support.
-
-### OpenGL2 ###
-Your videocard needs to at least support the OpenGL 2.1 spec.
-
-***Shaders:*** You can choose between either NVIDIA Cg shaders (deprecated, requires separate runtime
-to be installed on your system), or GLSL shaders.
-
-***Menu driver support:*** MaterialUI, XMB, Ozone and RGUI should all work correctly.
-
-### OpenGL3 ###
-Your videocard needs to at least support the OpenGL 3.2 core feature spec.
-
-***Shaders:*** You will be able to use modern Slang shaders with this driver.
-
-***Menu driver support:*** MaterialUI, XMB, Ozone and RGUI should all work correctly.
-
-### Direct3D 11 ###
-Your videocard needs to at least support the Direct3D11 11.0 spec. The card
-also needs to support at least the Shader Model 4.0.
-
-***Shaders:*** You will be able to use modern Slang shaders with this driver.
-
-***Menu driver support:*** MaterialUI, XMB, Ozone and RGUI should all work correctly.
-
-### Vulkan ###
-Your videocard needs to at least support the Vulkan 1.0 spec.
-
-***Shaders:*** You will be able to use modern Slang shaders with this driver.
-
-***Menu driver support:*** MaterialUI, XMB, Ozone and RGUI should all work correctly.
-
 ## Configuring
 
 The default configuration is defined in `config.def.h`.

accessibility.h

@@ -30,63 +30,13 @@
 #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;
+RETRO_BEGIN_DECLS
 
-bool is_accessibility_enabled(bool accessibility_enable, bool accessibility_enabled);
+bool is_accessibility_enabled(void);
 
-#ifdef HAVE_TRANSLATE
-bool is_narrator_running(bool accessibility_enable);
-#endif
+bool accessibility_speak_priority(const char* speak_text, int priority);
 
-/*
-   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);
+RETRO_END_DECLS
 
 #endif

audio/audio_defines.h

@@ -30,7 +30,7 @@ RETRO_BEGIN_DECLS
 
 #define AUDIO_MIXER_MAX_STREAMS        16
 
-#define AUDIO_MIXER_MAX_SYSTEM_STREAMS (AUDIO_MIXER_MAX_STREAMS + 5)
+#define AUDIO_MIXER_MAX_SYSTEM_STREAMS (AUDIO_MIXER_MAX_STREAMS + 4)
 
 /* do not define more than (MAX_SYSTEM_STREAMS - MAX_STREAMS) */
 enum audio_mixer_system_slot
@@ -38,8 +38,7 @@ enum audio_mixer_system_slot
    AUDIO_MIXER_SYSTEM_SLOT_OK = AUDIO_MIXER_MAX_STREAMS,
    AUDIO_MIXER_SYSTEM_SLOT_CANCEL,
    AUDIO_MIXER_SYSTEM_SLOT_NOTICE,
-   AUDIO_MIXER_SYSTEM_SLOT_BGM,
-   AUDIO_MIXER_SYSTEM_SLOT_ACHIEVEMENT_UNLOCK
+   AUDIO_MIXER_SYSTEM_SLOT_BGM
 };
 
 enum audio_action
@@ -77,11 +76,11 @@ enum audio_mixer_state
 
 typedef struct audio_statistics
 {
-   unsigned samples;
    float average_buffer_saturation;
    float std_deviation_percentage;
    float close_to_underrun;
    float close_to_blocking;
+   unsigned samples;
 } audio_statistics_t;
 
 RETRO_END_DECLS

audio/audio_driver.h

@@ -1,415 +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_DRIVER__H
-#define __AUDIO_DRIVER__H
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <sys/types.h>
-
-#include <boolean.h>
-#include <retro_common_api.h>
-#include <retro_inline.h>
-#include <libretro.h>
-#include <retro_miscellaneous.h>
-
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif /* HAVE_CONFIG_H */
-
-#ifdef HAVE_DSP_FILTER
-#include <audio/dsp_filter.h>
-#endif
-#ifdef HAVE_AUDIOMIXER
-#include <audio/audio_mixer.h>
-#endif
-#include <audio/audio_resampler.h>
-
-#include "audio_defines.h"
-
-#define AUDIO_BUFFER_FREE_SAMPLES_COUNT (8 * 1024)
-
-RETRO_BEGIN_DECLS
-
-#ifdef HAVE_AUDIOMIXER
-typedef struct audio_mixer_stream
-{
-   audio_mixer_sound_t *handle;
-   audio_mixer_voice_t *voice;
-   audio_mixer_stop_cb_t stop_cb;
-   void *buf;
-   char *name;
-   size_t bufsize;
-   float volume;
-   enum audio_mixer_stream_type  stream_type;
-   enum audio_mixer_type type;
-   enum audio_mixer_state state;
-} audio_mixer_stream_t;
-
-typedef struct audio_mixer_stream_params
-{
-   void *buf;
-   char *basename;
-   audio_mixer_stop_cb_t cb;
-   size_t bufsize;
-   unsigned slot_selection_idx;
-   float volume;
-   enum audio_mixer_slot_selection_type slot_selection_type;
-   enum audio_mixer_stream_type  stream_type;
-   enum audio_mixer_type  type;
-   enum audio_mixer_state state;
-} audio_mixer_stream_params_t;
-#endif
-
-typedef struct audio_driver
-{
-   /* Creates and initializes handle to audio driver.
-    *
-    * Returns: audio driver handle on success, otherwise NULL.
-    **/
-   void *(*init)(const char *device, unsigned rate,
-         unsigned latency, unsigned block_frames, unsigned *new_rate);
-
-   /*
-    * @data         : Pointer to audio data handle.
-    * @buf          : Audio buffer data.
-    * @size         : Size of audio buffer.
-    *
-    * Write samples to audio driver.
-    *
-    * Write data in buffer to audio driver.
-    * A frame here is defined as one combined sample of left and right
-    * channels. (I.e. 44.1kHz, 16-bit stereo has 88.2k samples/s, and
-    * 44.1k frames/s.)
-    *
-    * Samples are interleaved in format LRLRLRLRLR ...
-    * If the driver returns true in use_float(), a floating point
-    * format will be used, with range [-1.0, 1.0].
-    * If not, signed 16-bit samples in native byte ordering will be used.
-    *
-    * This function returns the number of frames successfully written.
-    * If an error occurs, -1 should be returned.
-    * Note that non-blocking behavior that cannot write at this time
-    * should return 0 as returning -1 will terminate the driver.
-    *
-    * Unless said otherwise with set_nonblock_state(), all writes
-    * are blocking, and it should block till it has written all frames.
-    */
-   ssize_t (*write)(void *data, const void *buf, size_t size);
-
-   /* Temporarily pauses the audio driver. */
-   bool (*stop)(void *data);
-
-   /* Resumes audio driver from the paused state. */
-   bool (*start)(void *data, bool is_shutdown);
-
-   /* Is the audio driver currently running? */
-   bool (*alive)(void *data);
-
-   /* Should we care about blocking in audio thread? Fast forwarding.
-    *
-    * If state is true, nonblocking operation is assumed.
-    * This is typically used for fast-forwarding. If driver cannot
-    * implement nonblocking writes, this can be disregarded, but should
-    * log a message to stderr.
-    * */
-   void (*set_nonblock_state)(void *data, bool toggle);
-
-   /* Stops and frees driver data. */
-   void (*free)(void *data);
-
-   /* Defines if driver will take standard floating point samples,
-    * or int16_t samples.
-    *
-    * If true is returned, the audio driver is capable of using
-    * floating point data. This will likely increase performance as the
-    * resampler unit uses floating point. The sample range is
-    * [-1.0, 1.0].
-    * */
-   bool (*use_float)(void *data);
-
-   /* Human-readable identifier. */
-   const char *ident;
-
-   /* Optional. Get audio device list (allocates, caller has to free this) */
-   void *(*device_list_new)(void *data);
-
-   /* Optional. Frees audio device list */
-   void (*device_list_free)(void *data, void *data2);
-
-   /* Optional. */
-   size_t (*write_avail)(void *data);
-
-   size_t (*buffer_size)(void *data);
-} audio_driver_t;
-
-typedef struct
-{
-   double source_ratio_original;
-   double source_ratio_current;
-
-   uint64_t free_samples_count;
-
-   struct string_list *devices_list;
-   float  *output_samples_buf;
-#ifdef HAVE_REWIND
-   int16_t *rewind_buf;
-#endif
-   int16_t *output_samples_conv_buf;
-#ifdef HAVE_DSP_FILTER
-   retro_dsp_filter_t *dsp;
-#endif
-   const retro_resampler_t *resampler;
-
-   void *resampler_data;
-   const audio_driver_t *current_audio;
-   void *context_audio_data;
-   float *input_data;
-#ifdef HAVE_AUDIOMIXER
-   struct audio_mixer_stream
-      mixer_streams[AUDIO_MIXER_MAX_SYSTEM_STREAMS];
-#endif
-   struct retro_audio_callback callback;                 /* ptr alignment */
-                                                         /* ptr alignment */
-   size_t chunk_size;
-   size_t chunk_nonblock_size;
-   size_t chunk_block_size;
-
-#ifdef HAVE_REWIND
-   size_t rewind_ptr;
-   size_t rewind_size;
-#endif
-   size_t buffer_size;
-   size_t data_ptr;
-
-   unsigned free_samples_buf[
-      AUDIO_BUFFER_FREE_SAMPLES_COUNT];
-
-#ifdef HAVE_AUDIOMIXER
-   float mixer_volume_gain;
-#endif
-
-   float rate_control_delta;
-   float input;
-   float volume_gain;
-
-   enum resampler_quality resampler_quality;
-
-   char resampler_ident[64];
-
-   bool active;
-   bool control;
-   bool mute_enable;
-   bool use_float;
-   bool suspended;
-#ifdef HAVE_AUDIOMIXER
-   bool mixer_mute_enable;
-   bool mixer_active;
-#endif
-#ifdef HAVE_RUNAHEAD
-   bool hard_disable;
-#endif
-} audio_driver_state_t;
-
-bool audio_driver_enable_callback(void);
-
-bool audio_driver_disable_callback(void);
-
-bool audio_driver_mixer_extension_supported(const char *ext);
-
-void audio_driver_dsp_filter_free(void);
-
-bool audio_driver_dsp_filter_init(const char *device);
-
-void audio_driver_set_buffer_size(size_t bufsize);
-
-bool audio_driver_get_devices_list(void **ptr);
-
-void audio_driver_setup_rewind(void);
-
-bool audio_driver_callback(void);
-
-bool audio_driver_has_callback(void);
-
-void audio_driver_frame_is_reverse(void);
-
-void audio_set_float(enum audio_action action, float val);
-
-float *audio_get_float_ptr(enum audio_action action);
-
-bool *audio_get_bool_ptr(enum audio_action action);
-
-#ifdef HAVE_AUDIOMIXER
-audio_mixer_stream_t *audio_driver_mixer_get_stream(unsigned i);
-
-bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params);
-
-void audio_driver_mixer_play_stream(unsigned i);
-
-void audio_driver_mixer_play_menu_sound(unsigned i);
-
-void audio_driver_mixer_play_menu_sound_looped(unsigned i);
-
-void audio_driver_mixer_play_stream_sequential(unsigned i);
-
-void audio_driver_mixer_play_stream_looped(unsigned i);
-
-void audio_driver_mixer_stop_stream(unsigned i);
-
-float audio_driver_mixer_get_stream_volume(unsigned i);
-
-void audio_driver_mixer_set_stream_volume(unsigned i, float vol);
-
-void audio_driver_mixer_remove_stream(unsigned i);
-
-enum audio_mixer_state audio_driver_mixer_get_stream_state(unsigned i);
-
-const char *audio_driver_mixer_get_stream_name(unsigned i);
-
-void audio_driver_load_system_sounds(void);
-
-#endif
-
-bool audio_driver_start(bool is_shutdown);
-
-bool audio_driver_stop(void);
-
-#ifdef HAVE_TRANSLATE
-/* TODO/FIXME - Doesn't currently work.  Fix this. */
-bool audio_driver_is_ai_service_speech_running(void);
-#endif
-
-extern audio_driver_t audio_rsound;
-extern audio_driver_t audio_audioio;
-extern audio_driver_t audio_oss;
-extern audio_driver_t audio_alsa;
-extern audio_driver_t audio_alsathread;
-extern audio_driver_t audio_tinyalsa;
-extern audio_driver_t audio_roar;
-extern audio_driver_t audio_openal;
-extern audio_driver_t audio_opensl;
-extern audio_driver_t audio_jack;
-extern audio_driver_t audio_sdl;
-extern audio_driver_t audio_xa;
-extern audio_driver_t audio_pulse;
-extern audio_driver_t audio_dsound;
-extern audio_driver_t audio_wasapi;
-extern audio_driver_t audio_coreaudio;
-extern audio_driver_t audio_coreaudio3;
-extern audio_driver_t audio_xenon360;
-extern audio_driver_t audio_ps3;
-extern audio_driver_t audio_gx;
-extern audio_driver_t audio_ax;
-extern audio_driver_t audio_psp;
-extern audio_driver_t audio_ps2;
-extern audio_driver_t audio_ctr_csnd;
-extern audio_driver_t audio_ctr_dsp;
-#ifdef HAVE_THREADS
-extern audio_driver_t audio_ctr_dsp_thread;
-#endif
-extern audio_driver_t audio_switch;
-extern audio_driver_t audio_switch_thread;
-extern audio_driver_t audio_switch_libnx_audren;
-extern audio_driver_t audio_switch_libnx_audren_thread;
-extern audio_driver_t audio_rwebaudio;
-
-audio_driver_state_t *audio_state_get_ptr(void);
-
-extern audio_driver_t *audio_drivers[];
-
-/**
- * audio_compute_buffer_statistics:
- *
- * Computes audio buffer statistics.
- *
- **/
-bool audio_compute_buffer_statistics(audio_statistics_t *stats);
-
-float audio_driver_monitor_adjust_system_rates(
-      double input_sample_rate,
-      double input_fps,
-      float video_refresh_rate,
-      unsigned video_swap_interval,
-      float audio_max_timing_skew);
-
-bool audio_driver_init_internal(
-      void *settings_data,
-      bool audio_cb_inited);
-
-bool audio_driver_deinit(void);
-
-bool audio_driver_find_driver(
-      void *settings_data,
-      const char *prefix,
-      bool verbosity_enabled);
-
-/**
- * audio_driver_sample:
- * @left                 : value of the left audio channel.
- * @right                : value of the right audio channel.
- *
- * Audio sample render callback function.
- **/
-void audio_driver_sample(int16_t left, int16_t right);
-
-/**
- * audio_driver_sample_batch:
- * @data                 : pointer to audio buffer.
- * @frames               : amount of audio frames to push.
- *
- * Batched audio sample render callback function.
- *
- * Returns: amount of frames sampled.
- **/
-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
-
-RETRO_END_DECLS
-
-#endif /* __AUDIO_DRIVER__H */

audio/audio_thread_wrapper.c

@@ -21,7 +21,6 @@
 #include <rthreads/rthreads.h>
 
 #include "audio_thread_wrapper.h"
-#include "audio_driver.h"
 #include "../verbosity.h"
 
 typedef struct audio_thread
@@ -32,16 +31,6 @@ typedef struct audio_thread
    sthread_t *thread;
    slock_t *lock;
    scond_t *cond;
-   const char *device;
-   unsigned *new_rate;
-
-   int inited;
-
-   /* Initialization options. */
-   unsigned out_rate;
-   unsigned latency;
-   unsigned block_frames;
-
    bool alive;
    bool stopped;
    bool stopped_ack;
@@ -49,6 +38,14 @@ typedef struct audio_thread
    bool is_shutdown;
    bool use_float;
 
+   int inited;
+
+   /* Initialization options. */
+   const char *device;
+   unsigned *new_rate;
+   unsigned out_rate;
+   unsigned latency;
+   unsigned block_frames;
 } audio_thread_t;
 
 static void audio_thread_loop(void *data)

audio/audio_thread_wrapper.h

@@ -19,7 +19,7 @@
 
 #include <boolean.h>
 
-#include "audio_driver.h"
+#include "../retroarch.h"
 
 /**
  * audio_init_thread:

audio/drivers/alsa.c

@@ -21,15 +21,15 @@
 
 #include <alsa/asoundlib.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct alsa
 {
    snd_pcm_t *pcm;
    size_t buffer_size;
-   unsigned int frame_bits;
    bool nonblock;
+   unsigned int frame_bits;
    bool has_float;
    bool can_pause;
    bool is_paused;
@@ -83,12 +83,12 @@ static void *alsa_init(const char *device, unsigned rate, unsigned latency,
    if (snd_pcm_hw_params_malloc(&params) < 0)
       goto error;
 
-   if (snd_pcm_hw_params_any(alsa->pcm, params) < 0)
-      goto error;
-
    alsa->has_float = find_float_format(alsa->pcm, params);
    format = alsa->has_float ? SND_PCM_FORMAT_FLOAT : SND_PCM_FORMAT_S16;
 
+   if (snd_pcm_hw_params_any(alsa->pcm, params) < 0)
+      goto error;
+
    if (snd_pcm_hw_params_set_access(
             alsa->pcm, params, SND_PCM_ACCESS_RW_INTERLEAVED) < 0)
       goto error;

audio/drivers/alsa_qsa.c

@@ -19,7 +19,7 @@
 #include <sys/asoundlib.h>
 #include <retro_math.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 
 #define MAX_FRAG_SIZE 3072
 #define DEFAULT_RATE 48000
@@ -29,18 +29,18 @@
 typedef struct alsa
 {
    uint8_t **buffer;
-   snd_pcm_t *pcm;
    uint8_t *buffer_chunk;
    unsigned buffer_index;
    unsigned buffer_ptr;
    volatile unsigned buffered_blocks;
 
-   unsigned buf_size;
-   unsigned buf_count;
+   snd_pcm_t *pcm;
    bool nonblock;
    bool has_float;
    bool can_pause;
    bool is_paused;
+   unsigned buf_size;
+   unsigned buf_count;
 } alsa_qsa_t;
 
 typedef long snd_pcm_sframes_t;

audio/drivers/alsathread.c

@@ -24,7 +24,7 @@
 #include <queues/fifo_queue.h>
 #include <string/stdstring.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #define TRY_ALSA(x) if (x < 0) \
@@ -33,18 +33,20 @@
 typedef struct alsa_thread
 {
    snd_pcm_t *pcm;
+   bool nonblock;
+   bool is_paused;
+   bool has_float;
+   volatile bool thread_dead;
+
+   size_t buffer_size;
+   size_t period_size;
+   snd_pcm_uframes_t period_frames;
+
    fifo_buffer_t *buffer;
    sthread_t *worker_thread;
    slock_t *fifo_lock;
    scond_t *cond;
    slock_t *cond_lock;
-   size_t buffer_size;
-   size_t period_size;
-   snd_pcm_uframes_t period_frames;
-   bool nonblock;
-   bool is_paused;
-   bool has_float;
-   volatile bool thread_dead;
 } alsa_thread_t;
 
 static void alsa_worker_thread(void *data)
@@ -64,7 +66,7 @@ static void alsa_worker_thread(void *data)
       size_t fifo_size;
       snd_pcm_sframes_t frames;
       slock_lock(alsa->fifo_lock);
-      avail     = FIFO_READ_AVAIL(alsa->buffer);
+      avail = fifo_read_avail(alsa->buffer);
       fifo_size = MIN(alsa->period_size, avail);
       fifo_read(alsa->buffer, buf, fifo_size);
       scond_signal(alsa->cond);
@@ -173,11 +175,10 @@ static void *alsa_thread_init(const char *device,
    TRY_ALSA(snd_pcm_open(&alsa->pcm, alsa_dev, SND_PCM_STREAM_PLAYBACK, 0));
 
    TRY_ALSA(snd_pcm_hw_params_malloc(&params));
-   TRY_ALSA(snd_pcm_hw_params_any(alsa->pcm, params));
-
    alsa->has_float = alsathread_find_float_format(alsa->pcm, params);
    format = alsa->has_float ? SND_PCM_FORMAT_FLOAT : SND_PCM_FORMAT_S16;
 
+   TRY_ALSA(snd_pcm_hw_params_any(alsa->pcm, params));
    TRY_ALSA(snd_pcm_hw_params_set_access(
             alsa->pcm, params, SND_PCM_ACCESS_RW_INTERLEAVED));
    TRY_ALSA(snd_pcm_hw_params_set_format(alsa->pcm, params, format));
@@ -255,7 +256,7 @@ static ssize_t alsa_thread_write(void *data, const void *buf, size_t size)
       size_t write_amt;
 
       slock_lock(alsa->fifo_lock);
-      avail           = FIFO_WRITE_AVAIL(alsa->buffer);
+      avail           = fifo_write_avail(alsa->buffer);
       write_amt       = MIN(avail, size);
 
       fifo_write(alsa->buffer, buf, write_amt);
@@ -270,7 +271,7 @@ static ssize_t alsa_thread_write(void *data, const void *buf, size_t size)
       {
          size_t avail;
          slock_lock(alsa->fifo_lock);
-         avail = FIFO_WRITE_AVAIL(alsa->buffer);
+         avail = fifo_write_avail(alsa->buffer);
 
          if (avail == 0)
          {
@@ -333,7 +334,7 @@ static size_t alsa_thread_write_avail(void *data)
    if (alsa->thread_dead)
       return 0;
    slock_lock(alsa->fifo_lock);
-   val = FIFO_WRITE_AVAIL(alsa->buffer);
+   val = fifo_write_avail(alsa->buffer);
    slock_unlock(alsa->fifo_lock);
    return val;
 }

audio/drivers/audioio.c

@@ -24,10 +24,10 @@
 #include <sys/audioio.h>
 
 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "config.h"
 #endif
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #define DEFAULT_DEV "/dev/audio"
@@ -36,9 +36,9 @@ static void *audioio_init(const char *device, unsigned rate, unsigned latency,
       unsigned block_frames,
       unsigned *new_out_rate)
 {
-   struct audio_info info;
+   int *fd = (int*)calloc(1, sizeof(int));
    const char *audiodev = device ? device : DEFAULT_DEV;
-   int              *fd = (int*)calloc(1, sizeof(int));
+   struct audio_info info;
 
    if (!fd)
       return NULL;

audio/drivers/coreaudio.c

@@ -31,24 +31,25 @@
 #include <retro_endianness.h>
 #include <string/stdstring.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
-#include "defines/cocoa_defines.h"
 
 typedef struct coreaudio
 {
    slock_t *lock;
    scond_t *cond;
-#if !HAS_MACOSX_10_12
+
+#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
    ComponentInstance dev;
 #else
    AudioComponentInstance dev;
 #endif
-   fifo_buffer_t *buffer;
-   size_t buffer_size;
    bool dev_alive;
    bool is_paused;
+
+   fifo_buffer_t *buffer;
    bool nonblock;
+   size_t buffer_size;
 } coreaudio_t;
 
 #if TARGET_OS_IOS
@@ -65,7 +66,7 @@ static void coreaudio_free(void *data)
    if (dev->dev_alive)
    {
       AudioOutputUnitStop(dev->dev);
-#if !HAS_MACOSX_10_12
+#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
       CloseComponent(dev->dev);
 #else
       AudioComponentInstanceDispose(dev->dev);
@@ -102,7 +103,7 @@ static OSStatus audio_write_cb(void *userdata,
 
    slock_lock(dev->lock);
 
-   if (FIFO_READ_AVAIL(dev->buffer) < write_avail)
+   if (fifo_read_avail(dev->buffer) < write_avail)
    {
       *action_flags = kAudioUnitRenderAction_OutputIsSilence;
 
@@ -140,7 +141,7 @@ static void choose_output_device(coreaudio_t *dev, const char* device)
    UInt32 size                         = 0;
 
    propaddr.mSelector = kAudioHardwarePropertyDevices;
-#if HAS_MACOSX_10_12
+#if MAC_OS_X_VERSION_10_12
    propaddr.mScope    = kAudioObjectPropertyScopeOutput;
 #else
    propaddr.mScope    = kAudioObjectPropertyScopeGlobal;
@@ -158,7 +159,7 @@ static void choose_output_device(coreaudio_t *dev, const char* device)
             &propaddr, 0, 0, &size, devices) != noErr)
       goto done;
 
-#if HAS_MACOSX_10_12
+#if MAC_OS_X_VERSION_10_12
 #else
    propaddr.mScope    = kAudioDevicePropertyScopeOutput;
 #endif
@@ -193,7 +194,7 @@ static void *coreaudio_init(const char *device,
    size_t fifo_size;
    UInt32 i_size;
    AudioStreamBasicDescription real_desc;
-#if !HAS_MACOSX_10_12
+#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
    Component comp;
 #else
    AudioComponent comp;
@@ -205,7 +206,7 @@ static void *coreaudio_init(const char *device,
    AudioStreamBasicDescription stream_desc = {0};
    bool component_unavailable              = false;
    static bool session_initialized         = false;
-#if !HAS_MACOSX_10_12
+#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
    ComponentDescription desc               = {0};
 #else
    AudioComponentDescription desc          = {0};
@@ -239,7 +240,7 @@ static void *coreaudio_init(const char *device,
 #endif
    desc.componentManufacturer = kAudioUnitManufacturer_Apple;
 
-#if !HAS_MACOSX_10_12
+#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
    comp = FindNextComponent(NULL, &desc);
 #else
    comp = AudioComponentFindNext(NULL, &desc);
@@ -247,7 +248,7 @@ static void *coreaudio_init(const char *device,
    if (!comp)
       goto error;
 
-#if !HAS_MACOSX_10_12
+#if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
    component_unavailable = (OpenAComponent(comp, &dev->dev) != noErr);
 #else
    component_unavailable = (AudioComponentInstanceNew(comp, &dev->dev) != noErr);
@@ -355,14 +356,14 @@ static ssize_t coreaudio_write(void *data, const void *buf_, size_t size)
 
       slock_lock(dev->lock);
 
-      write_avail = FIFO_WRITE_AVAIL(dev->buffer);
+      write_avail = fifo_write_avail(dev->buffer);
       if (write_avail > size)
          write_avail = size;
 
       fifo_write(dev->buffer, buf, write_avail);
-      buf     += write_avail;
+      buf += write_avail;
       written += write_avail;
-      size    -= write_avail;
+      size -= write_avail;
 
       if (dev->nonblock)
       {
@@ -429,7 +430,7 @@ static size_t coreaudio_write_avail(void *data)
    coreaudio_t *dev = (coreaudio_t*)data;
 
    slock_lock(dev->lock);
-   avail = FIFO_WRITE_AVAIL(dev->buffer);
+   avail = fifo_write_avail(dev->buffer);
    slock_unlock(dev->lock);
 
    return avail;

audio/drivers/coreaudio3.m

@@ -22,8 +22,7 @@
 #include <stdlib.h>
 #include <memory.h>
 
-#include "../audio_driver.h"
-#include "../../verbosity.h"
+#include "../../retroarch.h"
 
 #pragma mark - ringbuffer
 
@@ -31,9 +30,9 @@ typedef struct ringbuffer
 {
    float *buffer;
    size_t cap;
-   size_t write_ptr;
-   size_t read_ptr;
    atomic_int len;
+   size_t writePtr;
+   size_t readPtr;
 } ringbuffer_t;
 
 typedef ringbuffer_t * ringbuffer_h;
@@ -45,7 +44,7 @@ static inline size_t rb_len(ringbuffer_h r)
 
 static inline size_t rb_cap(ringbuffer_h r)
 {
-   return (r->read_ptr + r->cap - r->write_ptr) % r->cap;
+   return (r->readPtr + r->cap - r->writePtr) % r->cap;
 }
 
 static inline size_t rb_avail(ringbuffer_h r)
@@ -55,17 +54,17 @@ static inline size_t rb_avail(ringbuffer_h r)
 
 static inline void rb_advance_write(ringbuffer_h r)
 {
-   r->write_ptr = (r->write_ptr + 1) % r->cap;
+   r->writePtr = (r->writePtr + 1) % r->cap;
 }
 
 static inline void rb_advance_write_n(ringbuffer_h r, size_t n)
 {
-   r->write_ptr = (r->write_ptr + n) % r->cap;
+   r->writePtr = (r->writePtr + n) % r->cap;
 }
 
 static inline void rb_advance_read(ringbuffer_h r)
 {
-   r->read_ptr = (r->read_ptr + 1) % r->cap;
+   r->readPtr = (r->readPtr + 1) % r->cap;
 }
 
 static inline void rb_len_add(ringbuffer_h r, int n)
@@ -80,11 +79,11 @@ static inline void rb_len_sub(ringbuffer_h r, int n)
 
 static void rb_init(ringbuffer_h r, size_t cap)
 {
-   r->buffer     = malloc(cap * sizeof(float));
-   r->cap        = cap;
+   r->buffer   = malloc(cap * sizeof(float));
+   r->cap      = cap;
    atomic_init(&r->len, 0);
-   r->write_ptr  = 0;
-   r->read_ptr   = 0;
+   r->writePtr = 0;
+   r->readPtr  = 0;
 }
 
 static void rb_free(ringbuffer_h r)
@@ -103,13 +102,13 @@ static void rb_write_data(ringbuffer_h r, const float *data, size_t len)
    size_t first_write = n;
    size_t rest_write  = 0;
 
-   if (r->write_ptr + n > r->cap)
+   if (r->writePtr + n > r->cap)
    {
-      first_write     = r->cap - r->write_ptr;
-      rest_write      = n - first_write;
+      first_write = r->cap - r->writePtr;
+      rest_write  = n - first_write;
    }
 
-   memcpy(r->buffer + r->write_ptr, data, first_write*sizeof(float));
+   memcpy(r->buffer + r->writePtr, data, first_write*sizeof(float));
    memcpy(r->buffer, data + first_write, rest_write*sizeof(float));
 
    rb_advance_write_n(r, n);
@@ -127,9 +126,9 @@ static void rb_read_data(ringbuffer_h r,
       int i       = 0;
       for (; i < n/2; i++)
       {
-         d0[i] = r->buffer[r->read_ptr];
+         d0[i] = r->buffer[r->readPtr];
          rb_advance_read(r);
-         d1[i] = r->buffer[r->read_ptr];
+         d1[i] = r->buffer[r->readPtr];
          rb_advance_read(r);
       }
 

audio/drivers/ctr_csnd_audio.c

@@ -19,12 +19,12 @@
 #include <retro_miscellaneous.h>
 #include <retro_timers.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 
 typedef struct
 {
-   uint64_t cpu_ticks_last;
-
+   bool nonblock;
+   bool playing;
    int16_t* l;
    int16_t* r;
 
@@ -34,8 +34,7 @@ typedef struct
    uint32_t pos;
 
    uint32_t playpos;
-   bool nonblock;
-   bool playing;
+   uint64_t cpu_ticks_last;
 } ctr_csnd_audio_t;
 
 #define CTR_CSND_AUDIO_COUNT       (1u << 11u)

audio/drivers/ctr_dsp_audio.c

@@ -17,16 +17,17 @@
 #include <string.h>
 #include <malloc.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../ctr/ctr_debug.h"
 
 typedef struct
 {
-   ndspWaveBuf dsp_buf; /* TODO/FIXME - find out alignment */
-   int channel;
-   uint32_t pos;
    bool nonblock;
    bool playing;
+   int channel;
+   ndspWaveBuf dsp_buf;
+
+   uint32_t pos;
 } ctr_dsp_audio_t;
 
 #define CTR_DSP_AUDIO_COUNT       (1u << 11u)
@@ -107,15 +108,6 @@ static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size)
       {
          do{
             svcSleepThread(100000);
-
-            /* Run aptMainLoop to update APT state if DSP state
-             * changed, this prevents a hang on sleep. */
-            if(!aptMainLoop())
-            {
-               command_event(CMD_EVENT_QUIT, NULL);
-               return true;
-            }
-
             sample_pos = ndspChnGetSamplePos(ctr->channel);
          }while (((sample_pos - (ctr->pos + (size >>2))) & CTR_DSP_AUDIO_COUNT_MASK) > (CTR_DSP_AUDIO_COUNT >> 1)
                  || (((ctr->pos - (CTR_DSP_AUDIO_COUNT >> 4) - sample_pos) & CTR_DSP_AUDIO_COUNT_MASK) > (CTR_DSP_AUDIO_COUNT >> 1)));

audio/drivers/ctr_dsp_thread_audio.c

@@ -1,339 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2020 - Justin Weiss
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <3ds.h>
-#include <string.h>
-#include <malloc.h>
-#include <queues/fifo_queue.h>
-#include <rthreads/rthreads.h>
-
-#include "../audio_driver.h"
-#include "../../ctr/ctr_debug.h"
-
-typedef struct
-{
-   fifo_buffer_t* fifo;
-   size_t fifo_size;
-
-   slock_t* fifo_lock;
-   scond_t* fifo_avail;
-   scond_t* fifo_done;
-   sthread_t* thread;
-
-   volatile bool running;
-
-   bool nonblocking;
-   bool playing;
-   retro_time_t frame_time;
-   int channel;
-   ndspWaveBuf dsp_buf;
-
-   uint32_t pos;
-} ctr_dsp_thread_audio_t;
-
-// PCM16 stereo
-#define DSP_BYTES_TO_SAMPLES(bytes) (bytes / (2 * sizeof(uint16_t)))
-#define DSP_SAMPLES_TO_BYTES(samples) (samples * 2 * sizeof(uint16_t))
-
-static void ctr_dsp_audio_loop(void* data)
-{
-   uint32_t pos, buf_pos;
-   ctr_dsp_thread_audio_t *ctr  = (ctr_dsp_thread_audio_t*)data;
-
-   if (!ctr)
-      return;
-
-   while (1)
-   {
-      size_t buf_avail, avail, to_write;
-      slock_lock(ctr->fifo_lock);
-
-      do {
-         avail = FIFO_READ_AVAIL(ctr->fifo);
-
-         if (!avail) {
-            scond_wait(ctr->fifo_avail, ctr->fifo_lock);
-         }
-      } while (!avail && ctr->running);
-
-      slock_unlock(ctr->fifo_lock);
-
-      if (!ctr->running)
-         break;
-
-      pos = ctr->pos;
-      buf_pos = DSP_SAMPLES_TO_BYTES(ndspChnGetSamplePos(ctr->channel));
-
-      buf_avail = buf_pos >= pos ? buf_pos - pos : ctr->fifo_size - pos;
-      to_write = MIN(avail, buf_avail);
-
-      slock_lock(ctr->fifo_lock);
-
-      if (to_write > 0) {
-         fifo_read(ctr->fifo, ctr->dsp_buf.data_pcm8 + pos, to_write);
-         DSP_FlushDataCache(ctr->dsp_buf.data_pcm8 + pos, to_write);
-         scond_signal(ctr->fifo_done);
-      }
-
-      slock_unlock(ctr->fifo_lock);
-
-      if (buf_pos == pos) {
-         svcSleepThread(100000);
-      }
-
-      ctr->pos = (pos + to_write) % ctr->fifo_size;
-   }
-}
-
-static void ctr_dsp_thread_audio_free(void *data);
-
-static void *ctr_dsp_thread_audio_init(const char *device, unsigned rate, unsigned latency,
-      unsigned block_frames,
-      unsigned *new_rate)
-{
-   ctr_dsp_thread_audio_t *ctr = NULL;
-
-   (void)device;
-   (void)rate;
-
-   if (ndspInit() < 0)
-      return NULL;
-
-   ctr = (ctr_dsp_thread_audio_t*)calloc(1, sizeof(ctr_dsp_thread_audio_t));
-
-   if (!ctr)
-      return NULL;
-
-   *new_rate    = 32728;
-
-   ctr->running = true;
-   ctr->channel = 0;
-
-   ndspSetOutputMode(NDSP_OUTPUT_STEREO);
-   ndspSetClippingMode(NDSP_CLIP_SOFT); /* ?? */
-   ndspSetOutputCount(2);
-   ndspChnReset(ctr->channel);
-   ndspChnSetFormat(ctr->channel, NDSP_FORMAT_STEREO_PCM16);
-   ndspChnSetInterp(ctr->channel, NDSP_INTERP_NONE);
-   ndspChnSetRate(ctr->channel, 32728.0f);
-   ndspChnWaveBufClear(ctr->channel);
-
-   ctr->fifo_size = DSP_SAMPLES_TO_BYTES((*new_rate * MAX(latency, 8)) / 1000);
-
-   ctr->dsp_buf.data_pcm16 = linearAlloc(ctr->fifo_size);
-   memset(ctr->dsp_buf.data_pcm16, 0, ctr->fifo_size);
-   DSP_FlushDataCache(ctr->dsp_buf.data_pcm16, ctr->fifo_size);
-
-   ctr->dsp_buf.looping = true;
-   ctr->dsp_buf.nsamples = DSP_BYTES_TO_SAMPLES(ctr->fifo_size);
-   ndspChnWaveBufAdd(ctr->channel, &ctr->dsp_buf);
-
-   ctr->fifo = fifo_new(ctr->fifo_size);
-
-   if (!(ctr->fifo_lock = slock_new()) ||
-       !(ctr->fifo_avail = scond_new()) ||
-       !(ctr->fifo_done = scond_new()) ||
-       !(ctr->thread = sthread_create(ctr_dsp_audio_loop, ctr)))
-   {
-      RARCH_LOG("[Audio]: thread creation failed.\n");
-      ctr->running = false;
-      ctr_dsp_thread_audio_free(ctr);
-      return NULL;
-   }
-
-   ctr->pos = 0;
-   ctr->playing = true;
-
-   ctr->frame_time = (retro_time_t)roundf(1000000 * 4481134.0 / (*new_rate * 8192.0));
-
-   ndspSetMasterVol(1.0);
-
-   return ctr;
-}
-
-static void ctr_dsp_thread_audio_free(void *data)
-{
-   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
-   if (!ctr)
-      return;
-
-   if (ctr->running)
-   {
-      ctr->running = false;
-      scond_signal(ctr->fifo_avail);
-   }
-
-   if (ctr->thread)
-      sthread_join(ctr->thread);
-
-   scond_free(ctr->fifo_avail);
-   scond_free(ctr->fifo_done);
-   slock_free(ctr->fifo_lock);
-
-   if (ctr->fifo)
-   {
-      fifo_free(ctr->fifo);
-      ctr->fifo = NULL;
-   }
-
-   ndspChnWaveBufClear(ctr->channel);
-
-   linearFree(ctr->dsp_buf.data_pcm16);
-
-   free(ctr);
-   ndspExit();
-   ctr = NULL;
-}
-
-static ssize_t ctr_dsp_thread_audio_write(void *data, const void *buf, size_t size)
-{
-   size_t avail, written;
-   ctr_dsp_thread_audio_t * ctr = (ctr_dsp_thread_audio_t*)data;
-
-   if (!ctr || !ctr->running)
-      return 0;
-
-   if (ctr->nonblocking)
-   {
-      slock_lock(ctr->fifo_lock);
-      avail = FIFO_WRITE_AVAIL(ctr->fifo);
-      written = MIN(avail, size);
-      if (written > 0)
-      {
-         fifo_write(ctr->fifo, buf, written);
-         scond_signal(ctr->fifo_avail);
-      }
-      slock_unlock(ctr->fifo_lock);
-   }
-   else
-   {
-      written = 0;
-      while (written < size && ctr->running)
-      {
-         slock_lock(ctr->fifo_lock);
-         avail = FIFO_WRITE_AVAIL(ctr->fifo);
-         if (avail == 0)
-         {
-            if (ctr->running)
-            {
-               /* Wait a maximum of one frame, skip the write if the thread is still busy */
-               if (!scond_wait_timeout(ctr->fifo_done, ctr->fifo_lock, ctr->frame_time)) {
-                  slock_unlock(ctr->fifo_lock);
-                  break;
-               }
-            }
-            slock_unlock(ctr->fifo_lock);
-         }
-         else
-         {
-            size_t write_amt = MIN(size - written, avail);
-            fifo_write(ctr->fifo, (const char*)buf + written, write_amt);
-            scond_signal(ctr->fifo_avail);
-            slock_unlock(ctr->fifo_lock);
-            written += write_amt;
-         }
-      }
-   }
-
-   return written;
-}
-
-static bool ctr_dsp_thread_audio_stop(void *data)
-{
-   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
-
-   if (!ctr)
-     return false;
-
-   ndspSetMasterVol(0.0);
-   ctr->playing = false;
-
-   return true;
-}
-
-static bool ctr_dsp_thread_audio_alive(void *data)
-{
-   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
-
-   if (!ctr)
-     return false;
-
-   return ctr->playing;
-}
-
-static bool ctr_dsp_thread_audio_start(void *data, bool is_shutdown)
-{
-   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
-
-   if (!ctr)
-     return false;
-
-   /* Prevents restarting audio when the menu
-    * is toggled off on shutdown */
-   if (is_shutdown)
-      return true;
-
-   ndspSetMasterVol(1.0);
-   ctr->playing = true;
-
-   return true;
-}
-
-static void ctr_dsp_thread_audio_set_nonblock_state(void *data, bool state)
-{
-   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
-   if (ctr)
-      ctr->nonblocking = state;
-}
-
-static bool ctr_dsp_thread_audio_use_float(void *data)
-{
-   (void)data;
-   return false;
-}
-
-static size_t ctr_dsp_thread_audio_write_avail(void *data)
-{
-   size_t val;
-   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
-
-   slock_lock(ctr->fifo_lock);
-   val = FIFO_WRITE_AVAIL(ctr->fifo);
-   slock_unlock(ctr->fifo_lock);
-
-   return val;
-}
-
-static size_t ctr_dsp_thread_audio_buffer_size(void *data)
-{
-   ctr_dsp_thread_audio_t* ctr = (ctr_dsp_thread_audio_t*)data;
-   return ctr->fifo_size;
-}
-
-audio_driver_t audio_ctr_dsp_thread = {
-   ctr_dsp_thread_audio_init,
-   ctr_dsp_thread_audio_write,
-   ctr_dsp_thread_audio_stop,
-   ctr_dsp_thread_audio_start,
-   ctr_dsp_thread_audio_alive,
-   ctr_dsp_thread_audio_set_nonblock_state,
-   ctr_dsp_thread_audio_free,
-   ctr_dsp_thread_audio_use_float,
-   "dsp_thread",
-   NULL,
-   NULL,
-   ctr_dsp_thread_audio_write_avail,
-   ctr_dsp_thread_audio_buffer_size
-};

audio/drivers/dsound.c

@@ -39,7 +39,7 @@
 #include <queues/fifo_queue.h>
 #include <string/stdstring.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #ifdef _XBOX
@@ -136,8 +136,8 @@ static void dsound_thread(void *data)
 static DWORD CALLBACK dsound_thread(PVOID data)
 #endif
 {
-   DWORD write_ptr = 0;
-   dsound_t *ds    = (dsound_t*)data;
+   DWORD write_ptr;
+   dsound_t *ds = (dsound_t*)data;
 
    SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL);
 
@@ -155,7 +155,7 @@ static DWORD CALLBACK dsound_thread(PVOID data)
       avail = write_avail(read_ptr, write_ptr, ds->buffer_size);
 
       EnterCriticalSection(&ds->crit);
-      fifo_avail = FIFO_READ_AVAIL(ds->buffer);
+      fifo_avail = fifo_read_avail(ds->buffer);
       LeaveCriticalSection(&ds->crit);
 
       if (avail < CHUNK_SIZE || ((fifo_avail < CHUNK_SIZE) && (avail < ds->buffer_size / 2)))
@@ -303,8 +303,7 @@ static void dsound_free(void *data)
    free(ds);
 }
 
-static BOOL CALLBACK enumerate_cb(LPGUID guid,
-      LPCSTR desc, LPCSTR module, LPVOID context)
+static BOOL CALLBACK enumerate_cb(LPGUID guid, LPCSTR desc, LPCSTR module, LPVOID context)
 {
    union string_list_elem_attr attr;
    struct string_list *list = (struct string_list*)context;
@@ -315,20 +314,15 @@ static BOOL CALLBACK enumerate_cb(LPGUID guid,
 
    if (guid)
    {
+      unsigned i;
       LPGUID guid_copy = (LPGUID)malloc(sizeof(GUID) * 1);
+      guid_copy->Data1 = guid->Data1;
+      guid_copy->Data2 = guid->Data2;
+      guid_copy->Data3 = guid->Data3;
+      for (i = 0; i < 8; i++)
+         guid_copy->Data4[i] = guid->Data4[i];
 
-      if (guid_copy)
-      {
-         unsigned i;
-
-         guid_copy->Data1 = guid->Data1;
-         guid_copy->Data2 = guid->Data2;
-         guid_copy->Data3 = guid->Data3;
-         for (i = 0; i < 8; i++)
-            guid_copy->Data4[i] = guid->Data4[i];
-
-         list->elems[list->size - 1].userdata = guid_copy;
-      }
+      list->elems[list->size-1].userdata = guid_copy;
    }
 
    return TRUE;
@@ -517,7 +511,7 @@ static ssize_t dsound_write(void *data, const void *buf_, size_t size)
          size_t avail;
 
          EnterCriticalSection(&ds->crit);
-         avail = FIFO_WRITE_AVAIL(ds->buffer);
+         avail = fifo_write_avail(ds->buffer);
          if (avail > size)
             avail = size;
 
@@ -536,7 +530,7 @@ static ssize_t dsound_write(void *data, const void *buf_, size_t size)
          size_t avail;
 
          EnterCriticalSection(&ds->crit);
-         avail = FIFO_WRITE_AVAIL(ds->buffer);
+         avail = fifo_write_avail(ds->buffer);
          if (avail > size)
             avail = size;
 
@@ -551,8 +545,7 @@ static ssize_t dsound_write(void *data, const void *buf_, size_t size)
             break;
 
          if (avail == 0)
-            if (!(WaitForSingleObject(ds->event, 50) == WAIT_OBJECT_0))
-               return -1;
+            WaitForSingleObject(ds->event, INFINITE);
       }
    }
 
@@ -565,13 +558,21 @@ static size_t dsound_write_avail(void *data)
    dsound_t *ds = (dsound_t*)data;
 
    EnterCriticalSection(&ds->crit);
-   avail = FIFO_WRITE_AVAIL(ds->buffer);
+   avail = fifo_write_avail(ds->buffer);
    LeaveCriticalSection(&ds->crit);
    return avail;
 }
 
-static size_t dsound_buffer_size(void *data) { return 4 * 1024; }
-static bool dsound_use_float(void *data) { return false; }
+static size_t dsound_buffer_size(void *data)
+{
+   return 4 * 1024;
+}
+
+static bool dsound_use_float(void *data)
+{
+   (void)data;
+   return false;
+}
 
 static void *dsound_list_new(void *u)
 {

audio/drivers/gx_audio.c

@@ -27,17 +27,18 @@
 #include <boolean.h>
 #include <retro_inline.h>
 
-#include <defines/gx_defines.h>
-
-#include "../audio_driver.h"
+#include "../../retroarch.h"
+#include "../../defines/gx_defines.h"
 
 typedef struct
 {
-   size_t write_ptr;
    uint32_t data[BLOCKS][CHUNK_FRAMES];
+
    volatile unsigned dma_busy;
    volatile unsigned dma_next;
    volatile unsigned dma_write;
+   size_t write_ptr;
+
    bool nonblock;
    bool is_paused;
 } gx_audio_t;
@@ -108,7 +109,7 @@ static INLINE void copy_swapped(uint32_t * restrict dst,
    {
       uint32_t s = *src++;
       *dst++ = (s >> 16) | (s << 16);
-   } while (--size);
+   }while(--size);
 }
 
 static ssize_t gx_audio_write(void *data, const void *buf_, size_t size)

audio/drivers/jack.c

@@ -25,8 +25,7 @@
 #include <boolean.h>
 #include <rthreads/rthreads.h>
 
-#include "../../configuration.h"
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #define FRAMES(x) (x / (sizeof(float) * 2))
@@ -35,44 +34,23 @@ typedef struct jack
 {
    jack_client_t *client;
    jack_port_t *ports[2];
-   jack_ringbuffer_t *buffer;
+   jack_ringbuffer_t *buffer[2];
+   volatile bool shutdown;
+   bool nonblock;
+   bool is_paused;
+
 #ifdef HAVE_THREADS
    scond_t *cond;
    slock_t *cond_lock;
 #endif
    size_t buffer_size;
-   volatile bool shutdown;
-   bool nonblock;
-   bool is_paused;
 } jack_t;
 
-static size_t read_deinterleaved(float *dst[2], jack_nframes_t dst_offset,
-      jack_ringbuffer_data_t buf, jack_nframes_t nframes)
-{
-   int i;
-   jack_nframes_t j, frames_avail;
-   const float *src = (const float *)buf.buf;
-
-   if (nframes <= 0)
-      return 0;
-
-   frames_avail = FRAMES(buf.len);
-   nframes = nframes < frames_avail ? nframes : frames_avail;
-
-   for (j = 0; j < nframes; j++)
-      for (i = 0; i < 2; i++)
-         dst[i][dst_offset + j] = *src++;
-
-   return nframes;
-}
-
 static int process_cb(jack_nframes_t nframes, void *data)
 {
    int i;
-   jack_nframes_t read = 0;
+   jack_nframes_t avail[2], min_avail;
    jack_t *jd = (jack_t*)data;
-   jack_ringbuffer_data_t buf[2];
-   float *dst[2];
 
    if (nframes <= 0)
    {
@@ -82,20 +60,23 @@ static int process_cb(jack_nframes_t nframes, void *data)
       return 0;
    }
 
-   for (i = 0; i < 2; i++)
-      dst[i] = (float *)jack_port_get_buffer(jd->ports[i], nframes);
+   avail[0]  = jack_ringbuffer_read_space(jd->buffer[0]);
+   avail[1]  = jack_ringbuffer_read_space(jd->buffer[1]);
+   min_avail = ((avail[0] < avail[1]) ? avail[0] : avail[1]) / sizeof(jack_default_audio_sample_t);
 
-   jack_ringbuffer_get_read_vector(jd->buffer, buf);
+   if (min_avail > nframes)
+      min_avail = nframes;
 
    for (i = 0; i < 2; i++)
-      read += read_deinterleaved(dst, read, buf[i], nframes - read);
+   {
+      jack_nframes_t f;
+      jack_default_audio_sample_t *out = (jack_default_audio_sample_t*)jack_port_get_buffer(jd->ports[i], nframes);
 
-   jack_ringbuffer_read_advance(jd->buffer, read * sizeof(float) * 2);
-
-   for (; read < nframes; read++)
-      for (i = 0; i < 2; i++)
-         dst[i][read] = 0.0f;
+      jack_ringbuffer_read(jd->buffer[i], (char*)out, min_avail * sizeof(jack_default_audio_sample_t));
 
+      for (f = min_avail; f < nframes; f++)
+         out[f] = 0.0f;
+   }
 #ifdef HAVE_THREADS
    scond_signal(jd->cond);
 #endif
@@ -115,13 +96,13 @@ static void shutdown_cb(void *data)
 #endif
 }
 
-static int parse_ports(char **dest_ports, const char **jports)
+static int parse_ports(const char *audio_device,
+      char **dest_ports, const char **jports)
 {
    int i;
    char           *save   = NULL;
    int           parsed   = 0;
-   settings_t *settings   = config_get_ptr();
-   char *audio_device_cpy = strdup(settings->arrays.audio_device);
+   char *audio_device_cpy = strdup(audio_device);
    const char      *con   = strtok_r(audio_device_cpy, ",", &save);
 
    if (con)
@@ -212,15 +193,17 @@ static void *ja_init(const char *device,
    jd->buffer_size = bufsize;
 
    RARCH_LOG("[JACK]: Internal buffer size: %d frames.\n", (int)(bufsize / sizeof(jack_default_audio_sample_t)));
-
-   jd->buffer = jack_ringbuffer_create(bufsize);
-   if (!jd->buffer)
+   for (i = 0; i < 2; i++)
    {
-      RARCH_ERR("[JACK]: Failed to create buffers.\n");
-      goto error;
+      jd->buffer[i] = jack_ringbuffer_create(bufsize);
+      if (!jd->buffer[i])
+      {
+         RARCH_ERR("[JACK]: Failed to create buffers.\n");
+         goto error;
+      }
    }
 
-   parsed = parse_ports(dest_ports, jports);
+   parsed = parse_ports(device, dest_ports, jports);
 
    if (jack_activate(jd->client) < 0)
    {
@@ -252,46 +235,65 @@ error:
    return NULL;
 }
 
-static ssize_t ja_write(void *data, const void *buf_, size_t size)
+static size_t write_buffer(jack_t *jd, const float *buf, size_t size)
 {
-   jack_t      *jd = (jack_t*)data;
-   const char *buf = (const char *)buf_;
-   size_t  written = 0;
+   int i;
+   size_t j, written = 0;
+   jack_default_audio_sample_t out_deinterleaved_buffer[2][AUDIO_CHUNK_SIZE_NONBLOCKING * AUDIO_MAX_RATIO];
+   size_t frames = FRAMES(size);
 
-   while (size > 0)
+   /* Avoid buffer overflow if a DSP plugin generated a huge number of frames. */
+   if (frames > AUDIO_CHUNK_SIZE_NONBLOCKING * AUDIO_MAX_RATIO)
+      frames = AUDIO_CHUNK_SIZE_NONBLOCKING * AUDIO_MAX_RATIO;
+
+   for (i = 0; i < 2; i++)
+      for (j = 0; j < frames; j++)
+         out_deinterleaved_buffer[i][j] = buf[j * 2 + i];
+
+   while (written < frames)
    {
-      size_t avail, to_write;
-
+      size_t avail[2], min_avail, write_frames;
       if (jd->shutdown)
          return 0;
 
-      avail = jack_ringbuffer_write_space(jd->buffer);
+      avail[0] = jack_ringbuffer_write_space(jd->buffer[0]);
+      avail[1] = jack_ringbuffer_write_space(jd->buffer[1]);
 
-      to_write = size < avail ? size : avail;
-      /* make sure to only write multiples of the sample size */
-      to_write = (to_write / sizeof(float)) * sizeof(float);
+      min_avail = avail[0] < avail[1] ? avail[0] : avail[1];
+      min_avail /= sizeof(float);
 
-      if (to_write > 0)
+      write_frames = frames - written > min_avail ? min_avail : frames - written;
+
+      if (write_frames > 0)
       {
-         jack_ringbuffer_write(jd->buffer, buf, to_write);
-         buf     += to_write;
-         size    -= to_write;
-         written += to_write;
+         for (i = 0; i < 2; i++)
+         {
+            jack_ringbuffer_write(jd->buffer[i], (const char*)&out_deinterleaved_buffer[i][written],
+                  write_frames * sizeof(jack_default_audio_sample_t));
+         }
+         written += write_frames;
       }
-      else if (!jd->nonblock)
-      {
 #ifdef HAVE_THREADS
+      else
+      {
          slock_lock(jd->cond_lock);
          scond_wait(jd->cond, jd->cond_lock);
          slock_unlock(jd->cond_lock);
-#endif
-         continue;
       }
-      else
+#endif
+
+      if (jd->nonblock)
          break;
    }
 
-   return written;
+   return written * sizeof(float) * 2;
+}
+
+static ssize_t ja_write(void *data, const void *buf, size_t size)
+{
+   jack_t *jd = (jack_t*)data;
+
+   return write_buffer(jd, (const float*)buf, size);
 }
 
 static bool ja_stop(void *data)
@@ -338,8 +340,9 @@ static void ja_free(void *data)
       jack_client_close(jd->client);
    }
 
-   if (jd->buffer)
-      jack_ringbuffer_free(jd->buffer);
+   for (i = 0; i < 2; i++)
+      if (jd->buffer[i])
+         jack_ringbuffer_free(jd->buffer[i]);
 
 #ifdef HAVE_THREADS
    if (jd->cond_lock)
@@ -359,7 +362,7 @@ static bool ja_use_float(void *data)
 static size_t ja_write_avail(void *data)
 {
    jack_t *jd = (jack_t*)data;
-   return jack_ringbuffer_write_space(jd->buffer);
+   return jack_ringbuffer_write_space(jd->buffer[0]);
 }
 
 static size_t ja_buffer_size(void *data)

audio/drivers/openal.c

@@ -33,7 +33,7 @@
 #include <retro_miscellaneous.h>
 #include <retro_timers.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #define BUFSIZE 1024
@@ -43,14 +43,17 @@ typedef struct al
    ALuint source;
    ALuint *buffers;
    ALuint *res_buf;
+   size_t res_ptr;
+   ALenum format;
+   size_t num_buffers;
+   int rate;
+
+   uint8_t tmpbuf[BUFSIZE];
+   size_t tmpbuf_ptr;
+
    ALCdevice *handle;
    ALCcontext *ctx;
-   size_t res_ptr;
-   size_t num_buffers;
-   size_t tmpbuf_ptr;
-   int rate;
-   ALenum format;
-   uint8_t tmpbuf[BUFSIZE];
+
    bool nonblock;
    bool is_paused;
 } al_t;

audio/drivers/opensl.c

@@ -21,7 +21,7 @@
 
 #include <rthreads/rthreads.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 
 /* Helper macros, COM-style. */
 #define SLObjectItf_Realize(a, ...) ((*(a))->Realize(a, __VA_ARGS__))
@@ -37,6 +37,9 @@ typedef struct sl
 {
    uint8_t **buffer;
    uint8_t *buffer_chunk;
+   unsigned buffer_index;
+   unsigned buffer_ptr;
+   volatile unsigned buffered_blocks;
 
    SLObjectItf engine_object;
    SLEngineItf engine;
@@ -48,13 +51,10 @@ typedef struct sl
 
    slock_t *lock;
    scond_t *cond;
-   unsigned buf_size;
-   unsigned buf_count;
-   unsigned buffer_index;
-   unsigned buffer_ptr;
-   volatile unsigned buffered_blocks;
    bool nonblock;
    bool is_paused;
+   unsigned buf_size;
+   unsigned buf_count;
 } sl_t;
 
 static void opensl_callback(SLAndroidSimpleBufferQueueItf bq, void *ctx)
@@ -67,7 +67,7 @@ static void opensl_callback(SLAndroidSimpleBufferQueueItf bq, void *ctx)
 #define GOTO_IF_FAIL(x) do { \
    if ((res = (x)) != SL_RESULT_SUCCESS) \
       goto error; \
-} while (0)
+} while(0)
 
 static void sl_free(void *data)
 {
@@ -116,7 +116,7 @@ static void *sl_init(const char *device, unsigned rate, unsigned latency,
    if (!sl)
       goto error;
 
-   RARCH_LOG("[OpenSL]: Requested audio latency: %u ms.\n", latency);
+   RARCH_LOG("[OpenSL]: Requested audio latency: %u ms.", latency);
 
    GOTO_IF_FAIL(slCreateEngine(&sl->engine_object, 0, NULL, 0, NULL, NULL));
    GOTO_IF_FAIL(SLObjectItf_Realize(sl->engine_object, SL_BOOLEAN_FALSE));

audio/drivers/oss.c

@@ -30,10 +30,10 @@
 #include <retro_endianness.h>
 
 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "config.h"
 #endif
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #ifdef HAVE_OSS_BSD
@@ -42,27 +42,22 @@
 #define DEFAULT_OSS_DEV "/dev/dsp"
 #endif
 
-typedef struct oss_audio
-{
-   int fd;
-   bool is_paused;
-} oss_audio_t;
+static bool oss_is_paused = false;
 
-static void *oss_init(const char *device,
-      unsigned rate, unsigned latency,
+static void *oss_init(const char *device, unsigned rate, unsigned latency,
       unsigned block_frames,
       unsigned *new_out_rate)
 {
    int frags, frag, channels, format, new_rate;
-   oss_audio_t *ossaudio  = (oss_audio_t*)calloc(1, sizeof(oss_audio_t));
+   int              *fd   = (int*)calloc(1, sizeof(int));
    const char *oss_device = device ? device : DEFAULT_OSS_DEV;
 
-   if (!ossaudio)
+   if (!fd)
       return NULL;
 
-   if ((ossaudio->fd = open(oss_device, O_WRONLY)) < 0)
+   if ((*fd = open(oss_device, O_WRONLY)) < 0)
    {
-      free(ossaudio);
+      free(fd);
       perror("open");
       return NULL;
    }
@@ -70,21 +65,21 @@ static void *oss_init(const char *device,
    frags = (latency * rate * 4) / (1000 * (1 << 10));
    frag  = (frags << 16) | 10;
 
-   if (ioctl(ossaudio->fd, SNDCTL_DSP_SETFRAGMENT, &frag) < 0)
+   if (ioctl(*fd, SNDCTL_DSP_SETFRAGMENT, &frag) < 0)
       RARCH_WARN("Cannot set fragment sizes. Latency might not be as expected ...\n");
 
    channels = 2;
    format   = is_little_endian() ? AFMT_S16_LE : AFMT_S16_BE;
 
-   if (ioctl(ossaudio->fd, SNDCTL_DSP_CHANNELS, &channels) < 0)
+   if (ioctl(*fd, SNDCTL_DSP_CHANNELS, &channels) < 0)
       goto error;
 
-   if (ioctl(ossaudio->fd, SNDCTL_DSP_SETFMT, &format) < 0)
+   if (ioctl(*fd, SNDCTL_DSP_SETFMT, &format) < 0)
       goto error;
 
    new_rate = rate;
 
-   if (ioctl(ossaudio->fd, SNDCTL_DSP_SPEED, &new_rate) < 0)
+   if (ioctl(*fd, SNDCTL_DSP_SPEED, &new_rate) < 0)
       goto error;
 
    if (new_rate != (int)rate)
@@ -93,12 +88,11 @@ static void *oss_init(const char *device,
       *new_out_rate = new_rate;
    }
 
-   return ossaudio;
+   return fd;
 
 error:
-   close(ossaudio->fd);
-   if (ossaudio)
-      free(ossaudio);
+   close(*fd);
+   free(fd);
    perror("ioctl");
    return NULL;
 }
@@ -106,14 +100,14 @@ error:
 static ssize_t oss_write(void *data, const void *buf, size_t size)
 {
    ssize_t ret;
-   oss_audio_t *ossaudio  = (oss_audio_t*)data;
+   int *fd = (int*)data;
 
    if (size == 0)
       return 0;
 
-   if ((ret = write(ossaudio->fd, buf, size)) < 0)
+   if ((ret = write(*fd, buf, size)) < 0)
    {
-      if (errno == EAGAIN && (fcntl(ossaudio->fd, F_GETFL) & O_NONBLOCK))
+      if (errno == EAGAIN && (fcntl(*fd, F_GETFL) & O_NONBLOCK))
          return 0;
 
       return -1;
@@ -124,67 +118,58 @@ static ssize_t oss_write(void *data, const void *buf, size_t size)
 
 static bool oss_stop(void *data)
 {
-   oss_audio_t *ossaudio  = (oss_audio_t*)data;
+   int *fd = (int*)data;
 
-#if !defined(RETROFW)
-   if (ioctl(ossaudio->fd, SNDCTL_DSP_RESET, 0) < 0)
+   if (ioctl(*fd, SNDCTL_DSP_RESET, 0) < 0)
       return false;
-#endif
 
-   ossaudio->is_paused = true;
+   oss_is_paused = true;
    return true;
 }
 
 static bool oss_start(void *data, bool is_shutdown)
 {
-   oss_audio_t *ossaudio  = (oss_audio_t*)data;
-   if (!ossaudio)
-      return false;
-   ossaudio->is_paused = false;
+   (void)data;
+   oss_is_paused = false;
    return true;
 }
 
 static bool oss_alive(void *data)
 {
-   oss_audio_t *ossaudio  = (oss_audio_t*)data;
-   return !ossaudio->is_paused;
+   (void)data;
+   return !oss_is_paused;
 }
 
 static void oss_set_nonblock_state(void *data, bool state)
 {
    int rc;
-   oss_audio_t *ossaudio  = (oss_audio_t*)data;
+   int *fd = (int*)data;
 
    if (state)
-      rc =  fcntl(ossaudio->fd, F_SETFL,
-            fcntl(ossaudio->fd, F_GETFL) | O_NONBLOCK);
+      rc = fcntl(*fd, F_SETFL, fcntl(*fd, F_GETFL) | O_NONBLOCK);
    else
-      rc =  fcntl(ossaudio->fd, F_SETFL,
-            fcntl(ossaudio->fd, F_GETFL) & (~O_NONBLOCK));
+      rc = fcntl(*fd, F_SETFL, fcntl(*fd, F_GETFL) & (~O_NONBLOCK));
    if (rc != 0)
       RARCH_WARN("Could not set nonblocking on OSS file descriptor. Will not be able to fast-forward.\n");
 }
 
 static void oss_free(void *data)
 {
-   oss_audio_t *ossaudio  = (oss_audio_t*)data;
+   int *fd = (int*)data;
 
-/*RETROFW IOCTL always returns EINVAL*/ 
-#if !defined(RETROFW)
-   if (ioctl(ossaudio->fd, SNDCTL_DSP_RESET, 0) < 0)
+   if (ioctl(*fd, SNDCTL_DSP_RESET, 0) < 0)
       return;
-#endif
 
-   close(ossaudio->fd);
-   free(data);
+   close(*fd);
+   free(fd);
 }
 
 static size_t oss_write_avail(void *data)
 {
    audio_buf_info info;
-   oss_audio_t *ossaudio  = (oss_audio_t*)data;
+   int *fd = (int*)data;
 
-   if (ioctl(ossaudio->fd, SNDCTL_DSP_GETOSPACE, &info) < 0)
+   if (ioctl(*fd, SNDCTL_DSP_GETOSPACE, &info) < 0)
    {
       RARCH_ERR("[OSS]: SNDCTL_DSP_GETOSPACE failed ...\n");
       return 0;
@@ -196,9 +181,9 @@ static size_t oss_write_avail(void *data)
 static size_t oss_buffer_size(void *data)
 {
    audio_buf_info info;
-   oss_audio_t *ossaudio  = (oss_audio_t*)data;
+   int *fd = (int*)data;
 
-   if (ioctl(ossaudio->fd, SNDCTL_DSP_GETOSPACE, &info) < 0)
+   if (ioctl(*fd, SNDCTL_DSP_GETOSPACE, &info) < 0)
    {
       RARCH_ERR("[OSS]: SNDCTL_DSP_GETOSPACE failed ...\n");
       return 1; /* Return something non-zero to avoid SIGFPE. */

audio/drivers/ps2_audio.c

@@ -15,12 +15,13 @@
 
 #include <stdint.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <string.h>
 
 #include <kernel.h>
 #include <audsrv.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 
 #define AUDIO_BUFFER 128 * 1024
 #define AUDIO_CHANNELS 2
@@ -31,17 +32,26 @@ typedef struct ps2_audio
    /* TODO/FIXME - nonblock is not implemented */
    bool nonblock;
    bool running;
+
 } ps2_audio_t;
 
 static void audioConfigure(ps2_audio_t *ps2, unsigned rate)
 {
+   int err;
    struct audsrv_fmt_t format;
 
    format.bits     = AUDIO_BITS;
    format.freq     = rate;
    format.channels = AUDIO_CHANNELS;
 
-   audsrv_set_format(&format);
+   err             = audsrv_set_format(&format);
+
+   if (err)
+   {
+      printf("set format returned %d\n", err);
+      printf("audsrv returned error string: %s\n", audsrv_get_error_string());
+   }
+
    audsrv_set_volume(MAX_VOLUME);
 }
 

audio/drivers/ps3_audio.c

@@ -19,26 +19,26 @@
 
 #include <queues/fifo_queue.h>
 
-#include <defines/ps3_defines.h>
+#include "../../retroarch.h"
 
-#include "../audio_driver.h"
+#include "../../defines/ps3_defines.h"
 
 #define AUDIO_BLOCKS 8
 #define AUDIO_CHANNELS 2
 
 typedef struct
 {
-   fifo_buffer_t *buffer;
-   sys_ppu_thread_t thread;
-   sys_lwmutex_t lock;
-   sys_lwmutex_t cond_lock;
-   sys_lwcond_t cond;
    uint32_t audio_port;
    bool nonblock;
    bool started;
    volatile bool quit_thread;
-} ps3_audio_t;
+   fifo_buffer_t *buffer;
 
+   sys_ppu_thread_t thread;
+   sys_lwmutex_t lock;
+   sys_lwmutex_t cond_lock;
+   sys_lwcond_t cond;
+} ps3_audio_t;
 
 #ifdef __PSL1GHT__
 static void event_loop(void *data)
@@ -46,34 +46,34 @@ static void event_loop(void *data)
 static void event_loop(uint64_t data)
 #endif
 {
-   float out_tmp[AUDIO_BLOCK_SAMPLES * AUDIO_CHANNELS]
+   float out_tmp[CELL_AUDIO_BLOCK_SAMPLES * AUDIO_CHANNELS]
       __attribute__((aligned(16)));
    sys_event_queue_t id;
    sys_ipc_key_t key;
    sys_event_t event;
    ps3_audio_t *aud = (ps3_audio_t*)(uintptr_t)data;
 
-   audioCreateNotifyEventQueue(&id, &key);
-   audioSetNotifyEventQueue(key);
+   cellAudioCreateNotifyEventQueue(&id, &key);
+   cellAudioSetNotifyEventQueue(key);
 
    while (!aud->quit_thread)
    {
-      sysEventQueueReceive(id, &event, PS3_SYS_NO_TIMEOUT);
+      sys_event_queue_receive(id, &event, SYS_NO_TIMEOUT);
 
-      sysLwMutexLock(&aud->lock, PS3_SYS_NO_TIMEOUT);
-      if (FIFO_READ_AVAIL(aud->buffer) >= sizeof(out_tmp))
+      sys_lwmutex_lock(&aud->lock, SYS_NO_TIMEOUT);
+      if (fifo_read_avail(aud->buffer) >= sizeof(out_tmp))
          fifo_read(aud->buffer, out_tmp, sizeof(out_tmp));
       else
          memset(out_tmp, 0, sizeof(out_tmp));
-      sysLwMutexUnlock(&aud->lock);
-      sysLwCondSignal(&aud->cond);
+      sys_lwmutex_unlock(&aud->lock);
+      sys_lwcond_signal(&aud->cond);
 
-      audioAddData(aud->audio_port, out_tmp,
-            AUDIO_BLOCK_SAMPLES, 1.0);
+      cellAudioAddData(aud->audio_port, out_tmp,
+            CELL_AUDIO_BLOCK_SAMPLES, 1.0);
    }
 
-   audioRemoveNotifyEventQueue(key);
-   sysThreadExit(0);
+   cellAudioRemoveNotifyEventQueue(key);
+   sys_ppu_thread_exit(0);
 }
 
 static void *ps3_audio_init(const char *device,
@@ -81,63 +81,67 @@ static void *ps3_audio_init(const char *device,
       unsigned block_frames,
       unsigned *new_rate)
 {
-   audioPortParam params;
-   ps3_audio_t *data                 = NULL;
+   CellAudioPortParam params;
+   ps3_audio_t *data = calloc(1, sizeof(*data));
+   if (!data)
+      return NULL;
+
+   (void)latency;
+   (void)device;
+   (void)rate;
+
+   cellAudioInit();
+
+   params.numChannels = AUDIO_CHANNELS;
+   params.numBlocks   = AUDIO_BLOCKS;
+#if 0
+#ifdef HAVE_HEADSET
+   if(global->console.sound.mode == SOUND_MODE_HEADSET)
+      params.param_attrib = CELL_AUDIO_PORTATTR_OUT_SECONDARY;
+   else
+#endif
+#endif
+      params.param_attrib = 0;
+
+   if (cellAudioPortOpen(&params, &data->audio_port) != CELL_OK)
+   {
+      cellAudioQuit();
+      free(data);
+      return NULL;
+   }
+
+   data->buffer = fifo_new(CELL_AUDIO_BLOCK_SAMPLES *
+         AUDIO_CHANNELS * AUDIO_BLOCKS * sizeof(float));
+
 #ifdef __PSL1GHT__
-   sys_lwmutex_attr_t lock_attr      =
+   sys_lwmutex_attr_t lock_attr =
    {SYS_LWMUTEX_ATTR_PROTOCOL, SYS_LWMUTEX_ATTR_RECURSIVE, "\0"};
    sys_lwmutex_attr_t cond_lock_attr =
    {SYS_LWMUTEX_ATTR_PROTOCOL, SYS_LWMUTEX_ATTR_RECURSIVE, "\0"};
-   sys_lwcond_attr_t cond_attr       = {"\0"};
+   sys_lwcond_attribute_t cond_attr = {"\0"};
 #else
-   sys_lwmutex_attr_t lock_attr;
-   sys_lwmutex_attr_t cond_lock_attr;
-   sys_lwcond_attr_t cond_attr;
+   sys_lwmutex_attribute_t lock_attr;
+   sys_lwmutex_attribute_t cond_lock_attr;
+   sys_lwcond_attribute_t cond_attr;
 
    sys_lwmutex_attribute_initialize(lock_attr);
    sys_lwmutex_attribute_initialize(cond_lock_attr);
    sys_lwcond_attribute_initialize(cond_attr);
 #endif
 
-   data                              = calloc(1, sizeof(*data));
-   if (!data)
-      return NULL;
+   sys_lwmutex_create(&data->lock, &lock_attr);
+   sys_lwmutex_create(&data->cond_lock, &cond_lock_attr);
+   sys_lwcond_create(&data->cond, &data->cond_lock, &cond_attr);
 
-   audioInit();
-
-   params.numChannels                = AUDIO_CHANNELS;
-   params.numBlocks                  = AUDIO_BLOCKS;
-   params.param_attrib               = 0;
-#if 0
-#ifdef HAVE_HEADSET
-   if(global->console.sound.mode == SOUND_MODE_HEADSET)
-      params.param_attrib            = CELL_AUDIO_PORTATTR_OUT_SECONDARY;
-#endif
-#endif
-
-   if (audioPortOpen(&params, &data->audio_port) != CELL_OK)
-   {
-      audioQuit();
-      free(data);
-      return NULL;
-   }
-
-   data->buffer = fifo_new(AUDIO_BLOCK_SAMPLES *
-         AUDIO_CHANNELS * AUDIO_BLOCKS * sizeof(float));
-
-   sysLwMutexCreate(&data->lock, &lock_attr);
-   sysLwMutexCreate(&data->cond_lock, &cond_lock_attr);
-   sysLwCondCreate(&data->cond, &data->cond_lock, &cond_attr);
-
-   audioPortStart(data->audio_port);
+   cellAudioPortStart(data->audio_port);
    data->started = true;
-   sysThreadCreate(&data->thread, event_loop,
+   sys_ppu_thread_create(&data->thread, event_loop,
 #ifdef __PSL1GHT__
    data,
 #else
    (uint64_t)data,
 #endif
-   1500, 0x1000, SYS_THREAD_CREATE_JOINABLE, (char*)"sound");
+   1500, 0x1000, SYS_PPU_THREAD_CREATE_JOINABLE, (char*)"sound");
 
    return data;
 }
@@ -148,16 +152,16 @@ static ssize_t ps3_audio_write(void *data, const void *buf, size_t size)
 
    if (aud->nonblock)
    {
-      if (FIFO_WRITE_AVAIL(aud->buffer) < size)
+      if (fifo_write_avail(aud->buffer) < size)
          return 0;
    }
 
-   while (FIFO_WRITE_AVAIL(aud->buffer) < size)
-      sysLwCondWait(&aud->cond, 0);
+   while (fifo_write_avail(aud->buffer) < size)
+      sys_lwcond_wait(&aud->cond, 0);
 
-   sysLwMutexLock(&aud->lock, PS3_SYS_NO_TIMEOUT);
+   sys_lwmutex_lock(&aud->lock, SYS_NO_TIMEOUT);
    fifo_write(aud->buffer, buf, size);
-   sysLwMutexUnlock(&aud->lock);
+   sys_lwmutex_unlock(&aud->lock);
 
    return size;
 }
@@ -167,7 +171,7 @@ static bool ps3_audio_stop(void *data)
    ps3_audio_t *aud = data;
    if (aud->started)
    {
-      audioPortStop(aud->audio_port);
+      cellAudioPortStop(aud->audio_port);
       aud->started = false;
    }
    return true;
@@ -178,7 +182,7 @@ static bool ps3_audio_start(void *data, bool is_shutdown)
    ps3_audio_t *aud = data;
    if (!aud->started)
    {
-      audioPortStart(aud->audio_port);
+      cellAudioPortStart(aud->audio_port);
       aud->started = true;
    }
    return true;
@@ -206,28 +210,29 @@ static void ps3_audio_free(void *data)
 
    aud->quit_thread = true;
    ps3_audio_start(aud, false);
-   sysThreadJoin(aud->thread, &val);
+   sys_ppu_thread_join(aud->thread, &val);
 
    ps3_audio_stop(aud);
-   audioPortClose(aud->audio_port);
-   audioQuit();
+   cellAudioPortClose(aud->audio_port);
+   cellAudioQuit();
    fifo_free(aud->buffer);
 
-   sysLwMutexDestroy(&aud->lock);
-   sysLwMutexDestroy(&aud->cond_lock);
-   sysLwCondDestroy(&aud->cond);
+   sys_lwmutex_destroy(&aud->lock);
+   sys_lwmutex_destroy(&aud->cond_lock);
+   sys_lwcond_destroy(&aud->cond);
 
    free(data);
 }
 
 static bool ps3_audio_use_float(void *data)
 {
+   (void)data;
    return true;
 }
 
 static size_t ps3_audio_write_avail(void *data)
 {
-   /* TODO/FIXME - implement? */
+   (void)data;
    return 0;
 }
 

audio/drivers/psp_audio.c

@@ -34,60 +34,55 @@
 #include <pspkernel.h>
 #include <pspaudio.h>
 #elif defined(ORBIS)
-#include <libSceAudioOut.h>
-#include <defines/ps4_defines.h>
-#include <verbosity.h>
+#include <audioout.h>
+#define SCE_AUDIO_OUT_PORT_TYPE_MAIN   0
+#define SCE_AUDIO_OUT_MODE_STEREO      1
+#define SceUID uint32_t
 #endif
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 
 typedef struct psp_audio
 {
+   bool nonblock;
+
    uint32_t* buffer;
    uint32_t* zeroBuffer;
 
+   SceUID thread;
+   int rate;
+
+   volatile bool running;
+   volatile uint16_t read_pos;
+   volatile uint16_t write_pos;
+
    sthread_t *worker_thread;
    slock_t *fifo_lock;
    scond_t *cond;
    slock_t *cond_lock;
 
-   SceUID thread;
-
-   int port;
-   int rate;
-
-   volatile uint16_t read_pos;
-   volatile uint16_t write_pos;
-
-   volatile bool running;
-   bool nonblock;
 } psp_audio_t;
 
 #define AUDIO_OUT_COUNT 512u
 #define AUDIO_BUFFER_SIZE (1u<<13u)
 #define AUDIO_BUFFER_SIZE_MASK (AUDIO_BUFFER_SIZE-1)
 
-/* Return port used */
-static int configureAudio(unsigned rate) {
-   int port;
-#if defined(VITA)
-   port         = sceAudioOutOpenPort(
-         SCE_AUDIO_OUT_PORT_TYPE_MAIN, AUDIO_OUT_COUNT,
-         rate, SCE_AUDIO_OUT_MODE_STEREO);
-#elif defined(ORBIS)
-   port         = sceAudioOutOpen(0xff,
-         SCE_AUDIO_OUT_PORT_TYPE_MAIN, 0, AUDIO_OUT_COUNT,
-         rate, SCE_AUDIO_OUT_MODE_STEREO);
-#else
-   port = sceAudioSRCChReserve(AUDIO_OUT_COUNT, rate, 2);
-#endif
-   return port;
-}
-
 static void audioMainLoop(void *data)
 {
    psp_audio_t* psp = (psp_audio_t*)data;
 
+#if defined(VITA)
+   int port         = sceAudioOutOpenPort(
+         SCE_AUDIO_OUT_PORT_TYPE_MAIN, AUDIO_OUT_COUNT,
+         psp->rate, SCE_AUDIO_OUT_MODE_STEREO);
+#elif defined(ORBIS)
+   int port         = sceAudioOutOpen(0xff,
+         SCE_AUDIO_OUT_PORT_TYPE_MAIN, 0, AUDIO_OUT_COUNT,
+         psp->rate, SCE_AUDIO_OUT_MODE_STEREO);
+#else
+   sceAudioSRCChReserve(AUDIO_OUT_COUNT, psp->rate, 2);
+#endif
+
    while (psp->running)
    {
       bool cond           = false;
@@ -112,7 +107,7 @@ static void audioMainLoop(void *data)
       slock_unlock(psp->cond_lock);
 
 #if defined(VITA) || defined(ORBIS)
-      sceAudioOutOutput(psp->port,
+      sceAudioOutOutput(port,
         cond ? (psp->zeroBuffer)
               : (psp->buffer + read_pos_2));
 #else
@@ -121,6 +116,14 @@ static void audioMainLoop(void *data)
 #endif
    }
 
+#if defined(VITA)
+   sceAudioOutReleasePort(port);
+#elif defined(ORBIS)
+   sceAudioOutClose(port);
+#else
+   sceAudioSRCChRelease();
+#endif
+
    return;
 }
 
@@ -129,35 +132,43 @@ static void *psp_audio_init(const char *device,
       unsigned block_frames,
       unsigned *new_rate)
 {
-   int port;
    psp_audio_t *psp = (psp_audio_t*)calloc(1, sizeof(psp_audio_t));
 
    if (!psp)
       return NULL;
 
-   if ((port = configureAudio(rate)) < 0)
-      return NULL;
+   (void)device;
+   (void)latency;
 
-#if defined(ORBIS)
-   sceAudioOutInit();
-#endif
+#ifdef ORBIS
+   psp->buffer      = (uint32_t*)
+      malloc(AUDIO_BUFFER_SIZE * sizeof(uint32_t));
+#else
    /* Cache aligned, not necessary but helpful. */
-   psp->buffer        = (uint32_t*)malloc(AUDIO_BUFFER_SIZE * sizeof(uint32_t));
+   psp->buffer      = (uint32_t*)
+      memalign(64, AUDIO_BUFFER_SIZE * sizeof(uint32_t));
+#endif
    memset(psp->buffer, 0, AUDIO_BUFFER_SIZE * sizeof(uint32_t));
 
-   psp->zeroBuffer    = (uint32_t*)malloc(AUDIO_OUT_COUNT   * sizeof(uint32_t));
+#ifdef ORBIS
+   psp->zeroBuffer      = (uint32_t*)
+      malloc(AUDIO_OUT_COUNT * sizeof(uint32_t));
+#else
+   psp->zeroBuffer  = (uint32_t*)
+      memalign(64, AUDIO_OUT_COUNT   * sizeof(uint32_t));
+#endif
    memset(psp->zeroBuffer, 0, AUDIO_OUT_COUNT * sizeof(uint32_t));
 
-   psp->read_pos      = 0;
-   psp->write_pos     = 0;
-   psp->port          = port;
+   psp->read_pos    = 0;
+   psp->write_pos   = 0;
+   psp->rate        = rate;
 
-   psp->fifo_lock     = slock_new();
-   psp->cond_lock     = slock_new();
-   psp->cond          = scond_new();
+   psp->fifo_lock = slock_new();
+   psp->cond_lock = slock_new();
+   psp->cond = scond_new();
 
-   psp->nonblock      = false;
-   psp->running       = true;
+   psp->nonblock    = false;
+   psp->running     = true;
    psp->worker_thread = sthread_create(audioMainLoop, psp);
 
    return psp;
@@ -186,17 +197,7 @@ static void psp_audio_free(void *data)
    free(psp->buffer);
    psp->worker_thread = NULL;
    free(psp->zeroBuffer);
-
-#if defined(VITA)
-      sceAudioOutReleasePort(psp->port);
-#elif defined(ORBIS)
-      sceAudioOutClose(psp->port);
-#else
-      sceAudioSRCChRelease();
-#endif
-
    free(psp);
-
 }
 
 static ssize_t psp_audio_write(void *data, const void *buf, size_t size)
@@ -254,9 +255,6 @@ static bool psp_audio_stop(void *data)
 {
    psp_audio_t* psp = (psp_audio_t*)data;
 
-#if defined(ORBIS)
-   return false;
-#else
    if (psp){
       psp->running = false;
 
@@ -267,7 +265,6 @@ static bool psp_audio_stop(void *data)
       psp->worker_thread = NULL;
    }
    return true;
-#endif
 }
 
 static bool psp_audio_start(void *data, bool is_shutdown)

audio/drivers/pulse.c

@@ -23,7 +23,7 @@
 #include <retro_miscellaneous.h>
 #include <retro_endianness.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct

audio/drivers/roar.c

@@ -23,7 +23,7 @@
 
 #include <boolean.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct
@@ -105,11 +105,8 @@ static bool ra_alive(void *data)
 static void ra_set_nonblock_state(void *data, bool state)
 {
    roar_t *roar = (roar_t*)data;
-
    if (roar_vs_blocking(roar->vss, (state) ? ROAR_VS_FALSE : ROAR_VS_TRUE, NULL) < 0)
-   {
-      RARCH_ERR("Can't set nonblocking. Will not be able to fast-forward.\n");
-   }
+      fprintf(stderr, "RetroArch [ERROR]: Can't set nonblocking. Will not be able to fast-forward.\n");
    roar->nonblocking = state;
 }
 

audio/drivers/rsound.c

@@ -21,26 +21,27 @@
 #include <queues/fifo_queue.h>
 #include <rthreads/rthreads.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "rsound.h"
 
 typedef struct rsd
 {
    rsound_t *rd;
-
-   fifo_buffer_t *buffer;
-   slock_t *cond_lock;
-   scond_t *cond;
-
    bool nonblock;
    bool is_paused;
    volatile bool has_error;
+
+   fifo_buffer_t *buffer;
+
+   slock_t *cond_lock;
+   scond_t *cond;
 } rsd_t;
 
 static ssize_t rsound_audio_cb(void *data, size_t bytes, void *userdata)
 {
-   rsd_t *rsd        = (rsd_t*)userdata;
-   size_t avail      = FIFO_READ_AVAIL(rsd->buffer);
+   rsd_t *rsd = (rsd_t*)userdata;
+
+   size_t avail = fifo_read_avail(rsd->buffer);
    size_t write_size = bytes > avail ? avail : bytes;
    fifo_read(rsd->buffer, data, write_size);
    scond_signal(rsd->cond);
@@ -114,7 +115,7 @@ static ssize_t rs_write(void *data, const void *buf, size_t size)
 
       rsd_callback_lock(rsd->rd);
 
-      avail     = FIFO_WRITE_AVAIL(rsd->buffer);
+      avail = fifo_write_avail(rsd->buffer);
       write_amt = avail > size ? size : avail;
 
       fifo_write(rsd->buffer, buf, write_amt);
@@ -129,7 +130,7 @@ static ssize_t rs_write(void *data, const void *buf, size_t size)
          size_t avail;
          rsd_callback_lock(rsd->rd);
 
-         avail = FIFO_WRITE_AVAIL(rsd->buffer);
+         avail = fifo_write_avail(rsd->buffer);
 
          if (avail == 0)
          {
@@ -208,7 +209,7 @@ static size_t rs_write_avail(void *data)
    if (rsd->has_error)
       return 0;
    rsd_callback_lock(rsd->rd);
-   val = FIFO_WRITE_AVAIL(rsd->buffer);
+   val = fifo_write_avail(rsd->buffer);
    rsd_callback_unlock(rsd->rd);
    return val;
 }

audio/drivers/rwebaudio.c

@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <boolean.h>
 
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 
 /* forward declarations */
 unsigned RWebAudioSampleRate(void);
@@ -30,69 +30,76 @@ void RWebAudioSetNonblockState(bool state);
 void RWebAudioFree(void);
 size_t RWebAudioWriteAvail(void);
 size_t RWebAudioBufferSize(void);
-
-typedef struct rweb_audio
-{
-   bool is_paused;
-} rweb_audio_t;
+static bool rwebaudio_is_paused;
 
 static void rwebaudio_free(void *data)
 {
    RWebAudioFree();
-   free(data);
 }
 
 static void *rwebaudio_init(const char *device, unsigned rate, unsigned latency,
       unsigned block_frames,
       unsigned *new_rate)
 {
-   rweb_audio_t *rwebaudio = (rweb_audio_t*)calloc(1, sizeof(rweb_audio_t));
-   if (!rwebaudio)
-      return NULL;
-   if (RWebAudioInit(latency))
+   void *data           = RWebAudioInit(latency);
+
+   (void)device;
+   (void)rate;
+
+   if (data)
       *new_rate         = RWebAudioSampleRate();
-   return rwebaudio;
+   return data;
 }
 
 static ssize_t rwebaudio_write(void *data, const void *buf, size_t size)
 {
+   (void)data;
    return RWebAudioWrite(buf, size);
 }
 
 static bool rwebaudio_stop(void *data)
 {
-   rweb_audio_t *rwebaudio = (rweb_audio_t*)data;
-   if (!rwebaudio)
-      return false;
-   rwebaudio->is_paused = true;
+   (void)data;
+   rwebaudio_is_paused = true;
    return RWebAudioStop();
 }
 
 static void rwebaudio_set_nonblock_state(void *data, bool state)
 {
+   (void)data;
    RWebAudioSetNonblockState(state);
 }
 
 static bool rwebaudio_alive(void *data)
 {
-   rweb_audio_t *rwebaudio = (rweb_audio_t*)data;
-   if (!rwebaudio)
-      return false;
-   return !rwebaudio->is_paused;
+   (void)data;
+   return !rwebaudio_is_paused;
 }
 
 static bool rwebaudio_start(void *data, bool is_shutdown)
 {
-   rweb_audio_t *rwebaudio = (rweb_audio_t*)data;
-   if (!rwebaudio)
-      return false;
-   rwebaudio->is_paused = false;
+   (void)data;
+   rwebaudio_is_paused = false;
    return RWebAudioStart();
 }
 
-static size_t rwebaudio_write_avail(void *data) {return RWebAudioWriteAvail();}
-static size_t rwebaudio_buffer_size(void *data) {return RWebAudioBufferSize();}
-static bool rwebaudio_use_float(void *data) { return true; }
+static size_t rwebaudio_write_avail(void *data)
+{
+   (void)data;
+   return RWebAudioWriteAvail();
+}
+
+static size_t rwebaudio_buffer_size(void *data)
+{
+   (void)data;
+   return RWebAudioBufferSize();
+}
+
+   static bool rwebaudio_use_float(void *data)
+{
+   (void)data;
+   return true;
+}
 
 audio_driver_t audio_rwebaudio = {
    rwebaudio_init,

audio/drivers/sdl_audio.c

@@ -25,27 +25,28 @@
 #include <retro_inline.h>
 #include <retro_math.h>
 
+#include "../../retroarch.h"
+#include "../../verbosity.h"
+
 #include "SDL.h"
 #include "SDL_audio.h"
 
-#include "../audio_driver.h"
-#include "../../verbosity.h"
-
 typedef struct sdl_audio
 {
+   bool nonblock;
+   bool is_paused;
+
 #ifdef HAVE_THREADS
    slock_t *lock;
    scond_t *cond;
 #endif
    fifo_buffer_t *buffer;
-   bool nonblock;
-   bool is_paused;
 } sdl_audio_t;
 
 static void sdl_audio_cb(void *data, Uint8 *stream, int len)
 {
    sdl_audio_t  *sdl = (sdl_audio_t*)data;
-   size_t      avail = FIFO_READ_AVAIL(sdl->buffer);
+   size_t      avail = fifo_read_avail(sdl->buffer);
    size_t write_size = len > (int)avail ? avail : len;
 
    fifo_read(sdl->buffer, stream, write_size);
@@ -74,24 +75,19 @@ static void *sdl_audio_init(const char *device,
    int frames;
    size_t bufsize;
    SDL_AudioSpec out;
-   SDL_AudioSpec spec           = {0};
-   void *tmp                    = NULL;
-   sdl_audio_t *sdl             = NULL;
-   uint32_t sdl_subsystem_flags = SDL_WasInit(0);
+   SDL_AudioSpec spec   = {0};
+   void            *tmp = NULL;
+   sdl_audio_t *sdl     = NULL;
 
    (void)device;
 
-   /* Initialise audio subsystem, if required */
-   if (sdl_subsystem_flags == 0)
+   if (SDL_WasInit(0) == 0)
    {
       if (SDL_Init(SDL_INIT_AUDIO) < 0)
          return NULL;
    }
-   else if ((sdl_subsystem_flags & SDL_INIT_AUDIO) == 0)
-   {
-      if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
-         return NULL;
-   }
+   else if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
+      return NULL;
 
    sdl = (sdl_audio_t*)calloc(1, sizeof(*sdl));
    if (!sdl)
@@ -155,7 +151,7 @@ static ssize_t sdl_audio_write(void *data, const void *buf, size_t size)
       size_t avail, write_amt;
 
       SDL_LockAudio();
-      avail = FIFO_WRITE_AVAIL(sdl->buffer);
+      avail = fifo_write_avail(sdl->buffer);
       write_amt = avail > size ? size : avail;
       fifo_write(sdl->buffer, buf, write_amt);
       SDL_UnlockAudio();
@@ -170,7 +166,7 @@ static ssize_t sdl_audio_write(void *data, const void *buf, size_t size)
          size_t avail;
 
          SDL_LockAudio();
-         avail = FIFO_WRITE_AVAIL(sdl->buffer);
+         avail = fifo_write_avail(sdl->buffer);
 
          if (avail == 0)
          {
@@ -232,6 +228,7 @@ static void sdl_audio_free(void *data)
    sdl_audio_t *sdl = (sdl_audio_t*)data;
 
    SDL_CloseAudio();
+   SDL_QuitSubSystem(SDL_INIT_AUDIO);
 
    if (sdl)
    {

audio/drivers/switch_audio.c

@@ -20,7 +20,7 @@
 #include <stdint.h>
 
 #include "switch_audio_compat.h"
-#include "../audio_driver.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #ifdef HAVE_LIBNX
@@ -29,11 +29,12 @@
 #define BUFFER_COUNT 3
 #endif
 
-
-#define SAMPLE_RATE 48000
-#define NUM_CHANNELS 2
-
-#define SAMPLE_BUFFER_SIZE (((SAMPLE_RATE * NUM_CHANNELS * sizeof(uint16_t)) + 0xfff) & ~0xfff)
+static const int sample_rate           = 48000;
+static const int max_num_samples       = sample_rate;
+static const int num_channels          = 2;
+#ifndef HAVE_LIBNX
+static const size_t sample_buffer_size = ((max_num_samples * num_channels * sizeof(uint16_t)) + 0xfff) & ~0xfff;
+#endif
 
 typedef struct
 {
@@ -50,26 +51,24 @@ typedef struct
 #endif
 } switch_audio_t;
 
+static uint32_t switch_audio_data_size(void)
+{
 #ifdef HAVE_LIBNX
-static uint32_t switch_audio_data_size(void)
-{
-   static const int framerate    = 1000 / 30;
-   static const int sample_count = (SAMPLE_RATE / framerate);
-   return (sample_count * NUM_CHANNELS * sizeof(uint16_t));
-}
+   static const int framerate = 1000 / 30;
+   static const int samplecount = (sample_rate / framerate);
+   return (samplecount * num_channels * sizeof(uint16_t));
 #else
-static uint32_t switch_audio_data_size(void)
-{
-   return SAMPLE_BUFFER_SIZE;
-}
+   return sample_buffer_size;
 #endif
+}
 
 static size_t switch_audio_buffer_size(void *data)
 {
+   (void) data;
 #ifdef HAVE_LIBNX
    return (switch_audio_data_size() + 0xfff) & ~0xfff;
 #else
-   return SAMPLE_BUFFER_SIZE;
+   return sample_buffer_size;
 #endif
 }
 
@@ -86,7 +85,7 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size)
       uint32_t num;
       if (switch_audio_ipc_output_get_released_buffer(swa, num) != 0)
       {
-         RARCH_ERR("[Audio]: Failed to get released buffer?\n");
+         RARCH_LOG("Failed to get released buffer?\n");
          return -1;
       }
 
@@ -107,7 +106,7 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size)
             num                 = 0;
 
 #ifdef HAVE_LIBNX
-            if (audoutWaitPlayFinish(&swa->current_buffer, &num, UINT64_MAX) != 0) { }
+            if (audoutWaitPlayFinish(&swa->current_buffer, &num, U64_MAX) != 0) { }
 #else
             svcWaitSynchronization(&handle_idx, &swa->event, 1, 33333333);
             svcResetSignal(swa->event);
@@ -124,11 +123,11 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size)
 	if (to_write > switch_audio_buffer_size(NULL) - swa->current_buffer->data_size)
 		to_write = switch_audio_buffer_size(NULL) - swa->current_buffer->data_size;
 
-#ifndef HAVE_LIBNX
-   memcpy(((uint8_t*) swa->current_buffer->sample_data) + swa->current_buffer->data_size, buf, to_write);
-#else
-   memcpy(((uint8_t*) swa->current_buffer->buffer) + swa->current_buffer->data_size, buf, to_write);
-#endif
+   #ifndef HAVE_LIBNX
+	memcpy(((uint8_t*) swa->current_buffer->sample_data) + swa->current_buffer->data_size, buf, to_write);
+   #else
+	memcpy(((uint8_t*) swa->current_buffer->buffer) + swa->current_buffer->data_size, buf, to_write);
+   #endif
 	swa->current_buffer->data_size   += to_write;
 	swa->current_buffer->buffer_size  = switch_audio_buffer_size(NULL);
 
@@ -152,6 +151,7 @@ static bool switch_audio_stop(void *data)
 
    /* TODO/FIXME - fix libnx codepath */
 #ifndef HAVE_LIBNX
+
    if (!swa->is_paused)
 	   if (switch_audio_ipc_output_stop(swa) != 0)
 		   return false;
@@ -211,7 +211,8 @@ static void switch_audio_free(void *data)
 
 static bool switch_audio_use_float(void *data)
 {
-   return false; /* force INT16 */
+	(void) data;
+	return false; /* force INT16 */
 }
 
 static size_t switch_audio_write_avail(void *data)
@@ -238,8 +239,8 @@ static void *switch_audio_init(const char *device,
       unsigned *new_rate)
 {
    unsigned i;
-#ifndef HAVE_LIBNX
    char names[8][0x20];
+#ifndef HAVE_LIBNX
    uint32_t num_names  = 0;
 #endif
    switch_audio_t *swa = (switch_audio_t*) calloc(1, sizeof(*swa));
@@ -266,16 +267,16 @@ static void *switch_audio_init(const char *device,
    if (audio_ipc_open_output(names[0], &swa->output) != 0)
       goto fail_audio_ipc;
 
-   if (swa->output.sample_rate != SAMPLE_RATE)
+   if (swa->output.sample_rate != sample_rate)
    {
       RARCH_ERR("expected sample rate of %d, got sample rate of %d\n",
-            SAMPLE_RATE, swa->output.sample_rate);
+            sample_rate, swa->output.sample_rate);
       goto fail_audio_output;
    }
 
-   if (swa->output.num_channels != NUM_CHANNELS)
+   if (swa->output.num_channels != num_channels)
    {
-      RARCH_ERR("expected %d channels, got %d\n", NUM_CHANNELS,
+      RARCH_ERR("expected %d channels, got %d\n", num_channels,
             swa->output.num_channels);
       goto fail_audio_output;
    }
@@ -307,8 +308,7 @@ static void *switch_audio_init(const char *device,
 #else
       swa->buffers[i].ptr         = &swa->buffers[i].sample_data;
       swa->buffers[i].unknown     = 0;
-      swa->buffers[i].sample_data = alloc_pages(SAMPLE_BUFFER_SIZE,
-            switch_audio_buffer_size(NULL), NULL);
+      swa->buffers[i].sample_data = alloc_pages(sample_buffer_size, switch_audio_buffer_size(NULL), NULL);
 
       if (!swa->buffers[i].sample_data)
 	      goto fail_audio_output;

audio/drivers/switch_audio_compat.h

@@ -46,10 +46,6 @@ typedef AudioOutBuffer compat_audio_out_buffer;
 #define switch_audio_ipc_output_stop(a) audoutStopAudioOut()
 #define switch_audio_ipc_output_start(a) audoutStartAudioOut()
 
-#ifndef UINT64_MAX
-#define UINT64_MAX U64_MAX
-#endif
-
 #else
 
 /* libtransistor definitions */