(XDK1) Set default assets dir too

(XDK1) Setup some default dirs
Fix Python codepath
2026-11-08 08:10:30 -10:00 · 2018-02-19 13:43:32 +01:00 · 2018-02-19 13:29:16 +01:00 · 2018-02-19 09:11:33 +01:00 · 2018-02-19 08:22:54 +01:00 · 2018-02-18 15:42:55 +01:00
2881 changed files with 501143 additions and 67532 deletions
@@ -0,0 +1,22 @@
+## Guidelines
+
+1. Rebase before opening a pull request
+2. If you are sending several unrelated fixes or features, use a branch and a separate pull request for each
+3. If possible try squashing everything in a single commit. This is particularly beneficial in the case of feature merges since it allows easy bisecting when a problem arises
+
+
+## Description
+
+[Description of the pull request, detail any issues you are fixing or any features you are implementing]
+
+## Related Issues
+
+[Any issues this pull request may be addressing]
+
+## Related Pull Requests
+
+[Any other PRs from related repositories that might be needed for this pull request to work]
+
+## Reviewers
+
+[If possible @mention all the people that should review your pull request]
@@ -7,7 +7,13 @@
 *.elf
 *.dol
 *.map
+*.swp
+.tmp
+.tmp.c
+.tmp.cxx
 config.log
+/.project
+/.externalToolBuilders/
 /retroarch
 /retroarch.cfg
 /retroarch.exe
@@ -66,7 +72,24 @@ menu/driverspzarch.c
 # Wii U
 *.depend
 *.rpx
+*.last
 wiiu/wut/elf2rpl/elf2rpl
+/pkg/wiiu/retroarch
+/pkg/wiiu/wiiu
+/pkg/wiiu/rpx
+/wiiu-devel.properties
+
+
+# 3ds
+/.lst
+*.3dsx
+*.cia
+*.3ds
+*.bnr
+*.smdh
+/retroarch_3ds.core
+/retroarch_3ds.icn
+/retroarch_3ds_salamander.icn

 # Ctags
 /tags
@@ -95,8 +118,6 @@ pkg/apple/iOS/modules/
 obj-unix/
 .vagrant/

-.MAKEFILE_DEFINES
-.CONFIG_DEFINES
 /pkg/msvc/Release Cg/*.exe
 /pkg/msvc/Release Cg/*.iobj
 /pkg/msvc/Release Cg/*.ipdb
@@ -104,9 +125,23 @@ obj-unix/
 /pkg/msvc/Release Cg/*.lpl
 /pkg/msvc/Release Cg/*.cfg
 /pkg/msvc/*.db
+/pkg/msvc/.vs
+/pkg/msvc/*/.vs
 /pkg/msvc/msvc-2010/Release Cg/RetroArc.27FF7CE1.tlog/*.tlog
 /pkg/msvc/msvc-2010/Release Cg/RetroArc.27FF7CE1.tlog/*.lastbuildstate
 /pkg/msvc/msvc-2010/Release Cg/*.log
 /pkg/msvc/msvc-2010/Release Cg/*.obj
 /pkg/msvc/msvc-2010/Release Cg/*.res
 /pkg/msvc/msvc-2010/Release Cg/*.pdb
+retroarch.cfg
+Makefile.local
+
+# Emscripten artifacts
+
+retroarch.js
+retroarch.js.mem
+*.bc
+*.wasm
+
+# only ignore .js files in the repo root
+/*.js
@@ -3,6 +3,22 @@ language: generic

 matrix:
  include:
+    - compiler: mingw-x86
+      addons:
+        apt:
+          packages:
+            - g++-mingw-w64-i686
+            - mingw-w64-i686-dev
+      script:
+        - CROSS_COMPILE=i686-w64-mingw32- ./configure --disable-d3d9 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
+    - compiler: mingw-x64
+      addons:
+        apt:
+          packages:
+            - g++-mingw-w64-x86-64
+            - mingw-w64-x86-64-dev
+      script:
+        - CROSS_COMPILE=x86_64-w64-mingw32- ./configure --disable-d3d9 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
    - compiler: gcc
    - compiler: clang
      addons:
@@ -25,6 +41,7 @@ script:

 env:
  global:
+   - MAKEFLAGS="-j2"
   - secure: "qc91ReC3OlzSh2gFaSH6TYzC2qIQvgA2AZff6J13eaH8xijAhuMzttZ0rMQJ0DWCIhPeUb0kIzVyaGoe4MwPALzpw1C1AznIWiZJ53HN+hWCOcS/af7YVPk6HPySnwqrS+Wv3AIIvIKFV2mxv21F/JbT/N+pArlRrp904Xj+KPo="
 addons:
  apt:
@@ -38,6 +55,7 @@ addons:
      - libsdl-image1.2-dev
      - libsdl-mixer1.2-dev
      - libsdl-ttf2.0-dev
+      - libusb-1.0-0-dev
  coverity_scan:
    project:
      name: "RetroArch"
@@ -0,0 +1,125 @@
+{
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "/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}"
+            ],
+            "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}"
+            ],
+            "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}"
+                ],
+                "limitSymbolsToIncludedHeaders": true,
+                "databaseFilename": ""
+            }
+        },
+        {
+         "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}"
+             ],
+             "limitSymbolsToIncludedHeaders": true,
+             "databaseFilename": ""
+         }
+        },
+        {
+         "name": "msys2-mingw64",
+         "includePath": [
+             "C:/msys64/mingw64/include",
+             "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+             "${workspaceRoot}/libretro-common/include",
+             "${workspaceRoot}/include",                
+             "${workspaceRoot}"
+         ],
+         "defines": [
+             "_DEBUG",
+             "UNICODE"
+         ],
+         "intelliSenseMode": "msvc-x64",
+         "browse": {
+             "path": [
+                  "C:/msys64/mingw64/include",
+                  "C:/msys64/mingw64/x86_64-w64-mingw32/include",
+                  "${workspaceRoot}/libretro-common/include",
+                  "${workspaceRoot}/include",                
+                  "${workspaceRoot}"
+             ],
+             "limitSymbolsToIncludedHeaders": true,
+             "databaseFilename": ""
+         }
+     }
+    ],
+    "version": 3
+}
@@ -0,0 +1,48 @@
+{
+   // Use IntelliSense to learn about possible attributes.
+   // Hover to view descriptions of existing attributes.
+   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+   "version": "0.2.0",
+   "configurations": [
+      {
+         "name": "msys2-mingw64 debug",
+         "type": "cppdbg",
+         "request": "launch",
+         "program": "${workspaceFolder}/retroarch.exe",
+         "args": [],
+         "stopAtEntry": false,
+         "cwd": "${workspaceFolder}",
+         "environment": [],
+         "externalConsole": true,
+         "MIMode": "gdb",
+         "miDebuggerPath": "c:\\msys64\\mingw64\\bin\\gdb.exe",
+         "setupCommands": [
+            {
+               "description": "Enable pretty-printing for gdb",
+               "text": "-enable-pretty-printing",
+               "ignoreFailures": true
+            }
+         ]
+      },
+      {
+         "name": "msys2-mingw32 debug",
+         "type": "cppdbg",
+         "request": "launch",
+         "program": "${workspaceFolder}/retroarch.exe",
+         "args": [],
+         "stopAtEntry": false,
+         "cwd": "${workspaceFolder}",
+         "environment": [],
+         "externalConsole": true,
+         "MIMode": "gdb",
+         "miDebuggerPath": "c:\\msys64\\mingw32\\bin\\gdb.exe",
+         "setupCommands": [
+            {
+               "description": "Enable pretty-printing for gdb",
+               "text": "-enable-pretty-printing",
+               "ignoreFailures": true
+            }
+         ]
+      }
+   ]
+}
@@ -0,0 +1,17 @@
+{
+   "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.renderWhitespace": "all",
+   "editor.insertSpaces": true,
+   "files.associations": {
+      "frontend_driver.h": "c",
+      "*.in": "c",
+      "*.rh": "c"
+   },
+}
@@ -0,0 +1,91 @@
+{
+   // See https://go.microsoft.com/fwlink/?LinkId=733558
+   // for the documentation about the tasks.json format
+   "version": "2.0.0",
+   "tasks": [
+      {
+         "taskName": "msys2-mingw64 build",
+         "type": "shell",
+
+         "group": {
+            "kind": "build",
+            "isDefault": true },
+
+         "command": "./configure; make -j2",
+         "options": {
+            "shell": {
+               "executable": "C:\\msys64\\usr\\bin\\bash.exe",
+               "args": [
+                  "-c"
+               ]
+            }
+         }
+      }
+      {
+         "taskName": "msys2-mingw64 build with debug symbols",
+         "type": "shell",
+
+         "group": "build",
+
+         "command": "./configure; DEBUG=1 make -j2",
+         "options": {
+            "shell": {
+               "executable": "C:\\msys64\\usr\\bin\\bash.exe",
+               "args": [
+                  "-c"
+               ]
+            }
+         }
+      }
+      {
+         "taskName": "msys2-mingw64 rebuild",
+         "type": "shell",
+
+         "group": "build",
+
+         "command": "make -j2",
+         "options": {
+            "shell": {
+               "executable": "C:\\msys64\\usr\\bin\\bash.exe",
+               "args": [
+                  "-c"
+               ]
+            }
+         }
+      }
+      {
+         "taskName": "msys2-mingw64 clean",
+         "type": "shell",
+
+         "group": "build",
+
+         "command": "make clean",
+         "options": {
+            "shell": {
+               "executable": "C:\\msys64\\usr\\bin\\bash.exe",
+               "args": [
+                  "-c"
+               ]
+            }
+         }
+      }
+      {
+         "taskName": "msys2-mingw64 run",
+         "type": "shell",
+
+         "group": {
+            "kind": "test",
+            "isDefault": true },
+
+         "command": "./retroarch -v",
+         "options": {
+            "shell": {
+               "executable": "C:\\msys64\\usr\\bin\\bash.exe",
+               "args": [
+                  "-c"
+               ]
+            }
+         }
+      }
+   ]
+}
@@ -1,5 +1,238 @@
-# 1.6.2 (future)
- IOS: Fix GL regression - 32bit color format cores were no longer rendering 
+# 1.7.2 (future)
+
+# 1.7.1
+- 3DS: Now correctly reports amount of CPU cores.
+- 3DS: Frontend rating is now correctly implemented for both New 3DS/2DS and Old 3DS/2DS.
+- 3DS: Initial networking support, HTTP requests won't work yet.
+- 3DS: Now reports memory and battery state.
+- AUDIO: Added 'Audio Resampler Quality' setting to Audio Settings. Setting this higher will increase sound quality at the expense of sound latency and/or performance. Setting this value lower will improve sound latency/performance at the expense of sound quality. Only has an effect if the Sinc resampler is used, and you have to restart the game for changes to take effect.
+- CHEEVOS: Fix unofficial achievements not being loaded.
+- CHEEVOS: Show savestate menu entries when no achievements are found even if hardcore mode is enabled.
+- CHEEVOS: Support Neo Geo Pocket.
+- COMMON: Bugfix for issue related to 'Windows mouse pointer visible when running MESS or MAME cores'.
+- COMMON: Fix bug 'Last item in a Playlist is ignored'.
+- COMMON: New LED API. Driver implemented for Raspberry Pi, proof of concept implemented for core MAME 2003.
+- COMMON: Add quick menu option to watch shader files for changes and recompile them automatically (Linux only for now).
+- D3D8: Direct3D 8 can now work on systems that have Direct3D 8 installed.
+- D3D9: Add menu support for MaterialUI/XMB.
+- D3D10: Initial video driver implementation.
+- D3D11: Initial video driver implementation.
+- D3D11: SPIRV-Cross/slang shader support for D3D11.
+- D3D12: Initial video driver implementation.
+- DINPUT: don't reinitialize input driver on network events / media insertion / network drive connection
+- INPUT: show friendly names when available under input binds and system information
+- INPUT: show the config name when available under system information
+- GUI: Allow changing menu font color.
+- GUI: Menu visibility options for RGUI and MaterialUI.
+- GUI/MaterialUI: Works now with D3D8, D3D9 Cg, D3D11 and D3D12 drivers.
+- GUI/XMB: Add Monochrome Inverted icon theme.
+- GUI/XMB: Allow changing menu scale to 200%.
+- GUI/XMB: Works now with D3D8, D3D9 Cg, D3D11 and D3D12 drivers. Menu shader effects currently don't work on D3D8/D3D9 Cg.
+- HAIKU: Restored port.
+- KEYMAPPER: prevent a condition that caused input_menu_toggle to stop working when a RETRO_DEVICE_KEYBOARD type device is enabled
+- GL: ignore hard gpu sync when fast-forwarding
+- IOS10/11: Handle hardware keyboards and iCade controllers
+- LOCALIZATION: Update Italian translation.
+- LOCALIZATION: Update Japanese translation.
+- LOCALIZATION: Update Portuguese-Brazilian translation.
+- LOCALIZATION: Update Spanish translation.
+- NETPLAY: Add menu option to select different MITM (relay) server locations.
+- OSX: Modify HID buttons detection algorithm.
+- QB: Added --datarootdir.
+- QB: Added --bindir and --mandir and deprecated --with-bin_dir and --with-man_dir.
+- QB: Added --docdir.
+- SHADERS: Allow saving of shader presets based on the parent directory (Saving one for */foo/bar/mario.sfc* would result in *shaders/presets/corename/bar.ext*). We decided it's safer to still isolate the presets to a single core because different cores may treat video output differently.
+- SHADERS: Don't save the path to the current preset to the main config. This was causing weird behavior, instead it will try to load *currentconfig.ext* and it will save a preset with that name when select *apply shader preset*. The resulting shader will restore properly after restarting and even after core/parent/game specific presets are loaded
+- SOLARIS: Initial port.
+- SWITCH: Initial Nintendo Switch port, based on libtransistor SDK.
+- PS3: Enable Cheevos.
+- PSP: Enable threading support through pthreads.
+- SHADERS: SPIRV-Cross/slang shader support for D3D11.
+- SHIELD ATV: Allow the remote / gamepad takeover hack to work with the 2017 gamepad
+- SUBSYSTEM: Subsystem saves now respect the save directory
+- SUBSYSTEM: You can now load subsystem games from the menu (see https://github.com/libretro/RetroArch/pull/6282 for caveats)
+- VULKAN: Fix swapchain recreation bug on Nvidia GPUs with Windows 10 (resolved in Windows Nvidia driver version 390.77).
+- WINDOWS: Improved Unicode support (for cores/directory creation and 7zip archives).
+- WINDOWS: Show progress meter on taskbar for downloads (Windows 7 and up).
+- WINDOWS: WS_EX_LAYERED drastically decreases performance, so only set it when needed (transparency in windowed mode).
+- WIIU: Overlay support.
+- WIIU: Transparency support in menu + overlays.
+- WIIU: Increased stability during core switching.
+- WIIU: Shader support.
+- WIIU: Menu shader effects added (shaders).
+- WIIU: Add missing time/clock support. (also fixes RTC [Real Time Clock] in Gambatte)
+- XBOX OG: Restored port.
+
+# 1.7.0
+- CHEEVOS: Add badges for achievements, shows thumbnail images of achievements.
+- CHEEVOS: Leaderboard support.
+- CHEEVOS: Only disable savestates on hardcore mode if achievements are not available.
+- COMMANDLINE: Fix fullscreen toggle switch.
+- COMMON: Add 'Automatically Load Content To Playlist' feature, enabled by default.
+- COMMON: Fix slowmotion ratio always being reset back to 1.
+- COMMON: Optimized NBIO implementations now for Apple, Windows, and Linux. Uses mmap for Linux/Windows/BSD if/when available. File I/O should now be much faster for loading images inside the menu.
+- COMMON: Native Blissbox support now for latest firmware as of writing (2.0). Implementation through libusb and/or native Windows HID.
+- COMMON: New lightgun API.
+- COMMON: New VFS (Virtual File System) API.
+- COMMON: Fixed some playlist bugs.
+- COMMON: New snow shader.
+- COMMON: Fix Quick Menu title, no longer shows 'Select File'.
+- COMMON: Fix loading cores that require no content one after another.
+- COMMON: Map Delete key to Y button for non-unified menu keyboard controls.
+- COMMON: Fix for relative paths being normalised and generating a duplicate history entry.
+- EMSCRIPTEN: Fix references to browserfs.
+- FREEBSD: Support libusb HID input driver.
+- HAIKU: Buildfix.
+- INPUT: Map clear button to DEL key.
+- LINUX/X11: Add RetroArch logo to window title bar.
+- LINUX/X11: Input driver now supports new lightgun code.
+- LINUX/X11: Support window transparency (requires a compositing window manager).
+- LOBBIES: Fix for crash on join netplay rooms via touch / glui.
+- LOCALIZATION: Update Italian translation.
+- LOCALIZATION: Update Japanese translation.
+- LOCALIZATION: Update Portuguese-Brazilian translation.
+- LOCALIZATION: Update Polish translation.
+- LOCALIZATION: Update Russian translation.
+- MENU: Snowflake menu shader effect.
+- OSX/PPC: Fix the GL2 renderchain, had to use EXT versions of framebuffer/renderbuffer functions.
+- PS3: HTTP requests / downloads should now work.
+- PS3: Core Updater now works.
+- PS3: Improved font rendering, enable STB Unicode font renderer.
+- PSP: Make it work with Vita's Adrenaline.
+- PSP: Fix audio sync.
+- PSP: Fix content loading, port should be functional again.
+- PSP: Use 64MB when available.
+- SCANNER: Fix crash from Windows-incompatible format string.
+- VITA: Improve packaging, installation times.
+- WIIU: Disabled the controller patcher for now since it was the source of many stability issues.
+- VULKAN: Various stability fixes for WSI.
+- WINDOWS: Add MSVC 2017 solution.
+- WINDOWS: Get rid of the empty console window in MSVC 2010 builds.
+- WINDOWS: Raw input driver now supports new lightgun code.
+- WINDOWS: Use configured OSD/text message color on GDI driver.
+- WINDOWS/XINPUT: Populate XInput VID/PID from DInput so autoconfig doesn't rely solely on joypad names
+- WINDOWS/XINPUT: Fix crash that occurs in some situations with Steam running and a Steam Controller plugged in.
+- WINDOWS: Improve version reporting under System Information.
+- WINDOWS: Support window transparency.
+- WINDOWS: Correct usage of GetWindowPlacement per MS docs, fixes game window position on Win95/98.
+- WINDOWS: Added Visual Studio 2017 support.
+
+# 1.6.9
+- COMMON: Small memory leak.
+- NETPLAY: Fix network command only working once.
+
+# 1.6.8
+- Audio: Fix the Audio DSP picker
+- CHEEVOS: Add support for Atari Lynx cheevos.
+- CHEEVOS: Add support for RetroAchievements Leaderboards.
+- GUI: (MaterialUI) Fix crash that happened on context reset with Vulkan.
+- GUI: (MaterialUI) Skip querying and drawing items that are not visible; Cache content height and bbox calculation.
+- GUI: (MaterialUI) Fix entry box highlight calculation.
+- GUI: (XMB) Skip drawing the fading list when it is already transparent. Optimization.
+- GUI: (XMB) Comment out visible item calculation in xmb_draw_items().
+- GUI: (RGUI) Prevent crashes when using a non-English language reliant on UTF8.
+- GUI: Add menu option for OSD background color.
+- GUI: Add menu option for OSD text color.
+- GUI: Add menu option to remove frame count from OSD.
+- GUI: Allow wraparound of int/float settings when pressing the left key
+- INPUT/LIBRETRO: Add support for more mouse buttons (buttons 4/5)
+- INPUT/LIBRETRO: Add support for analog buttons
+- INPUT: Always show the controls menu even if descriptors are not set
+- INPUT: Fix input descriptors not being set on cores that don't implement the controllers interface
+- INPUT: Apply descriptors only for the amount of cores the core supports
+- INPUT: Implement keyboard to gamepad input remapping (limited to one gamepad device for now)
+- INPUT: Fix absolute mouse move handling on the winraw driver
+- INPUT: Ignore keyboard input if window is not active on udev driver
+- INPUT: Sanitize the filenames of autoconfig profiles before saving
+- LOBBIES: Fix crash on navigating left / right from the lobby menu
+- LOCALIZATION: Update Dutch translation
+- LOCALIZATION: Update Italian translation.
+- LOCALIZATION: Update Japanese translation.
+- LOCALIZATION: Update Portuguese-Brazilian translation.
+- LOCALIZATION: Update Russian translation.
+- LINUX/ARMHF: Set buildbot updater URL to armhf location instead of blank string
+- LINUX/PI: Broadcom VC4: Add Videocore config option
+- LINUX/UDEV: Fix - RetroArch reads keyboard input when not focused with the udev input driver.
+- NETPLAY: Fix disconnection not fully deinitializing Netplay.
+- NETPLAY: Fix lan rooms when there is more than one room
+- NETPLAY: Fix lan rooms on systems where all addresses are treated as IPv6
+- COMMON: Fix clear/free loop conditionals in playlists.
+- WINDOWS/GDI: Fix flickering of text.
+- WINDOWS/GDI: Fix graphics corruption on Windows 98
+- WINDOWS/GDI: Allow compiling without DirectInput8 for NT support
+- WINDOWS/WGL: Try to use wglSwapLayerBuffers instead of SwapBuffers if possible (for more optimal performance).
+- WINDOWS: Fix menubar text corruption on Japanese locale systems
+- WINDOWS: Support Unicode file I/O (can now display CJK characters in file browser for example).
+- WINDOWS: Support Windows 95, NT3.51, NT4
+- WINDOWS: add Makefile.griffin targets for msvc6,2003,2005,2010,2012,2013
+- WII: Use custom, embedded libogc SDK.
+- WIIU: Initial touchscreen support for WiiU gamepad.
+- WIIU: Add Cheevos support.
+- SCANNER: Fix archive scanning.
+- SCANNER: Support CHD files.
+- SCANNER: Support Gamecube ISO scanning.
+- SCANNER: Use primary data track of disc images for CRC lookups rather than cue files.  This is slower but finds matches more reliably, and is necessary for CHD files to work at all.  Update your databases!
+- SCANNER: Fall back on looking inside archives when matching MAME/FBA content (most recent cores only).  If you had difficulty with content being detected before, you may have better luck now.  Update your databases and core info!
+
+# 1.6.7
+- SCANNER: Fix directory scanning.
+- SCANNER: Fix file scanning.
+- COMMON: Fix 'Disk Image Append' option.
+- FREEBSD: Compatibility fixes for Video4Linux2 camera driver.
+- GUI: (MaterialUI) Add disk image append icons.
+- GUI: (MaterialUI) Improve word wrapping when menu icons are enabled.
+- GUI: (MaterialUI) Add User Interface -> Appearance -> Menu Icons Enable. You can turn on/off the icons on the lefthand side of the menu entries.
+- GUI: Performance optimizations for XMB menu driver - only calculates visible items.
+- LOCALIZATION: Update Italian translation.
+
+# 1.6.6
+- 3DS: Fixes serious performance regression that affected every core; rewind was always implicitly enabled.
+- AUDIO: MOD/S3M/XM sound should now be properly mixed in with the core's sound.
+- GUI: Visual makeover of MaterialUI.
+- GUI: Added 'Music', 'Images' and 'Video' collection options to RGUI/MaterialUI.
+- GUI: Allow the user to add 'Favorites'.
+- GUI: Allow the user to rename entries.
+- GUI: Performance optimizations for XMB menu driver.
+- LOCALIZATION: Update Italian translation
+- INPUT: Overlay controller response - when we press buttons on the gamepad or keyboard, the corresponding buttons on the overlay will be highlighted as well.
+- NETBSD: Silence some compilation warnings.
+- COMMON: Fixed bug 'Deleting an entry from a playlist would not update the list view inside XMB'.
+- COMMON: Fix inet_ntop_compat on Unix
+- LOBBY: Add skeleton to add help descriptions to lobbies
+
+# 1.6.5
+Skipped this one.
+
+# 1.6.4
+
+- ANDROID: Fire Stick & Fire TV remote overrides gamepad port 0 on button press and viceversa like SHIELD devices
+- ANDROID: Provide default save / system / state / screenshot locations
+- AUDIO: Audio mixer supports MOD/S3M/XM file types now!
+- INPUT: input swap override flag (for remotes) is cleared correctly
+- INPUT: allow specifying libretro device in remap files
+- INPUT: allow specifying analog dpad mode in remap files
+- INPUT: allow saving libretro device to remap files
+- INPUT: allow saving analog dpad mode to remap files
+- INPUT: allow removing core and game remap files from the menu
+- COMMON: Cores can now request to set a 'shared context'. You no longer need to explicitly enable 'Shared Hardware Context' for Citra/OpenLara/Dolphin.
+- COMMON: Add 'Delete Core' option to Core Information menu.
+- COMMON: Allow Max Timing Skew to be set to 0.
+- COMMON: Change the "content dir" behavior so it works on either a flag or an empty directory setting, now platform drivers can provide defaults for save / system / state / screenshot dirs and still allow the content dir functionality, these settings are under settings / saving and flagged as advanced
+- GUI: You can turn on/off 'Horizontal Animation' now for the XMB menu. Turning animations off can result in a performance boost.
+- GUI: Fix sublabel word-wrapping in XMB where multi-byte languages were cut off too soon
+- LOCALIZATION: Update Dutch translation
+- LOCALIZATION: Update Traditional Chinese translation
+- LOCALIZATION: Update Italian translation
+- LOCALIZATION: Update Russian translation
+- WINDOWS: Provide default save / system / state / screenshot locations
+- LOBBIES: Show what country the host is in
+- MENU: Enable OSD text rendering for gdi and libcaca drivers
+- WINDOWS 98/ME/2K: Set default directory for MSVC 2005 RetroArch version.
+- WII: Better V-Sync handling, backported from SuperrSonic.
+- WIIU: Exception handler rewritten.
+
+# 1.6.3
+- IOS: Fix GL regression - 32bit color format cores were no longer rendering
 - CHEEVOS: Add support for N64 cheevos and other small fixes.
 - CHEEVOS: Add 'Achievements -> Achievements Verbose Mode'. Ability to display cheevos related messages in OSD, useful for RetroAchievements users.
 - AUDIO: Audio mixer's volume can now be independently increased/decreased, and muted.
@@ -23,7 +256,7 @@
 - VITA: Add cheevos support
 - VITA: Add support for external USB if mounted
 - WAYLAND: Fix menu mouse input
- WII: Add support for single-port 'PS1/PS2 to USB controller adapter'
+- WII: Add support for single-port 'PS1/PS2 to USB controller adapter

 # 1.6.0
 - ANDROID: Allow remotes to retain OK/Cancel position when menu_swap_ok_cancel is enabled
@@ -9,17 +9,24 @@ endif

 include config.mk

+# Put your favorite compile flags in this file, if you want different defaults than upstream.
+# Do not attempt to create that file upstream.
+# (It'd be better to put this comment in that file, but .gitignore doesn't work on files that exist in the repo.)
+-include Makefile.local
+
 TARGET = retroarch

-OBJDIR := obj-unix
+OBJDIR_BASE := obj-unix

-ifeq ($(GLOBAL_CONFIG_DIR),)
-   GLOBAL_CONFIG_DIR = /etc
+ifeq ($(DEBUG), 1)
+   OBJDIR := $(OBJDIR_BASE)/debug
+else
+   OBJDIR := $(OBJDIR_BASE)/release
 endif

 OBJ :=
 LIBS :=
-DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY
+DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'

 ifneq ($(findstring BSD,$(OS)),)
@@ -70,6 +77,7 @@ endif

 ifeq ($(DEBUG), 1)
   OPTIMIZE_FLAG = -O0 -g
+   DEFINES += -DDEBUG -D_DEBUG
 else
   OPTIMIZE_FLAG = -O3 -ffast-math
 endif
@@ -78,7 +86,7 @@ ifneq ($(findstring Win32,$(OS)),)
   LDFLAGS += -mwindows
 endif

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

 APPEND_CFLAGS := $(CFLAGS)
 CXXFLAGS += $(APPEND_CFLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS
@@ -123,10 +131,16 @@ endif

 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))

+ifneq ($(X86),)
+   CFLAGS += -m32
+   CXXLAGS += -m32
+   LDFLAGS += -m32
+endif
+
 ifneq ($(SANITIZER),)
-    CFLAGS   := -fsanitize=$(SANITIZER) $(CFLAGS)
-    CXXFLAGS := -fsanitize=$(SANITIZER) $(CXXFLAGS)
-    LDFLAGS  := -fsanitize=$(SANITIZER) $(LDFLAGS)
+   CFLAGS   := -fsanitize=$(SANITIZER) $(CFLAGS)
+   CXXFLAGS := -fsanitize=$(SANITIZER) $(CXXFLAGS)
+   LDFLAGS  := -fsanitize=$(SANITIZER) $(LDFLAGS)
 endif

 ifneq ($(findstring $(GPERFTOOLS),profiler),)
@@ -187,29 +201,33 @@ 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)$(PREFIX)/share/applications 2>/dev/null || /bin/true
+	mkdir -p $(DESTDIR)$(DATA_DIR)/applications 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)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
-	install -m755 $(TARGET) $(DESTDIR)$(BIN_DIR)
-	install -m755 tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
-	install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
-	install -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
-	install -m644 docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
-	install -m644 docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
-	install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps
+	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 retroarch.desktop $(DESTDIR)$(DATA_DIR)/applications
+	cp docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
+	cp docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
+	cp media/retroarch.svg $(DESTDIR)$(DATA_DIR)/pixmaps
+	cp COPYING $(DESTDIR)$(DOC_DIR)
+	cp README.md $(DESTDIR)$(DOC_DIR)
+	chmod 755 $(DESTDIR)$(BIN_DIR)/$(TARGET)
+	chmod 755 $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
+	chmod 644 $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
+	chmod 644 $(DESTDIR)$(DATA_DIR)/applications/retroarch.desktop
+	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
+	chmod 644 $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
+	chmod 644 $(DESTDIR)$(DATA_DIR)/pixmaps/retroarch.svg
 	@if test -d media/assets; then \
 		echo "Installing media assets..."; \
-		mkdir -p $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb; \
-		mkdir -p $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/glui; \
-		cp -r media/assets/xmb/  $(DESTDIR)$(ASSETS_DIR)/retroarch/assets; \
-		cp -r media/assets/glui/ $(DESTDIR)$(ASSETS_DIR)/retroarch/assets; \
-		echo "Removing unneeded source image files.."; \
-		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/flatui/src; \
-		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/monochrome/src; \
-		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/retroactive/src; \
-		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/neoactive/src; \
-		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/retroactive_marked/src; \
-		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/dot-art/src; \
+		mkdir -p $(DESTDIR)$(ASSETS_DIR)/assets/xmb; \
+		mkdir -p $(DESTDIR)$(ASSETS_DIR)/assets/glui; \
+		cp -r media/assets/xmb/ $(DESTDIR)$(ASSETS_DIR)/assets; \
+		cp -r media/assets/glui/ $(DESTDIR)$(ASSETS_DIR)/assets; \
+		cp media/assets/COPYING $(DESTDIR)$(DOC_DIR)/COPYING.assets; \
 		echo "Asset copying done."; \
 	fi

@@ -217,14 +235,17 @@ uninstall:
 	rm -f $(DESTDIR)$(BIN_DIR)/retroarch
 	rm -f $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
 	rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
-	rm -f $(DESTDIR)$(PREFIX)/share/applications/retroarch.desktop
+	rm -f $(DESTDIR)$(DATA_DIR)/applications/retroarch.desktop
+	rm -f $(DESTDIR)$(DATA_DIR)/pixmaps/retroarch.svg
+	rm -f $(DESTDIR)$(DOC_DIR)/COPYING
+	rm -f $(DESTDIR)$(DOC_DIR)/COPYING.assets
+	rm -f $(DESTDIR)$(DOC_DIR)/README.md
 	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
 	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
-	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.svg
-	rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch
+	rm -rf $(DESTDIR)$(ASSETS_DIR)

 clean:
-	rm -rf $(OBJDIR)
+	rm -rf $(OBJDIR_BASE)
 	rm -f $(TARGET)
 	rm -f *.d

@@ -9,21 +9,21 @@ BUILD_3DS               = 1
 BUILD_CIA               = 1
 LIBCTRU_NO_DEPRECATION  = 1

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

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

 OBJ :=
 OBJ += gfx/drivers/ctr_shaders/ctr_sprite.o
@@ -46,6 +46,9 @@ ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
 	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB
+	DEFINES += -DHAVE_NETWORKING -DHAVE_CHEEVOS -DHAVE_SOCKET_LEGACY -DHAVE_THREADS
+	#-DHAVE_SSL -DMBEDTLS_SSL_DEBUG_ALL
+	#ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file
 else
 	HAVE_CC_RESAMPLER = 1
 	HAVE_MENU_COMMON = 1
@@ -61,44 +64,23 @@ else
 	HAVE_ZARCH = 0
 	HAVE_MATERIALUI = 1
 	HAVE_XMB = 1
+	HAVE_STATIC_VIDEO_FILTERS = 1
+	HAVE_STATIC_AUDIO_FILTERS = 1
+	HAVE_NETWORKING = 1
+	HAVE_CHEEVOS = 1
+	HAVE_SOCKET_LEGACY = 1
+	HAVE_THREADS = 1
+	HAVE_SSL = 1

 	include Makefile.common
 	BLACKLIST :=
 	BLACKLIST += input/input_overlay.o
 	BLACKLIST += tasks/task_overlay.o
 	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-
-	OBJ += gfx/drivers/ctr_gfx.o
-	OBJ += gfx/drivers_font/ctr_font.o
-	OBJ += menu/drivers_display/menu_display_ctr.o
-	OBJ += input/drivers/ctr_input.o
-	OBJ += input/drivers_joypad/ctr_joypad.o
-	OBJ += audio/drivers/ctr_csnd_audio.o
-	OBJ += audio/drivers/ctr_dsp_audio.o
-	OBJ += frontend/drivers/platform_ctr.o
-	OBJ += gfx/video_filters/2xsai.o
-	OBJ += gfx/video_filters/super2xsai.o
-	OBJ += gfx/video_filters/supereagle.o
-	OBJ += gfx/video_filters/2xbr.o
-	OBJ += gfx/video_filters/darken.o
-	OBJ += gfx/video_filters/epx.o
-	OBJ += gfx/video_filters/scale2x.o
-	OBJ += gfx/video_filters/blargg_ntsc_snes.o
-	OBJ += gfx/video_filters/lq2x.o
-	OBJ += gfx/video_filters/phosphor2x.o
-	OBJ += libretro-common/audio/dsp_filters/echo.o
-	OBJ += libretro-common/audio/dsp_filters/eq.o
-	OBJ += libretro-common/audio/dsp_filters/chorus.o
-	OBJ += libretro-common/audio/dsp_filters/iir.o
-	OBJ += libretro-common/audio/dsp_filters/panning.o
-	OBJ += libretro-common/audio/dsp_filters/phaser.o
-	OBJ += libretro-common/audio/dsp_filters/reverb.o
-	OBJ += libretro-common/audio/dsp_filters/wahwah.o
 endif

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

 ifeq ($(strip $(CTRULIB)),)
@@ -142,9 +124,9 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
   WHOLE_END := -Wl,--no-whole-archive
 endif

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

-CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE -DSINC_LOWEST_QUALITY
+CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
 CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)

 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
@@ -155,19 +137,25 @@ LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 CFLAGS   += -std=gnu99 -ffast-math


-LIBS	:= $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lctru -lm
+LIBS	:= $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lm
+
+ifeq ($(DEBUG), 1)
+	LIBS	+= -lctrud
+else
+	LIBS	+= -lctru
+endif


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

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

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

 .PHONY: $(BUILD) clean all
@@ -178,7 +166,7 @@ $(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA) $(TARGET).core
 $(TARGET).3dsx: $(TARGET).elf
 $(TARGET).elf: $(OBJ) libretro_ctr.a

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

 CC      := $(PREFIX)gcc
 CXX     := $(PREFIX)g++
@@ -189,25 +177,38 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)

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

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

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

 %.o: %.cpp
@@ -228,15 +229,15 @@ endif
 %.vsh:

 $(TARGET).smdh: $(APP_ICON)
-	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)
-	cp ctr/big_text_section.xml $(TARGET).xml
+	cp pkg/ctr/big_text_section.xml $(TARGET).xml
 else
 	rm -f $(TARGET).xml
 endif
-	-3dsxtool $< $@ $(_3DSXFLAGS)
+	$(DEVKITARM)/bin/3dsxtool $< $@ $(_3DSXFLAGS)

 $(TARGET).elf: ctr/3dsx_custom_crt0.o
 	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
@@ -11,10 +11,10 @@ APP_DESCRIPTION      = Retroarch 3DS
 APP_AUTHOR           = Team Libretro
 APP_PRODUCT_CODE     = RETROARCH-3DS
 APP_UNIQUE_ID        = 0xBAC00
-APP_ICON             = ctr/assets/default.png
-APP_BANNER           = ctr/assets/libretro_banner.png
-APP_AUDIO            = ctr/assets/silent.wav
-APP_RSF              = ctr/tools/template.rsf
+APP_ICON             = pkg/ctr/assets/default.png
+APP_BANNER           = pkg/ctr/assets/libretro_banner.png
+APP_AUDIO            = pkg/ctr/assets/silent.wav
+APP_RSF              = pkg/ctr/tools/template.rsf
 APP_SYSTEM_MODE      = 64MB
 APP_SYSTEM_MODE_EXT  = 124MB

@@ -25,6 +25,7 @@ OBJ := ctr/ctr_system.o \
 		 frontend/frontend_driver.o \
 		 frontend/drivers/platform_ctr.o \
 		 frontend/drivers/platform_null.o \
+		 libretro-common/encodings/encoding_utf.o \
 		 libretro-common/compat/compat_strcasestr.o \
 		 libretro-common/file/file_path.o \
 		 libretro-common/string/stdstring.o \
@@ -34,6 +35,7 @@ OBJ := ctr/ctr_system.o \
 		 libretro-common/compat/compat_strl.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
+		 libretro-common/vfs/vfs_implementation.o \
 		 libretro-common/hash/rhash.o \
 		 file_path_str.o \
 		 verbosity.o
@@ -43,7 +45,7 @@ ifeq ($(strip $(DEVKITPRO)),)
 endif

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

 APP_TITLE         := $(shell echo "$(APP_TITLE)" | cut -c1-128)
@@ -73,7 +75,7 @@ else
   CFLAGS	+= -O3
 endif

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

 #CFLAGS += -DRARCH_INTERNAL
 CFLAGS += -DRARCH_CONSOLE -DIS_SALAMANDER
@@ -109,7 +111,7 @@ $(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
 $(TARGET).3dsx: $(TARGET).elf
 $(TARGET).elf: $(OBJ)

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

 CC      := $(PREFIX)gcc
 CXX     := $(PREFIX)g++
@@ -120,25 +122,38 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)

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

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

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

 %.o: %.cpp
@@ -159,11 +174,11 @@ endif
 %.vsh:

 $(TARGET).smdh: $(APP_ICON)
-	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)
-	cp ctr/big_text_section.xml $(TARGET).xml
+	cp pkg/ctr/big_text_section.xml $(TARGET).xml
 else
 	rm -f $(TARGET).xml
 endif
@@ -1,14 +1,15 @@
 TARGET := retroarch.js

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

 PTHREAD = 0
 OS = Emscripten
 OBJ :=
-DEFINES := -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD)
-DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVERLAY -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN
+DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD)
+DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN

+HAVE_OVERLAY = 1
 HAVE_CC_RESAMPLER = 1
 HAVE_EGL    = 1
 HAVE_OPENGLES = 1
@@ -17,30 +18,28 @@ HAVE_RPNG   = 1
 HAVE_EMSCRIPTEN = 1
 HAVE_RGUI = 1
 HAVE_SDL = 0
-HAVE_SDL2 = 1
+HAVE_SDL2 = 0
 HAVE_ZLIB = 1
-HAVE_FBO = 1
 WANT_ZLIB = 1
+HAVE_SHADERPIPELINE = 1
+HAVE_STATIC_VIDEO_FILTERS = 1
+HAVE_STATIC_AUDIO_FILTERS = 1
 MEMORY = 536870912

-# XXX: setting this to 1/2 currently crashes Firefox nightly
-PRECISE_F32 = 2
+PRECISE_F32 = 1
+
+OBJDIR := obj-emscripten

 ifneq ($(NATIVE_ZLIB),)
   WANT_ZLIB = 0
 endif

-ifeq ($(HAVE_SDL2), 1)
-DEFINES += -DHAVE_SDL2
-endif
-
 #if you compile with SDL2 flag add this Emscripten flag "-s USE_SDL=2" to LDFLAGS:

-LIBS    := -s USE_SDL=2 -s USE_ZLIB=1
-LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) \
+LIBS    := -s USE_ZLIB=1
+LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) -s NO_EXIT_RUNTIME=0 -s FULL_ES2=1 -s BINARYEN_TRAP_MODE=\"clamp\" \
           -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_load_state', '_cmd_take_screenshot']" \
           --js-library emscripten/library_rwebaudio.js \
-           --js-library emscripten/library_rwebinput.js \
           --js-library emscripten/library_rwebcam.js
 ifneq ($(PTHREAD), 0)
   LDFLAGS += -s USE_PTHREADS=$(PTHREAD) -s PTHREAD_POOL_SIZE=2
@@ -48,31 +47,16 @@ endif

 ifeq ($(ASYNC), 1)
   LDFLAGS += -s ASYNCIFY=$(ASYNC)
-endif  
+endif
+
+ifeq ($(HAVE_SDL2), 1)
+   LIBS += -s USE_SDL=2
+   DEFINES += -DHAVE_SDL2
+endif

 include Makefile.common

-OBJ += gfx/video_filters/2xsai.o
-OBJ += gfx/video_filters/super2xsai.o
-OBJ += gfx/video_filters/supereagle.o
-OBJ += gfx/video_filters/2xbr.o
-OBJ += gfx/video_filters/darken.o
-OBJ += gfx/video_filters/epx.o
-OBJ += gfx/video_filters/scale2x.o
-OBJ += gfx/video_filters/blargg_ntsc_snes.o
-OBJ += gfx/video_filters/lq2x.o
-OBJ += gfx/video_filters/phosphor2x.o
-
-OBJ += libretro-common/audio/dsp_filters/echo.o
-OBJ += libretro-common/audio/dsp_filters/eq.o
-OBJ += libretro-common/audio/dsp_filters/chorus.o
-OBJ += libretro-common/audio/dsp_filters/iir.o
-OBJ += libretro-common/audio/dsp_filters/panning.o
-OBJ += libretro-common/audio/dsp_filters/phaser.o
-OBJ += libretro-common/audio/dsp_filters/reverb.o
-OBJ += libretro-common/audio/dsp_filters/wahwah.o
-
-CFLAGS += -Ideps/libz/
+CFLAGS += -Ideps/libz -Ideps -Ideps/stb
 libretro = libretro_emscripten.bc

 ifneq ($(V), 1)
@@ -83,7 +67,7 @@ ifeq ($(DEBUG), 1)
   LDFLAGS += -O0 -g
   CFLAGS += -O0 -g
 else
-   LDFLAGS += -O2
+   LDFLAGS += -O2 -s WASM=1
   # WARNING: some optimizations can break some cores (ex: LTO breaks tyrquake)
   LDFLAGS += -s PRECISE_F32=$(PRECISE_F32)
   ifeq ($(LTO), 1)
@@ -92,48 +76,29 @@ else
   CFLAGS += -O2
 endif

-CFLAGS += -DHAVE_RPNG -Wall -Wno-unused-result -Wno-unused-variable -I. -Ilibretro-common/include -std=gnu99 -s USE_ZLIB=1 \
+CFLAGS += -DHAVE_RPNG -Wall -I. -Ilibretro-common/include -std=gnu99 -s USE_ZLIB=1 \
          -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_take_screenshot']"

+RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
+
 all: $(TARGET)

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

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

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

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

 .PHONY: all clean
@@ -0,0 +1,358 @@
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
+
+ifeq ($(strip $(DEVKITPRO)),)
+$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro")
+endif
+
+ifeq ($(strip $(DEVKITPPC)),)
+$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
+endif
+
+export PATH	:=	$(DEVKITPPC)/bin:$(PATH)
+
+ifeq ($(PLATFORM),)
+PLATFORM=wii
+endif
+
+#---------------------------------------------------------------------------------
+# change shell on Snow Leopard
+#---------------------------------------------------------------------------------
+UNAME_S	:=	$(shell uname -s)
+UNAME_R	:=	$(shell uname -r)
+
+ifneq (,$(findstring Darwin,$(UNAME_S)))
+	ifneq (,$(findstring 10.8.0,$(UNAME_R)))
+		export SHELL=/bin/bash
+	endif
+endif
+
+#---------------------------------------------------------------------------------
+# path to tools 
+#---------------------------------------------------------------------------------
+export PORTLIBS	:=	$(DEVKITPRO)/portlibs/ppc
+export PATH	:=	$(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH)
+
+#---------------------------------------------------------------------------------
+# the prefix on the compiler executables
+#---------------------------------------------------------------------------------
+PREFIX	:=	powerpc-eabi-
+
+export AS	:=	$(PREFIX)as
+export CC	:=	$(PREFIX)gcc
+export CXX	:=	$(PREFIX)g++
+export AR	:=	$(PREFIX)ar
+export OBJCOPY	:=	$(PREFIX)objcopy
+
+
+ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))
+
+#---------------------------------------------------------------------------------
+%.a:
+#---------------------------------------------------------------------------------
+	@rm -f $@
+	$(AR) -rc $@ $^
+
+#---------------------------------------------------------------------------------
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+	
+#---------------------------------------------------------------------------------
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+#---------------------------------------------------------------------------------
+%.o: %.m
+	$(CC) $(OBJCFLAGS) -c $< -o $@
+
+#---------------------------------------------------------------------------------
+%.o: %.s
+	$(CC) -x assembler-with-cpp $(ASFLAGS) -c $< -o $@
+
+#---------------------------------------------------------------------------------
+%.o: %.S
+	$(CC) -x assembler-with-cpp $(ASFLAGS) -c $< -o $@
+
+#---------------------------------------------------------------------------------
+# canned command sequence for binary data
+#---------------------------------------------------------------------------------
+define bin2o
+	bin2s -a 32 $< | $(AS) -o $(@)
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(<F) | tr . _)`.h
+endef
+
+BUILD		:=	build
+
+BUILD_LITE = 1
+CURDIR   = .
+
+export BASEDIR		:= $(CURDIR)
+export DEPSDIR    := $(BASEDIR)/wii/libogc/deps
+export LWIPDIR		:= $(BASEDIR)/wii/libogc/lwip
+export OGCDIR		:= $(BASEDIR)/wii/libogc/libogc
+export DBDIR		:= $(BASEDIR)/wii/libogc/libdb
+export BTEDIR		:= $(BASEDIR)/wii/libogc/lwbt
+export WIIUSEDIR	:= $(BASEDIR)/wii/libogc/wiiuse
+export LIBWIIKEYB	:= $(BASEDIR)/wii/libogc/libwiikeyboard
+export STUBSDIR	:= $(BASEDIR)/wii/libogc/lockstubs
+export LIBS			:=	$(BASEDIR)/wii/libogc/libs
+
+export INCDIR		:=	$(BASEDIR)/wii/libogc/include
+
+export LIBDIR		:= $(LIBS)/$(PLATFORM)
+
+#---------------------------------------------------------------------------------
+BBALIB		:= $(LIBDIR)/libbba
+OGCLIB		:= $(LIBDIR)/libogc
+DBLIB			:= $(LIBDIR)/libdb
+BTELIB		:= $(LIBDIR)/libbte
+WIIUSELIB	:= $(LIBDIR)/libwiiuse
+WIIKEYBLIB	:= $(LIBDIR)/libwiikeyboard
+STUBSLIB		:= $(LIBDIR)/libgclibstubs
+
+#---------------------------------------------------------------------------------
+DEFAULTINCDIR := $(BASEDIR)/wii/libogc/include
+DEFINCS		:= -I$(DEFAULTINCDIR)
+INCLUDES	:=	$(DEFINCS) \
+				-I$(BASEDIR)/wii/libogc \
+				-I$(DEFAULTINCDIR)/netif \
+				-I$(DEFAULTINCDIR)/ipv4 \
+				-I$(DEFAULTINCDIR)/sdcard \
+				-I$(DEFAULTINCDIR)/ogc \
+				-I$(DEFAULTINCDIR)/ogc/machine \
+				-I$(DEFAULTINCDIR)/bte \
+				-I$(DEFAULTINCDIR)/sdcard \
+				-I$(DEFAULTINCDIR)/wiikeyboard \
+				-I$(DEFAULTINCDIR)/wiiuse \
+				-I$(DEFAULTINCDIR)/di
+
+MACHDEP		:= -DBIGENDIAN -DGEKKO -mcpu=750 -meabi -msdata=eabi -mhard-float -ffunction-sections -fdata-sections
+
+
+ifeq ($(PLATFORM),wii)
+MACHDEP		+=	-DHW_RVL
+endif
+
+ifeq ($(PLATFORM),cube)
+MACHDEP		+=	-DHW_DOL
+endif
+
+CFLAGS		:= -DLIBOGC_INTERNAL -DNDEBUG -O2 -fno-strict-aliasing -mregnames -Wall $(MACHDEP) $(INCLUDES)
+ASFLAGS		:=	$(MACHDEP) -mregnames -D_LANGUAGE_ASSEMBLY $(INCLUDES)
+
+#---------------------------------------------------------------------------------
+VPATH :=	$(LWIPDIR)				\
+			$(LWIPDIR)/arch/gc		\
+			$(LWIPDIR)/arch/gc/netif	\
+			$(LWIPDIR)/core			\
+			$(LWIPDIR)/core/ipv4	\
+			$(LWIPDIR)/netif	\
+			$(OGCDIR)			\
+			$(DBDIR)			\
+			$(DBDIR)/uIP		\
+			$(BTEDIR)		\
+			$(WIIUSEDIR)		\
+			$(SDCARDDIR)			\
+			$(LIBWIIKEYB)		\
+			$(STUBSDIR)
+
+
+#---------------------------------------------------------------------------------
+SOURCES_LWIP := $(LWIPDIR)/network.c \
+					 $(LWIPDIR)/netio.c \
+					 $(LWIPDIR)/arch/gc/netif/gcif.c	\
+					 $(LWIPDIR)/core/inet.c \
+					 $(LWIPDIR)/core/mem.c \
+					 $(LWIPDIR)/core/dhcp.c \
+					 $(LWIPDIR)/core/raw.c	\
+					 $(LWIPDIR)/core/memp.c \
+					 $(LWIPDIR)/core/netif.c \
+					 $(LWIPDIR)/core/pbuf.c \
+					 $(LWIPDIR)/core/stats.c \
+					 $(LWIPDIR)/core/sys.c \
+					 $(LWIPDIR)/core/tcp.c \
+					 $(LWIPDIR)/core/tcp_in.c \
+					 $(LWIPDIR)/core/tcp_out.c	\
+					 $(LWIPDIR)/core/udp.c \
+					 $(LWIPDIR)/core/ipv4/icmp.c \
+					 $(LWIPDIR)/core/ipv4/ip.c \
+					 $(LWIPDIR)/core/ipv4/ip_frag.c \
+					 $(LWIPDIR)/core/ipv4/ip_addr.c \
+					 $(LWIPDIR)/netif/etharp.c \
+					 $(LWIPDIR)/netif/loopif.c
+
+LWIPOBJ := $(SOURCES_LWIP:.c=.o)
+
+#---------------------------------------------------------------------------------
+SOURCES_OGC		:=	\
+					$(OGCDIR)/console.c \
+					$(OGCDIR)/lwp_priority.c \
+					$(OGCDIR)/lwp_queue.c \
+					$(OGCDIR)/lwp_threadq.c \
+					$(OGCDIR)/lwp_threads.c \
+					$(OGCDIR)/lwp_sema.c	\
+					$(OGCDIR)/lwp_messages.c \
+					$(OGCDIR)/lwp.c \
+					$(OGCDIR)/lwp_stack.c \
+					$(OGCDIR)/lwp_mutex.c 	\
+					$(OGCDIR)/lwp_watchdog.c \
+					$(OGCDIR)/lwp_wkspace.c \
+					$(OGCDIR)/lwp_objmgr.c \
+					$(OGCDIR)/lwp_heap.c \
+					$(OGCDIR)/sys_state.c \
+					$(OGCDIR)/exception.c \
+					$(OGCDIR)/irq.c \
+					$(OGCDIR)/semaphore.c \
+					$(OGCDIR)/video.c \
+					$(OGCDIR)/pad.c \
+					$(OGCDIR)/exi.c \
+					$(OGCDIR)/mutex.c \
+					$(OGCDIR)/arqueue.c \
+					$(OGCDIR)/arqmgr.c	\
+					$(OGCDIR)/system.c \
+					$(OGCDIR)/cond.c \
+					$(OGCDIR)/gx.c \
+					$(OGCDIR)/gu.c \
+					$(OGCDIR)/audio.c \
+					$(OGCDIR)/cache.c \
+					$(OGCDIR)/decrementer.c			\
+					$(OGCDIR)/message.c \
+					$(OGCDIR)/card.c \
+					$(OGCDIR)/aram.c \
+					$(OGCDIR)/depackrnc1.c \
+					$(OGCDIR)/dsp.c \
+					$(OGCDIR)/si.c \
+					$(OGCDIR)/tpl.c \
+					$(OGCDIR)/ipc.c \
+					$(OGCDIR)/console_font_8x16.c \
+					$(OGCDIR)/timesupp.c \
+					$(OGCDIR)/lock_supp.c \
+					$(OGCDIR)/newlibc.c \
+					$(OGCDIR)/usbgecko.c \
+					$(OGCDIR)/usbmouse.c \
+					$(OGCDIR)/sbrk.c \
+					$(OGCDIR)/malloc_lock.c \
+					$(OGCDIR)/kprintf.c \
+					$(OGCDIR)/stm.c \
+					$(OGCDIR)/ios.c \
+					$(OGCDIR)/es.c \
+					$(OGCDIR)/isfs.c \
+					$(OGCDIR)/usb.c \
+					$(OGCDIR)/network_common.c \
+					$(OGCDIR)/sdgecko_io.c \
+					$(OGCDIR)/sdgecko_buf.c \
+					$(OGCDIR)/gcsd.c \
+					$(OGCDIR)/argv.c \
+					$(OGCDIR)/network_wii.c \
+					$(OGCDIR)/wiisd.c \
+					$(OGCDIR)/conf.c \
+					$(OGCDIR)/usbstorage.c \
+					$(OGCDIR)/texconv.c \
+					$(OGCDIR)/wiilaunch.c
+
+SOURCES_OGC_ASM := $(OGCDIR)/cache_asm.S \
+						 $(OGCDIR)/decrementer_handler.S \
+						 $(OGCDIR)/depackrnc.S \
+						 $(OGCDIR)/exception_handler.S \
+						 $(OGCDIR)/gu_psasm.S \
+						 $(OGCDIR)/irq_handler.S \
+						 $(OGCDIR)/lwp_handler.S \
+						 $(OGCDIR)/ogc_crt0.S \
+						 $(OGCDIR)/system_asm.S \
+						 $(OGCDIR)/video_asm.S
+
+
+ifneq ($(BUILD_LITE), 1)
+SOURCES_OGC += $(OGCDIR)/dvd.c
+endif
+
+OGCOBJ := $(SOURCES_OGC:.c=.o) $(SOURCES_OGC_ASM:.S=.o)
+
+#---------------------------------------------------------------------------------
+SOURCES_DB		:=	\
+				$(DBDIR)/uIP/uip_ip.c \
+				$(DBDIR)/uIP/uip_tcp.c \
+				$(DBDIR)/uIP/uip_pbuf.c \
+				$(DBDIR)/uIP/uip_netif.c \
+				$(DBDIR)/uIP/uip_arp.c \
+				$(DBDIR)/uIP/uip_arch.c \
+				$(DBDIR)/uIP/uip_icmp.c \
+				$(DBDIR)/uIP/memb.c \
+				$(DBDIR)/uIP/memr.c \
+				$(DBDIR)/uIP/bba.c \
+				$(DBDIR)/tcpip.c \
+				$(DBDIR)/debug.c \
+				$(DBDIR)/debug_handler.c \
+				$(DBDIR)/debug_supp.c \
+				$(DBDIR)/geckousb.c
+
+DBOBJ      := $(SOURCES_DB:.c=.o)
+
+#---------------------------------------------------------------------------------
+SOURCES_BTE		:=	\
+					$(BTEDIR)/bte.c \
+					$(BTEDIR)/hci.c \
+					$(BTEDIR)/l2cap.c \
+					$(BTEDIR)/btmemb.c \
+					$(BTEDIR)/btmemr.c \
+					$(BTEDIR)/btpbuf.c \
+					$(BTEDIR)/physbusif.c
+
+BTEOBJ      := $(SOURCES_BTE:.c=.o)
+
+#---------------------------------------------------------------------------------
+SOURCES_WIIUSE	:=	\
+					$(WIIUSEDIR)/classic.c \
+					$(WIIUSEDIR)/dynamics.c \
+					$(WIIUSEDIR)/events.c \
+					$(WIIUSEDIR)/io.c \
+					$(WIIUSEDIR)/io_wii.c \
+					$(WIIUSEDIR)/ir.c \
+					$(WIIUSEDIR)/nunchuk.c \
+					$(WIIUSEDIR)/wiiuse.c \
+					$(WIIUSEDIR)/speaker.c \
+					$(WIIUSEDIR)/wpad.c \
+					$(WIIUSEDIR)/motion_plus.c
+
+WIIUSEOBJ   := $(SOURCES_WIIUSE:.c=.o)
+
+#---------------------------------------------------------------------------------
+SOURCES_WIIKEYB = $(LIBWIIKEYB)/usbkeyboard.c \
+						$(LIBWIIKEYB)/keyboard.c \
+						$(LIBWIIKEYB)/ukbdmap.c \
+						$(LIBWIIKEYB)/wskbdutil.c
+
+WIIKEYBLIBOBJ	:=	$(SOURCES_WIIKEYB:.c=.o)
+
+LIBRARIES	:=	$(OGCLIB).a  $(DBLIB).a
+
+ifeq ($(PLATFORM),cube)
+LIBRARIES	+=	$(BBALIB).a
+endif
+ifeq ($(PLATFORM),wii)
+LIBRARIES	+=	$(BTELIB).a $(WIIUSELIB).a $(WIIKEYBLIB).a
+endif
+
+all: $(LIBRARIES)
+#---------------------------------------------------------------------------------
+$(BBALIB).a: $(LWIPOBJ)
+#---------------------------------------------------------------------------------
+$(OGCLIB).a: $(OGCOBJ)
+#---------------------------------------------------------------------------------
+$(DBLIB).a: $(DBOBJ)
+#---------------------------------------------------------------------------------
+$(WIIKEYBLIB).a: $(WIIKEYBLIBOBJ)
+#---------------------------------------------------------------------------------
+$(BTELIB).a: $(BTEOBJ)
+#---------------------------------------------------------------------------------
+$(WIIUSELIB).a: $(WIIUSEOBJ)
+#---------------------------------------------------------------------------------
+
+#---------------------------------------------------------------------------------
+clean:
+#---------------------------------------------------------------------------------
+	rm -fr $(LWIPOBJ) $(OGCOBJ) $(DBOBJ) $(BTEOBJ) $(WIIUSEOBJ) $(WIIKEYBLIBOBJ)
+	rm -f *.map
@@ -0,0 +1,273 @@
+TARGET		    := retroarch.exe
+DEBUG           = 0
+GRIFFIN_BUILD   = 0
+OS              = Win32
+ARCH            = amd64
+#TARGET_ARCH     = x86
+BUILD_DIR       = objs/msvc
+CXX_BUILD       = 0
+
+
+WindowsSdkDir = C:\Program Files (x86)\Windows Kits\10\$(NOTHING)
+WindowsSDKVersion := 10.0.14393.0\$(NOTHING)
+VCINSTALLDIR := C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\$(NOTHING)
+
+HAVE_D3DX                := 1
+HAVE_D3D8                := 0
+HAVE_D3D9                := 1
+HAVE_D3D10               := 1
+HAVE_D3D11               := 1
+HAVE_D3D12               := 1
+HAVE_CG                  := 1
+HAVE_OPENGL              := 1
+HAVE_VULKAN              := 1
+HAVE_XAUDIO              := 1
+HAVE_XINPUT              := 1
+HAVE_WASAPI              := 0
+HAVE_THREAD_STORAGE      := 1
+
+HAVE_RPNG                := 1
+HAVE_ZLIB                := 1
+WANT_ZLIB                := 1
+HAVE_RGUI                := 1
+HAVE_XMB                 := 1
+HAVE_MATERIALUI          := 1
+HAVE_STB_FONT            := 1
+HAVE_THREADS             := 1
+HAVE_LIBRETRODB          := 1
+HAVE_COMMAND             := 1
+HAVE_STDIN_CMD           := 1
+HAVE_CMD                 := 1
+HAVE_DYLIB               := 1
+HAVE_DYNAMIC             := 1
+HAVE_DINPUT              := 1
+HAVE_MENU_COMMON         := 1
+HAVE_BUILTINZLIB         := 1
+
+HAVE_RJPEG               := 1
+HAVE_RBMP                := 1
+HAVE_RTGA                := 1
+HAVE_7ZIP                := 1
+HAVE_NETWORKING          := 1
+HAVE_NETWORK_CMD         := 1
+HAVE_OVERLAY             := 1
+HAVE_LANGEXTRA           := 1
+HAVE_CHEEVOS             := 1
+HAVE_KEYMAPPER           := 1
+HAVE_SHADERPIPELINE      := 1
+HAVE_IMAGEVIEWER         := 1
+
+include Makefile.common
+INCLUDE_DIRS := $(patsubst  -isystem%,-I%,$(INCLUDE_DIRS))
+CFLAGS       := $(filter-out  -Wno-unknown-pragmas,$(CFLAGS))
+CXXFLAGS     := $(filter-out  -fpermissive -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -Wno-parentheses,$(CXXFLAGS))
+LIBS         := $(filter-out  -lstdc++,$(LIBS))
+
+ifeq ($(ARCH),x64)
+   ARCH := amd64
+endif
+
+ARCH2 := $(ARCH)
+ifeq ($(ARCH),amd64)
+   ARCH2 := x64
+endif
+
+ifeq ($(TARGET_ARCH),)
+   TARGET_ARCH = $(ARCH)
+endif
+
+ifeq ($(TARGET_ARCH),x64)
+   TARGET_ARCH = amd64
+endif
+
+TARGET_ARCH2 = $(TARGET_ARCH)
+ifeq ($(TARGET_ARCH2),amd64)
+   TARGET_ARCH2 = x64
+endif
+
+CROSS = $(ARCH)
+ifeq ($(ARCH),x86)
+CROSS =
+endif
+
+
+INCLUDE := $(VCINSTALLDIR)include;$(VCINSTALLDIR)atlmfc\include;$(WindowsSdkDir)include\$(WindowsSDKVersion)ucrt;$(WindowsSdkDir)include\$(WindowsSDKVersion)shared;$(WindowsSdkDir)include\$(WindowsSDKVersion)um;
+LIB     := $(VCINSTALLDIR)LIB\$(CROSS);$(VCINSTALLDIR)atlmfc\lib\$(CROSS);$(WindowsSdkDir)lib\$(WindowsSDKVersion)ucrt\$(TARGET_ARCH2);$(WindowsSdkDir)lib\$(WindowsSDKVersion)um\$(TARGET_ARCH2);C:\Program Files (x86)\NVIDIA Corporation\Cg\lib.$(TARGET_ARCH2);C:\Program Files (x86)\Microsoft DirectX SDK (February 2010)\Lib\$(TARGET_ARCH2);
+LIBPATH := $(VCINSTALLDIR)LIB\$(CROSS);$(VCINSTALLDIR)atlmfc\lib\$(CROSS);
+
+PATH := $(shell IFS=$$'\n'; cygpath "$(VCINSTALLDIR)bin\\$(CROSS)"):$(shell IFS=$$'\n'; cygpath "$(WindowsSdkDir)\bin\\$(ARCH2)"):$(PATH)
+
+
+export INCLUDE := $(INCLUDE)
+export LIB     := $(LIB)
+export LIBPATH := $(LIBPATH)
+export PATH    := $(PATH)
+
+#$(info WindowsSdkDir : $(WindowsSdkDir))
+#$(info WindowsSDKVersion : $(WindowsSDKVersion))
+#$(info VCINSTALLDIR : $(VCINSTALLDIR))
+#$(info INCLUDE : $(INCLUDE))
+#$(info LIB : $(LIB))
+#$(info LIBPATH : $(LIBPATH))
+#$(info PATH : $(PATH))
+#$(error end)
+
+DEFINES += -D__SSE__ -D__SSE2__
+ifeq ($(TARGET_ARCH2),x64)
+DEFINES += -D__x86_64__
+else
+#DEFINES += -D__i686__
+endif
+
+FLAGS  += -nologo -MP
+FLAGS  += -Gm- -Zc:inline -fp:precise -Zc:forScope -GR- -Gd -Oi -volatile:iso
+#FLAGS  += -Zc:wchar_t -Zp16 -Z7
+#FLAGS += -utf-8
+#FLAGS += -source-charset:utf-8
+
+CXXFLAGS += $(CFLAGS) -TP -EHsc
+ifeq ($(CXX_BUILD),1)
+   CFLAGS  := $(CXXFLAGS)
+   DEFINES += -DCXX_BUILD
+else
+   CFLAGS  += -TC
+endif
+
+WARNINGS += -WX -W3
+WARNINGS += -wd4101 -wd4996 -wd4244 -wd4267 -wd4090 -wd4305 -wd4146 -wd4334 -wd4018 -wd4800 -wd4838
+
+CC = cl.exe
+CXX = cl.exe
+LD = link.exe
+RC = rc.exe
+
+LIBS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib
+LDFLAGS  += -nologo -wx -nxcompat -machine:$(TARGET_ARCH2)
+
+
+ifeq ($(DEBUG),1)
+   FLAGS += -GS -Gy -Od -RTC1 -D_SECURE_SCL=1 -Zi
+   FLAGS += -MDd
+   LDFLAGS += -DEBUG
+   DEFINES += -DDEBUG -D_DEBUG
+else
+   FLAGS += -GS- -Gy- -O2 -Ob2 -GF -GT -Oy -Ot -D_SECURE_SCL=0
+   FLAGS += -MD
+endif
+
+
+ifeq ($(DEBUG),1)
+   BUILD_DIR := $(BUILD_DIR)-debug
+endif
+
+ifeq ($(GRIFFIN_BUILD),1)
+   BUILD_DIR := $(BUILD_DIR)-griffin
+endif
+
+BUILD_DIR := $(BUILD_DIR)-$(TARGET_ARCH2)
+
+ifneq ($(V), 1)
+   Q := @
+endif
+
+
+ifeq ($(GRIFFIN_BUILD), 1)
+   OBJ       := griffin/griffin.o griffin/griffin_cpp.o
+   DEFINES   += -DHAVE_GRIFFIN -DUSE_MATH_DEFINES
+else
+   BLACKLIST :=
+   OBJ := $(filter-out $(BLACKLIST),$(OBJ))
+endif
+
+DEFINES += -DRARCH_INTERNAL -DHAVE_DYNAMIC -DJSON_STATIC
+INCLUDE_DIRS += -I. -Igfx/include
+
+#OBJ := version_git.o
+
+OBJ := $(patsubst %rarch.o,%rarch.res,$(OBJ))
+OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))
+OBJ := $(OBJ:.o=.obj)
+
+
+
+
+LDFLAGS += -WX -SUBSYSTEM:WINDOWS -ENTRY:mainCRTStartup
+
+DEFINES := $(patsubst -f%,,$(DEFINES))
+LDFLAGS := $(patsubst -l%,%.lib,$(LDFLAGS))
+LIBS := $(filter-out -lm,$(LIBS))
+LIBS := $(patsubst -l%,%.lib,$(LIBS))
+
+
+#$(info INCLUDE_DIRS : $(INCLUDE_DIRS))
+#$(info DEFINES : $(DEFINES))
+#$(info CFLAGS : $(CFLAGS))
+#$(info CXXFLAGS : $(CXXFLAGS))
+#$(info LDFLAGS : $(LDFLAGS))
+#$(info LIBS : $(LIBS))
+#$(info OBJ : $(OBJ))
+#$(info target : $(TARGET))
+#$(info flags : $(FLAGS))
+#$(info INCLUDE : $(INCLUDE))
+#$(info LIB : $(LIB))
+#$(info LIBPATH : $(LIBPATH))
+#$(error end)
+
+$(info os     : $(OS))
+$(info host   : $(ARCH))
+$(info target : $(TARGET_ARCH))
+
+all: $(TARGET)
+
+%: $(BUILD_DIR)/%
+	cp $< $@
+
+ifeq ($(DEBUG),1)
+%.exe: $(BUILD_DIR)/%.exe
+	cp $< $@
+	cp $(BUILD_DIR)/$*.pdb $*.pbd
+endif
+
+SHELL:=$(SHELL) -o pipefail
+
+DEPFLAGS = -showIncludes | tee $(BUILD_DIR)/$*.dtemp | sed /'Note: including file:'/d
+MAKEDEPS = echo $@: $< \\ > $(BUILD_DIR)/$*.depend && \
+           grep 'Note: including file:' $(BUILD_DIR)/$*.dtemp \
+           | sed '/$(subst \,\\,$(WindowsSdkDir))/Id; /$(subst \,\\,$(VCINSTALLDIR))/Id; s/Note: including file:[ ]*//g; s/\\/\//g; s/ /\\ /g; s/.*/   & \\/g' \
+           >> $(BUILD_DIR)/$*.depend && \
+           rm -f $(BUILD_DIR)/$*.dtemp
+
+#DEPFLAGS :=
+#MAKEDEPS :=
+
+$(BUILD_DIR)/%.obj: %.cpp
+	@mkdir -p $(dir $@)
+	$(Q)$(CXX) -c -Fo:$@ $< $(FLAGS) $(CXXFLAGS) $(DEFINES) $(INCLUDE_DIRS) $(WARNINGS) $(DEPFLAGS)
+	@$(MAKEDEPS)
+
+$(BUILD_DIR)/%.obj: %.c
+	@mkdir -p $(dir $@)
+	$(Q)$(CC) -c -Fo:$@ $< $(FLAGS) $(CFLAGS) $(DEFINES) $(INCLUDE_DIRS) $(WARNINGS) $(DEPFLAGS)
+	@$(MAKEDEPS)
+
+$(BUILD_DIR)/%.res: %.rc
+	@mkdir -p $(dir $@)
+	$(Q)$(RC) $<
+	$(Q)mv $*.res $@
+
+$(BUILD_DIR)/$(TARGET): $(OBJ) .$(TARGET).last
+	@touch .$(TARGET).last
+	$(Q)$(LD) $(OBJ) $(LDFLAGS) $(LIBS) -out:$(BUILD_DIR)/$(TARGET)
+
+%.h %.hpp %.depend %.last: ;
+
+clean:
+	rm -f $(OBJ) $(TARGET)
+	rm -f $(BUILD_DIR)/$(TARGET)
+	rm -f .$(TARGET).last
+	rm -f $(OBJ:.obj=.depend)
+
+.PHONY: clean all
+.PRECIOUS: %.depend %.last
+
+-include $(patsubst %.obj,%.depend,$(filter %.obj,$(OBJ)))
@@ -1,4 +1,4 @@
-RARCH_VERSION		= "0.9.9.3"
+include version.all

 DEBUG = 0

@@ -15,7 +15,7 @@ LDFLAGS = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib

 LIBS = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound
 DEFINES = -std=gnu99 -DHAVE_THREADS -DHAVE_GETOPT_LONG=1 -DHAVE_GRIFFIN -DRARCH_INTERNAL
-DEFINES += -D__ARM_ARCH_6__ -DSINC_LOWER_QUALITY -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_OVERLAY -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
+DEFINES += -D__ARM_ARCH_6__ -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_OVERLAY -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
 DEFINES += $(INCDIRS)
 DEFINES += -D__OPENPANDORA__ -DPANDORA
 DEFINES += -marm -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -ftree-vectorize
@@ -1,4 +1,4 @@
-RARCH_VERSION		= "0.9.9.3"
+include version.all

 #which compiler to build  with - GCC or SNC
 #set to GCC for debug builds for use with debugger
@@ -33,7 +33,7 @@ EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
 CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF

 LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
-INCDIRS = -I. -Idefines -Ideps/libz -Ilibretro-common/include
+INCDIRS = -I. -Idefines -Ideps/libz -Ilibretro-common/include -Ideps -Ideps/stb

 # system platform
 system_platform = unix
@@ -63,7 +63,19 @@ endif

 PPU_SRCS		= griffin/griffin.c

-DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS
+DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT
+
+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
@@ -101,7 +113,7 @@ PPU_LDLIBS =  $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l

 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_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -DWANT_ZLIB -DSINC_LOWER_QUALITY -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
+DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LANGEXTRA -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -DWANT_ZLIB -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_CHEEVOS

 #DEFINES += -DHAVE_IMAGEVIEWER

@@ -163,20 +175,20 @@ pkg: $(PPU_TARGET)  create-shaders copy-media-files create-npdrm-salamander crea
 	$(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf pkg/ps3

 pkg-signed: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+	$(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-$(RARCH_VERSION).pkg
+	$(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-$(RARCH_VERSION)-kmeaw.pkg
-	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
+	$(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-$(RARCH_VERSION).pkg
-	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
+	$(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)
@@ -1,4 +1,4 @@
-RARCH_VERSION		= "0.9.9.3"
+include version.all

 #which compiler to build  with - GCC or SNC
 #set to GCC for debug builds for use with debugger
@@ -31,7 +31,7 @@ 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
+INCDIRS = -I. -Idefines -Ideps -Ideps/stb

 # system platform
 system_platform = unix
@@ -63,6 +63,18 @@ 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
@@ -99,7 +111,7 @@ PPU_LDLIBS =  $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -l

 PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe

-DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_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
+DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_STB_VORBIS

 ifeq ($(DEBUG), 1)
   PPU_OPTIMIZE_LV	:= -O0 -g
@@ -159,20 +171,20 @@ pkg: $(PPU_TARGET)  create-shaders copy-media-files create-npdrm-salamander crea
 	$(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf pkg/ps3

 pkg-signed: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+	$(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-$(RARCH_VERSION).pkg
+	$(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-$(RARCH_VERSION)-kmeaw.pkg
-	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
+	$(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-$(RARCH_VERSION).pkg
-	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
+	$(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)
@@ -16,9 +16,32 @@ 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

-PPU_CFLAGS		+= -I. -Ilibretro-common/include -Ideps/libz -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
+INCFLAGS    = -I. -Idefines -Ilibretro-common/include -Ideps/libz
+DEFINES     = -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
+
+ifeq ($(DEX_BUILD), 1)
+DEFINES += -DDEX_BUILD
+endif
+
+ifeq ($(CEX_BUILD), 1)
+DEFINES += -DCEX_BUILD
+endif
+
+ifeq ($(ODE_BUILD), 1)
+DEFINES += -DODE_BUILD
+endif
+
+PPU_CFLAGS	:= $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
+PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
+
 PPU_SRCS		= frontend/frontend_salamander.c \
 				  frontend/frontend_driver.c \
 				  frontend/drivers/platform_ps3.c \
@@ -29,9 +52,11 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  libretro-common/file/retro_dirent.c \
 				  libretro-common/hash/rhash.c \
 				  libretro-common/string/stdstring.c \
+				  libretro-common/encodings/encoding_utf.c \
 				  libretro-common/compat/compat_strl.c \
 				  libretro-common/compat/compat_strcasestr.c \
 				  libretro-common/streams/file_stream.c \
+				  libretro-common/vfs/vfs_implementation.c \
 				  libretro-common/file/config_file.c \
 				  file_path_str.c \
 				  verbosity.c
@@ -60,8 +85,6 @@ endif

 PPU_LDLIBS		+= -lm -lnet_stub -lnetctl_stub -lio_stub -lsysmodule_stub -lsysutil_stub -lsysutil_game_stub -lfs_stub -lsysutil_np_stub

-PPU_OPTIMIZE_LV		:= -O2
-
 MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe

 include $(CELL_MK_DIR)/sdk.target.mk
@@ -1,4 +1,4 @@
-RARCH_VERSION		= "0.9.9.3"
+include version.all

 DEBUG			= 0
 HAVE_LOGGER		= 0
@@ -17,7 +17,7 @@ ELF_TARGET := retroarch_psl1ght.elf
 EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
 CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF

-INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ideps/libz -Ips3/gcmgl/include/export -Ips3/include
+INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ideps/libz -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb
 LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.

 MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__
@@ -89,7 +89,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
 endif

-SHARED_FLAGS := -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB   -DHAVE_GRIFFIN=1 -DHAVE_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
+SHARED_FLAGS := -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_GCMGL -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_MOUSE  -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB   -DHAVE_GRIFFIN=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts -DHAVE_CC_RESAMPLER
 CFLAGS += -std=gnu99 $(SHARED_FLAGS)
 CXXFLAGS += $(SHARED_FLAGS)

@@ -121,7 +121,7 @@ pkg: $(ELF_TARGET) create-npdrm-core
 	$(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf ps3/pkg

 pkg-signed: $(ELF_TARGET) create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg

 clean:
 	rm -f $(ELF_TARGET)
@@ -1,8 +1,10 @@
-BUILD_PRX          = 1
+BUILD_PRX          = 0
+PSP_LARGE_MEMORY   = 1
 DEBUG              = 0
 HAVE_KERNEL_PRX    = 1
+HAVE_LOGGER        = 0
 HAVE_FILE_LOGGER   = 0
-HAVE_THREADS       = 0
+HAVE_THREADS       = 1
 BIG_STACK          = 0
 WHOLE_ARCHIVE_LINK = 0

@@ -11,7 +13,7 @@ TARGET = retroarchpsp
 ifeq ($(DEBUG), 1)
   OPTIMIZE_LV	:= -O0 -g
 else
-   OPTIMIZE_LV	:= -O3 -g
+   OPTIMIZE_LV	:= -O2
 endif

 ifeq ($(WHOLE_ARCHIVE_LINK), 1)
@@ -19,11 +21,11 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
   WHOLE_END := -Wl,--no-whole-archive
 endif

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

-RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LANGEXTRA -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DSINC_LOWEST_QUALITY -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
+RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LANGEXTRA -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER

 LIBDIR =
 LDFLAGS =
@@ -1,4 +1,5 @@
-BUILD_PRX         = 1
+BUILD_PRX         = 0
+PSP_LARGE_MEMORY  = 1
 HAVE_FILE_LOGGER  = 0
 DEBUG             = 0

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

 INCDIR = $(PSPPATH)/include libretro-common/include
@@ -24,7 +25,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
 endif

-CFLAGS += $(RARCH_DEFINES)
+CFLAGS += $(RARCH_DEFINES) 

 EXTRA_TARGETS   = EBOOT.PBP
 PSP_EBOOT_TITLE = RetroArch
@@ -40,10 +41,12 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/lists/string_list.o \
 		 libretro-common/lists/dir_list.o \
 		 libretro-common/file/retro_dirent.o \
+		 libretro-common/encodings/encoding_utf.o \
 		 libretro-common/compat/compat_strl.o \
 		 libretro-common/compat/compat_strcasestr.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
+		 libretro-common/vfs/vfs_implementation.o \
 		 libretro-common/hash/rhash.o \
 		 file_path_str.o \
 		 verbosity.o \
@@ -0,0 +1,68 @@
+TARGET := retroarch_switch
+
+DEBUG                  ?= 0
+GRIFFIN_BUILD           = 0
+WHOLE_ARCHIVE_LINK      = 0
+
+OBJ :=
+
+DEFINES := -DSWITCH=1 -U__linux__ -U__linux
+
+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 -DWANT_ZLIB
+else
+	HAVE_CC_RESAMPLER = 1
+	HAVE_MENU_COMMON = 1
+	HAVE_RTGA = 1
+	HAVE_RPNG = 1
+	HAVE_RJPEG = 1
+	HAVE_RBMP = 1
+	HAVE_RGUI = 1
+	HAVE_ZLIB = 1
+	HAVE_BUILTINZLIB = 1
+	HAVE_LIBRETRODB = 1
+	HAVE_ZARCH = 0
+	HAVE_MATERIALUI = 0 # enable later?
+	HAVE_XMB = 0
+	HAVE_STATIC_VIDEO_FILTERS = 1
+	HAVE_STATIC_AUDIO_FILTERS = 1
+	HAVE_MENU = 1
+
+	include Makefile.common
+        BLACKLIST :=
+	BLACKLIST += input/input_overlay.o
+        BLACKLIST += tasks/task_overlay.o
+	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
+endif
+
+
+ifeq ($(strip $(LIBTRANSISTOR_HOME)),)
+$(error "Please set LIBTRANSISTOR_HOME in your environment. export LIBTRANSISTOR_HOME=<path t>o libtransistor")
+endif
+
+include $(LIBTRANSISTOR_HOME)/libtransistor.mk
+
+INCDIRS := -I. -Ideps/libz -Ilibretro-common/include -Ideps/stb -I$(LIBTRANSISTOR_HOME)/build/sdl2_install/include/SDL2/
+LIBDIRS := -L.
+
+TARGETS := $(TARGET).nro
+
+CFLAGS += $(INCDIRS) $(DEFINES) -Wunused-command-line-argument
+
+all: $(TARGETS)
+
+$(TARGET).nro.so: $(OBJ) libretro_switch.a fs.squashfs.o $(LIBTRANSISTOR_NRO_LIB) $(LIBTRANSISTOR_COMMON_LIBS)
+	$(LD) $(LD_FLAGS) --allow-multiple-definition -o $@ $(OBJ) libretro_switch.a fs.squashfs.o $(LIBTRANSISTOR_NRO_LDFLAGS) -lm
+
+%.squashfs.o: %.squashfs
+	$(LD) -s -r -b binary -m aarch64elf -T $(LIBTRANSISTOR_HOME)/fs.T -o $@ $<
+
+fs.squashfs: fs/*
+	mksquashfs $^ $@ -comp lz4 -nopad -noappend
+
+clean:
+	rm -f $(OBJ) $(TARGET).nro.so $(TARGET).nro
+
+.PHONY: clean all
@@ -47,6 +47,8 @@ else
 	HAVE_CC_RESAMPLER	:= 1
 	HAVE_CHEEVOS		:= 1
 	RARCH_CONSOLE		:= 1
+	HAVE_STATIC_VIDEO_FILTERS = 1
+	HAVE_STATIC_AUDIO_FILTERS = 1

 	ifeq ($(DEBUG), 1)
 		HAVE_NETLOGGER = 1
@@ -60,24 +62,6 @@ else
 	OBJ += input/drivers_joypad/psp_joypad.o
 	OBJ += audio/drivers/psp_audio.o
 	OBJ += frontend/drivers/platform_psp.o
-	OBJ += gfx/video_filters/2xsai.o
-	OBJ += gfx/video_filters/super2xsai.o
-	OBJ += gfx/video_filters/supereagle.o
-	OBJ += gfx/video_filters/2xbr.o
-	OBJ += gfx/video_filters/darken.o
-	OBJ += gfx/video_filters/epx.o
-	OBJ += gfx/video_filters/scale2x.o
-	OBJ += gfx/video_filters/blargg_ntsc_snes.o
-	OBJ += gfx/video_filters/lq2x.o
-	OBJ += gfx/video_filters/phosphor2x.o
-	OBJ += libretro-common/audio/dsp_filters/echo.o
-	OBJ += libretro-common/audio/dsp_filters/eq.o
-	OBJ += libretro-common/audio/dsp_filters/chorus.o
-	OBJ += libretro-common/audio/dsp_filters/iir.o
-	OBJ += libretro-common/audio/dsp_filters/panning.o
-	OBJ += libretro-common/audio/dsp_filters/phaser.o
-	OBJ += libretro-common/audio/dsp_filters/reverb.o
-	OBJ += libretro-common/audio/dsp_filters/wahwah.o
 endif


@@ -98,7 +82,7 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)

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

 ARCHFLAGS := -march=armv7-a -mfpu=neon -mfloat-abi=hard -DVITA
@@ -41,10 +41,12 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/lists/string_list.o \
 		 libretro-common/lists/dir_list.o \
 		 libretro-common/file/retro_dirent.o \
+		 libretro-common/encodings/encoding_utf.o \
 		 libretro-common/compat/compat_strl.o \
 		 libretro-common/compat/compat_strcasestr.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/streams/file_stream.o \
+		 libretro-common/vfs/vfs_implementation.o \
 		 libretro-common/hash/rhash.o \
 		 file_path_str.o \
 		 verbosity.o
@@ -6,6 +6,7 @@
 DEBUG			= 0
 HAVE_LOGGER		= 0
 HAVE_FILE_LOGGER	= 0
+EXTERNAL_LIBOGC = 0

 # system platform
 system_platform = unix
@@ -29,13 +30,23 @@ ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
 DOL_TARGET := retroarch-salamander_wii.dol
 ELF_TARGET := retroarch-salamander_wii.elf

-INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -Ilibretro-common/include -Ideps/libz
+INCLUDE := -I. -Ilibretro-common/include -Ideps/libz
+ifeq ($(EXTERNAL_LIBOGC), 1)
+INCLUDE += -I$(DEVKITPRO)/libogc/include 
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
+else
+INCLUDE += -Iwii/libogc/include 
+LIBDIRS := -Lwii/libogc/libs/wii -L.
+endif

 MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
 CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
-LIBS := -lfat -lwiiuse -logc -lbte
+LIBS := -lwiiuse -logc -lbte
+
+ifeq ($(EXTERNAL_LIBOGC), 1)
+LIBS += -lfat
+endif

 APP_BOOTER_DIR = wii/app_booter

@@ -50,7 +61,9 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/lists/string_list.o \
 		libretro-common/lists/dir_list.o \
 		libretro-common/streams/file_stream.o \
+		libretro-common/vfs/vfs_implementation.o \
 		libretro-common/file/retro_dirent.o \
+		libretro-common/encodings/encoding_utf.o \
 		libretro-common/compat/compat_strl.o \
 		libretro-common/compat/compat_strcasestr.o \
 		libretro-common/file/config_file.o \
@@ -58,6 +71,20 @@ OBJ = frontend/frontend_salamander.o \
 		verbosity.o \
 		$(APP_BOOTER_DIR)/app_booter.binobj

+ifeq ($(EXTERNAL_LIBOGC), 1)
+else
+OBJ += wii/libogc/libfat/cache.o \
+		wii/libogc/libfat/directory.o \
+		wii/libogc/libfat/disc.o \
+		wii/libogc/libfat/fatdir.o \
+		wii/libogc/libfat/fatfile.o \
+		wii/libogc/libfat/file_allocation_table.o \
+		wii/libogc/libfat/filetime.o \
+		wii/libogc/libfat/libfat.o \
+		wii/libogc/libfat/lock.o \
+		wii/libogc/libfat/partition.o
+endif
+
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
@@ -1,102 +1,172 @@
 TARGET		    := retroarch_wiiu
-BUILD_HBL_ELF	     = 1
-BUILD_RPX	         = 1
-DEBUG                = 0
-GRIFFIN_BUILD        = 0
-WHOLE_ARCHIVE_LINK   = 0

+BUILD_HBL_ELF              = 1
+BUILD_RPX                  = 1
+DEBUG                      = 0
+GRIFFIN_BUILD              = 0
+SALAMANDER_BUILD           = 0
+WHOLE_ARCHIVE_LINK         = 0
+WIIU_HID                   = 0
+WIIU_LOG_RPX               = 0
+BUILD_DIR                  = objs/wiiu
 PC_DEVELOPMENT_IP_ADDRESS  ?=
 PC_DEVELOPMENT_TCP_PORT	   ?=

+ifeq ($(SALAMANDER_BUILD),1)
+   BUILD_DIR := $(BUILD_DIR)-salamander
+   TARGET    := $(TARGET)_salamander
+else ifeq ($(GRIFFIN_BUILD),1)
+   BUILD_DIR := $(BUILD_DIR)-griffin
+endif
+
+ifeq ($(DEBUG),1)
+   BUILD_DIR := $(BUILD_DIR)-debug
+endif
+
+ifneq ($(V), 1)
+   Q := @
+endif
+
 OBJ :=
+OBJ += wiiu/input/wpad_driver.o
+OBJ += wiiu/input/kpad_driver.o
+OBJ += wiiu/input/pad_functions.o
 OBJ += wiiu/system/memory.o
 OBJ += wiiu/system/exception_handler.o
-OBJ += wiiu/system/missing_libc_functions.o
 OBJ += wiiu/fs/sd_fat_devoptab.o
 OBJ += wiiu/fs/fs_utils.o
-OBJ += wiiu/controller_patcher/ControllerPatcher.o
-OBJ += wiiu/controller_patcher/ControllerPatcherWrapper.o
-OBJ += wiiu/controller_patcher/ConfigReader.o
-OBJ += wiiu/controller_patcher/config/ConfigParser.o
-OBJ += wiiu/controller_patcher/config/ConfigValues.o
-OBJ += wiiu/controller_patcher/network/ControllerPatcherNet.o
-OBJ += wiiu/controller_patcher/network/TCPServer.o
-OBJ += wiiu/controller_patcher/network/UDPClient.o
-OBJ += wiiu/controller_patcher/network/UDPServer.o
-OBJ += wiiu/controller_patcher/patcher/ControllerPatcherUtils.o
-OBJ += wiiu/controller_patcher/patcher/ControllerPatcherHID.o
-OBJ += wiiu/controller_patcher/utils/CPRetainVars.o
-OBJ += wiiu/controller_patcher/utils/CPStringTools.o
-OBJ += wiiu/controller_patcher/utils/PadConst.o
-OBJ += wiiu/controller_patcher/utils/FSHelper.o
-OBJ += wiiu/tex_shader.o
 OBJ += wiiu/hbl.o

 DEFINES :=

-ifeq ($(GRIFFIN_BUILD), 1)
-	OBJ += griffin/griffin.o
-	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_LIBRETRODB
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
-	DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING
-#	DEFINES += -DWANT_IFADDRS
-#	DEFINES += -DHAVE_FREETYPE
-	DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
-else
-	HAVE_MENU_COMMON = 1
-	HAVE_RTGA = 1
-	HAVE_RPNG = 1
-	HAVE_RJPEG = 1
-	HAVE_RBMP = 1
-	HAVE_RGUI = 1
-	HAVE_ZLIB = 1
-	HAVE_7ZIP = 1
-	HAVE_BUILTINZLIB = 1
-	HAVE_LIBRETRODB = 1
-	HAVE_ZARCH = 0
-	HAVE_MATERIALUI = 1
-	HAVE_XMB = 1
-	HAVE_STB_FONT = 1
-#	HAVE_FREETYPE = 1
-	HAVE_LANGEXTRA = 1
-	HAVE_LIBRETRODB = 1
-	HAVE_NETWORKING = 1
-#	WANT_IFADDRS = 1
-
-	include Makefile.common
-	BLACKLIST :=
-	BLACKLIST += input/input_overlay.o
-	BLACKLIST += tasks/task_overlay.o
-	BLACKLIST += $(LIBRETRO_COMM_DIR)/net/net_ifinfo.o
-	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-
-	OBJ += gfx/drivers/wiiu_gfx.o
-	OBJ += gfx/drivers_font/wiiu_font.o
-	OBJ += menu/drivers_display/menu_display_wiiu.o
-	OBJ += input/drivers/wiiu_input.o
-	OBJ += input/drivers_joypad/wiiu_joypad.o
-	OBJ += audio/drivers/wiiu_audio.o
-	OBJ += frontend/drivers/platform_wiiu.o
-	OBJ += gfx/video_filters/2xsai.o
-	OBJ += gfx/video_filters/super2xsai.o
-	OBJ += gfx/video_filters/supereagle.o
-	OBJ += gfx/video_filters/2xbr.o
-	OBJ += gfx/video_filters/darken.o
-	OBJ += gfx/video_filters/epx.o
-	OBJ += gfx/video_filters/scale2x.o
-	OBJ += gfx/video_filters/blargg_ntsc_snes.o
-	OBJ += gfx/video_filters/lq2x.o
-	OBJ += gfx/video_filters/phosphor2x.o
-	OBJ += libretro-common/audio/dsp_filters/echo.o
-	OBJ += libretro-common/audio/dsp_filters/eq.o
-	OBJ += libretro-common/audio/dsp_filters/chorus.o
-	OBJ += libretro-common/audio/dsp_filters/iir.o
-	OBJ += libretro-common/audio/dsp_filters/panning.o
-	OBJ += libretro-common/audio/dsp_filters/phaser.o
-	OBJ += libretro-common/audio/dsp_filters/reverb.o
-	OBJ += libretro-common/audio/dsp_filters/wahwah.o
+ifeq ($(WIIU_LOG_RPX),1)
+   defines += -DWIIU_LOG_RPX
 endif

+ifeq ($(WIIU_HID),1)
+   DEFINES += -DWIIU_HID
+   OBJ += wiiu/input/hidpad_driver.o
+   OBJ += wiiu/input/wiiu_hid.o
+   OBJ += input/connect/joypad_connection.o \
+          input/connect/connect_ps2adapter.o \
+          input/connect/connect_psxadapter.o \
+          input/connect/connect_ps3.o \
+          input/connect/connect_ps4.o \
+          input/connect/connect_wii.o \
+          input/connect/connect_nesusb.o \
+          input/connect/connect_snesusb.o \
+          input/connect/connect_wiiupro.o \
+          input/connect/connect_wiiugca.o
+endif
+
+ifeq ($(SALAMANDER_BUILD),1)
+   DEFINES += -DRARCH_CONSOLE -DIS_SALAMANDER
+
+   OBJ += frontend/frontend_salamander.o
+   OBJ += frontend/frontend_driver.o
+   OBJ += frontend/drivers/platform_wiiu.o
+   OBJ += frontend/drivers/platform_null.o
+   OBJ += libretro-common/encodings/encoding_utf.o
+   OBJ += libretro-common/compat/compat_strcasestr.o
+   OBJ += libretro-common/file/file_path.o
+   OBJ += libretro-common/string/stdstring.o
+   OBJ += libretro-common/lists/string_list.o
+   OBJ += libretro-common/lists/dir_list.o
+   OBJ += libretro-common/file/retro_dirent.o
+   OBJ += libretro-common/compat/compat_strl.o
+   OBJ += libretro-common/file/config_file.o
+   OBJ += libretro-common/streams/file_stream.o
+   OBJ += libretro-common/vfs/vfs_implementation.o
+   OBJ += libretro-common/hash/rhash.o
+   OBJ += file_path_str.o
+   OBJ += verbosity.o
+else
+   DEFINES += -DRARCH_INTERNAL
+   DEFINES += -DHAVE_KEYMAPPER
+   DEFINES += -DHAVE_UPDATE_ASSETS
+   DEFINES += -DHAVE_FILTERS_BUILTIN
+   DEFINES += -DHAVE_SLANG
+   DEFINES += -DHAVE_SHADERPIPELINE
+
+   OBJ += wiiu/system/missing_libc_functions.o
+   OBJ += wiiu/shader_utils.o
+   OBJ += gfx/drivers/gx2_shaders/tex.o
+   OBJ += gfx/drivers/gx2_shaders/sprite.o
+   OBJ += gfx/drivers/gx2_shaders/frame.o
+   OBJ += gfx/drivers/gx2_shaders/ribbon.o
+   OBJ += gfx/drivers/gx2_shaders/ribbon_simple.o
+   OBJ += gfx/drivers/gx2_shaders/bokeh.o
+   OBJ += gfx/drivers/gx2_shaders/snow.o
+   OBJ += gfx/drivers/gx2_shaders/snow_simple.o
+   OBJ += gfx/drivers/gx2_shaders/snowflake.o
+   OBJ += gfx/drivers_shader/slang_preprocess.o
+   OBJ += gfx/drivers_shader/glslang_util.o
+
+   ifeq ($(GRIFFIN_BUILD), 1)
+   	OBJ += griffin/griffin.o
+   	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_LIBRETRODB
+   	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
+   	DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING
+   #	DEFINES += -DWANT_IFADDRS
+   #	DEFINES += -DHAVE_FREETYPE
+   	DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
+   else
+   	HAVE_MENU_COMMON = 1
+   	HAVE_RTGA = 1
+   	HAVE_RPNG = 1
+   	HAVE_RJPEG = 1
+   	HAVE_RBMP = 1
+   	HAVE_RGUI = 1
+   	HAVE_ZLIB = 1
+   	HAVE_7ZIP = 1
+   	HAVE_BUILTINZLIB = 1
+   	HAVE_KEYMAPPER = 1
+   	HAVE_LIBRETRODB = 1
+   	HAVE_ZARCH = 0
+   	HAVE_MATERIALUI = 1
+   	HAVE_XMB = 1
+   	HAVE_STB_FONT = 1
+   #	HAVE_FREETYPE = 1
+   	HAVE_LANGEXTRA = 1
+   	HAVE_LIBRETRODB = 1
+   	HAVE_NETWORKING = 1
+   	HAVE_CHEEVOS = 1
+   #	WANT_IFADDRS = 1
+   	HAVE_OVERLAY = 1
+   	HAVE_STATIC_VIDEO_FILTERS = 1
+   	HAVE_STATIC_AUDIO_FILTERS = 1
+   	WANT_LIBFAT = 1
+   	WANT_IOSUHAX = 1
+
+   	include Makefile.common
+   	BLACKLIST := $(LIBRETRO_COMM_DIR)/net/net_ifinfo.o
+   	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
+
+   	OBJ += gfx/drivers/gx2_gfx.o
+   	OBJ += gfx/drivers_font/wiiu_font.o
+   	OBJ += menu/drivers_display/menu_display_wiiu.o
+   	OBJ += input/drivers/wiiu_input.o
+   	OBJ += input/drivers_joypad/wiiu_joypad.o
+   	OBJ += audio/drivers/wiiu_audio.o
+   	OBJ += frontend/drivers/platform_wiiu.o
+   endif
+endif
+
+OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))
+
+#todo: remove -DWIIU and use the built-in macros instead (HW_WUP or __wiiu__).
+DEFINES += -DWIIU -DMSB_FIRST -D__WUT__
+#DEFINES += -D_GNU_SOURCE
+DEFINES += -DHAVE_MAIN
+DEFINES += -DRARCH_CONSOLE
+
+ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
+   DEFINES += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
+endif
+
+ifneq ($(PC_DEVELOPMENT_TCP_PORT),)
+   DEFINES += -DPC_DEVELOPMENT_TCP_PORT=$(PC_DEVELOPMENT_TCP_PORT)
+endif

 ifeq ($(strip $(DEVKITPPC)),)
 $(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
@@ -126,8 +196,7 @@ else
   ELF2RPL   := $(ELF2RPL).exe
 endif

-
-INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Iwiiu -Iwiiu/include -I$(DEVKITPRO)/portlibs/ppc/include
+INCDIRS := -I. -Ideps -Ideps/stb -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Iwiiu -Iwiiu/include -I$(DEVKITPRO)/portlibs/ppc/include
 LIBDIRS := -L. -L$(DEVKITPRO)/portlibs/ppc/lib

 CFLAGS  := -mwup -mcpu=750 -meabi -mhard-float
@@ -138,6 +207,7 @@ ifeq ($(DEBUG), 1)
 else
   CFLAGS += -O3
 endif
+
 LDFLAGS := $(CFLAGS)

 ASFLAGS := $(CFLAGS) -mregnames
@@ -146,34 +216,28 @@ CFLAGS +=  -ffast-math -Werror=implicit-function-declaration
 #CFLAGS += -fomit-frame-pointer -mword-relocations
 #CFLAGS	+= -Wall

-#todo: remove -DWIIU and use the built-in macros instead (HW_WUP or __wiiu__).
-CFLAGS += -DWIIU -DMSB_FIRST
-CFLAGS += -DHAVE_MAIN
-CFLAGS += -DHAVE_UPDATE_ASSETS
-CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
-CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
-
-ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
-   CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
-endif
-
-ifneq ($(PC_DEVELOPMENT_TCP_PORT),)
-   CFLAGS += -DPC_DEVELOPMENT_TCP_PORT=$(PC_DEVELOPMENT_TCP_PORT)
-endif
-
 ifeq ($(WHOLE_ARCHIVE_LINK), 1)
   WHOLE_START := -Wl,--whole-archive
   WHOLE_END := -Wl,--no-whole-archive
 endif
-CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -D_GNU_SOURCE
+
+CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions

 LDFLAGS  += -Wl,--gc-sections

-LIBS	:= $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm -lfat -liosuhax
+LIBS	:= $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm
+
+ifneq ($(WANT_LIBFAT), 1)
+LIBS += -lfat
+endif
+
+ifneq ($(WANT_IOSUHAX), 1)
+LIBS += -liosuhax
+endif


-RPX_OBJ           = wiiu/system/stubs_rpl.o
-HBL_ELF_OBJ       = wiiu/system/dynamic.o wiiu/system/stubs_elf.o
+RPX_OBJ           = $(BUILD_DIR)/wiiu/system/stubs_rpl.o
+HBL_ELF_OBJ       = $(BUILD_DIR)/wiiu/system/dynamic.o $(BUILD_DIR)/wiiu/system/stubs_elf.o

 RPX_LDFLAGS      := -pie -fPIE
 RPX_LDFLAGS      += -z common-page-size=64 -z max-page-size=64
@@ -191,55 +255,67 @@ ifeq ($(BUILD_HBL_ELF), 1)
 TARGETS += $(TARGET).elf
 endif

-DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
-POSTCOMPILE = mv -f $*.Tdepend $*.depend
+DEPFLAGS    = -MT $@ -MMD -MP -MF $(BUILD_DIR)/$*.depend


 all: $(TARGETS)

-%.o: %.cpp
-%.o: %.cpp %.depend
-	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
-
-%.o: %.c
-%.o: %.c %.depend
-	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
+%: $(BUILD_DIR)/%
+	cp $< $@


-%.o: %.S
-%.o: %.S %.depend
-	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
+$(BUILD_DIR)/%.o: %.cpp %.depend
+	@$(if $(Q), echo CXX $<,)
+	@mkdir -p $(dir $@)
+	$(Q)$(CXX) -c -o $@ $< $(CXXFLAGS) $(DEFINES) $(INCDIRS) $(DEPFLAGS)

-%.o: %.s
-%.o: %.s %.depend
-	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
+$(BUILD_DIR)/%.o: %.c %.depend
+	@$(if $(Q), echo CC $<,)
+	@mkdir -p $(dir $@)
+	$(Q)$(CC) -c -o $@ $< $(CFLAGS) $(DEFINES) $(INCDIRS) $(DEPFLAGS)
+
+$(BUILD_DIR)/%.o: %.S %.depend
+	@$(if $(Q), echo AS $<,)
+	@mkdir -p $(dir $@)
+	$(Q)$(CC) -c -o $@ $< $(ASFLAGS) $(DEFINES) $(INCDIRS) $(DEPFLAGS)
+
+$(BUILD_DIR)/%.o: %.s %.depend
+	@$(if $(Q), echo AS $<,)
+	@mkdir -p $(dir $@)
+	$(Q)$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
 %.a:
-	$(AR) -rc $@ $^
+	@$(if $(Q), echo AR $<,)
+	@mkdir -p $(dir $@)
+	$(Q)$(AR) -rc $@ $^

 %.depend: ;
-
+%.last: ;

 $(ELF2RPL):
-	$(MAKE) -C wiiu/wut/elf2rpl/
+	@$(if $(Q), echo MAKE $@,)
+	$(Q)$(MAKE) -C wiiu/wut/elf2rpl/

-$(TARGET).elf: $(OBJ) $(HBL_ELF_OBJ) libretro_wiiu.a wiiu/link_elf.ld
-	$(LD) $(OBJ) $(HBL_ELF_OBJ) $(LDFLAGS) $(HBL_ELF_LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
+$(BUILD_DIR)/$(TARGET).elf: $(OBJ) $(HBL_ELF_OBJ) libretro_wiiu.a wiiu/link_elf.ld .$(TARGET).elf.last
+	@$(if $(Q), echo LD $@,)
+	@touch .$(TARGET).elf.last
+	$(Q)$(LD) $(OBJ) $(HBL_ELF_OBJ) $(LDFLAGS) $(HBL_ELF_LDFLAGS) $(LIBDIRS) $(LIBS) -o $@

-$(TARGET).rpx.elf: $(OBJ) $(RPX_OBJ) libretro_wiiu.a wiiu/link_elf.ld
-	$(LD) $(OBJ) $(RPX_OBJ) $(LDFLAGS) $(RPX_LDFLAGS) $(LIBDIRS)  $(LIBS) -o $@
+$(BUILD_DIR)/$(TARGET).rpx.elf: $(OBJ) $(RPX_OBJ) libretro_wiiu.a wiiu/link_elf.ld
+	@$(if $(Q), echo LD $@,)
+	$(Q)$(LD) $(OBJ) $(RPX_OBJ) $(LDFLAGS) $(RPX_LDFLAGS) $(LIBDIRS)  $(LIBS) -o $@

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

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

 .PHONY: clean all
-.PRECIOUS: %.depend
+.PRECIOUS: %.depend %.last

 -include $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
@@ -1,175 +0,0 @@
-TARGET		    := retroarch_wiiu_salamander
-BUILD_HBL_ELF	     = 1
-BUILD_RPX	     = 1
-DEBUG                = 0
-
-PC_DEVELOPMENT_IP_ADDRESS  =
-PC_DEVELOPMENT_TCP_PORT	   =
-
-OBJ :=
-OBJ += wiiu/system/memory.o
-OBJ += wiiu/system/exception_handler.o
-OBJ += wiiu/fs/sd_fat_devoptab.o
-OBJ += wiiu/fs/fs_utils.o
-OBJ += wiiu/hbl.o
-OBJ += frontend/frontend_salamander.o
-OBJ += frontend/frontend_driver.o
-OBJ += frontend/drivers/platform_wiiu.o
-OBJ += frontend/drivers/platform_null.o
-OBJ += libretro-common/compat/compat_strcasestr.o
-OBJ += libretro-common/file/file_path.o
-OBJ += libretro-common/string/stdstring.o
-OBJ += libretro-common/lists/string_list.o
-OBJ += libretro-common/lists/dir_list.o
-OBJ += libretro-common/file/retro_dirent.o
-OBJ += libretro-common/compat/compat_strl.o
-OBJ += libretro-common/file/config_file.o
-OBJ += libretro-common/streams/file_stream.o
-OBJ += libretro-common/hash/rhash.o
-OBJ += file_path_str.o
-OBJ += verbosity.o
-
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPRO")
-endif
-
-export PATH	  := $(PATH):$(DEVKITPPC)/bin
-
-PREFIX := powerpc-eabi-
-
-CC      := $(PREFIX)gcc
-CXX     := $(PREFIX)g++
-AS      := $(PREFIX)as
-AR      := $(PREFIX)ar
-OBJCOPY := $(PREFIX)objcopy
-STRIP   := $(PREFIX)strip
-NM      := $(PREFIX)nm
-LD      := $(CXX)
-
-ELF2RPL   := wiiu/wut/elf2rpl/elf2rpl
-
-ifneq ($(findstring Linux,$(shell uname -a)),)
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-else
-   ELF2RPL   := $(ELF2RPL).exe
-endif
-
-
-INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Iwiiu -Iwiiu/include -I$(DEVKITPRO)/portlibs/ppc/include
-LIBDIRS := -L. -L$(DEVKITPRO)/portlibs/ppc/lib
-
-CFLAGS  := -mwup -mcpu=750 -meabi -mhard-float
-LDFLAGS :=
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -g
-else
-   CFLAGS += -O3
-endif
-LDFLAGS := $(CFLAGS)
-
-ASFLAGS := $(CFLAGS) -mregnames
-
-CFLAGS +=  -ffast-math -Werror=implicit-function-declaration
-#CFLAGS += -fomit-frame-pointer -mword-relocations
-#CFLAGS	+= -Wall
-
-#todo: remove -DWIIU and use the built-in macros instead (HW_WUP or __wiiu__).
-CFLAGS += -DWIIU -DMSB_FIRST
-CFLAGS += -DHAVE_MAIN
-CFLAGS += -DRARCH_CONSOLE -DIS_SALAMANDER
-
-ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
-   CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
-endif
-
-ifneq ($(PC_DEVELOPMENT_TCP_PORT),)
-   CFLAGS += -DPC_DEVELOPMENT_TCP_PORT=$(PC_DEVELOPMENT_TCP_PORT)
-endif
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
-
-LDFLAGS  += -Wl,--gc-sections
-
-LIBS	:= $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm -lfat -liosuhax
-
-
-RPX_OBJ           = wiiu/system/stubs_rpl.o
-HBL_ELF_OBJ       = wiiu/system/dynamic.o wiiu/system/stubs_elf.o
-
-RPX_LDFLAGS      := -pie -fPIE
-RPX_LDFLAGS      += -z common-page-size=64 -z max-page-size=64
-RPX_LDFLAGS      += -T wiiu/link_rpl.ld
-RPX_LDFLAGS      += -nostartfiles
-
-HBL_ELF_LDFLAGS  := -T wiiu/link_elf.ld
-
-TARGETS :=
-ifeq ($(BUILD_RPX), 1)
-TARGETS += $(TARGET).rpx
-endif
-
-ifeq ($(BUILD_HBL_ELF), 1)
-TARGETS += $(TARGET).elf
-endif
-
-DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
-POSTCOMPILE = mv -f $*.Tdepend $*.depend
-
-
-all: $(TARGETS)
-
-%.o: %.cpp
-%.o: %.cpp %.depend
-	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
-
-%.o: %.c
-%.o: %.c %.depend
-	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
-
-
-%.o: %.S
-%.o: %.S %.depend
-	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
-
-%.o: %.s
-%.o: %.s %.depend
-	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
-%.a:
-	$(AR) -rc $@ $^
-
-%.depend: ;
-
-
-$(ELF2RPL):
-	$(MAKE) -C wiiu/wut/elf2rpl/
-
-$(TARGET).elf: $(OBJ) $(HBL_ELF_OBJ) libretro_wiiu.a wiiu/link_elf.ld
-	$(LD) $(OBJ) $(HBL_ELF_OBJ) $(LDFLAGS) $(HBL_ELF_LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
-
-$(TARGET).rpx.elf: $(OBJ) $(RPX_OBJ) libretro_wiiu.a wiiu/link_elf.ld
-	$(LD) $(OBJ) $(RPX_OBJ) $(LDFLAGS) $(RPX_LDFLAGS) $(LIBDIRS)  $(LIBS) -o $@
-
-$(TARGET).rpx: $(TARGET).rpx.elf $(ELF2RPL)
-	-$(ELF2RPL) $(TARGET).rpx.elf $@
-
-clean:
-	rm -f $(OBJ) $(RPX_OBJ) $(HBL_ELF_OBJ) $(TARGET).elf $(TARGET).rpx.elf $(TARGET).rpx
-	rm -f $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
-
-.PHONY: clean all
-.PRECIOUS: %.depend
-
-include $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
-
@@ -5,7 +5,6 @@ HAVE_XAUDIO = 1
 HAVE_DSOUND = 1
 HAVE_WASAPI = 1
 HAVE_OPENGL = 1
-HAVE_FBO = 1
 HAVE_DYLIB = 1
 HAVE_D3D9 = 1
 HAVE_NETWORKING = 1
@@ -122,8 +121,8 @@ else
   CXXFLAGS += -O3 -ffast-math
 endif

-CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I.
-CXXFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -std=c++98 -D__STDC_CONSTANT_MACROS
+CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps 
+CXXFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps -std=c++98 -D__STDC_CONSTANT_MACROS
 ifeq ($(CXX_BUILD), 1)
   CFLAGS += -std=c++98 -xc++ -D__STDC_CONSTANT_MACROS
 else
@@ -8,6 +8,12 @@ Popular examples of implementations for this API includes videogame system emula
 more generalized 3D programs.
 These programs are instantiated as dynamic libraries. We refer to these as "libretro cores".

+![XMB menu driver](http://i.imgur.com/BMR1xxr.png "XMB menu driver")
+
+![rgui menu driver](http://i.imgur.com/X3CbBKa.png "rgui menu driver")
+
+![glui menu driver](http://i.imgur.com/ooqv8rw.png "glui menu driver")
+
 ## libretro

 [libretro](http://libretro.com) is an API that exposes generic audio/video/input callbacks.
@@ -30,13 +36,16 @@ or visit our IRC channel: #retroarch @ irc.freenode.org.

 ## Documentation

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

 ## Related projects

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

 ## Philosophy

@@ -52,13 +61,27 @@ RetroArch also emphasizes on being easy to integrate into various launcher front

 ## Platforms

-RetroArch has been ported to the following platforms outside PC:
+RetroArch has been ported to the following platforms:

+   - DOS
+   - Windows
+   - Linux
+   - Emscripten
+   - FreeBSD
+   - NetBSD
+   - OpenBSD
+   - Haiku
+   - Solaris
+   - MacOS X
   - PlayStation 3
-   - Xbox 360 (Libxenon/XeXDK)
-   - Xbox 1
-   - Wii, Gamecube (Libogc)
+   - PlayStation Portable
+   - PlayStation Vita
+   - Original Microsoft Xbox
+   - Microsoft Xbox 360 (Libxenon/XeXDK)
+   - Nintendo Wii, GameCube (Libogc)
+   - Nintendo WiiU
   - Nintendo 3DS
+   - Nintendo Switch
   - Raspberry Pi
   - Android
   - iOS
@@ -119,94 +142,5 @@ Users only need to configure a certain option if the desired value deviates from
 To configure joypads, use the built-in menu or the `retroarch-joyconfig` command-line tool.

 ## Compiling and installing
-**Linux**

- Prerequisites:
-```bash
-sudo apt-get install -y make git-core curl g++ pkg-config libglu1-mesa-dev freeglut3-dev mesa-common-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev
-```
- Compiling:
-```bash
-./configure
-make
-```
-
-**Mac**
-
- Prerequisites: [XCode](https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CB4QFjAA&url=https%3A%2F%2Fitunes.apple.com%2Fus%2Fapp%2Fxcode%2Fid497799835%3Fmt%3D12&ei=ZmfeVNPtIILVoASBnoCYBw&usg=AFQjCNGrxKmVtXUdvUU3MhqZhP4MHT6Gtg&sig2=RIXKsWQ79YTQBt_lK5fdKA&bvm=bv.85970519,d.cGU), [Cg](https://developer.nvidia.com/cg-toolkit-download).
- You can open the project (**pkg/apple/RetroArch.xcodeproj**) in the Xcode IDE and build (**&#8984;-B**) and run (**&#8984;-R**) it there. Or you can use the command line...
- Debug:
-```bash
-# Build
-xcodebuild -target RetroArch -configuration Debug -project pkg/apple/RetroArch.xcodeproj
-# Run
-open ./pkg/apple/build/Debug/RetroArch.app/
-```
- Release:
-```bash
-# Build
-xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
-# Run
-open ./pkg/apple/build/Release/RetroArch.app/
-```
-
-**PC**
-
-Instructions for compiling on PC can be found in the [wiki](https://github.com/Themaister/RetroArch/wiki).
-
-**PlayStation 3**
-
-RetroArch PS3 needs to be compiled in the following order:
-
-1) Compile RetroArch Salamander
-
-    make -f Makefile.ps3.salamander
-
-2) Finally, compile RetroArch packed together with the GUI:
-
-    make -f Makefile.ps3
-
-**PlayStation 3 - Creating a PKG installable file**
-
-You can add `pkg` as a parameter in order to make a PKG file - for example:
-
-    make -f Makefile.ps3 pkg
-
-This creates an NPDRM package. This can be installed on debug PS3s.
-
-To make a non-NPDRM package that can be installed on a jailbroken/CFW PS3 (such as PSGroove or PS3 CFWs and other 3.55 CFW derivatives), do:
-
-    make -f Makefile.ps3 pkg-signed
-
-If you're using Kmeaw 3.55 firmware, the package needs to be signed:
-
-    make -f Makefile.ps3 pkg-signed-cfw
-
-NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch PS3. This file needs to be called ***`libretro_ps3.a`***.
-
-**Xbox 360 (XeXDK)**
-
-You will need Microsoft Visual Studio 2010 installed (or higher) in order to compile RetroArch 360.
-
-The solution file can be found at the following location:
-
-    pkg/msvc-360/RetroArch-360.sln
-
-NOTE: A pre-existing libretro library needs to be present in the `pkg/msvc-360/RetroArch-360/Release` directory in order to link RetroArch 360. This file needs to be
-called ***`libretro_xdk360.lib`***.
-
-**Xbox 360 (Libxenon)**
-
-You will need to have the libxenon libraries and a working Devkit Xenon toolchain installed in order to compile RetroArch 360 Libxenon.
-
-    make -f Makefile.xenon
-
-NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch 360 Libxenon. This file needs to be called ***`libretro_xenon360.a`***.
-
-**Wii**
-
-You will need to have the libogc libraries and a working Devkit PPC toolchain installed in order to compile RetroArch Wii.
-
-    make -f Makefile.griffin platform=wii
-
-NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch Wii. This file needs to be called ***`libretro_wii.a`***.
+Instructions for compiling and installing RetroArch can be found in the [Libretro/RetroArch Documentation Center](https://docs.libretro.com/).
@@ -1,7 +1,7 @@
 /*  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.
@@ -21,7 +21,6 @@
 #include <lists/string_list.h>
 #include <audio/conversion/float_to_s16.h>
 #include <audio/conversion/s16_to_float.h>
-#include <audio/audio_resampler.h>
 #include <audio/dsp_filter.h>
 #include <file/file_path.h>
 #include <lists/dir_list.h>
@@ -111,10 +110,13 @@ static const audio_driver_t *audio_drivers[] = {
 #endif
 #if defined(PSP) || defined(VITA)
  &audio_psp,
-#endif   
+#endif
 #ifdef _3DS
   &audio_ctr_csnd,
   &audio_ctr_dsp,
+#endif
+#ifdef SWITCH
+   &audio_switch,
 #endif
   &audio_null,
   NULL,
@@ -144,13 +146,15 @@ static size_t audio_driver_rewind_size                   = 0;
 static int16_t *audio_driver_rewind_buf                  = NULL;
 static int16_t *audio_driver_output_samples_conv_buf     = NULL;

+#ifdef DEBUG
 static unsigned audio_driver_free_samples_buf[AUDIO_BUFFER_FREE_SAMPLES_COUNT];
 static uint64_t audio_driver_free_samples_count          = 0;
+#endif

 static size_t audio_driver_buffer_size                   = 0;
 static size_t audio_driver_data_ptr                      = 0;

-static bool audio_driver_control                         = false; 
+static bool audio_driver_control                         = false;
 static bool audio_driver_mixer_mute_enable               = false;
 static bool audio_driver_mute_enable                     = false;
 static bool audio_driver_use_float                       = false;
@@ -179,6 +183,17 @@ static void *audio_driver_resampler_data                 = NULL;
 static const audio_driver_t *current_audio               = NULL;
 static void *audio_driver_context_audio_data             = NULL;

+enum resampler_quality audio_driver_get_resampler_quality(void)
+{
+   settings_t *settings = config_get_ptr();
+
+   if (!settings)
+      return RESAMPLER_QUALITY_DONTCARE;
+
+   return (enum resampler_quality)settings->uints.audio_resampler_quality;
+}
+
+#ifdef DEBUG
 /**
 * compute_audio_buffer_statistics:
 *
@@ -212,10 +227,22 @@ static void compute_audio_buffer_statistics(void)
      accum_var += diff * diff;
   }

+#ifdef WARPUP
+   /* uint64 to double not implemented, fair chance signed int64 to double doesn't exist either */
+   /* https://forums.libretro.com/t/unsupported-platform-help/13903/ */
+   (void)stddev; (void)avg_filled; (void)deviation;
+#elif defined(_MSC_VER) && _MSC_VER <= 1200
+   /* FIXME: error C2520: conversion from unsigned __int64 to double not implemented, use signed __int64 */
+   (void)stddev; (void)avg_filled; (void)deviation;
+#else
   stddev          = (unsigned)sqrt((double)accum_var / (samples - 2));
   avg_filled      = 1.0f - (float)avg / audio_driver_buffer_size;
   deviation       = (float)stddev / audio_driver_buffer_size;

+   RARCH_LOG("[Audio]: Average audio buffer saturation: %.2f %%, standard deviation (percentage points): %.2f %%.\n",
+         avg_filled * 100.0, deviation * 100.0);
+#endif
+
   low_water_size  = (unsigned)(audio_driver_buffer_size * 3 / 4);
   high_water_size = (unsigned)(audio_driver_buffer_size     / 4);

@@ -227,12 +254,11 @@ static void compute_audio_buffer_statistics(void)
         high_water_count++;
   }

-   RARCH_LOG("[Audio]: Average audio buffer saturation: %.2f %%, standard deviation (percentage points): %.2f %%.\n",
-         avg_filled * 100.0, deviation * 100.0);
   RARCH_LOG("[Audio]: Amount of time spent close to underrun: %.2f %%. Close to blocking: %.2f %%.\n",
         (100.0 * low_water_count) / (samples - 1),
         (100.0 * high_water_count) / (samples - 1));
 }
+#endif

 /**
 * audio_driver_find_handle:
@@ -317,7 +343,9 @@ static bool audio_driver_deinit_internal(void)

   command_event(CMD_EVENT_DSP_FILTER_DEINIT, NULL);

+#ifdef DEBUG
   compute_audio_buffer_statistics();
+#endif

   return true;
 }
@@ -332,13 +360,13 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
   size_t max_bufsamples = AUDIO_CHUNK_SIZE_NONBLOCKING * 2;
   settings_t *settings  = config_get_ptr();
   /* Accomodate rewind since at some point we might have two full buffers. */
-   size_t outsamples_max = AUDIO_CHUNK_SIZE_NONBLOCKING * 2 * AUDIO_MAX_RATIO * 
+   size_t outsamples_max = AUDIO_CHUNK_SIZE_NONBLOCKING * 2 * AUDIO_MAX_RATIO *
      settings->floats.slowmotion_ratio;

   convert_s16_to_float_init_simd();
   convert_float_to_s16_init_simd();

-   conv_buf = (int16_t*)malloc(outsamples_max 
+   conv_buf = (int16_t*)malloc(outsamples_max
         * sizeof(int16_t));
   /* Used for recording even if audio isn't enabled. */
   retro_assert(conv_buf != NULL);
@@ -376,9 +404,9 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
      if (!audio_init_thread(
               &current_audio,
               &audio_driver_context_audio_data,
-               *settings->arrays.audio_device 
+               *settings->arrays.audio_device
               ? settings->arrays.audio_device : NULL,
-               settings->uints.audio_out_rate, &new_rate, 
+               settings->uints.audio_out_rate, &new_rate,
               settings->uints.audio_latency,
               settings->uints.audio_block_frames,
               current_audio))
@@ -390,7 +418,7 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
   else
 #endif
   {
-      audio_driver_context_audio_data = 
+      audio_driver_context_audio_data =
         current_audio->init(*settings->arrays.audio_device ?
               settings->arrays.audio_device : NULL,
               settings->uints.audio_out_rate,
@@ -411,7 +439,7 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
   }

   audio_driver_use_float = false;
-   if (     audio_driver_active 
+   if (     audio_driver_active
         && current_audio->use_float(audio_driver_context_audio_data))
      audio_driver_use_float = true;

@@ -436,6 +464,7 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
            &audio_driver_resampler_data,
            &audio_driver_resampler,
            settings->arrays.audio_resampler,
+            audio_driver_get_resampler_quality(),
            audio_source_ratio_original))
   {
      RARCH_ERR("Failed to initialize resampler \"%s\".\n",
@@ -467,7 +496,7 @@ static bool audio_driver_init_internal(bool audio_cb_inited)

   if (
         !audio_cb_inited
-         && audio_driver_active 
+         && audio_driver_active
         && settings->bools.audio_rate_control
         )
   {
@@ -475,7 +504,7 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
       * and buffer_size to be implemented. */
      if (current_audio->buffer_size)
      {
-         audio_driver_buffer_size = 
+         audio_driver_buffer_size =
            current_audio->buffer_size(audio_driver_context_audio_data);
         audio_driver_control = true;
      }
@@ -485,7 +514,9 @@ static bool audio_driver_init_internal(bool audio_cb_inited)

   command_event(CMD_EVENT_DSP_FILTER_INIT, NULL);

+#ifdef DEBUG
   audio_driver_free_samples_count = 0;
+#endif

   audio_mixer_init(settings->uints.audio_out_rate);

@@ -513,8 +544,8 @@ void audio_driver_set_nonblocking_state(bool enable)
            audio_driver_context_audio_data,
            settings->bools.audio_sync ? enable : true);

-   audio_driver_chunk_size = enable ? 
-      audio_driver_chunk_nonblock_size : 
+   audio_driver_chunk_size = enable ?
+      audio_driver_chunk_nonblock_size :
      audio_driver_chunk_block_size;
 }

@@ -525,11 +556,8 @@ void audio_driver_set_nonblocking_state(bool enable)
 *
 * Writes audio samples to audio driver. Will first
 * perform DSP processing (if enabled) and resampling.
- *
- * Returns: true (1) if audio samples were written to the audio
- * driver, false (0) in case of an error.
 **/
-static bool audio_driver_flush(const int16_t *data, size_t samples)
+static void audio_driver_flush(const int16_t *data, size_t samples)
 {
   struct resampler_data src_data;
   bool is_perfcnt_enable                               = false;
@@ -538,7 +566,7 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
   bool is_slowmotion                                   = false;
   const void *output_data                              = NULL;
   unsigned output_frames                               = 0;
-   float audio_volume_gain                              = !audio_driver_mute_enable ? 
+   float audio_volume_gain                              = !audio_driver_mute_enable ?
      audio_driver_volume_gain : 0.0f;

   src_data.data_in                                     = NULL;
@@ -553,10 +581,11 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
   runloop_get_status(&is_paused, &is_idle, &is_slowmotion,
         &is_perfcnt_enable);

-   if (is_paused)
-      return true;
-   if (!audio_driver_active || !audio_driver_input_data)
-      return false;
+   if (            is_paused                || 
+		   !audio_driver_active     || 
+		   !audio_driver_input_data ||
+		   !audio_driver_output_samples_buf)
+      return;

   convert_s16_to_float(audio_driver_input_data, data, samples,
         audio_volume_gain);
@@ -591,29 +620,31 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
   if (audio_driver_control)
   {
      /* Readjust the audio input rate. */
-      unsigned write_idx   = audio_driver_free_samples_count++ &
-         (AUDIO_BUFFER_FREE_SAMPLES_COUNT - 1);
      int      half_size   = (int)(audio_driver_buffer_size / 2);
-      int      avail       = 
+      int      avail       =
         (int)current_audio->write_avail(audio_driver_context_audio_data);
      int      delta_mid   = avail - half_size;
      double   direction   = (double)delta_mid / half_size;
      double   adjust      = 1.0 + audio_driver_rate_control_delta * direction;
-
-#if 0
-      RARCH_LOG_OUTPUT("[Audio]: Audio buffer is %u%% full\n",
-            (unsigned)(100 - (avail * 100) / audio_driver_buffer_size));
-#endif
+#ifdef DEBUG
+      unsigned write_idx   = audio_driver_free_samples_count++ &
+         (AUDIO_BUFFER_FREE_SAMPLES_COUNT - 1);

      audio_driver_free_samples_buf
         [write_idx]               = avail;
-      audio_source_ratio_current   = 
+#endif
+      audio_source_ratio_current   =
         audio_source_ratio_original * adjust;

 #if 0
-      RARCH_LOG_OUTPUT("[Audio]: New rate: %lf, Orig rate: %lf\n",
-            audio_source_ratio_current,
-            audio_source_ratio_original);
+      if (verbosity_is_enabled())
+      {
+         RARCH_LOG_OUTPUT("[Audio]: Audio buffer is %u%% full\n",
+               (unsigned)(100 - (avail * 100) / audio_driver_buffer_size));
+         RARCH_LOG_OUTPUT("[Audio]: New rate: %lf, Orig rate: %lf\n",
+               audio_source_ratio_current,
+               audio_source_ratio_original);
+      }
 #endif
   }

@@ -629,9 +660,9 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)

   if (audio_mixer_active)
   {
-      bool override     = audio_driver_mixer_mute_enable ? true : 
+      bool override     = audio_driver_mixer_mute_enable ? true :
         (audio_driver_mixer_volume_gain != 0.0f) ? true : false;
-      float mixer_gain  = !audio_driver_mixer_mute_enable ? 
+      float mixer_gain  = !audio_driver_mixer_mute_enable ?
         audio_driver_mixer_volume_gain : 0.0f;
      audio_mixer_mix(audio_driver_output_samples_buf,
            src_data.output_frames, mixer_gain, override);
@@ -653,12 +684,7 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)

   if (current_audio->write(audio_driver_context_audio_data,
            output_data, output_frames * 2) < 0)
-   {
      audio_driver_active = false;
-      return false;
-   }
-
-   return true;
 }

 /**
@@ -676,7 +702,7 @@ void audio_driver_sample(int16_t left, int16_t right)
   if (audio_driver_data_ptr < audio_driver_chunk_size)
      return;

-   audio_driver_flush(audio_driver_output_samples_conv_buf, 
+   audio_driver_flush(audio_driver_output_samples_conv_buf,
         audio_driver_data_ptr);

   audio_driver_data_ptr = 0;
@@ -707,8 +733,8 @@ size_t audio_driver_sample_batch(const int16_t *data, size_t frames)
 * @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 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)
@@ -722,9 +748,9 @@ void audio_driver_sample_rewind(int16_t left, int16_t right)
 * @data                 : pointer to audio buffer.
 * @frames               : amount of audio frames to push.
 *
- * Batched audio sample render callback function (rewind version). 
+ * Batched audio sample render callback function (rewind version).
 *
- * This callback function will be used instead of 
+ * This callback function will be used instead of
 * audio_driver_sample_batch when rewinding is activated.
 *
 * Returns: amount of frames sampled. Will be equal to @frames
@@ -750,15 +776,14 @@ void audio_driver_dsp_filter_free(void)

 void audio_driver_dsp_filter_init(const char *device)
 {
-#if defined(HAVE_DYLIB) && !defined(HAVE_FILTERS_BUILTIN)
-   char basedir[PATH_MAX_LENGTH];
-   char ext_name[PATH_MAX_LENGTH];
-#endif
   struct string_list *plugs     = NULL;
 #if defined(HAVE_DYLIB) && !defined(HAVE_FILTERS_BUILTIN)
-   fill_pathname_basedir(basedir, device, sizeof(basedir));
+   char *basedir   = (char*)calloc(PATH_MAX_LENGTH, sizeof(*basedir));
+   char *ext_name  = (char*)calloc(PATH_MAX_LENGTH, sizeof(*ext_name));
+   size_t str_size = PATH_MAX_LENGTH * sizeof(char);
+   fill_pathname_basedir(basedir, device, str_size);

-   if (!frontend_driver_get_core_extension(ext_name, sizeof(ext_name)))
+   if (!frontend_driver_get_core_extension(ext_name, str_size))
      goto error;

   plugs = dir_list_new(basedir, ext_name, false, true, false, false);
@@ -770,9 +795,18 @@ void audio_driver_dsp_filter_init(const char *device)
   if (!audio_driver_dsp)
      goto error;

+#if defined(HAVE_DYLIB) && !defined(HAVE_FILTERS_BUILTIN)
+   free(basedir);
+   free(ext_name);
+#endif
+
   return;

 error:
+#if defined(HAVE_DYLIB) && !defined(HAVE_FILTERS_BUILTIN)
+   free(basedir);
+   free(ext_name);
+#endif
   if (!audio_driver_dsp)
      RARCH_ERR("[DSP]: Failed to initialize DSP filter \"%s\".\n", device);
 }
@@ -789,9 +823,9 @@ void audio_driver_monitor_adjust_system_rates(void)
   struct retro_system_av_info   *av_info = video_viewport_get_system_av_info();
   float video_refresh_rate               = settings->floats.video_refresh_rate;
   float max_timing_skew                  = settings->floats.audio_max_timing_skew;
-   const struct retro_system_timing *info = av_info ? 
+   const struct retro_system_timing *info = av_info ?
      (const struct retro_system_timing*)&av_info->timing : NULL;
-   
+
   if (!info || info->sample_rate <= 0.0)
      return;

@@ -841,13 +875,16 @@ bool audio_driver_find_driver(void)
      current_audio = (const audio_driver_t*)audio_driver_find_handle(i);
   else
   {
-      unsigned d;
-      RARCH_ERR("Couldn't find any audio driver named \"%s\"\n",
-            settings->arrays.audio_driver);
-      RARCH_LOG_OUTPUT("Available audio drivers are:\n");
-      for (d = 0; audio_driver_find_handle(d); d++)
-         RARCH_LOG_OUTPUT("\t%s\n", audio_driver_find_ident(d));
-      RARCH_WARN("Going to default to first audio driver...\n");
+      if (verbosity_is_enabled())
+      {
+         unsigned d;
+         RARCH_ERR("Couldn't find any audio driver named \"%s\"\n",
+               settings->arrays.audio_driver);
+         RARCH_LOG_OUTPUT("Available audio drivers are:\n");
+         for (d = 0; audio_driver_find_handle(d); d++)
+            RARCH_LOG_OUTPUT("\t%s\n", audio_driver_find_ident(d));
+         RARCH_WARN("Going to default to first audio driver...\n");
+      }

      current_audio = (const audio_driver_t*)audio_driver_find_handle(0);

@@ -871,7 +908,7 @@ bool audio_driver_free_devices_list(void)
   if (!current_audio || !current_audio->device_list_free
         || !audio_driver_context_audio_data)
      return false;
-   current_audio->device_list_free(audio_driver_context_audio_data, 
+   current_audio->device_list_free(audio_driver_context_audio_data,
         audio_driver_devices_list);
   audio_driver_devices_list = NULL;
   return true;
@@ -914,6 +951,11 @@ bool audio_driver_mixer_extension_supported(const char *ext)

 #ifdef HAVE_STB_VORBIS
   string_list_append(str_list, "ogg", attr);
+#endif
+#ifdef HAVE_IBXM
+   string_list_append(str_list, "mod", attr);
+   string_list_append(str_list, "s3m", attr);
+   string_list_append(str_list, "xm", attr);
 #endif
   string_list_append(str_list, "wav", attr);

@@ -945,7 +987,8 @@ static int audio_mixer_find_index(audio_mixer_sound_t *sound)
   return -1;
 }

-static void audio_mixer_play_stop_cb(audio_mixer_sound_t *sound, unsigned reason)
+static void audio_mixer_play_stop_cb(
+      audio_mixer_sound_t *sound, unsigned reason)
 {
   int idx = audio_mixer_find_index(sound);

@@ -986,7 +1029,7 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
   audio_mixer_stop_cb_t stop_cb = audio_mixer_play_stop_cb;
   bool looped                   = false;
   void *buf                     = NULL;
-   
+
   if (audio_mixer_current_max_idx >= AUDIO_MIXER_MAX_STREAMS)
      return false;

@@ -1008,6 +1051,9 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
      case AUDIO_MIXER_TYPE_OGG:
         handle = audio_mixer_load_ogg(buf, (int32_t)params->bufsize);
         break;
+      case AUDIO_MIXER_TYPE_MOD:
+         handle = audio_mixer_load_mod(buf, (int32_t)params->bufsize);
+         break;
      case AUDIO_MIXER_TYPE_NONE:
         free(buf);
         return false;
@@ -1112,7 +1158,7 @@ bool audio_driver_set_callback(const void *data)
 bool audio_driver_enable_callback(void)
 {
   if (!audio_callback.callback)
-      return false; 
+      return false;
   if (audio_callback.set_state)
      audio_callback.set_state(true);
   return true;
@@ -1132,7 +1178,7 @@ bool audio_driver_disable_callback(void)
 void audio_driver_monitor_set_rate(void)
 {
   settings_t *settings = config_get_ptr();
-   double new_src_ratio = (double)settings->uints.audio_out_rate / 
+   double new_src_ratio = (double)settings->uints.audio_out_rate /
      audio_driver_input;

   audio_source_ratio_original = new_src_ratio;
@@ -1152,7 +1198,9 @@ bool audio_driver_callback(void)

 bool audio_driver_has_callback(void)
 {
-   return audio_callback.callback;
+   if (audio_callback.callback)
+	   return true;
+   return false;
 }

 bool audio_driver_toggle_mute(void)
@@ -1169,8 +1217,8 @@ bool audio_driver_mixer_toggle_mute(void)

 static INLINE bool audio_driver_alive(void)
 {
-   if (     current_audio 
-         && current_audio->alive 
+   if (     current_audio
+         && current_audio->alive
         && audio_driver_context_audio_data)
      return current_audio->alive(audio_driver_context_audio_data);
   return false;
@@ -1178,7 +1226,7 @@ static INLINE bool audio_driver_alive(void)

 bool audio_driver_start(bool is_shutdown)
 {
-   if (!current_audio || !current_audio->start 
+   if (!current_audio || !current_audio->start
         || !audio_driver_context_audio_data)
      goto error;
   if (!current_audio->start(audio_driver_context_audio_data, is_shutdown))
@@ -1196,7 +1244,7 @@ error:

 bool audio_driver_stop(void)
 {
-   if (!current_audio || !current_audio->stop 
+   if (!current_audio || !current_audio->stop
         || !audio_driver_context_audio_data)
      return false;
   if (!audio_driver_alive())
@@ -1,7 +1,7 @@
 /*  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.
@@ -23,6 +23,7 @@

 #include <boolean.h>
 #include <audio/audio_mixer.h>
+#include <audio/audio_resampler.h>
 #include <retro_common_api.h>

 RETRO_BEGIN_DECLS
@@ -90,7 +91,7 @@ typedef struct audio_driver
   /* Is the audio driver currently running? */
   bool (*alive)(void *data);

-   /* Should we care about blocking in audio thread? Fast forwarding. 
+   /* 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
@@ -103,7 +104,7 @@ typedef struct audio_driver
   void (*free)(void *data);

   /* Defines if driver will take standard floating point samples,
-    * or int16_t 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
@@ -255,6 +256,8 @@ bool audio_driver_init(void);

 bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params);

+enum resampler_quality audio_driver_get_resampler_quality(void);
+
 extern audio_driver_t audio_rsound;
 extern audio_driver_t audio_oss;
 extern audio_driver_t audio_alsa;
@@ -277,6 +280,7 @@ extern audio_driver_t audio_ax;
 extern audio_driver_t audio_psp;
 extern audio_driver_t audio_ctr_csnd;
 extern audio_driver_t audio_ctr_dsp;
+extern audio_driver_t audio_switch;
 extern audio_driver_t audio_rwebaudio;
 extern audio_driver_t audio_null;

@@ -1,7 +1,7 @@
 /*  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.
@@ -56,7 +56,7 @@ static void audio_thread_loop(void *data)
      return;

   RARCH_LOG("[Audio Thread]: Initializing audio driver.\n");
-   thr->driver_data   = thr->driver->init(thr->device, thr->out_rate, thr->latency, 
+   thr->driver_data   = thr->driver->init(thr->device, thr->out_rate, thr->latency,
         thr->block_frames, thr->new_rate);
   slock_lock(thr->lock);
   thr->inited        = thr->driver_data ? 1 : -1;
@@ -68,7 +68,7 @@ static void audio_thread_loop(void *data)
   if (thr->inited < 0)
      return;

-   /* Wait until we start to avoid calling 
+   /* Wait until we start to avoid calling
    * stop immediately after initialization. */
   slock_lock(thr->lock);
   while (thr->stopped)
@@ -188,7 +188,7 @@ static bool audio_thread_stop(void *data)
   audio_thread_t *thr = (audio_thread_t*)data;

   if (!thr)
-      return false; 
+      return false;

   audio_thread_block(thr);
   thr->is_paused = true;
@@ -274,7 +274,7 @@ static const audio_driver_t audio_thread = {
 *
 * Starts a audio driver in a new thread.
 * Access to audio driver will be mediated through this driver.
- * This driver interfaces with audio callback and is 
+ * This driver interfaces with audio callback and is
 * only used in that case.
 *
 * Returns: true (1) if successful, otherwise false (0).
@@ -1,7 +1,7 @@
 /*  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.
@@ -1,7 +1,7 @@
 /*  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.
@@ -121,7 +121,7 @@ static void *alsa_init(const char *device, unsigned rate, unsigned latency,
   if (snd_pcm_hw_params(alsa->pcm, params) < 0)
      goto error;

-   /* Shouldn't have to bother with this, 
+   /* Shouldn't have to bother with this,
    * but some drivers are apparently broken. */
   if (snd_pcm_hw_params_get_period_size(params, &buffer_size, NULL))
      snd_pcm_hw_params_get_period_size_min(params, &buffer_size, NULL);
@@ -370,7 +370,7 @@ static void *alsa_device_list_new(void *data)
      /* description of device IOID - input / output identifcation
       * ("Input" or "Output"), NULL means both) */

-      if (!io || (string_is_equal_fast(io, "Output", 6)))
+      if (!io || (string_is_equal(io, "Output")))
         string_list_append(s, name, attr);

      if (name)
@@ -1,7 +1,7 @@
 /*  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.
@@ -231,7 +231,7 @@ static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size)

      if (avail_write)
      {
-         memcpy(alsa->buffer[alsa->buffer_index] + 
+         memcpy(alsa->buffer[alsa->buffer_index] +
               alsa->buffer_ptr, buf, avail_write);

         alsa->buffer_ptr      += avail_write;
@@ -355,8 +355,8 @@ static void alsa_qsa_free(void *data)
 static size_t alsa_qsa_write_avail(void *data)
 {
   alsa_t *alsa = (alsa_t*)data;
-   size_t avail = (alsa->buf_count - 
-         (int)alsa->buffered_blocks - 1) * alsa->buf_size + 
+   size_t avail = (alsa->buf_count -
+         (int)alsa->buffered_blocks - 1) * alsa->buf_size +
      (alsa->buf_size - (int)alsa->buffer_ptr);
   return avail;
 }
@@ -364,7 +364,7 @@ static size_t alsa_qsa_write_avail(void *data)
 static size_t alsa_qsa_buffer_size(void *data)
 {
   alsa_t *alsa = (alsa_t*)data;
-   return alsa->buf_size * alsa->buf_count; 
+   return alsa->buf_size * alsa->buf_count;
 }

 audio_driver_t audio_alsa = {
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2012-2015 - Michael Lelli
- * 
+ *
 *  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.
@@ -77,7 +77,7 @@ static void alsa_worker_thread(void *data)

      frames = snd_pcm_writei(alsa->pcm, buf, alsa->period_frames);

-      if (frames == -EPIPE || frames == -EINTR || 
+      if (frames == -EPIPE || frames == -EINTR ||
            frames == -ESTRPIPE)
      {
         if (snd_pcm_recover(alsa->pcm, frames, 1) < 0)
@@ -192,7 +192,7 @@ static void *alsa_thread_init(const char *device,

   TRY_ALSA(snd_pcm_hw_params(alsa->pcm, params));

-   /* Shouldn't have to bother with this, 
+   /* Shouldn't have to bother with this,
    * but some drivers are apparently broken. */
   if (snd_pcm_hw_params_get_period_size(params, &alsa->period_frames, NULL))
      snd_pcm_hw_params_get_period_size_min(
@@ -370,7 +370,7 @@ static void *alsa_device_list_new(void *data)
      /* description of device IOID - input / output identifcation
       * ("Input" or "Output"), NULL means both) */

-      if (!io || (string_is_equal_fast(io,"Output", 6)))
+      if (!io || string_is_equal(io,"Output"))
         string_list_append(s, name, attr);

      if (name)
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2014 - Chris Moeller
- * 
+ *
 *  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.
@@ -112,7 +112,7 @@ static OSStatus audio_write_cb(void *userdata,
      slock_unlock(dev->lock);

      /* Technically possible to deadlock without. */
-      scond_signal(dev->cond); 
+      scond_signal(dev->cond);
      return noErr;
   }

@@ -169,10 +169,10 @@ static void choose_output_device(coreaudio_t *dev, const char* device)
      size           = 1024;

      if (AudioObjectGetPropertyData(devices[i],
-               &propaddr, 0, 0, &size, device_name) == noErr 
+               &propaddr, 0, 0, &size, device_name) == noErr
            && string_is_equal(device_name, device))
      {
-         AudioUnitSetProperty(dev->dev, kAudioOutputUnitProperty_CurrentDevice, 
+         AudioUnitSetProperty(dev->dev, kAudioOutputUnitProperty_CurrentDevice,
               kAudioUnitScope_Global, 0, &devices[i], sizeof(AudioDeviceID));
         goto done;
      }
@@ -244,7 +244,7 @@ static void *coreaudio_init(const char *device,
 #endif
   if (comp == NULL)
      goto error;
-   
+
 #if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
   component_unavailable = (OpenAComponent(comp, &dev->dev) != noErr);
 #else
@@ -269,17 +269,17 @@ static void *coreaudio_init(const char *device,
   stream_desc.mBytesPerFrame    = 2 * sizeof(float);
   stream_desc.mFramesPerPacket  = 1;
   stream_desc.mFormatID         = kAudioFormatLinearPCM;
-   stream_desc.mFormatFlags      = kAudioFormatFlagIsFloat | 
-      kAudioFormatFlagIsPacked | (is_little_endian() ? 
+   stream_desc.mFormatFlags      = kAudioFormatFlagIsFloat |
+      kAudioFormatFlagIsPacked | (is_little_endian() ?
            0 : kAudioFormatFlagIsBigEndian);
-   
+
   if (AudioUnitSetProperty(dev->dev, kAudioUnitProperty_StreamFormat,
         kAudioUnitScope_Input, 0, &stream_desc, sizeof(stream_desc)) != noErr)
      goto error;
-   
+
   /* Check returned audio format. */
   i_size = sizeof(real_desc);
-   if (AudioUnitGetProperty(dev->dev, kAudioUnitProperty_StreamFormat, 
+   if (AudioUnitGetProperty(dev->dev, kAudioUnitProperty_StreamFormat,
            kAudioUnitScope_Input, 0, &real_desc, &i_size) != noErr)
      goto error;

@@ -49,7 +49,7 @@ typedef struct
 static void ctr_csnd_audio_update_playpos(ctr_csnd_audio_t* ctr)
 {
   uint64_t current_tick   = svcGetSystemTick();
-   uint32_t samples_played = (current_tick - ctr->cpu_ticks_last) 
+   uint32_t samples_played = (current_tick - ctr->cpu_ticks_last)
      / CTR_CSND_CPU_TICKS_PER_SAMPLE;

   ctr->playpos   = (ctr->playpos + samples_played) & CTR_CSND_AUDIO_COUNT_MASK;
@@ -94,7 +94,7 @@ Result csndPlaySound_custom(int chn, u32 flags, float vol, float pan,

 	if (loopMode == CSND_LOOPMODE_NORMAL && paddr1 > paddr0)
 	{
-		/* Now that the first block is playing, 
+		/* Now that the first block is playing,
       * configure the size of the subsequent blocks */
 		size -= paddr1 - paddr0;
 		CSND_SetBlock(chn, 1, paddr1, size);
@@ -209,7 +209,7 @@ static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size)
 }

 static bool ctr_csnd_audio_stop(void *data)
-{   
+{
   ctr_csnd_audio_t* ctr = (ctr_csnd_audio_t*)data;

   /* using SetPlayState would make tracking the playback
@@ -1,7 +1,7 @@
 /*  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.
@@ -21,8 +21,8 @@

 #ifndef _XBOX
 #include <windows.h>
-#include <mmreg.h>
 #include <mmsystem.h>
+#include <mmreg.h>
 #endif

 #include <dsound.h>
@@ -93,7 +93,7 @@ static INLINE bool grab_region(dsound_t *ds, uint32_t write_ptr,
      struct audio_lock *region)
 {
   const char *err = NULL;
-   HRESULT     res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE, 
+   HRESULT     res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE,
         &region->chunk1, &region->size1, &region->chunk2, &region->size2, 0);

   if (res == DSERR_BUFFERLOST)
@@ -152,7 +152,7 @@ static void dsound_thread(void *data)
      struct audio_lock region;
      DWORD read_ptr, avail, fifo_avail;
      get_positions(ds, &read_ptr, NULL);
-      
+
      avail = write_avail(read_ptr, write_ptr, ds->buffer_size);

      EnterCriticalSection(&ds->crit);
@@ -161,12 +161,12 @@ static void dsound_thread(void *data)

      if (avail < CHUNK_SIZE || ((fifo_avail < CHUNK_SIZE) && (avail < ds->buffer_size / 2)))
      {
-         /* No space to write, or we don't have data in our fifo, 
+         /* No space to write, or we don't have data in our fifo,
          * but we can wait some time before it underruns ... */


         /* We could opt for using the notification interface,
-          * but it is not guaranteed to work, so use high 
+          * but it is not guaranteed to work, so use high
          * priority sleeping patterns.
          */
         retro_sleep(1);
@@ -182,7 +182,7 @@ static void dsound_thread(void *data)

      if (fifo_avail < CHUNK_SIZE)
      {
-         /* Got space to write, but nothing in FIFO (underrun), 
+         /* Got space to write, but nothing in FIFO (underrun),
          * fill block with silence. */

         memset(region.chunk1, 0, region.size1);
@@ -191,7 +191,7 @@ static void dsound_thread(void *data)
         release_region(ds, &region);
         write_ptr = (write_ptr + region.size1 + region.size2) % ds->buffer_size;
      }
-      else 
+      else
      {
         /* All is good. Pull from it and notify FIFO. */

@@ -322,7 +322,11 @@ static void *dsound_init(const char *device, unsigned rate, unsigned latency,

   RARCH_LOG("DirectSound devices:\n");
 #ifndef _XBOX
-   DirectSoundEnumerate(enumerate_cb, &dev);
+#ifdef UNICODE
+   DirectSoundEnumerate((LPDSENUMCALLBACKW)enumerate_cb, &dev);
+#else
+   DirectSoundEnumerate((LPDSENUMCALLBACKA)enumerate_cb, &dev);
+#endif
 #endif

   if (DirectSoundCreate(dev.guid, &ds->ds, NULL) != DS_OK)
@@ -1,7 +1,7 @@
 /*  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.
@@ -129,9 +129,9 @@ static ssize_t gx_audio_write(void *data, const void *buf_, size_t size)
      if (frames < to_write)
         to_write = frames;

-      /* FIXME: Nonblocking audio should break out of loop 
+      /* FIXME: Nonblocking audio should break out of loop
       * when it has nothing to write. */
-      while ((wa->dma_write == wa->dma_next || 
+      while ((wa->dma_write == wa->dma_next ||
               wa->dma_write == wa->dma_busy) && !wa->nonblock)
         OSSleepThread(wa->cond);

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- * 
+ *
 *  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.
@@ -181,7 +181,7 @@ static void *ja_init(const char *device, unsigned rate, unsigned latency,
      RARCH_ERR("[JACK]: Failed to register ports.\n");
      goto error;
   }
-   
+
   jports = jack_get_ports(jd->client, NULL, NULL, JackPortIsPhysical | JackPortIsInput);
   if (jports == NULL)
   {
@@ -222,7 +222,7 @@ static void *ja_init(const char *device, unsigned rate, unsigned latency,

   for (i = 0; i < parsed; i++)
      free(dest_ports[i]);
-  
+
   jack_free(jports);
   return jd;

@@ -1,7 +1,7 @@
 /*  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.
@@ -1,7 +1,7 @@
 /*  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.
@@ -1,7 +1,7 @@
 /*  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.
@@ -200,7 +200,7 @@ error:
 static bool sl_stop(void *data)
 {
   sl_t      *sl = (sl_t*)data;
-   sl->is_paused = (SLPlayItf_SetPlayState(sl->player, SL_PLAYSTATE_STOPPED) 
+   sl->is_paused = (SLPlayItf_SetPlayState(sl->player, SL_PLAYSTATE_STOPPED)
         == SL_RESULT_SUCCESS) ? true : false;

   return sl->is_paused ? true : false;
@@ -1,7 +1,7 @@
 /*  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.
@@ -51,7 +51,7 @@ static void *oss_init(const char *device, unsigned rate, unsigned latency,
   int frags, frag, channels, format, new_rate;
   int              *fd   = (int*)calloc(1, sizeof(int));
   const char *oss_device = device ? device : DEFAULT_OSS_DEV;
-   
+
   if (!fd)
      return NULL;

@@ -1,7 +1,7 @@
 /*  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.
@@ -110,11 +110,11 @@ static void *ps3_audio_init(const char *device,
      return NULL;
   }

-   data->buffer = fifo_new(CELL_AUDIO_BLOCK_SAMPLES * 
+   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"};
@@ -20,6 +20,9 @@
 #include <stdio.h>
 #include <string.h>

+#include <rthreads/rthreads.h>
+#include <queues/fifo_queue.h>
+
 #ifdef VITA
 #include <psp2/kernel/processmgr.h>
 #include <psp2/kernel/threadmgr.h>
@@ -46,27 +49,21 @@ typedef struct psp_audio
   volatile uint16_t read_pos;
   volatile uint16_t write_pos;

-#ifdef VITA
-   char lock[32] __attribute__ ((aligned (8)));
-   char cond_lock[32] __attribute__ ((aligned (8)));
-   char cond[32] __attribute__ ((aligned (8)));
-#endif
+   sthread_t *worker_thread;
+   slock_t *fifo_lock;
+   scond_t *cond;
+   slock_t *cond_lock;
+
 } psp_audio_t;

 #define AUDIO_OUT_COUNT 512u
 #define AUDIO_BUFFER_SIZE (1u<<13u)
 #define AUDIO_BUFFER_SIZE_MASK (AUDIO_BUFFER_SIZE-1)

-#ifdef VITA
-#define PSP_THREAD_STOPPED SCE_THREAD_STOPPED
-#else
-#define SceKernelThreadInfo SceKernelThreadRunStatus
-#define sceKernelGetThreadInfo sceKernelReferThreadRunStatus
-#endif
-
-static int audioMainLoop(SceSize args, void* argp)
+static void audioMainLoop(void *data)
 {
-   psp_audio_t* psp = *((psp_audio_t**)argp);
+   psp_audio_t* psp = (psp_audio_t*)data;
+
 #ifdef VITA
   int port         = sceAudioOutOpenPort(
         SCE_AUDIO_OUT_PORT_TYPE_MAIN, AUDIO_OUT_COUNT,
@@ -81,17 +78,11 @@ static int audioMainLoop(SceSize args, void* argp)
      uint16_t read_pos   = psp->read_pos;
      uint16_t read_pos_2 = psp->read_pos;

-#ifdef VITA
-      sceKernelLockLwMutex((struct SceKernelLwMutexWork*)&psp->lock, 1, 0);
-#endif
+      slock_lock(psp->fifo_lock);

      cond                = ((uint16_t)(psp->write_pos - read_pos) & AUDIO_BUFFER_SIZE_MASK)
            < (AUDIO_OUT_COUNT * 2);

-#ifndef VITA
-      sceAudioSRCOutputBlocking(PSP_AUDIO_VOLUME_MAX, cond ? (psp->zeroBuffer)
-            : (psp->buffer + read_pos));
-#endif
      if (!cond)
      {
         read_pos      += AUDIO_OUT_COUNT;
@@ -99,13 +90,18 @@ static int audioMainLoop(SceSize args, void* argp)
         psp->read_pos  = read_pos;
      }

-#ifdef VITA
-      sceKernelUnlockLwMutex((struct SceKernelLwMutexWork*)&psp->lock, 1);
-      sceKernelSignalLwCond((struct SceKernelLwCondWork*)&psp->cond);
+      slock_unlock(psp->fifo_lock);
+      slock_lock(psp->cond_lock);
+      scond_signal(psp->cond);
+      slock_unlock(psp->cond_lock);

+#ifdef VITA
      sceAudioOutOutput(port,
        cond ? (psp->zeroBuffer)
              : (psp->buffer + read_pos_2));
+#else
+      sceAudioSRCOutputBlocking(PSP_AUDIO_VOLUME_MAX, cond ? (psp->zeroBuffer)
+            : (psp->buffer + read_pos));
 #endif
   }

@@ -113,9 +109,9 @@ static int audioMainLoop(SceSize args, void* argp)
   sceAudioOutReleasePort(port);
 #else
   sceAudioSRCChRelease();
-   sceKernelExitThread(0);
 #endif
-   return 0;
+
+   return;
 }

 static void *psp_audio_init(const char *device,
@@ -131,7 +127,6 @@ static void *psp_audio_init(const char *device,
   (void)device;
   (void)latency;

-
   /* Cache aligned, not necessary but helpful. */
   psp->buffer      = (uint32_t*)
      memalign(64, AUDIO_BUFFER_SIZE * sizeof(uint32_t));
@@ -143,68 +138,67 @@ static void *psp_audio_init(const char *device,
   psp->read_pos    = 0;
   psp->write_pos   = 0;
   psp->rate        = rate;
-#if defined(VITA)

-   sceKernelCreateLwMutex((struct SceKernelLwMutexWork*)&psp->lock, "audio_get_lock", 0, 0, 0);
-   sceKernelCreateLwMutex((struct SceKernelLwMutexWork*)&psp->cond_lock, "audio_get_cond_lock", 0, 0, 0);
-   sceKernelCreateLwCond((struct SceKernelLwCondWork*)&psp->cond, "audio_get_cond", 0, (struct SceKernelLwMutexWork*)&psp->cond_lock, 0);
-   psp->thread      = sceKernelCreateThread
-      ("audioMainLoop", audioMainLoop, 0x10000100, 0x10000, 0, 0, NULL);
-#else
-   psp->thread      = sceKernelCreateThread
-      ("audioMainLoop", audioMainLoop, 0x08, 0x10000, 0, NULL);
-#endif
+   psp->fifo_lock = slock_new();
+   psp->cond_lock = slock_new();
+   psp->cond = scond_new();

   psp->nonblocking = false;
   psp->running     = true;
-   sceKernelStartThread(psp->thread, sizeof(psp_audio_t*), &psp);
+   psp->worker_thread = sthread_create(audioMainLoop, psp);

   return psp;
 }

 static void psp_audio_free(void *data)
 {
-   SceUInt timeout = 100000;
   psp_audio_t* psp = (psp_audio_t*)data;
   if(!psp)
      return;

-   psp->running    = false;
-#if defined(VITA)
-   sceKernelWaitThreadEnd(psp->thread, NULL, &timeout);
-   sceKernelDeleteLwMutex((struct SceKernelLwMutexWork*)&psp->lock);
-   sceKernelDeleteLwMutex((struct SceKernelLwMutexWork*)&psp->cond_lock);
-   sceKernelDeleteLwCond((struct SceKernelLwCondWork*)&psp->cond);
-#else
-   sceKernelWaitThreadEnd(psp->thread, &timeout);
-#endif
+   if(psp->running){
+      if (psp->worker_thread)
+      {
+            psp->running = false;
+            sthread_join(psp->worker_thread);
+      }
+      
+      if (psp->cond)
+            scond_free(psp->cond);
+      if (psp->fifo_lock)
+            slock_free(psp->fifo_lock);
+      if (psp->cond_lock)
+            slock_free(psp->cond_lock);
+   }
   free(psp->buffer);
-   sceKernelDeleteThread(psp->thread);
+   psp->worker_thread = NULL;
   free(psp->zeroBuffer);
   free(psp);
 }

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

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

-#ifdef VITA
+   slock_lock(psp->cond_lock);
   while (AUDIO_BUFFER_SIZE - ((uint16_t)
-         (psp->write_pos - psp->read_pos) & AUDIO_BUFFER_SIZE_MASK) < size)
-      sceKernelWaitLwCond((struct SceKernelLwCondWork*)&psp->cond, 0);
-
-   sceKernelLockLwMutex((struct SceKernelLwMutexWork*)&psp->lock, 1, 0);
-#endif
+      (psp->write_pos - psp->read_pos) & AUDIO_BUFFER_SIZE_MASK) < size)
+      scond_wait(psp->cond, psp->cond_lock);
+   slock_unlock(psp->cond_lock);

+   slock_lock(psp->fifo_lock);
   if((write_pos + sampleCount) > AUDIO_BUFFER_SIZE)
   {
      memcpy(psp->buffer + write_pos, buf,
@@ -220,13 +214,10 @@ static ssize_t psp_audio_write(void *data, const void *buf, size_t size)
   write_pos      &= AUDIO_BUFFER_SIZE_MASK;
   psp->write_pos  = write_pos;

-#ifdef VITA
-   sceKernelUnlockLwMutex((struct SceKernelLwMutexWork*)&psp->lock, 1);
+   slock_unlock(psp->fifo_lock);
+   return size;

-  return size;
-#else
-  return sampleCount;
-#endif
+   
 }

 static bool psp_audio_alive(void *data)
@@ -240,51 +231,32 @@ static bool psp_audio_alive(void *data)

 static bool psp_audio_stop(void *data)
 {
-   SceKernelThreadInfo info;
-   SceUInt timeout   = 100000;
   psp_audio_t* psp = (psp_audio_t*)data;

-   if(psp && !psp->running)  
+   if (psp){
+      psp->running = false;
+
+      if (!psp->worker_thread)
      return true;
-   
-   info.size = sizeof(SceKernelThreadInfo);

-   if (sceKernelGetThreadInfo(
-            psp->thread, &info) < 0) /* Error */
-      return false;
-
-   if (info.status == PSP_THREAD_STOPPED)
-      return false;
-
-   psp->running = false;
-#if defined(VITA)
-   sceKernelWaitThreadEnd(psp->thread, NULL, &timeout);
-#else
-   sceKernelWaitThreadEnd(psp->thread, &timeout);
-#endif
+      sthread_join(psp->worker_thread);
+      psp->worker_thread = NULL;
+   }
   return true;
 }

 static bool psp_audio_start(void *data, bool is_shutdown)
 {
-   SceKernelThreadInfo info;
   psp_audio_t* psp = (psp_audio_t*)data;
-   
-   if(psp && psp->running)  
+
+   if(psp && psp->running)
      return true;

-   info.size = sizeof(SceKernelThreadInfo);
-
-   if (sceKernelGetThreadInfo(
-            psp->thread, &info) < 0) /* Error */
-      return false;
-
-   if (info.status != PSP_THREAD_STOPPED)
-      return false;
-
-   psp->running = true;
-
-   sceKernelStartThread(psp->thread, sizeof(psp_audio_t*), &psp);
+   if (!psp->worker_thread)
+   {
+      psp->running = true;
+      psp->worker_thread = sthread_create(audioMainLoop, psp);
+   }

   return true;
 }
@@ -307,17 +279,12 @@ static size_t psp_write_avail(void *data)
   size_t val;
   psp_audio_t* psp = (psp_audio_t*)data;

-#ifdef VITA
-   sceKernelLockLwMutex((struct SceKernelLwMutexWork*)&psp->lock, 1, 0);
-#endif
-
+   if (!psp||!psp->running)
+      return 0;
+   slock_lock(psp->fifo_lock);
   val = AUDIO_BUFFER_SIZE - ((uint16_t)
         (psp->write_pos - psp->read_pos) & AUDIO_BUFFER_SIZE_MASK);
-
-#ifdef VITA
-   sceKernelUnlockLwMutex((struct SceKernelLwMutexWork*)&psp->lock, 1);
-#endif
-
+   slock_unlock(psp->fifo_lock);
   return val;
 }

@@ -1,7 +1,7 @@
 /*  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.
@@ -20,6 +20,7 @@
 #include <pulse/pulseaudio.h>

 #include <boolean.h>
+#include <retro_miscellaneous.h>
 #include <retro_endianness.h>

 #include "../audio_driver.h"
@@ -88,7 +89,7 @@ static void context_state_cb(pa_context *c, void *data)
   }
 }

-static void stream_state_cb(pa_stream *s, void *data) 
+static void stream_state_cb(pa_stream *s, void *data)
 {
   pa_t *pa = (pa_t*)data;

@@ -104,7 +105,7 @@ static void stream_state_cb(pa_stream *s, void *data)
   }
 }

-static void stream_request_cb(pa_stream *s, size_t length, void *data) 
+static void stream_request_cb(pa_stream *s, size_t length, void *data)
 {
   pa_t *pa = (pa_t*)data;

@@ -114,7 +115,7 @@ static void stream_request_cb(pa_stream *s, size_t length, void *data)
   pa_threaded_mainloop_signal(pa->mainloop, 0);
 }

-static void stream_latency_update_cb(pa_stream *s, void *data) 
+static void stream_latency_update_cb(pa_stream *s, void *data)
 {
   pa_t *pa = (pa_t*)data;

@@ -149,7 +150,7 @@ static void buffer_attr_cb(pa_stream *s, void *data)
 }

 static void *pulse_init(const char *device, unsigned rate,
-      unsigned latency, 
+      unsigned latency,
      unsigned block_frames,
      unsigned *new_rate)
 {
@@ -232,7 +233,7 @@ static void *pulse_init(const char *device, unsigned rate,
 unlock_error:
   pa_threaded_mainloop_unlock(pa->mainloop);
 error:
-   pulse_free(pa); 
+   pulse_free(pa);
   return NULL;
 }

@@ -1,7 +1,7 @@
 /*  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.
@@ -1,7 +1,7 @@
 /*  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.
@@ -1,6 +1,6 @@
 /*  RSound - A PCM audio client/server
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- * 
+ *
 *  RSound 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.
@@ -43,7 +43,7 @@ RETRO_BEGIN_DECLS
 #endif

 /* Feature tests */
-#define RSD_SAMPLERATE              RSD_SAMPLERATE 
+#define RSD_SAMPLERATE              RSD_SAMPLERATE
 #define RSD_CHANNELS                RSD_CHANNELS
 #define RSD_HOST                    RSD_HOST
 #define RSD_PORT                    RSD_PORT
@@ -125,7 +125,7 @@ enum rsd_settings
 /* Audio callback for rsd_set_callback. Return -1 to trigger an error in the stream. */
 typedef ssize_t (*rsd_audio_callback_t)(void *data, size_t bytes, void *userdata);

-/* Error callback. Signals caller that stream has been stopped, 
+/* Error callback. Signals caller that stream has been stopped,
 * either by audio callback returning -1 or stream was hung up. */
 typedef void (*rsd_error_callback_t)(void *userdata);

@@ -144,7 +144,7 @@ typedef struct rsound
   int conn_type;

   volatile int buffer_pointer; /* Obsolete, but kept for backwards header compatibility. */
-   size_t buffer_size; 
+   size_t buffer_size;
   fifo_buffer_t *fifo_buffer;

   volatile int thread_active;
@@ -196,13 +196,13 @@ typedef struct rsound
   rsd_set_param(rd, RSD_HOST, "foohost");
 *sets more params*
 rsd_start(rd);
- rsd_write(rd, buf, size); 
+ rsd_write(rd, buf, size);
 rsd_stop(rd);
 rsd_free(rd);
 */
 int rsd_init (rsound_t **rd);

-/* This is a simpler function that initializes an rsound struct, sets params as given, 
+/* This is a simpler function that initializes an rsound struct, sets params as given,
   and starts the stream. Should this function fail, the structure will stay uninitialized.
   Should NULL be passed in either host, port or ident, defaults will be used. */

@@ -211,29 +211,29 @@ int rsd_simple_start (rsound_t **rd, const char* host, const char* port, const c

 /* Sets params associated with an rsound_t. These options (int options) include:

-RSD_HOST: Server to connect to. Expects (char *) in param. 
-If not set, will default to environmental variable RSD_SERVER or "localhost". 
+RSD_HOST: Server to connect to. Expects (char *) in param.
+If not set, will default to environmental variable RSD_SERVER or "localhost".

-RSD_PORT: Set port. Expects (char *) in param. 
+RSD_PORT: Set port. Expects (char *) in param.
 If not set, will default to environmental variable RSD_PORT or "12345".

 RSD_CHANNELS: Set number of audio channels. Expects (int *) in param. Mandatory.

 RSD_SAMPLERATE: Set samplerate of audio stream. Expects (int *) in param. Mandatory.

-RSD_BUFSIZE: Sets internal buffersize for the stream. 
-Might be overridden if too small. 
+RSD_BUFSIZE: Sets internal buffersize for the stream.
+Might be overridden if too small.
 Expects (int *) in param. Optional.

-RSD_LATENCY: Sets maximum audio latency in milliseconds, 
-(must be used with rsd_delay_wait() or this will have no effect). 
-Most applications do not need this. 
-Might be overridden if too small. 
+RSD_LATENCY: Sets maximum audio latency in milliseconds,
+(must be used with rsd_delay_wait() or this will have no effect).
+Most applications do not need this.
+Might be overridden if too small.
 Expects (int *) in param. Optional.

-RSD_FORMAT: Sets sample format. 
-It defaults to S16_LE, so you probably will not use this. 
-Expects (int *) in param, with available values found in the format enum. 
+RSD_FORMAT: Sets sample format.
+It defaults to S16_LE, so you probably will not use this.
+Expects (int *) in param, with available values found in the format enum.
 If invalid format is given, param might be changed to reflect the sample format the library will use.

 RSD_IDENTITY: Sets an identity string associated with the client.
@@ -244,14 +244,14 @@ Will be truncated if longer than 256 bytes.

 int rsd_set_param (rsound_t *rd, enum rsd_settings option, void* param);

-/* Enables use of the callback interface. This must be set when stream is not active. 
-   When callback is active, use of the blocking interface is disabled. 
-   Only valid functions to call after rsd_start() is stopping the stream with either rsd_pause() or rsd_stop(). Calling any other function is undefined. 
-   The callback is called at regular intervals and is asynchronous, so thread safety must be ensured by the caller. 
-   If not enough data can be given to the callback, librsound will fill the rest of the callback data with silence. 
+/* Enables use of the callback interface. This must be set when stream is not active.
+   When callback is active, use of the blocking interface is disabled.
+   Only valid functions to call after rsd_start() is stopping the stream with either rsd_pause() or rsd_stop(). Calling any other function is undefined.
+   The callback is called at regular intervals and is asynchronous, so thread safety must be ensured by the caller.
+   If not enough data can be given to the callback, librsound will fill the rest of the callback data with silence.
   librsound will attempt to obey latency information given with RSD_LATENCY as given before calling rsd_start().
   max_size signifies the maximum size that will ever be requested by librsound. Set this to 0 to let librsound decide the maximum size.
-   Should an error occur to the stream, err_callback will be called, and the stream will be stopped. The stream can be started again. 
+   Should an error occur to the stream, err_callback will be called, and the stream will be stopped. The stream can be started again.

   Callbacks can be disabled by setting callbacks to NULL. */

@@ -260,37 +260,37 @@ void rsd_set_callback (rsound_t *rd, rsd_audio_callback_t callback, rsd_error_ca
 /* Lock and unlock the callback. When the callback lock is aquired, the callback is guaranteed to not be executing.
   The lock has to be unlocked afterwards.
   Attemping to call several rsd_callback_lock() in succession might cause a deadlock.
-   The lock should be held for as short period as possible. 
+   The lock should be held for as short period as possible.
   Try to avoid calling code that may block when holding the lock. */
 void rsd_callback_lock (rsound_t *rd);

 void rsd_callback_unlock (rsound_t *rd);

-/* Establishes connection to server. Might fail if connection can't be established or that one of 
+/* Establishes connection to server. Might fail if connection can't be established or that one of
   the mandatory options isn't set in rsd_set_param(). This needs to be called after params have been set
-   with rsd_set_param(), and before rsd_write(). */ 
+   with rsd_set_param(), and before rsd_write(). */
 int rsd_start (rsound_t *rd);

 /* Shuts down the rsound data structures, but returns the file descriptor associated with the connection.
-   The control socket will be shut down. If this function returns a negative number, the exec failed, 
-   but the data structures will not be teared down. 
+   The control socket will be shut down. If this function returns a negative number, the exec failed,
+   but the data structures will not be teared down.
   Should a valid file descriptor be returned, it will always be blocking.
   This call will block until all internal buffers have been sent to the network.  */
 int rsd_exec (rsound_t *rd);

-/* Disconnects from server. All audio data still in network buffer and other buffers will be dropped. 
+/* Disconnects from server. All audio data still in network buffer and other buffers will be dropped.
   To continue playing, you will need to rsd_start() again. */
 int rsd_stop (rsound_t *rd);

-/* Writes from buf to the internal buffer. Might fail if no connection is established, 
+/* Writes from buf to the internal buffer. Might fail if no connection is established,
   or there was an unexpected error. This function will block until all data has
   been written to the buffer. This function will return the number of bytes written to the buffer,
   or 0 should it fail (disconnection from server). You will have to restart the stream again should this occur. */
 size_t rsd_write (rsound_t *rd, const void* buf, size_t size);

-/* Gets the position of the buffer pointer. 
-   Not really interesting for normal applications. 
-   Might be useful for implementing rsound on top of other blocking APIs. 
+/* Gets the position of the buffer pointer.
+   Not really interesting for normal applications.
+   Might be useful for implementing rsound on top of other blocking APIs.
 *NOTE* This function is deprecated, it should not be used in new applications. */
 size_t rsd_pointer (rsound_t *rd);

@@ -306,12 +306,12 @@ size_t rsd_delay_ms (rsound_t *rd);
 /* Returns bytes per sample */
 int rsd_samplesize(rsound_t *rd);

-/* Will sleep until latency of stream reaches maximum allowed latency defined earlier by rsd_set_param - RSD_LATENCY 
+/* Will sleep until latency of stream reaches maximum allowed latency defined earlier by rsd_set_param - RSD_LATENCY
   Useful for hard headed blocking I/O design where user defined latency is needed. If rsd_set_param hasn't been set
   with RSD_LATENCY, this function will do nothing. */
 void rsd_delay_wait(rsound_t *rd);

-/* Pauses or unpauses a stream. pause -> enable = 1 
+/* Pauses or unpauses a stream. pause -> enable = 1
   This function essentially calls on start() and stop(). This behavior might be changed later. */
 int rsd_pause (rsound_t *rd, int enable);

@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2010-2015 - Michael Lelli
 *  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.
@@ -1,7 +1,7 @@
 /*  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.
@@ -14,14 +14,6 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stdint.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "SDL.h"
-#include "SDL_audio.h"
-
 #include <boolean.h>
 #include <rthreads/rthreads.h>
 #include <queues/fifo_queue.h>
@@ -31,6 +23,14 @@
 #include "../audio_driver.h"
 #include "../../verbosity.h"

+#include <stdint.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "SDL.h"
+#include "SDL_audio.h"
+
 typedef struct sdl_audio
 {
   bool nonblock;
@@ -93,7 +93,7 @@ static void *sdl_audio_init(const char *device,
   if (!sdl)
      return NULL;

-   /* We have to buffer up some data ourselves, so we let SDL 
+   /* We have to buffer up some data ourselves, so we let SDL
    * carry approximately half of the latency.
    *
    * SDL double buffers audio and we do as well. */
@@ -119,7 +119,7 @@ static void *sdl_audio_init(const char *device,
   sdl->cond                = scond_new();
 #endif

-   RARCH_LOG("[SDL audio]: Requested %u ms latency, got %d ms\n", 
+   RARCH_LOG("[SDL audio]: Requested %u ms latency, got %d ms\n",
         latency, (int)(out.samples * 4 * 1000 / (*new_rate)));

   /* Create a buffer twice as big as needed and prefill the buffer. */
@@ -0,0 +1,303 @@
+/*  RetroArch - A frontend for libretro.
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <malloc.h>
+#include <stdint.h>
+
+#include<libtransistor/nx.h>
+
+#include "../audio_driver.h"
+#include "../../verbosity.h"
+
+static const int sample_rate           = 48000;
+static const int max_num_samples       = sample_rate;
+static const int num_channels          = 2;
+static const size_t sample_buffer_size = ((max_num_samples * num_channels * sizeof(uint16_t)) + 0xfff) & ~0xfff;
+
+/* don't think this can be in mapped memory, since samples get DMA'd out of it */
+static uint16_t __attribute__((aligned(0x1000))) sample_buffer_1[sample_buffer_size/sizeof(uint16_t)];
+static uint16_t __attribute__((aligned(0x1000))) sample_buffer_2[sample_buffer_size/sizeof(uint16_t)];
+static uint16_t __attribute__((aligned(0x1000))) sample_buffer_3[sample_buffer_size/sizeof(uint16_t)];
+static uint16_t *sample_buffers[3] = {sample_buffer_1, sample_buffer_2, sample_buffer_3};
+
+typedef struct
+{
+   audio_output_t output;
+   handle_t event;
+   audio_output_buffer_t buffers[3];
+   audio_output_buffer_t *current_buffer;
+   bool blocking;
+   bool is_paused;
+   uint64_t last_append;
+   unsigned latency;
+} switch_audio_t;
+
+static ssize_t switch_audio_write(void *data, const void *buf, size_t size)
+{
+   size_t to_write     = size;
+	switch_audio_t *swa = (switch_audio_t*) data;
+
+#if 0
+	RARCH_LOG("write %ld samples\n", size/sizeof(uint16_t));
+#endif
+
+	if (!swa->current_buffer)
+   {
+      uint32_t num;
+      if (audio_ipc_output_get_released_buffer(&swa->output, &num, &swa->current_buffer) != RESULT_OK)
+      {
+         RARCH_LOG("Failed to get released buffer?\n");
+         return -1;
+      }
+
+#if 0
+      RARCH_LOG("got buffer, num %d, ptr %p\n", num, swa->current_buffer);
+#endif
+
+      if (num < 1)
+         swa->current_buffer = NULL;
+
+      if (!swa->current_buffer)
+      {
+         if (swa->blocking)
+         {
+            RARCH_LOG("No buffer, blocking...\n");
+
+            while(swa->current_buffer == NULL)
+            {
+               uint32_t num;
+               uint32_t handle_idx;
+
+               svcWaitSynchronization(&handle_idx, &swa->event, 1, 33333333);
+               svcResetSignal(swa->event);
+
+               if (audio_ipc_output_get_released_buffer(&swa->output, &num, &swa->current_buffer) != RESULT_OK)
+                  return -1;
+            }
+         } else {
+            /* no buffer, nonblocking... */
+            return 0;
+         }
+      }
+
+      swa->current_buffer->data_size = 0;
+   }
+
+	if (to_write > sample_buffer_size - swa->current_buffer->data_size)
+		to_write = sample_buffer_size - swa->current_buffer->data_size;
+	
+	memcpy(((uint8_t*) swa->current_buffer->sample_data) + swa->current_buffer->data_size, buf, to_write);
+	swa->current_buffer->data_size   += to_write;
+	swa->current_buffer->buffer_size  = sample_buffer_size;
+
+	if (swa->current_buffer->data_size > (48000*swa->latency)/1000)
+   {
+		result_t r = audio_ipc_output_append_buffer(&swa->output, swa->current_buffer);
+		if (r != RESULT_OK)
+      {
+			RARCH_ERR("failed to append buffer: 0x%x\n", r);
+			return -1;
+		}
+		swa->current_buffer = NULL;
+	}
+
+#if 0
+	RARCH_LOG("submitted %ld samples, %ld samples since last submit\n",
+         to_write/num_channels/sizeof(uint16_t),
+         (svcGetSystemTick() - swa->last_append) * sample_rate / 19200000);
+#endif
+	swa->last_append = svcGetSystemTick();
+	
+	return to_write;
+}
+
+static bool switch_audio_stop(void *data)
+{
+   switch_audio_t *swa = (switch_audio_t*) data;
+   if (!swa)
+      return false;
+
+   if(!swa->is_paused) {
+	   if(audio_ipc_output_stop(&swa->output) != RESULT_OK)
+		   return false;
+   }
+
+   swa->is_paused = true;
+   return true;
+}
+
+static bool switch_audio_start(void *data, bool is_shutdown)
+{
+   switch_audio_t *swa = (switch_audio_t*) data;
+
+   if(swa->is_paused) {
+	   if (audio_ipc_output_start(&swa->output) != RESULT_OK)
+		   return false;
+   }
+
+   swa->is_paused = false;
+   return true;
+}
+
+static bool switch_audio_alive(void *data)
+{
+   switch_audio_t *swa = (switch_audio_t*) data;
+   if (!swa)
+      return false;
+   return !swa->is_paused;
+}
+
+static void switch_audio_free(void *data)
+{
+   switch_audio_t *swa = (switch_audio_t*) data;
+
+   audio_ipc_output_close(&swa->output);
+   audio_ipc_finalize();
+   free(swa);
+}
+
+static bool switch_audio_use_float(void *data)
+{
+	(void) data;
+	return false; /* force INT16 */
+}
+
+static size_t switch_audio_write_avail(void *data)
+{
+   switch_audio_t *swa = (switch_audio_t*) data;
+
+   if (!swa || !swa->current_buffer)
+      return 0;
+
+   return swa->current_buffer->buffer_size;
+}
+
+static void switch_audio_set_nonblock_state(void *data, bool state)
+{
+   switch_audio_t *swa = (switch_audio_t*) data;
+
+   if (swa)
+      swa->blocking = !state;
+}
+
+static void *switch_audio_init(const char *device,
+                               unsigned rate, unsigned latency,
+                               unsigned block_frames,
+                               unsigned *new_rate)
+{
+   result_t r;
+   unsigned i;
+   char names[8][0x20];
+   uint32_t num_names  = 0;
+   switch_audio_t *swa = (switch_audio_t*) calloc(1, sizeof(*swa));
+
+   if (!swa)
+      return NULL;
+
+   r = audio_ipc_init();
+
+   if (r != RESULT_OK)
+      goto fail;
+
+   if (audio_ipc_list_outputs(&names[0], 8, &num_names) != RESULT_OK)
+      goto fail_audio_ipc;
+
+   if (num_names != 1)
+   {
+      RARCH_ERR("got back more than one AudioOut\n");
+      goto fail_audio_ipc;
+   }
+
+   if (audio_ipc_open_output(names[0], &swa->output) != RESULT_OK)
+      goto fail_audio_ipc;
+
+   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);
+      goto fail_audio_output;
+   }
+
+   if (swa->output.num_channels != num_channels)
+   {
+      RARCH_ERR("expected %d channels, got %d\n", num_channels,
+            swa->output.num_channels);
+      goto fail_audio_output;
+   }
+
+   if (swa->output.sample_format != PCM_INT16)
+   {
+      RARCH_ERR("expected PCM_INT16, got %d\n", swa->output.sample_format);
+      goto fail_audio_output;
+   }
+
+   if (audio_ipc_output_register_buffer_event(&swa->output, &swa->event) != RESULT_OK)
+      goto fail_audio_output;
+
+   swa->blocking = block_frames;
+
+   *new_rate = swa->output.sample_rate;
+
+   for(i = 0; i < 3; i++)
+   {
+      swa->buffers[i].ptr         = &swa->buffers[i].sample_data;
+      swa->buffers[i].sample_data = sample_buffers[i];
+      swa->buffers[i].buffer_size = sample_buffer_size;
+      swa->buffers[i].data_size   = sample_buffer_size;
+      swa->buffers[i].unknown     = 0;
+
+      if (audio_ipc_output_append_buffer(&swa->output, &swa->buffers[i]) != RESULT_OK)
+         goto fail_audio_output;
+   }
+
+   swa->current_buffer = NULL;
+   swa->latency        = latency;
+   swa->last_append    = svcGetSystemTick();
+
+   swa->is_paused      = true;
+   
+   return swa;
+
+fail_audio_output:
+   audio_ipc_output_close(&swa->output);
+fail_audio_ipc:
+   audio_ipc_finalize();
+fail:
+   free(swa);
+   return NULL;
+}
+
+static size_t switch_audio_buffer_size(void *data)
+{
+   (void) data;
+   return sample_buffer_size;
+}
+
+audio_driver_t audio_switch = {
+   switch_audio_init,
+   switch_audio_write,
+   switch_audio_stop,
+   switch_audio_start,
+   switch_audio_alive,
+   switch_audio_set_nonblock_state,
+   switch_audio_free,
+   switch_audio_use_float,
+   "switch",
+   NULL, /* device_list_new */
+   NULL, /* device_list_free */
+   switch_audio_write_avail,
+   switch_audio_buffer_size, /* buffer_size */
+};
@@ -30,7 +30,7 @@
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2017 - Daniel De Matteis
 *  Copyright (C) 2017      - Charlton Head
- * 
+ *
 *  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.
@@ -508,7 +508,7 @@ struct snd_pcm_sw_params
 struct snd_pcm_hw_params
 {
   unsigned int flags;
-   struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - 
+   struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK -
      SNDRV_PCM_HW_PARAM_FIRST_MASK + 1];
   struct snd_mask mres[5];	/* reserved masks */
   struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL -
@@ -753,9 +753,9 @@ struct pcm
   /** Flags that were passed to @ref pcm_open */
   unsigned int flags;
   /** Whether the PCM is running or not */
-   int running:1;
+   unsigned int running:1;
   /** Whether or not the PCM has been prepared */
-   int prepared:1;
+   unsigned int prepared:1;
   /** The number of underruns that have occured */
   int underruns;
   /** Size of the buffer */
@@ -1523,7 +1523,7 @@ static struct pcm_params *pcm_params_get(unsigned int card, unsigned int device,
   snprintf(fn, sizeof(fn), "/dev/snd/pcmC%uD%u%c", card, device,
         flags & PCM_IN ? 'c' : 'p');

-   fd = open(fn, O_RDWR);
+   fd = open(fn, O_RDWR|O_NONBLOCK);
   if (fd < 0)
   {
      fprintf(stderr, "cannot open device '%s'\n", fn);
@@ -2320,7 +2320,7 @@ tinyalsa_write(void *data, const void *buf_, size_t size_)
      }
   }

-   return written;			
+   return written;

 }

@@ -2366,7 +2366,7 @@ tinyalsa_start(void *data, bool is_shutdown)
 			RARCH_ERR("[TINYALSA]: Failed to unpause.\n");
 			return false;
 		}
-		
+
 		tinyalsa->is_paused = false;
 	}

@@ -2414,7 +2414,7 @@ static size_t tinyalsa_write_avail(void *data)
 static size_t tinyalsa_buffer_size(void *data)
 {
 	tinyalsa_t *tinyalsa = (tinyalsa_t*)data;
-	
+
 	return tinyalsa->buffer_size;
 }

@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2011-2017 - Daniel De Matteis
- * 
+ *
 *  RetroArch is free software: you can redistribute it and/or modify it under the terms
 *  of the GNU General Public License as published by the Free Software Found-
 *  ation, either version 3 of the License, or (at your option) any later version.
@@ -15,7 +15,7 @@

 #include <stdlib.h>

-#ifdef _WIN32_WINNT 
+#ifdef _WIN32_WINNT
 #undef _WIN32_WINNT
 #endif
 #define _WIN32_WINNT 0x0600
@@ -23,11 +23,11 @@

 #include <windows.h>
 #include <winerror.h>
+#include <propidl.h>
 #include <initguid.h>
 #include <mmdeviceapi.h>
 #include <mmreg.h>
 #include <audioclient.h>
-#include <propidl.h>

 #include <lists/string_list.h>
 #include <queues/fifo_queue.h>
@@ -38,36 +38,92 @@

 DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14); /* DEVPROP_TYPE_STRING */

+#ifdef __cplusplus
+#define _IMMDeviceCollection_Item(This,nDevice,ppdevice) (This)->Item(nDevice,ppdevice)
+#define _IAudioClient_Start(This)	( (This)->Start() )
+#define _IAudioClient_Stop(This)	( (This)->Stop() )
+#define _IAudioClient_GetCurrentPadding(This,pNumPaddingFrames)	\
+    ( (This)->GetCurrentPadding(pNumPaddingFrames) )
+#define _IAudioRenderClient_GetBuffer(This,NumFramesRequested,ppData)	\
+    ( (This)->GetBuffer(NumFramesRequested,ppData) )
+#define _IAudioRenderClient_ReleaseBuffer(This,NumFramesWritten,dwFlags)	\
+    ( (This)->ReleaseBuffer(NumFramesWritten,dwFlags) )
+#define _IAudioClient_GetService(This,riid,ppv) ( (This)->GetService(riid,ppv) )
+#define _IAudioClient_SetEventHandle(This,eventHandle)	( (This)->SetEventHandle(eventHandle) )
+#define _IAudioClient_GetBufferSize(This,pNumBufferFrames) ( (This)->GetBufferSize(pNumBufferFrames) )
+#define _IAudioClient_GetStreamLatency(This,phnsLatency)	( (This)->GetStreamLatency(phnsLatency) )
+#define _IAudioClient_GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod)	( (This)->GetDevicePeriod(phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) )
+#define _IMMDevice_Activate(This,iid,dwClsCtx,pActivationParams,ppv) ((This)->Activate(iid,(dwClsCtx),pActivationParams,ppv))
+#define _IMMDeviceEnumerator_EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices) (This)->EnumAudioEndpoints(dataFlow,dwStateMask,ppDevices)
+#define _IMMDeviceEnumerator_GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint) (This)->GetDefaultAudioEndpoint(dataFlow,role,ppEndpoint)
+#define _IMMDevice_OpenPropertyStore(This,stgmAccess,ppProperties) (This)->OpenPropertyStore(stgmAccess,ppProperties)
+#define _IMMDevice_GetId(This,ppstrId) ((This)->GetId(ppstrId))
+#define _IPropertyStore_GetValue(This,key,pv) ( (This)->GetValue(key,pv) )
+#define _IMMDeviceCollection_GetCount(This,cProps) ( (This)->GetCount(cProps) )
+#else
+#define _IMMDeviceCollection_Item(This,nDevice,ppdevice) (This)->lpVtbl->Item(This,nDevice,ppdevice)
+#define _IAudioClient_Start(This)	( (This)->lpVtbl -> Start(This) )
+#define _IAudioClient_Stop(This)	( (This)->lpVtbl -> Stop(This) )
+#define _IAudioClient_GetCurrentPadding(This,pNumPaddingFrames)	\
+    ( (This)->lpVtbl -> GetCurrentPadding(This,pNumPaddingFrames) )
+#define _IAudioRenderClient_GetBuffer(This,NumFramesRequested,ppData)	\
+    ( (This)->lpVtbl -> GetBuffer(This,NumFramesRequested,ppData) )
+#define _IAudioRenderClient_ReleaseBuffer(This,NumFramesWritten,dwFlags)	\
+    ( (This)->lpVtbl -> ReleaseBuffer(This,NumFramesWritten,dwFlags) )
+#define _IAudioClient_GetService(This,riid,ppv)	( (This)->lpVtbl -> GetService(This,&(riid),ppv) )
+#define _IAudioClient_SetEventHandle(This,eventHandle)	( (This)->lpVtbl -> SetEventHandle(This,eventHandle) )
+#define _IAudioClient_GetBufferSize(This,pNumBufferFrames) ( (This)->lpVtbl -> GetBufferSize(This,pNumBufferFrames) )
+#define _IAudioClient_GetStreamLatency(This,phnsLatency)	( (This)->lpVtbl -> GetStreamLatency(This,phnsLatency) )
+#define _IAudioClient_GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod)	( (This)->lpVtbl -> GetDevicePeriod(This,phnsDefaultDevicePeriod,phnsMinimumDevicePeriod) )
+#define _IMMDevice_Activate(This,iid,dwClsCtx,pActivationParams,ppv) ((This)->lpVtbl->Activate(This,&(iid),dwClsCtx,pActivationParams,ppv))
+#define _IMMDeviceEnumerator_EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices) (This)->lpVtbl->EnumAudioEndpoints(This,dataFlow,dwStateMask,ppDevices)
+#define _IMMDeviceEnumerator_GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint) (This)->lpVtbl->GetDefaultAudioEndpoint(This,dataFlow,role,ppEndpoint)
+#define _IMMDevice_OpenPropertyStore(This,stgmAccess,ppProperties) (This)->lpVtbl->OpenPropertyStore(This,stgmAccess,ppProperties)
+#define _IMMDevice_GetId(This,ppstrId) (This)->lpVtbl->GetId(This,ppstrId)
+#define _IPropertyStore_GetValue(This,key,pv) ( (This)->lpVtbl -> GetValue(This,&(key),pv) )
+#define _IMMDeviceCollection_GetCount(This,cProps) ( (This)->lpVtbl -> GetCount(This,cProps) )
+#endif

-#define WASAPI_WARN(bool_exp, err_str, warn_exp)\
-      if (!(bool_exp)) {\
-         wasapi_warn(err_str);\
+#define WASAPI_WARN(bool_exp, err_str, warn_exp) \
+      if (!(bool_exp)) { \
+         RARCH_WARN("[WASAPI]: %s.\n", err_str); \
         warn_exp; }

-#define WASAPI_CHECK(bool_exp, err_str, err_exp)\
-      if (!(bool_exp)) {\
-         wasapi_err(err_str);\
+#define WASAPI_CHECK(bool_exp, err_str, err_exp) \
+      if (!(bool_exp)) { \
+         RARCH_ERR("[WASAPI]: %s.\n", err_str); \
         err_exp; }

-#define WASAPI_HR_CHECK(hr, fun_str, err_exp)\
-      if (FAILED(hr)) {\
-         wasapi_com_err(fun_str, hr);\
+#define WASAPI_HR_CHECK(hr, fun_str, err_exp) \
+      if (FAILED(hr)) { \
+         RARCH_ERR("[WASAPI]: %s failed with error 0x%.8X.\n", fun_str, hr); \
         err_exp; }

-#define WASAPI_HR_WARN(hr, fun_str, warn_exp)\
-      if (FAILED(hr)) {\
-         wasapi_com_warn(fun_str, hr);\
+#define WASAPI_HR_WARN(hr, fun_str, warn_exp) \
+      if (FAILED(hr)) { \
+         RARCH_WARN("[WASAPI]: %s failed with error 0x%.8X.\n", fun_str, hr); \
         warn_exp; }

-#define WASAPI_SR_CHECK(bool_exp, fun_str, err_exp)\
-      if (!(bool_exp)) {\
-         wasapi_sys_err(fun_str);\
+#define WASAPI_SR_CHECK(bool_exp, fun_str, err_exp) \
+      if (!(bool_exp)) { \
+         RARCH_ERR("[WASAPI]: %s failed with error %d.\n", fun_str, GetLastError()); \
         err_exp; }

-#define WASAPI_RELEASE(iface)\
-      if(iface) {\
+#ifdef __cplusplus
+#define WASAPI_RELEASE(iface) \
+      if(iface) \
+      { \
+         iface->Release(); \
+         iface = NULL; \
+      }
+#else
+#define WASAPI_RELEASE(iface) \
+      if(iface) \
+      { \
         iface->lpVtbl->Release(iface);\
-         iface = NULL; }\
+         iface = NULL; \
+      }
+#endif

 #define WASAPI_FREE(ptr)\
      if(ptr) {\
@@ -81,48 +137,18 @@ DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0

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

-static void wasapi_log(const char *msg)
-{
-   RARCH_LOG("[WASAPI]: %s.\n", msg);
-}
-
-static void wasapi_warn(const char *warn)
-{
-   RARCH_WARN("[WASAPI]: %s.\n", warn);
-}
-
-static void wasapi_err(const char *err)
-{
-   RARCH_ERR("[WASAPI]: %s.\n", err);
-}
-
-static void wasapi_com_warn(const char *fun, HRESULT hr)
-{
-   RARCH_WARN("[WASAPI]: %s failed with error 0x%.8X.\n", fun, hr);
-}
-
-static void wasapi_com_err(const char *fun, HRESULT hr)
-{
-   RARCH_ERR("[WASAPI]: %s failed with error 0x%.8X.\n", fun, hr);
-}
-
-static void wasapi_sys_err(const char *fun)
-{
-   RARCH_ERR("[WASAPI]: %s failed with error %d.\n", fun, GetLastError());
-}
-
 static bool wasapi_check_device_id(IMMDevice *device, const char *id)
 {
   HRESULT hr;
@@ -137,8 +163,8 @@ static bool wasapi_check_device_id(IMMDevice *device, const char *id)

   id_length = MultiByteToWideChar(CP_ACP, 0, id, -1, dev_cmp_id, id_length);
   WASAPI_SR_CHECK(id_length > 0, "MultiByteToWideChar", goto error);
-   
-   hr = device->lpVtbl->GetId(device, &dev_id);
+
+   hr = _IMMDevice_GetId(device, &dev_id);
   WASAPI_HR_CHECK(hr, "IMMDevice::GetId", goto error);

   result = lstrcmpW(dev_cmp_id, dev_id) == 0 ? true : false;
@@ -164,27 +190,36 @@ static IMMDevice *wasapi_init_device(const char *id)
   IMMDeviceCollection *collection = NULL;

   if (id)
+   {
      RARCH_LOG("[WASAPI]: Initializing device %s ...\n", id);
+   }
   else
-      wasapi_log("Initializing default device ..");
+   {
+      RARCH_LOG("[WASAPI]: Initializing default device.. \n");
+   }

+#ifdef __cplusplus
+   hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
+         IID_IMMDeviceEnumerator, (void **)&enumerator);
+#else
   hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
         &IID_IMMDeviceEnumerator, (void **)&enumerator);
+#endif
   WASAPI_HR_CHECK(hr, "CoCreateInstance", goto error);

   if (id)
   {
-      hr = enumerator->lpVtbl->EnumAudioEndpoints(enumerator,
-         eRender, DEVICE_STATE_ACTIVE, &collection);
+      hr = _IMMDeviceEnumerator_EnumAudioEndpoints(enumerator,
+            eRender, DEVICE_STATE_ACTIVE, &collection);
      WASAPI_HR_CHECK(hr, "IMMDeviceEnumerator::EnumAudioEndpoints",
            goto error);

-      hr = collection->lpVtbl->GetCount(collection, &dev_count);
+      hr = _IMMDeviceCollection_GetCount(collection, &dev_count);
      WASAPI_HR_CHECK(hr, "IMMDeviceCollection::GetCount", goto error);

      for (i = 0; i < dev_count; ++i)
      {
-         hr = collection->lpVtbl->Item(collection, i, &device);
+         hr = _IMMDeviceCollection_Item(collection, i, &device);
         WASAPI_HR_CHECK(hr, "IMMDeviceCollection::Item", continue);

         if (wasapi_check_device_id(device, id))
@@ -195,8 +230,8 @@ static IMMDevice *wasapi_init_device(const char *id)
   }
   else
   {
-      hr = enumerator->lpVtbl->GetDefaultAudioEndpoint(enumerator,
-            eRender, eConsole, &device);
+      hr = _IMMDeviceEnumerator_GetDefaultAudioEndpoint(
+            enumerator, eRender, eConsole, &device);
      WASAPI_HR_CHECK(hr, "IMMDeviceEnumerator::GetDefaultAudioEndpoint",
            goto error);
   }
@@ -207,8 +242,6 @@ static IMMDevice *wasapi_init_device(const char *id)
   WASAPI_RELEASE(collection);
   WASAPI_RELEASE(enumerator);

-   wasapi_log("Device initialized");
-
   return device;

 error:
@@ -216,9 +249,13 @@ error:
   WASAPI_RELEASE(enumerator);

   if (id)
-      wasapi_warn("Failed to initialize device");
+   {
+      RARCH_WARN("[WASAPI]: Failed to initialize device.\n");
+   }
   else
-      wasapi_err("Failed to initialize device");
+   {
+      RARCH_ERR("[WASAPI]: Failed to initialize device.\n");
+   }

   return NULL;
 }
@@ -268,7 +305,8 @@ static IAudioClient *wasapi_init_client_sh(IMMDevice *device,
   IAudioClient *client = NULL;
   bool float_fmt_res   = *float_fmt;
   unsigned rate_res    = *rate;
-   HRESULT hr           = device->lpVtbl->Activate(device, &IID_IAudioClient,
+   HRESULT hr           = _IMMDevice_Activate(device,
+         IID_IAudioClient,
         CLSCTX_ALL, NULL, (void**)&client);
   WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);

@@ -286,19 +324,34 @@ static IAudioClient *wasapi_init_client_sh(IMMDevice *device,
               float_fmt_res ? "float" : "pcm", rate_res, latency);

         wasapi_set_format(&wf, float_fmt_res, rate_res);
+#ifdef __cplusplus
+         hr = client->Initialize(AUDCLNT_SHAREMODE_SHARED,
+               AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST,
+               0, 0, (WAVEFORMATEX*)&wf, NULL);
+#else
         hr = client->lpVtbl->Initialize(client, AUDCLNT_SHAREMODE_SHARED,
               AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST,
               0, 0, (WAVEFORMATEX*)&wf, NULL);
+#endif
+
         if (hr == AUDCLNT_E_ALREADY_INITIALIZED)
         {
-            client->lpVtbl->Release(client);
-            hr = device->lpVtbl->Activate(device, &IID_IAudioClient,
-               CLSCTX_ALL, NULL, (void**)&client);
+            HRESULT hr;
+            WASAPI_RELEASE(client);
+            hr           = _IMMDevice_Activate(device,
+                  IID_IAudioClient,
+                  CLSCTX_ALL, NULL, (void**)&client);
            WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);

+#ifdef __cplusplus
+            hr = client->Initialize(AUDCLNT_SHAREMODE_SHARED,
+                  AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST,
+                  0, 0, (WAVEFORMATEX*)&wf, NULL);
+#else
            hr = client->lpVtbl->Initialize(client, AUDCLNT_SHAREMODE_SHARED,
                  AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST,
                  0, 0, (WAVEFORMATEX*)&wf, NULL);
+#endif
         }
         if (hr != AUDCLNT_E_UNSUPPORTED_FORMAT)
         {
@@ -306,7 +359,7 @@ static IAudioClient *wasapi_init_client_sh(IMMDevice *device,
            break;
         }

-         wasapi_warn("Unsupported format");
+         RARCH_WARN("[WASAPI]: Unsupported format.\n");
         rate_res = wasapi_pref_rate(j);
         if (rate_res == *rate) /* requested rate is allready tested */
            rate_res = wasapi_pref_rate(++j); /* skip it */
@@ -337,12 +390,12 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
   REFERENCE_TIME minimum_period  = 0;
   REFERENCE_TIME buffer_duration = 0;
   UINT32 buffer_length           = 0;
-   HRESULT hr                     = device->lpVtbl->Activate(
-		   device, &IID_IAudioClient,
+   HRESULT hr                     = _IMMDevice_Activate(device,
+         IID_IAudioClient,
         CLSCTX_ALL, NULL, (void**)&client);
   WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);

-   hr = client->lpVtbl->GetDevicePeriod(client, NULL, &minimum_period);
+   hr = _IAudioClient_GetDevicePeriod(client, NULL, &minimum_period);
   WASAPI_HR_CHECK(hr, "IAudioClient::GetDevicePeriod", goto error);

   /* buffer_duration is in 100ns units */
@@ -364,34 +417,54 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
               float_fmt_res ? "float" : "pcm", rate_res, latency);

         wasapi_set_format(&wf, float_fmt_res, rate_res);
+#ifdef __cplusplus
+         hr = client->Initialize(AUDCLNT_SHAREMODE_EXCLUSIVE,
+               AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST,
+               buffer_duration, buffer_duration, (WAVEFORMATEX*)&wf, NULL);
+#else
         hr = client->lpVtbl->Initialize(client, AUDCLNT_SHAREMODE_EXCLUSIVE,
               AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST,
               buffer_duration, buffer_duration, (WAVEFORMATEX*)&wf, NULL);
+#endif
         if (hr == AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED)
         {
-            hr = client->lpVtbl->GetBufferSize(client, &buffer_length);
+            hr = _IAudioClient_GetBufferSize(client, &buffer_length);
            WASAPI_HR_CHECK(hr, "IAudioClient::GetBufferSize", goto error);

-            client->lpVtbl->Release(client);
-            hr = device->lpVtbl->Activate(device, &IID_IAudioClient,
-               CLSCTX_ALL, NULL, (void**)&client);
+            WASAPI_RELEASE(client);
+            hr                     = _IMMDevice_Activate(device,
+                  IID_IAudioClient,
+                  CLSCTX_ALL, NULL, (void**)&client);
            WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);

            buffer_duration = 10000.0 * 1000.0 / rate_res * buffer_length + 0.5;
+#ifdef __cplusplus
+            hr = client->Initialize(AUDCLNT_SHAREMODE_EXCLUSIVE,
+                  AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST,
+                  buffer_duration, buffer_duration, (WAVEFORMATEX*)&wf, NULL);
+#else
            hr = client->lpVtbl->Initialize(client, AUDCLNT_SHAREMODE_EXCLUSIVE,
                  AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST,
                  buffer_duration, buffer_duration, (WAVEFORMATEX*)&wf, NULL);
+#endif
         }
         if (hr == AUDCLNT_E_ALREADY_INITIALIZED)
         {
-            client->lpVtbl->Release(client);
-            hr = device->lpVtbl->Activate(device, &IID_IAudioClient,
-               CLSCTX_ALL, NULL, (void**)&client);
+            WASAPI_RELEASE(client);
+            hr                     = _IMMDevice_Activate(device,
+                  IID_IAudioClient,
+                  CLSCTX_ALL, NULL, (void**)&client);
            WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);

+#ifdef __cplusplus
+            hr = client->Initialize(AUDCLNT_SHAREMODE_EXCLUSIVE,
+                  AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST,
+                  buffer_duration, buffer_duration, (WAVEFORMATEX*)&wf, NULL);
+#else
            hr = client->lpVtbl->Initialize(client, AUDCLNT_SHAREMODE_EXCLUSIVE,
                  AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST,
                  buffer_duration, buffer_duration, (WAVEFORMATEX*)&wf, NULL);
+#endif
         }
         if (hr != AUDCLNT_E_UNSUPPORTED_FORMAT)
         {
@@ -405,7 +478,7 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
            break;
         }

-         wasapi_warn("Unsupported format");
+         RARCH_WARN("[WASAPI]: Unsupported format.\n");
         rate_res = wasapi_pref_rate(j);
         if (rate_res == *rate) /* requested rate is allready tested */
            rate_res = wasapi_pref_rate(++j); /* skip it */
@@ -461,22 +534,29 @@ static IAudioClient *wasapi_init_client(IMMDevice *device, bool *exclusive,
   /* next calls are allowed to fail (we losing info only) */

   if (*exclusive)
-      hr = client->lpVtbl->GetDevicePeriod(client, NULL, &device_period);
+      hr = _IAudioClient_GetDevicePeriod(client, NULL, &device_period);
   else
-      hr = client->lpVtbl->GetDevicePeriod(client, &device_period, NULL);
+      hr = _IAudioClient_GetDevicePeriod(client, &device_period, NULL);
+
   if (FAILED(hr))
-      wasapi_com_warn("IAudioClient::GetDevicePeriod", hr);
+   {
+      RARCH_WARN("[WASAPI]: IAudioClient::GetDevicePeriod failed with error 0x%.8X.\n", hr);
+   }

   if (!*exclusive)
   {
-      hr = client->lpVtbl->GetStreamLatency(client, &stream_latency);
+      hr = _IAudioClient_GetStreamLatency(client, &stream_latency);
      if (FAILED(hr))
-         wasapi_com_warn("IAudioClient::GetStreamLatency", hr);
+      {
+         RARCH_WARN("[WASAPI]: IAudioClient::GetStreamLatency failed with error 0x%.8X.\n", hr);
+      }
   }

-   hr = client->lpVtbl->GetBufferSize(client, &buffer_length);
+   hr = _IAudioClient_GetBufferSize(client, &buffer_length);
   if (FAILED(hr))
-      wasapi_com_warn("IAudioClient::GetBufferSize", hr);
+   {
+      RARCH_WARN("[WASAPI]: IAudioClient::GetBufferSize failed with error 0x%.8X.\n", hr);
+   }

   if (*exclusive)
      latency_res = (double)buffer_length * 1000.0 / (*rate);
@@ -528,7 +608,7 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,
   if (!w->client)
      goto error;

-   hr = w->client->lpVtbl->GetBufferSize(w->client, &frame_count);
+   hr = _IAudioClient_GetBufferSize(w->client, &frame_count);
   WASAPI_HR_CHECK(hr, "IAudioClient::GetBufferSize", goto error);

   w->frame_size = float_format ? 8 : 4;
@@ -545,7 +625,7 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,
   {
      if (sh_buffer_length < 0)
      {
-         hr = w->client->lpVtbl->GetDevicePeriod(w->client, &dev_period, NULL);
+         hr = _IAudioClient_GetDevicePeriod(w->client, &dev_period, NULL);
         WASAPI_HR_CHECK(hr, "IAudioClient::GetDevicePeriod", goto error);

         sh_buffer_length = dev_period * rate / 10000000;
@@ -558,26 +638,29 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,
            sh_buffer_length, (double)sh_buffer_length * 1000.0 / rate);
   }
   else
-      wasapi_log("Intermediate buffer is off");
+   {
+      RARCH_LOG("[WASAPI]: Intermediate buffer is off. \n");
+   }

   w->write_event = CreateEventA(NULL, FALSE, FALSE, NULL);
   WASAPI_SR_CHECK(w->write_event, "CreateEventA", goto error);

-   hr = w->client->lpVtbl->SetEventHandle(w->client, w->write_event);
+   hr = _IAudioClient_SetEventHandle(w->client, w->write_event);
   WASAPI_HR_CHECK(hr, "IAudioClient::SetEventHandle", goto error);

-   hr = w->client->lpVtbl->GetService(w->client,
-         &IID_IAudioRenderClient, (void**)&w->renderer);
+   hr = _IAudioClient_GetService(w->client,
+         IID_IAudioRenderClient, (void**)&w->renderer);
   WASAPI_HR_CHECK(hr, "IAudioClient::GetService", goto error);

-   hr = w->renderer->lpVtbl->GetBuffer(w->renderer, frame_count, &dest);
+   hr = _IAudioRenderClient_GetBuffer(w->renderer, frame_count, &dest);
   WASAPI_HR_CHECK(hr, "IAudioRenderClient::GetBuffer", goto error);

-   hr = w->renderer->lpVtbl->ReleaseBuffer(w->renderer, frame_count,
+   hr = _IAudioRenderClient_ReleaseBuffer(
+         w->renderer, frame_count,
         AUDCLNT_BUFFERFLAGS_SILENT);
   WASAPI_HR_CHECK(hr, "IAudioRenderClient::ReleaseBuffer", goto error);

-   hr = w->client->lpVtbl->Start(w->client);
+   hr = _IAudioClient_Start(w->client);
   WASAPI_HR_CHECK(hr, "IAudioClient::Start", goto error);
   w->running = true;
   w->blocking = settings->bools.audio_sync;
@@ -586,7 +669,7 @@ static void *wasapi_init(const char *dev_id, unsigned rate, unsigned latency,

 error:
   WASAPI_RELEASE(w->renderer);
-   WASAPI_RELEASE(w->client);      
+   WASAPI_RELEASE(w->client);
   WASAPI_RELEASE(w->device);
   if (w->write_event)
      CloseHandle(w->write_event);
@@ -603,13 +686,14 @@ static bool wasapi_flush(wasapi_t * w, const void * data, size_t size)
 {
   BYTE *dest         = NULL;
   UINT32 frame_count = size / w->frame_size;
-   HRESULT hr         = w->renderer->lpVtbl->GetBuffer(w->renderer, frame_count, &dest);
-
+   HRESULT hr         = _IAudioRenderClient_GetBuffer(
+         w->renderer, frame_count, &dest);
   WASAPI_HR_CHECK(hr, "IAudioRenderClient::GetBuffer", return false)

   memcpy(dest, data, size);
-   hr = w->renderer->lpVtbl->ReleaseBuffer(w->renderer, frame_count, 0);
-
+   hr = _IAudioRenderClient_ReleaseBuffer(
+         w->renderer, frame_count,
+         0);
   WASAPI_HR_CHECK(hr, "IAudioRenderClient::ReleaseBuffer", return false);

   return true;
@@ -619,13 +703,14 @@ static bool wasapi_flush_buffer(wasapi_t * w, size_t size)
 {
   BYTE *dest         = NULL;
   UINT32 frame_count = size / w->frame_size;
-   HRESULT hr         = w->renderer->lpVtbl->GetBuffer(w->renderer, frame_count, &dest);
-
+   HRESULT hr         = _IAudioRenderClient_GetBuffer(
+         w->renderer, frame_count, &dest);
   WASAPI_HR_CHECK(hr, "IAudioRenderClient::GetBuffer", return false)

   fifo_read(w->buffer, dest, size);
-   hr = w->renderer->lpVtbl->ReleaseBuffer(w->renderer, frame_count, 0);
-
+   hr = _IAudioRenderClient_ReleaseBuffer(
+         w->renderer, frame_count,
+         0);
   WASAPI_HR_CHECK(hr, "IAudioRenderClient::ReleaseBuffer", return false);

   return true;
@@ -634,42 +719,41 @@ static bool wasapi_flush_buffer(wasapi_t * w, size_t size)
 static ssize_t wasapi_write_sh(wasapi_t *w, const void * data, size_t size)
 {
   DWORD ir;
-   size_t read_avail;
-   size_t write_avail;
   HRESULT hr;
-   bool br;
-   ssize_t writen = -1;
-   UINT32 padding = 0;
+   size_t write_avail = 0;
+   ssize_t written    = -1;
+   UINT32 padding     = 0;

   if (w->buffer)
   {
      write_avail = fifo_write_avail(w->buffer);
      if (!write_avail)
      {
+         size_t read_avail  = 0;
+
         if (w->blocking)
         {
            ir = WaitForSingleObject(w->write_event, INFINITE);
            WASAPI_SR_CHECK(ir == WAIT_OBJECT_0, "WaitForSingleObject", return -1);
         }

-         hr = w->client->lpVtbl->GetCurrentPadding(w->client, &padding);
+         hr = _IAudioClient_GetCurrentPadding(w->client, &padding);
         WASAPI_HR_CHECK(hr, "IAudioClient::GetCurrentPadding", return -1);

-         read_avail = fifo_read_avail(w->buffer);
+         read_avail  = fifo_read_avail(w->buffer);
         write_avail = w->engine_buffer_size - padding * w->frame_size;
-         writen = read_avail < write_avail ? read_avail : write_avail;
-         if (writen)
+         written     = read_avail < write_avail ? read_avail : write_avail;
+         if (written)
         {
-            br = wasapi_flush_buffer(w, writen);
-            if (!br)
+            if (!wasapi_flush_buffer(w, written))
               return -1;
         }
      }

      write_avail = fifo_write_avail(w->buffer);
-      writen = size < write_avail ? size : write_avail;
-      if (writen)
-         fifo_write(w->buffer, data, writen);
+      written     = size < write_avail ? size : write_avail;
+      if (written)
+         fifo_write(w->buffer, data, written);
   }
   else
   {
@@ -679,46 +763,42 @@ static ssize_t wasapi_write_sh(wasapi_t *w, const void * data, size_t size)
         WASAPI_SR_CHECK(ir == WAIT_OBJECT_0, "WaitForSingleObject", return -1);
      }

-      hr = w->client->lpVtbl->GetCurrentPadding(w->client, &padding);
+      hr = _IAudioClient_GetCurrentPadding(w->client, &padding);
      WASAPI_HR_CHECK(hr, "IAudioClient::GetCurrentPadding", return -1);

      write_avail = w->engine_buffer_size - padding * w->frame_size;
      if (!write_avail)
         return 0;

-      writen = size < write_avail ? size : write_avail;
-      if (writen)
+      written = size < write_avail ? size : write_avail;
+      if (written)
      {
-         br = wasapi_flush(w, data, writen);
-         if (!br)
+         if (!wasapi_flush(w, data, written))
            return -1;
      }
   }

-   return writen;
+   return written;
 }

 static ssize_t wasapi_write_ex(wasapi_t *w, const void * data, size_t size)
 {
-   DWORD ir;
-   size_t write_avail;
-   bool br        = false;
-   ssize_t writen = 0;
+   ssize_t writen     = 0;
+   size_t write_avail = fifo_write_avail(w->buffer);

-   write_avail = fifo_write_avail(w->buffer);
   if (!write_avail)
   {
-      ir = WaitForSingleObject(w->write_event, w->blocking ? INFINITE : 0);
+      DWORD ir = WaitForSingleObject(
+            w->write_event, w->blocking ? INFINITE : 0);
      if (ir != WAIT_OBJECT_0 && w->blocking)
      {
-         wasapi_sys_err("WaitForSingleObject");
+         RARCH_ERR("[WASAPI]: WaitForSingleObject failed with error %d.\n", GetLastError());
         return -1;
      }
      if (ir != WAIT_OBJECT_0)
         return 0;

-      br = wasapi_flush_buffer(w, w->engine_buffer_size);
-      if (!br)
+      if (!wasapi_flush_buffer(w, w->engine_buffer_size))
         return -1;

      write_avail = w->engine_buffer_size;
@@ -732,34 +812,34 @@ static ssize_t wasapi_write_ex(wasapi_t *w, const void * data, size_t size)

 static ssize_t wasapi_write(void *wh, const void *data, size_t size)
 {
-   size_t writen;
-   ssize_t ir;
+   size_t written;
   wasapi_t *w = (wasapi_t*)wh;

   if (w->blocking)
   {
-      for (writen = 0, ir = -1; writen < size; writen += ir)
+      ssize_t ir;
+      for (written = 0, ir = -1; written < size; written += ir)
      {
         if (w->exclusive)
-            ir = wasapi_write_ex(w, data + writen, size - writen);
+            ir = wasapi_write_ex(w, (char*)data + written, size - written);
         else
-            ir = wasapi_write_sh(w, data + writen, size - writen);
+            ir = wasapi_write_sh(w, (char*)data + written, size - written);
         if (ir == -1)
            return -1;
      }
   }
   else if (w->exclusive)
-      writen = wasapi_write_ex(w, data, size);
+      written = wasapi_write_ex(w, data, size);
   else
-      writen = wasapi_write_sh(w, data, size);
+      written = wasapi_write_sh(w, data, size);

-   return writen;
+   return written;
 }

 static bool wasapi_stop(void *wh)
 {
   wasapi_t *w = (wasapi_t*)wh;
-   HRESULT hr  = w->client->lpVtbl->Stop(w->client);
+   HRESULT  hr = _IAudioClient_Stop(w->client);
   WASAPI_HR_CHECK(hr, "IAudioClient::Stop", return !w->running);

   w->running = false;
@@ -770,7 +850,7 @@ static bool wasapi_stop(void *wh)
 static bool wasapi_start(void *wh, bool u)
 {
   wasapi_t *w = (wasapi_t*)wh;
-   HRESULT hr  = w->client->lpVtbl->Start(w->client);
+   HRESULT  hr = _IAudioClient_Start(w->client);

   if (hr == AUDCLNT_E_NOT_STOPPED)
      return true;
@@ -800,13 +880,13 @@ static void wasapi_set_nonblock_state(void *wh, bool nonblock)

 static void wasapi_free(void *wh)
 {
+   DWORD ir;
   wasapi_t *w        = (wasapi_t*)wh;
   HANDLE write_event = w->write_event;
-   DWORD ir;

   WASAPI_RELEASE(w->renderer);
   if (w->client)
-      w->client->lpVtbl->Stop(w->client);
+      _IAudioClient_Stop(w->client);
   WASAPI_RELEASE(w->client);
   WASAPI_RELEASE(w->device);
   CoUninitialize();
@@ -816,7 +896,9 @@ static void wasapi_free(void *wh)

   ir = WaitForSingleObject(write_event, 20);
   if (ir == WAIT_FAILED)
-      wasapi_sys_err("WaitForSingleObject");
+   {
+      RARCH_ERR("[WASAPI]: WaitForSingleObject failed with error %d.\n", GetLastError());
+   }

   /* If event isn't signaled log and leak */
   WASAPI_CHECK(ir == WAIT_OBJECT_0, "Memory leak in wasapi_free", return);
@@ -850,28 +932,31 @@ static void *wasapi_device_list_new(void *u)
   char *dev_name_str              = NULL;
   struct string_list *sl          = string_list_new();

-   wasapi_log("Enumerating active devices ..");
-
   WASAPI_CHECK(sl, "string_list_new failed", return NULL);

   attr.i = 0;
+#ifdef __cplusplus
+   hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
+         IID_IMMDeviceEnumerator, (void **)&enumerator);
+#else
   hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL,
         &IID_IMMDeviceEnumerator, (void **)&enumerator);
+#endif
   WASAPI_HR_CHECK(hr, "CoCreateInstance", goto error);

-   hr = enumerator->lpVtbl->EnumAudioEndpoints(enumerator,
+   hr = _IMMDeviceEnumerator_EnumAudioEndpoints(enumerator,
         eRender, DEVICE_STATE_ACTIVE, &collection);
   WASAPI_HR_CHECK(hr, "IMMDeviceEnumerator::EnumAudioEndpoints", goto error);

-   hr = collection->lpVtbl->GetCount(collection, &dev_count);
+   hr = _IMMDeviceCollection_GetCount(collection, &dev_count);
   WASAPI_HR_CHECK(hr, "IMMDeviceCollection::GetCount", goto error);

   for (i = 0; i < dev_count; ++i)
   {
-      hr = collection->lpVtbl->Item(collection, i, &device);
+      hr = _IMMDeviceCollection_Item(collection, i, &device);
      WASAPI_HR_CHECK(hr, "IMMDeviceCollection::Item", goto error);

-      hr = device->lpVtbl->GetId(device, &dev_id_wstr);
+      hr = _IMMDevice_GetId(device, &dev_id_wstr);
      WASAPI_HR_CHECK(hr, "IMMDevice::GetId", goto error);

      ir = WideCharToMultiByte(CP_ACP, 0, dev_id_wstr, -1,
@@ -885,13 +970,13 @@ static void *wasapi_device_list_new(void *u)
            dev_id_str, ir, NULL, NULL);
      WASAPI_SR_CHECK(ir, "WideCharToMultiByte", goto error);

-      hr = device->lpVtbl->OpenPropertyStore(device, STGM_READ, &prop_store);
+      hr = _IMMDevice_OpenPropertyStore(device, STGM_READ, &prop_store);
      WASAPI_HR_CHECK(hr, "IMMDevice::OpenPropertyStore", goto error);

      PropVariantInit(&prop_var);
      prop_var_init = true;
-      hr = prop_store->lpVtbl->GetValue(prop_store,
-            &PKEY_Device_FriendlyName, &prop_var);
+      hr = _IPropertyStore_GetValue(prop_store, PKEY_Device_FriendlyName,
+            &prop_var);
      WASAPI_HR_CHECK(hr, "IPropertyStore::GetValue", goto error);

      ir = WideCharToMultiByte(CP_ACP, 0, prop_var.pwszVal, -1,
@@ -922,8 +1007,6 @@ static void *wasapi_device_list_new(void *u)
   WASAPI_RELEASE(collection);
   WASAPI_RELEASE(enumerator);

-   wasapi_log("Devices enumerated");
-
   return sl;

 error:
@@ -939,7 +1022,7 @@ error:
   if (sl)
      string_list_free(sl);

-   wasapi_err("Device enumeration failed");
+   RARCH_ERR("[WASAPI]: Device enumeration failed.\n");

   return NULL;
 }
@@ -960,9 +1043,9 @@ static size_t wasapi_write_avail(void *wh)
   if (w->buffer)
      return fifo_write_avail(w->buffer);

-   hr = w->client->lpVtbl->GetCurrentPadding(w->client, &padding);
+   hr = _IAudioClient_GetCurrentPadding(w->client, &padding);
   WASAPI_HR_CHECK(hr, "IAudioClient::GetCurrentPadding", return 0);
-   
+
   return w->engine_buffer_size - padding * w->frame_size;
 }

@@ -193,11 +193,11 @@ static bool ax_audio_start(void* data, bool is_shutdown)

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

   if(!size || (size & 0x3))
      return 0;
@@ -330,8 +330,8 @@ audio_driver_t audio_ax =
   ax_audio_free,
   ax_audio_use_float,
   "AX",
-   NULL,
-   NULL,
-/*   ax_audio_write_avail, */
-/*   ax_audio_buffer_size */
+   NULL, /* device_list_new */
+   NULL, /* device_list_free */
+   NULL, /* write_avail */
+   NULL, /* buffer_size */
 };
@@ -1,7 +1,7 @@
 /*  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.
@@ -45,6 +45,12 @@ typedef struct xaudio2 xaudio2_t;

 #define MAX_BUFFERS_MASK (MAX_BUFFERS - 1)

+#ifndef COINIT_MULTITHREADED
+#define COINIT_MULTITHREADED 0x00
+#endif
+
+#define XAUDIO2_WRITE_AVAILABLE(handle) ((handle)->bufsize * (MAX_BUFFERS - (handle)->buffers - 1))
+
 typedef struct
 {
   xaudio2_t *xa;
@@ -53,8 +59,13 @@ typedef struct
   size_t bufsize;
 } xa_t;

+#if defined(__cplusplus) && !defined(CINTERFACE)
 struct xaudio2 : public IXAudio2VoiceCallback
+#else
+struct xaudio2
+#endif
 {
+#if defined(__cplusplus) && !defined(CINTERFACE)
   xaudio2() :
      buf(0), pXAudio2(0), pMasterVoice(0),
      pSourceVoice(0), hEvent(0), buffers(0), bufsize(0),
@@ -64,7 +75,7 @@ struct xaudio2 : public IXAudio2VoiceCallback
   virtual ~xaudio2() {}

   STDMETHOD_(void, OnBufferStart) (void *) {}
-   STDMETHOD_(void, OnBufferEnd) (void *) 
+   STDMETHOD_(void, OnBufferEnd) (void *)
   {
      InterlockedDecrement((LONG volatile*)&buffers);
      SetEvent(hEvent);
@@ -74,6 +85,9 @@ struct xaudio2 : public IXAudio2VoiceCallback
   STDMETHOD_(void, OnVoiceError) (void *, HRESULT) {}
   STDMETHOD_(void, OnVoiceProcessingPassEnd) () {}
   STDMETHOD_(void, OnVoiceProcessingPassStart) (UINT32) {}
+#else
+   const IXAudio2VoiceCallbackVtbl *lpVtbl;
+#endif

   uint8_t *buf;
   IXAudio2 *pXAudio2;
@@ -87,6 +101,31 @@ struct xaudio2 : public IXAudio2VoiceCallback
   unsigned write_buffer;
 };

+#if !defined(__cplusplus) || defined(CINTERFACE)
+static void WINAPI voice_on_buffer_end(IXAudio2VoiceCallback *handle_, void *data)
+{
+   xaudio2_t *handle = (xaudio2_t*)handle_;
+   (void)data;
+   InterlockedDecrement((LONG volatile*)&handle->buffers);
+   SetEvent(handle->hEvent);
+}
+
+static void WINAPI dummy_voidp(IXAudio2VoiceCallback *handle, void *data) { (void)handle; (void)data; }
+static void WINAPI dummy_nil(IXAudio2VoiceCallback *handle) { (void)handle; }
+static void WINAPI dummy_uint32(IXAudio2VoiceCallback *handle, UINT32 dummy) { (void)handle; (void)dummy; }
+static void WINAPI dummy_voidp_hresult(IXAudio2VoiceCallback *handle, void *data, HRESULT dummy) { (void)handle; (void)data; (void)dummy; }
+
+const struct IXAudio2VoiceCallbackVtbl voice_vtable = {
+   dummy_uint32,
+   dummy_nil,
+   dummy_nil,
+   dummy_voidp,
+   voice_on_buffer_end,
+   dummy_voidp,
+   dummy_voidp_hresult,
+};
+#endif
+
 #if 0
 static void xaudio2_enumerate_devices(xaudio2_t *xa)
 {
@@ -97,13 +136,13 @@ static void xaudio2_enumerate_devices(xaudio2_t *xa)
   (void)i;
   (void)dev_count;
 #ifndef _XBOX
-   xa->pXAudio2->GetDeviceCount(&dev_count);
+   IXAudio2_GetDeviceCount(xa->pXAudio2, &dev_count);
   fprintf(stderr, "XAudio2 devices:\n");

   for (i = 0; i < dev_count; i++)
   {
      XAUDIO2_DEVICE_DETAILS dev_detail;
-      xa->pXAudio2->GetDeviceDetails(i, &dev_detail);
+      IXAudio2_GetDeviceDetails(xa->pXAudio2, i, &dev_detail);
      fwprintf(stderr, L"\t%u: %s\n", i, dev_detail.DisplayName);
   }
 #endif
@@ -130,51 +169,68 @@ static void xaudio2_free(xaudio2_t *handle)

   if (handle->pSourceVoice)
   {
-      handle->pSourceVoice->Stop(0, XAUDIO2_COMMIT_NOW);
-      handle->pSourceVoice->DestroyVoice();
+      IXAudio2SourceVoice_Stop(handle->pSourceVoice,
+            0, XAUDIO2_COMMIT_NOW);
+      IXAudio2SourceVoice_DestroyVoice(handle->pSourceVoice);
   }

   if (handle->pMasterVoice)
-      handle->pMasterVoice->DestroyVoice();
+   {
+      IXAudio2MasteringVoice_DestroyVoice(handle->pMasterVoice);
+   }

   if (handle->pXAudio2)
-      handle->pXAudio2->Release();
+   {
+      IXAudio2_Release(handle->pXAudio2);
+   }

   if (handle->hEvent)
      CloseHandle(handle->hEvent);

   free(handle->buf);
-   delete handle;
-}

-#ifndef COINIT_MULTITHREADED
-#define COINIT_MULTITHREADED 0x00
+#if defined(__cplusplus) && !defined(CINTERFACE)
+   delete handle;
+#else
+   free(handle);
 #endif
+}

 static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
      size_t size, unsigned device)
 {
-   xaudio2_t *handle;
-   WAVEFORMATEX wfx = {0};
+   xaudio2_t *handle = NULL;
+   WAVEFORMATEX wfx  = {0};

 #ifndef _XBOX
   CoInitializeEx(0, COINIT_MULTITHREADED);
 #endif

+#if defined(__cplusplus) && !defined(CINTERFACE)
   handle = new xaudio2;
+#else
+   handle = (xaudio2_t*)calloc(1, sizeof(*handle));
+#endif
+
+   if (!handle)
+      goto error;
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+   handle->lpVtbl = &voice_vtable;
+#endif

   if (FAILED(XAudio2Create(&handle->pXAudio2, 0, XAUDIO2_DEFAULT_PROCESSOR)))
      goto error;

-   if (FAILED(handle->pXAudio2->CreateMasteringVoice(&handle->pMasterVoice,
-               channels, samplerate, 0, device, NULL)))
+   if (FAILED(IXAudio2_CreateMasteringVoice(handle->pXAudio2, &handle->pMasterVoice, channels, samplerate, 0, device, NULL)))
      goto error;

   xaudio2_set_wavefmt(&wfx, channels, samplerate);

-   if (FAILED(handle->pXAudio2->CreateSourceVoice(&handle->pSourceVoice, &wfx,
+   if (FAILED(IXAudio2_CreateSourceVoice(handle->pXAudio2,
+               &handle->pSourceVoice, &wfx,
               XAUDIO2_VOICE_NOSRC, XAUDIO2_DEFAULT_FREQ_RATIO,
-               handle)))
+               (IXAudio2VoiceCallback*)handle, 0, 0)))
      goto error;

   handle->hEvent  = CreateEvent(0, FALSE, FALSE, 0);
@@ -186,7 +242,8 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
   if (!handle->buf)
      goto error;

-   if (FAILED(handle->pSourceVoice->Start(0)))
+   if (FAILED(IXAudio2SourceVoice_Start(handle->pSourceVoice, 0,
+               XAUDIO2_COMMIT_NOW)))
      goto error;

   return handle;
@@ -196,21 +253,16 @@ error:
   return NULL;
 }

-static size_t xaudio2_write_avail(xaudio2_t *handle)
-{
-   return handle->bufsize * (MAX_BUFFERS - handle->buffers - 1);
-}
-
-static size_t xaudio2_write(xaudio2_t *handle, const void *buf, size_t bytes_)
+static size_t xaudio2_write(xaudio2_t *handle, const uint8_t *buffer, size_t bytes_)
 {
   unsigned bytes        = bytes_;
-   const uint8_t *buffer = (const uint8_t*)buf;

   while (bytes)
   {
      unsigned need   = MIN(bytes, handle->bufsize - handle->bufptr);

-      memcpy(handle->buf + handle->write_buffer * handle->bufsize + handle->bufptr,
+      memcpy(handle->buf + handle->write_buffer *
+            handle->bufsize + handle->bufptr,
            buffer, need);

      handle->bufptr += need;
@@ -219,15 +271,23 @@ static size_t xaudio2_write(xaudio2_t *handle, const void *buf, size_t bytes_)

      if (handle->bufptr == handle->bufsize)
      {
-         XAUDIO2_BUFFER xa2buffer = {0};
+         XAUDIO2_BUFFER xa2buffer;

         while (handle->buffers == MAX_BUFFERS - 1)
            WaitForSingleObject(handle->hEvent, INFINITE);

+         xa2buffer.Flags      = 0;
         xa2buffer.AudioBytes = handle->bufsize;
         xa2buffer.pAudioData = handle->buf + handle->write_buffer * handle->bufsize;
+         xa2buffer.PlayBegin  = 0;
+         xa2buffer.PlayLength = 0;
+         xa2buffer.LoopBegin  = 0;
+         xa2buffer.LoopLength = 0;
+         xa2buffer.LoopCount  = 0;
+         xa2buffer.pContext   = NULL;

-         if (FAILED(handle->pSourceVoice->SubmitSourceBuffer(&xa2buffer, NULL)))
+         if (FAILED(IXAudio2SourceVoice_SubmitSourceBuffer(
+                     handle->pSourceVoice, &xa2buffer, NULL)))
            return 0;

         InterlockedIncrement((LONG volatile*)&handle->buffers);
@@ -280,7 +340,7 @@ static ssize_t xa_write(void *data, const void *buf, size_t size)

   if (xa->nonblock)
   {
-      size_t avail = xaudio2_write_avail(xa->xa);
+      size_t avail = XAUDIO2_WRITE_AVAILABLE(xa->xa);

      if (avail == 0)
         return 0;
@@ -288,7 +348,7 @@ static ssize_t xa_write(void *data, const void *buf, size_t size)
         size = avail;
   }

-   ret = xaudio2_write(xa->xa, buf, size);
+   ret = xaudio2_write(xa->xa, (const uint8_t*)buf, size);
   if (ret == 0 && size > 0)
      return -1;
   return ret;
@@ -344,7 +404,7 @@ static void xa_free(void *data)
 static size_t xa_write_avail(void *data)
 {
   xa_t *xa = (xa_t*)data;
-   return xaudio2_write_avail(xa->xa);
+   return XAUDIO2_WRITE_AVAILABLE(xa->xa);
 }

 static size_t xa_buffer_size(void *data)
@@ -2,7 +2,7 @@
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2017 - Daniel De Matteis
 *  Copyright (C) 2010-2014 - OV2
- * 
+ *
 *  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.
@@ -15,20 +15,29 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-// Kinda stripped down. Only contains the bare essentials used in RetroArch.
+/* Kinda stripped down. Only contains the bare essentials used in RetroArch. */

 #ifndef XAUDIO2_STRIPPED_H
 #define XAUDIO2_STRIPPED_H

 #include <retro_inline.h>
+#include <retro_environment.h>

-// All structures defined in this file use tight field packing
+/* All structures defined in this file use tight field packing */
 #pragma pack(push, 1)
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
 #define X2DEFAULT(x) = (x)
+#else
+#define X2DEFAULT(x)
+#endif

 #ifdef _XBOX
 #include <xtl.h>

+#ifndef __cplusplus
+#define OPAQUE interface
+#endif
 #define DEFINE_CLSID(className, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
 	DEFINE_GUID(CLSID_##className, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)
 #define DEFINE_IID(interfaceName, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
@@ -38,7 +47,7 @@ DEFINE_CLSID(XAudio2, 3eda9b49, 2085, 498b, 9b, b2, 39, a6, 77, 84, 93, de);
 DEFINE_CLSID(XAudio2_Debug, 47199894, 7cc2, 444d, 98, 73, ce, d2, 56, 2c, c6, 0e);
 DEFINE_IID(IXAudio2, 8bcf1f58, 9fe7, 4583, 8a, c6, e2, ad, c4, 65, c8, bb);

-#include <audiodefs.h>      // Basic audio data types and constants
+#include <audiodefs.h>      /* Basic audio data types and constants */

 #else

@@ -48,6 +57,11 @@ DEFINE_IID(IXAudio2, 8bcf1f58, 9fe7, 4583, 8a, c6, e2, ad, c4, 65, c8, bb);
 #include <objbase.h>
 #include <mmreg.h>

+#ifndef __cplusplus
+#undef OPAQUE
+#define OPAQUE struct
+#endif
+
 #define DEFINE_GUID_X(n, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
   static const GUID n = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }
 #define DEFINE_CLSID_X(className, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
@@ -55,7 +69,13 @@ DEFINE_IID(IXAudio2, 8bcf1f58, 9fe7, 4583, 8a, c6, e2, ad, c4, 65, c8, bb);
 #define DEFINE_IID_X(interfaceName, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
   DEFINE_GUID_X(IID_##interfaceName, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8)

-DEFINE_CLSID_X(XAudio2, 5a508685, a254, 4fba, 9b, 82, 9a, 24, b0, 03, 06, af); // 2.7
+#ifndef __cplusplus
+#ifndef INTERFACE
+#define INTERFACE void
+#endif
+#endif
+
+DEFINE_CLSID_X(XAudio2, 5a508685, a254, 4fba, 9b, 82, 9a, 24, b0, 03, 06, af); /* 2.7 */
 DEFINE_IID_X(IXAudio2, 8bcf1f58, 9fe7, 4583, 8a, c6, e2, ad, c4, 65, c8, bb);

 #endif
@@ -99,7 +119,11 @@ typedef enum XAUDIO2_XBOX_HWTHREAD_SPECIFIER
 #else
 typedef enum XAUDIO2_WINDOWS_PROCESSOR_SPECIFIER
 {
+#if defined(__STDC_C89__)
+   XAUDIO2_ANY_PROCESSOR       = 0xffff,
+#else
   XAUDIO2_ANY_PROCESSOR       = 0xffffffff,
+#endif
   XAUDIO2_DEFAULT_PROCESSOR   = XAUDIO2_ANY_PROCESSOR
 } XAUDIO2_WINDOWS_PROCESSOR_SPECIFIER, XAUDIO2_PROCESSOR;
 #endif
@@ -107,7 +131,7 @@ typedef enum XAUDIO2_WINDOWS_PROCESSOR_SPECIFIER
 typedef enum XAUDIO2_FILTER_TYPE {
   LowPassFilter,
   BandPassFilter,
-   HighPassFilter 
+   HighPassFilter
 } XAUDIO2_FILTER_TYPE;

 typedef struct XAUDIO2_DEVICE_DETAILS
@@ -118,7 +142,8 @@ typedef struct XAUDIO2_DEVICE_DETAILS
   WAVEFORMATEXTENSIBLE OutputFormat;
 } XAUDIO2_DEVICE_DETAILS;

-// Forward declarations.
+/* Forward declarations. */
+#ifdef __cplusplus
 struct XAUDIO2_VOICE_DETAILS;
 struct XAUDIO2_VOICE_SENDS;
 struct XAUDIO2_EFFECT_DESCRIPTOR;
@@ -130,6 +155,20 @@ struct XAUDIO2_PERFORMANCE_DATA;
 struct XAUDIO2_DEBUG_CONFIGURATION;
 struct IXAudio2EngineCallback;
 struct IXAudio2SubmixVoice;
+#else
+typedef OPAQUE XAUDIO2_VOICE_DETAILS XAUDIO2_VOICE_DETAILS;
+typedef OPAQUE XAUDIO2_VOICE_SENDS XAUDIO2_VOICE_SENDS;
+typedef OPAQUE XAUDIO2_EFFECT_DESCRIPTOR XAUDIO2_EFFECT_DESCRIPTOR;
+typedef OPAQUE XAUDIO2_EFFECT_CHAIN XAUDIO2_EFFECT_CHAIN;
+typedef OPAQUE XAUDIO2_FILTER_PARAMETERS XAUDIO2_FILTER_PARAMETERS;
+typedef OPAQUE XAUDIO2_BUFFER_WMA XAUDIO2_BUFFER_WMA;
+typedef OPAQUE XAUDIO2_VOICE_STATE XAUDIO2_VOICE_STATE;
+typedef OPAQUE XAUDIO2_PERFORMANCE_DATA XAUDIO2_PERFORMANCE_DATA;
+typedef OPAQUE XAUDIO2_DEBUG_CONFIGURATION XAUDIO2_DEBUG_CONFIGURATION;
+typedef OPAQUE IXAudio2EngineCallback IXAudio2EngineCallback;
+typedef OPAQUE IXAudio2SubmixVoice IXAudio2SubmixVoice;
+#endif
+

 typedef struct XAUDIO2_BUFFER
 {
@@ -144,6 +183,9 @@ typedef struct XAUDIO2_BUFFER
   void *pContext;
 } XAUDIO2_BUFFER;

+#undef INTERFACE
+#define INTERFACE IXAudio2VoiceCallback
+
 DECLARE_INTERFACE(IXAudio2VoiceCallback)
 {
   STDMETHOD_(void, OnVoiceProcessingPassStart) (THIS_ UINT32 BytesRequired) PURE;
@@ -155,6 +197,9 @@ DECLARE_INTERFACE(IXAudio2VoiceCallback)
   STDMETHOD_(void, OnVoiceError) (THIS_ void *pBufferContext, HRESULT Error) PURE;
 };

+#undef INTERFACE
+#define INTERFACE IXAudio2Voice
+
 DECLARE_INTERFACE(IXAudio2Voice)
 {
 #define Declare_IXAudio2Voice_Methods() \
@@ -196,11 +241,17 @@ DECLARE_INTERFACE(IXAudio2Voice)
   Declare_IXAudio2Voice_Methods();
 };

+#undef INTERFACE
+#define INTERFACE IXAudio2MasteringVoice
+
 DECLARE_INTERFACE_(IXAudio2MasteringVoice, IXAudio2Voice)
 {
   Declare_IXAudio2Voice_Methods();
 };

+#undef INTERFACE
+#define INTERFACE IXAudio2SourceVoice
+
 DECLARE_INTERFACE_(IXAudio2SourceVoice, IXAudio2Voice)
 {
   Declare_IXAudio2Voice_Methods();
@@ -216,6 +267,8 @@ DECLARE_INTERFACE_(IXAudio2SourceVoice, IXAudio2Voice)
   STDMETHOD_(void, GetFrequencyRatio) (THIS_ float* pRatio) PURE;
 };

+#undef INTERFACE
+#define INTERFACE IXAudio2

 DECLARE_INTERFACE_(IXAudio2, IUnknown)
 {
@@ -253,31 +306,58 @@ DECLARE_INTERFACE_(IXAudio2, IUnknown)
         void *pReserved X2DEFAULT(NULL)) PURE;
 };

+#if defined(__cplusplus) && !defined(CINTERFACE)
+/* C++ hooks */
+#define IXAudio2_Initialize(handle,a,b) handle->Initialize(a, b)
+#define IXAudio2SourceVoice_SubmitSourceBuffer(handle, a, b) handle->SubmitSourceBuffer(a, b)
+#define IXAudio2SourceVoice_Stop(handle, a, b) handle->Stop(a, b)
+#define IXAudio2SourceVoice_DestroyVoice(handle) handle->DestroyVoice()
+#define IXAudio2MasteringVoice_DestroyVoice(handle) handle->DestroyVoice()
+#define IXAudio2_Release(handle) handle->Release()
+#define IXAudio2_CreateSourceVoice(handle, a, b, c, d, e, f, g) handle->CreateSourceVoice(a, b, c, d, e, f, g)
+#define IXAudio2_CreateMasteringVoice(handle, a, b, c, d, e, f) handle->CreateMasteringVoice(a, b, c, d, e, f)
+#define IXAudio2SourceVoice_Start(handle, a, b) handle->Start(a, b)
+#else
+/* C hooks */
+#define IXAudio2_Initialize(handle,a,b) (handle)->lpVtbl->Initialize(handle, a, b)
+#define IXAudio2_Release(handle) (handle)->lpVtbl->Release(handle)
+#define IXAudio2_CreateSourceVoice(handle,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain) (handle)->lpVtbl->CreateSourceVoice(handle, ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain)
+#define IXAudio2_CreateMasteringVoice(handle,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceIndex,pEffectChain) (handle)->lpVtbl->CreateMasteringVoice(handle, ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceIndex,pEffectChain)
+#define IXAudio2_GetDeviceCount(handle, puCount) (handle)->lpVtbl->GetDeviceCount(handle, puCount)
+#define IXAudio2_GetDeviceDetails(handle, Index,pDeviceDetails) (handle)->lpVtbl->GetDeviceDetails(handle, Index, pDeviceDetails)
+#define IXAudio2SourceVoice_Start(handle, Flags, OperationSet) (handle)->lpVtbl->Start(handle, Flags, OperationSet)
+#define IXAudio2SourceVoice_Stop(handle, Flags, OperationSet) (handle)->lpVtbl->Stop(handle, Flags, OperationSet)
+#define IXAudio2SourceVoice_SubmitSourceBuffer(handle, pBuffer, pBufferWMA) (handle)->lpVtbl->SubmitSourceBuffer(handle, pBuffer, pBufferWMA)
+#define IXAudio2SourceVoice_DestroyVoice(handle) (handle)->lpVtbl->DestroyVoice(handle)
+#define IXAudio2MasteringVoice_DestroyVoice(handle) (handle)->lpVtbl->DestroyVoice(handle)
+#endif
+
 #ifdef _XBOX
 STDAPI XAudio2Create(__deref_out IXAudio2** ppXAudio2, UINT32 Flags X2DEFAULT(0),
 		XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR));
 #else
-static INLINE HRESULT XAudio2Create(IXAudio2 **ppXAudio2, UINT32, XAUDIO2_PROCESSOR)
+static INLINE HRESULT XAudio2Create(IXAudio2 **ppXAudio2, UINT32 flags, XAUDIO2_PROCESSOR proc)
 {
-   IXAudio2 *pXAudio2;
-
+   IXAudio2 *pXAudio2 = NULL;
+#ifdef __cplusplus
   HRESULT hr = CoCreateInstance(CLSID_XAudio2, NULL, CLSCTX_INPROC_SERVER, IID_IXAudio2, (void**)&pXAudio2);
+#else
+   HRESULT hr = CoCreateInstance(&CLSID_XAudio2, NULL, CLSCTX_INPROC_SERVER, &IID_IXAudio2, (void**)&pXAudio2);
+#endif

   if (SUCCEEDED(hr))
   {
-      //hr = IXAudio2_Initialize(pXAudio2, 0, XAUDIO2_DEFAULT_PROCESSOR);
-      hr = pXAudio2->Initialize(0, XAUDIO2_DEFAULT_PROCESSOR);
+      hr = IXAudio2_Initialize(pXAudio2, 0, XAUDIO2_DEFAULT_PROCESSOR);
      if (SUCCEEDED(hr))
         *ppXAudio2 = pXAudio2;
      else
-         //IXAudio2_Release(pXAudio2);
-         pXAudio2->Release();
+         IXAudio2_Release(pXAudio2);
   }
   return hr;
 }
 #endif

-// Undo the #pragma pack(push, 1) directive at the top of this file
+/* Undo the #pragma pack(push, 1) directive at the top of this file */
 #pragma pack(pop)

 #endif
@@ -1,7 +1,7 @@
 /*  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.
@@ -70,7 +70,7 @@ static ssize_t xenon360_audio_write(void *data, const void *buf, size_t size)
   {
      while (xenon_sound_get_unplayed() >= MAX_BUFFER)
      {
-         /* libxenon doesn't have proper 
+         /* libxenon doesn't have proper
          * synchronization primitives for this... */
         udelay(50);
      }
@@ -151,7 +151,9 @@ done:
 }

 static void *resampler_CC_init(const struct resampler_config *config,
-      double bandwidth_mod, resampler_simd_mask_t mask)
+      double bandwidth_mod, 
+      enum resampler_quality quality,
+      resampler_simd_mask_t mask)
 {
   (void)mask;
   (void)bandwidth_mod;
@@ -492,18 +494,20 @@ static void resampler_CC_process(void *re_, struct resampler_data *data)


 static void *resampler_CC_init(const struct resampler_config *config,
-      double bandwidth_mod, resampler_simd_mask_t mask)
+      double bandwidth_mod, 
+      enum resampler_quality quality,
+      resampler_simd_mask_t mask)
 {
   int i;
   rarch_CC_resampler_t *re = (rarch_CC_resampler_t*)
      memalign_alloc(32, sizeof(rarch_CC_resampler_t));

-   /* TODO: lookup if NEON support can be detected at 
+   /* TODO: lookup if NEON support can be detected at
    * runtime and a funcptr set at runtime for either
    * C codepath or NEON codepath. This will help out
    * Android. */
   (void)mask;
-   (void)config; 
+   (void)config;
   if (!re)
      return NULL;

@@ -1,7 +1,7 @@
 /*  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.
@@ -16,7 +16,7 @@

 /*  RSound - A PCM audio client/server
 *  Copyright (C) 2010 - Hans-Kristian Arntzen
- * 
+ *
 *  RSound 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.
@@ -67,7 +67,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <time.h>
-#include <errno.h> 
+#include <errno.h>

 #include <compat/strl.h>
 #include <retro_inline.h>
@@ -75,8 +75,8 @@
 #include <retro_miscellaneous.h>
 #include <retro_timers.h>

-/* 
- ****************************************************************************   
+/*
+ ****************************************************************************
 Naming convention. Functions for use in API are called rsd_*(),         *
 internal function are called rsnd_*()                                   *
 ****************************************************************************
@@ -251,7 +251,7 @@ static int rsnd_connect_server( rsound_t *rd )
   if ( rd->conn.ctl_socket < 0 )
      goto error;

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

 #ifdef __CELLOS_LV2__
   setsockopt(rd->conn.socket, SOL_SOCKET, SO_NBIO, &i, sizeof(int));
@@ -302,7 +302,7 @@ static int rsnd_send_header_info(rsound_t *rd)
   uint16_t temp16;
   uint32_t temp32;

-   /* These magic numbers represent the position of the elements in the wave header. 
+   /* These magic numbers represent the position of the elements in the wave header.
      We can't simply send a wave struct over the network since the compiler is allowed to
      pad our structs as they like, so sizeof(waveheader) might not be similar on two different
      systems. */
@@ -353,7 +353,7 @@ static int rsnd_send_header_info(rsound_t *rd)
   }

   /* Since the values in the wave header we are interested in, are little endian (>_<), we need
-      to determine whether we're running it or not, so we can byte swap accordingly. 
+      to determine whether we're running it or not, so we can byte swap accordingly.
      Could determine this compile time, but it was simpler to do it this way. */

   // Fancy macros for embedding little endian values into the header.
@@ -501,7 +501,7 @@ static int rsnd_get_backend_info ( rsound_t *rd )
   // Can we read the last 8 bytes so we can use the protocol interface?
   // This is non-blocking.
   if ( rsnd_recv_chunk(rd->conn.socket, rsnd_header, RSND_HEADER_SIZE, 0) == RSND_HEADER_SIZE )
-      rd->conn_type |= RSD_CONN_PROTO; 
+      rd->conn_type |= RSD_CONN_PROTO;
   else
   {  RSD_DEBUG("[RSound] Failed to get new proto.\n"); }

@@ -515,7 +515,7 @@ static int rsnd_get_backend_info ( rsound_t *rd )
   return 0;
 }

-/* Makes sure that we're connected and done with wave header handshaking. Returns -1 on error, and 0 on success. 
+/* Makes sure that we're connected and done with wave header handshaking. Returns -1 on error, and 0 on success.
   This goes for all other functions in use. */
 static int rsnd_create_connection(rsound_t *rd)
 {
@@ -750,7 +750,7 @@ static int64_t rsnd_get_time_usec(void)

 /* Calculates how many bytes there are in total in the virtual buffer. This is calculated client side.
   It should be accurate enough unless we have big problems with buffer underruns.
-   This function is called by rsd_delay() to determine the latency. 
+   This function is called by rsd_delay() to determine the latency.
   This function might be changed in the future to correctly determine latency from server. */
 static void rsnd_drain(rsound_t *rd)
 {
@@ -777,7 +777,7 @@ static void rsnd_drain(rsound_t *rd)
 }

 /* Tries to fill the buffer. Uses signals to determine when the buffer is ready to be filled. Should the thread not be active
-   it will treat this as an error. Crude implementation of a blocking FIFO. */ 
+   it will treat this as an error. Crude implementation of a blocking FIFO. */
 static size_t rsnd_fill_buffer(rsound_t *rd, const char *buf, size_t size)
 {

@@ -851,7 +851,7 @@ static int rsnd_stop_thread(rsound_t *rd)

      sthread_join(rd->thread.thread);
      RSD_DEBUG("[RSound] Thread joined successfully.\n");
-      
+
      return 0;
   }
   else
@@ -981,7 +981,7 @@ static int rsnd_close_ctl(rsound_t *rd)
 }


-// Sends delay info request to server on the ctl socket. This code section isn't critical, and will work if it works. 
+// Sends delay info request to server on the ctl socket. This code section isn't critical, and will work if it works.
 // It will never block.
 static int rsnd_send_info_query(rsound_t *rd)
 {
@@ -1111,7 +1111,7 @@ static void rsnd_thread ( void * thread_data )
         // We only bother to check after 1 sec of audio has been played, as it might be quite inaccurate in the start of the stream.
         if ( (rd->conn_type & RSD_CONN_PROTO) && (rd->total_written > rd->channels * rd->rate * rd->samplesize) )
         {
-            rsnd_send_info_query(rd); 
+            rsnd_send_info_query(rd);
            rsnd_update_server_info(rd);
         }

@@ -1263,7 +1263,7 @@ static void rsnd_cb_thread(void *thread_data)

      if ( (rd->conn_type & RSD_CONN_PROTO) && (rd->total_written > rd->channels * rd->rate * rd->samplesize) )
      {
-         rsnd_send_info_query(rd); 
+         rsnd_send_info_query(rd);
         rsnd_update_server_info(rd);
      }

@@ -1304,7 +1304,7 @@ int rsd_stop(rsound_t *rd)

   const char buf[] = "RSD    5 STOP";

-   // Do not really care about errors here. 
+   // Do not really care about errors here.
   // The socket will be closed down in any case in rsnd_reset().
   rsnd_send_chunk(rd->conn.ctl_socket, buf, strlen(buf), 0);

@@ -1325,7 +1325,7 @@ size_t rsd_write( rsound_t *rsound, const void* buf, size_t size)

   while ( written < size )
   {
-      size_t write_size = (size - written) > max_write ? max_write : (size - written); 
+      size_t write_size = (size - written) > max_write ? max_write : (size - written);
      size_t     result = rsnd_fill_buffer(rsound, (const char*)buf + written, write_size);

      if (result == 0)
@@ -1454,7 +1454,7 @@ int rsd_set_param(rsound_t *rd, enum rsd_settings option, void* param)
 			rd->max_latency = *((int*)param);
 			break;

-			// Checks if format is valid.   
+			// Checks if format is valid.
 		case RSD_FORMAT:
 			rd->format = (uint16_t)(*((int*)param));
 			rd->samplesize = rsnd_format_to_samplesize(rd->format);
@@ -1509,7 +1509,7 @@ size_t rsd_pointer(rsound_t *rsound)
   retro_assert(rsound != NULL);
   int ptr;

-   ptr = rsnd_get_ptr(rsound);   
+   ptr = rsnd_get_ptr(rsound);

   return ptr;
 }
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2016 - Daniel De Matteis
- * 
+ *
 *  RetroArch is free software: you can redistribute it and/or modify it under the terms
 *  of the GNU General Public License as published by the Free Software Found-
 *  ation, either version 3 of the License, or (at your option) any later version.
@@ -14,7 +14,7 @@ USE_KERNEL_LIBC=1
 USE_KERNEL_LIBS=1

 LIBDIR =
-LDFLAGS = -mno-crt0 -nostartfiles
+LDFLAGS = -nostartfiles
 LIBS = -lpspdebug -lpspge -lpspsdk -lc -lpspuser
 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak
@@ -55,9 +55,10 @@ void exitspawn_kernel(const char *fileName, SceSize args, void *argp)
   game_param.unk4 = 0;
   game_param.unk5 = 0x10000;

-   pspSdkSetK1(0);
-   sceKernelSuspendAllUserThreads();
-   sceKernelLoadExecVSHMs2(fileName, &game_param);
+   int k1 = pspSdkSetK1(0);
+   //sceKernelSuspendAllUserThreads(); 
+   int ret = sceKernelLoadExecVSHMs2(fileName, &game_param);
+   pspSdkSetK1(k1);
 }

 int module_start(SceSize args, void *argp)
@@ -66,7 +67,7 @@ int module_start(SceSize args, void *argp)
   (void)argp;

   buttons = 0;
-   thread_active = 0;   
+   thread_active = 0;
   main_thread_id = sceKernelCreateThread("main Thread", main_thread, 0x11, 0x200, 0, NULL);

   if (main_thread >= 0)
@@ -34,7 +34,7 @@ int __vita_delete_thread_reent(int thid)
 	// We only need to cleanup if reent is allocated, i.e. if it's on our TLS
 	// We also don't need to clean up the global reent
 	struct _reent **on_tls = NULL;
-	
+
 	if (thid == 0)
 		on_tls = TLS_REENT_PTR;
 	else
@@ -141,16 +141,16 @@ struct _reent *__getreent_for_thread(int thid) {

 	// A pointer to our reent should be on the TLS
 	struct _reent **on_tls = NULL;
-	
+
 	if (thid == 0)
 		on_tls = TLS_REENT_PTR;
 	else
-		on_tls = TLS_REENT_THID_PTR(thid);	
-	
+		on_tls = TLS_REENT_THID_PTR(thid);
+
 	if (*on_tls) {
 		return *on_tls;
 	}
-  
+
  	sceKernelLockMutex(_newlib_reent_mutex, 1, 0);

 	// If it's not on the TLS this means the thread doesn't have a reent allocated yet
@@ -1,7 +1,7 @@
 /*  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.
@@ -139,7 +139,7 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
      case RARCH_CAMERA_CTL_OWNS_DRIVER:
         return camera_driver_data_own;
      case RARCH_CAMERA_CTL_SET_ACTIVE:
-         camera_driver_active = true; 
+         camera_driver_active = true;
         break;
      case RARCH_CAMERA_CTL_FIND_DRIVER:
         {
@@ -157,14 +157,17 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
               camera_driver = (const camera_driver_t*)camera_driver_find_handle(i);
            else
            {
-               unsigned d;
-               RARCH_ERR("Couldn't find any camera driver named \"%s\"\n",
-                     settings->arrays.camera_driver);
-               RARCH_LOG_OUTPUT("Available camera drivers are:\n");
-               for (d = 0; camera_driver_find_handle(d); d++)
-                  RARCH_LOG_OUTPUT("\t%s\n", camera_driver_find_ident(d));
+               if (verbosity_is_enabled())
+               {
+                  unsigned d;
+                  RARCH_ERR("Couldn't find any camera driver named \"%s\"\n",
+                        settings->arrays.camera_driver);
+                  RARCH_LOG_OUTPUT("Available camera drivers are:\n");
+                  for (d = 0; camera_driver_find_handle(d); d++)
+                     RARCH_LOG_OUTPUT("\t%s\n", camera_driver_find_ident(d));

-               RARCH_WARN("Going to default to first camera driver...\n");
+                  RARCH_WARN("Going to default to first camera driver...\n");
+               }

               camera_driver = (const camera_driver_t*)camera_driver_find_handle(0);

@@ -174,10 +177,10 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
         }
         break;
      case RARCH_CAMERA_CTL_UNSET_ACTIVE:
-         camera_driver_active = false; 
+         camera_driver_active = false;
         break;
      case RARCH_CAMERA_CTL_IS_ACTIVE:
-        return camera_driver_active; 
+        return camera_driver_active;
      case RARCH_CAMERA_CTL_DEINIT:
        if (camera_data && camera_driver)
        {
@@ -191,8 +194,8 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
        camera_data = NULL;
        break;
      case RARCH_CAMERA_CTL_STOP:
-        if (     camera_driver 
-              && camera_driver->stop 
+        if (     camera_driver
+              && camera_driver->stop
              && camera_data)
           camera_driver->stop(camera_data);
        break;
@@ -243,6 +246,6 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
      default:
         break;
   }
-   
+
   return true;
 }
@@ -1,7 +1,7 @@
 /*  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.
@@ -2,7 +2,7 @@
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2017 - Daniel De Matteis
 *  Copyright (C) 2012-2015 - Michael Lelli
- * 
+ *
 *  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.
@@ -152,7 +152,7 @@ static void android_camera_stop(void *data)

   CALL_VOID_METHOD(env, android_app->activity->clazz,
         androidcamera->onCameraStop);
-   
+
   if (androidcamera->tex)
      video_driver_texture_unload((uintptr_t*)&androidcamera->tex);
 }
@@ -171,12 +171,12 @@ static bool android_camera_poll(void *data,

   (void)frame_raw_cb;

-   CALL_BOOLEAN_METHOD(env, newFrame, android_app->activity->clazz, 
+   CALL_BOOLEAN_METHOD(env, newFrame, android_app->activity->clazz,
         androidcamera->onCameraPoll);

   if (newFrame)
   {
-      /* FIXME: Identity for now. Use proper texture matrix as 
+      /* FIXME: Identity for now. Use proper texture matrix as
       * returned by Android Camera. */
      static const float affine[] = {
         1.0f, 0.0f, 0.0f,
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2012-2015 - Michael Lelli
 *  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.
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2012-2015 - Michael Lelli
 *  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.
@@ -2,7 +2,7 @@
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2017 - Daniel De Matteis
 *  Copyright (C) 2012-2015 - Michael Lelli
- * 
+ *
 *  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.
@@ -16,7 +16,9 @@
 */

 #include <stdio.h>
+#if !defined(__FreeBSD__) || __FreeBSD__ < 5
 #include <malloc.h>
+#endif
 #include <string.h>
 #include <assert.h>
 #include <stddef.h>
@@ -28,7 +30,9 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>

+#ifndef __FreeBSD__
 #include <asm/types.h>
+#endif
 #include <linux/videodev2.h>

 #include <memmap.h>
@@ -0,0 +1,59 @@
+#include <file/file_path.h>
+#include <string/stdstring.h>
+#include <streams/file_stream.h>
+
+#ifdef HAVE_MENU
+#include "../menu/menu_driver.h"
+#endif
+
+#include "../file_path_special.h"
+#include "../configuration.h"
+#include "../verbosity.h"
+#include "../network/net_http_special.h"
+
+#include "badges.h"
+
+badges_ctx_t badges_ctx;
+
+bool badge_exists(const char* filepath)
+{
+  return filestream_exists(filepath);
+}
+
+void set_badge_menu_texture(badges_ctx_t * badges, int i)
+{
+   char badge_file[16];
+   char fullpath[PATH_MAX_LENGTH];
+
+   snprintf(badge_file, sizeof(badge_file), "%s%s", badges->badge_id_list[i],
+         badges->badge_locked[i] ? "_lock.png" : ".png");
+
+   fill_pathname_application_special(fullpath,
+         PATH_MAX_LENGTH * sizeof(char),
+         APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES);
+
+#ifdef HAVE_MENU
+   menu_display_reset_textures_list(badge_file, fullpath,
+         &badges->menu_texture_list[i],TEXTURE_FILTER_MIPMAP_LINEAR);
+#endif
+}
+
+void set_badge_info (badges_ctx_t *badge_struct, int id,
+      const char *badge_id, bool active)
+{
+   if (!badge_struct)
+      return;
+
+   badge_struct->badge_id_list[id] = badge_id;
+   badge_struct->badge_locked[id]  = active;
+   set_badge_menu_texture(badge_struct, id);
+}
+
+menu_texture_item get_badge_texture(int id)
+{
+   settings_t *settings = config_get_ptr();
+   if (!settings || !settings->bools.cheevos_badges_enable)
+      return (menu_texture_item)NULL;
+
+   return badges_ctx.menu_texture_list[id];
+}
@@ -0,0 +1,29 @@
+#ifndef __RARCH_BADGE_H
+#define __RARCH_BADGE_H
+
+#include "../menu/menu_driver.h"
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+#define CHEEVOS_BADGE_LIMIT 256
+
+typedef struct
+{
+  bool badge_locked[CHEEVOS_BADGE_LIMIT];
+  const char * badge_id_list[CHEEVOS_BADGE_LIMIT];
+  menu_texture_item menu_texture_list[CHEEVOS_BADGE_LIMIT];
+} badges_ctx_t;
+
+bool badge_exists(const char* filepath);
+void set_badge_menu_texture(badges_ctx_t * badges, int i);
+extern void set_badge_info (badges_ctx_t *badge_struct, int id, const char *badge_id, bool active);
+extern menu_texture_item get_badge_texture(int id);
+
+extern badges_ctx_t badges_ctx;
+static badges_ctx_t new_badges_ctx;
+
+RETRO_END_DECLS
+
+#endif
@@ -19,10 +19,25 @@
 #include <stdint.h>
 #include <stdlib.h>

+#include <boolean.h>
+
 #include <retro_common_api.h>

 RETRO_BEGIN_DECLS

+/*****************************************************************************
+Setup - mainly for debugging
+*****************************************************************************/
+
+/* Define this macro to get extra-verbose log for cheevos. */
+#undef CHEEVOS_VERBOSE
+
+/*****************************************************************************
+End of setup
+*****************************************************************************/
+
+#define CHEEVOS_TAG "[CHEEVOS]: "
+
 typedef struct cheevos_ctx_desc
 {
   unsigned idx;
@@ -30,20 +45,80 @@ typedef struct cheevos_ctx_desc
   size_t len;
 } cheevos_ctx_desc_t;

-typedef struct
+typedef enum
 {
-   unsigned size;
-   unsigned type;
-   int      bank_id;
-   unsigned value;
-   unsigned previous;
-} cheevos_var_t;
+   CHEEVOS_CONSOLE_NONE = 0,
+   /* Don't change those, the values match the console IDs
+    * at retroachievements.org. */
+   CHEEVOS_CONSOLE_MEGA_DRIVE      = 1,
+   CHEEVOS_CONSOLE_NINTENDO_64     = 2,
+   CHEEVOS_CONSOLE_SUPER_NINTENDO  = 3,
+   CHEEVOS_CONSOLE_GAMEBOY         = 4,
+   CHEEVOS_CONSOLE_GAMEBOY_ADVANCE = 5,
+   CHEEVOS_CONSOLE_GAMEBOY_COLOR   = 6,
+   CHEEVOS_CONSOLE_NINTENDO        = 7,
+   CHEEVOS_CONSOLE_PC_ENGINE       = 8,
+   CHEEVOS_CONSOLE_SEGA_CD         = 9,
+   CHEEVOS_CONSOLE_SEGA_32X        = 10,
+   CHEEVOS_CONSOLE_MASTER_SYSTEM   = 11,
+   CHEEVOS_CONSOLE_PLAYSTATION     = 12,
+   CHEEVOS_CONSOLE_ATARI_LYNX      = 13,
+   CHEEVOS_CONSOLE_NEOGEO_POCKET   = 14,
+   CHEEVOS_CONSOLE_XBOX_360        = 15,
+   CHEEVOS_CONSOLE_GAMECUBE        = 16,
+   CHEEVOS_CONSOLE_ATARI_JAGUAR    = 17,
+   CHEEVOS_CONSOLE_NINTENDO_DS     = 18,
+   CHEEVOS_CONSOLE_WII             = 19,
+   CHEEVOS_CONSOLE_WII_U           = 20,
+   CHEEVOS_CONSOLE_PLAYSTATION_2   = 21,
+   CHEEVOS_CONSOLE_XBOX            = 22,
+   CHEEVOS_CONSOLE_SKYNET          = 23,
+   CHEEVOS_CONSOLE_XBOX_ONE        = 24,
+   CHEEVOS_CONSOLE_ATARI_2600      = 25,
+   CHEEVOS_CONSOLE_MS_DOS          = 26,
+   CHEEVOS_CONSOLE_ARCADE          = 27,
+   CHEEVOS_CONSOLE_VIRTUAL_BOY     = 28,
+   CHEEVOS_CONSOLE_MSX             = 29,
+   CHEEVOS_CONSOLE_COMMODORE_64    = 30,
+   CHEEVOS_CONSOLE_ZX81            = 31
+} cheevos_console_t;
+
+enum
+{
+   CHEEVOS_DIRTY_TITLE       = 1 << 0,
+   CHEEVOS_DIRTY_DESC        = 1 << 1,
+   CHEEVOS_DIRTY_POINTS      = 1 << 2,
+   CHEEVOS_DIRTY_AUTHOR      = 1 << 3,
+   CHEEVOS_DIRTY_ID          = 1 << 4,
+   CHEEVOS_DIRTY_BADGE       = 1 << 5,
+   CHEEVOS_DIRTY_CONDITIONS  = 1 << 6,
+   CHEEVOS_DIRTY_VOTES       = 1 << 7,
+   CHEEVOS_DIRTY_DESCRIPTION = 1 << 8,
+
+   CHEEVOS_DIRTY_ALL         = (1 << 9) - 1
+};
+
+enum
+{
+   CHEEVOS_ACTIVE_SOFTCORE = 1 << 0,
+   CHEEVOS_ACTIVE_HARDCORE = 1 << 1
+};
+
+enum
+{
+   CHEEVOS_FORMAT_FRAMES = 0,
+   CHEEVOS_FORMAT_SECS,
+   CHEEVOS_FORMAT_MILLIS,
+   CHEEVOS_FORMAT_SCORE,
+   CHEEVOS_FORMAT_VALUE,
+   CHEEVOS_FORMAT_OTHER
+};

 bool cheevos_load(const void *data);

 void cheevos_reset_game(void);

-void cheevos_populate_menu(void *data, bool hardcore);
+void cheevos_populate_menu(void *data);

 bool cheevos_get_description(cheevos_ctx_desc_t *desc);

@@ -61,9 +136,7 @@ void cheevos_set_support_cheevos(bool state);

 bool cheevos_get_support_cheevos(void);

-void cheevos_parse_guest_addr(cheevos_var_t *var, unsigned value);
-
-uint8_t *cheevos_get_memory(const cheevos_var_t *var);
+cheevos_console_t cheevos_get_console(void);

 extern bool cheevos_loaded;
 extern int cheats_are_enabled;
@@ -0,0 +1,192 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2017 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "cond.h"
+#include "var.h"
+
+#include "../retroarch.h"
+#include "../verbosity.h"
+
+/*****************************************************************************
+Parsing
+*****************************************************************************/
+
+static cheevos_cond_op_t cheevos_cond_parse_operator(const char** memaddr)
+{
+   const char *str = *memaddr;
+   cheevos_cond_op_t op;
+
+   if (*str == '=' && str[1] == '=')
+   {
+      op = CHEEVOS_COND_OP_EQUALS;
+      str += 2;
+   }
+   else if (*str == '=')
+   {
+      op = CHEEVOS_COND_OP_EQUALS;
+      str++;
+   }
+   else if (*str == '!' && str[1] == '=')
+   {
+      op = CHEEVOS_COND_OP_NOT_EQUAL_TO;
+      str += 2;
+   }
+   else if (*str == '<' && str[1] == '=')
+   {
+      op = CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL;
+      str += 2;
+   }
+   else if (*str == '<')
+   {
+      op = CHEEVOS_COND_OP_LESS_THAN;
+      str++;
+   }
+   else if (*str == '>' && str[1] == '=')
+   {
+      op = CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL;
+      str += 2;
+   }
+   else if (*str == '>')
+   {
+      op = CHEEVOS_COND_OP_GREATER_THAN;
+      str++;
+   }
+   else
+   {
+      RARCH_ERR(CHEEVOS_TAG "unknown operator %c\n.", *str);
+      op = CHEEVOS_COND_OP_EQUALS;
+   }
+
+   *memaddr = str;
+   return op;
+}
+
+void cheevos_cond_parse(cheevos_cond_t* cond, const char** memaddr)
+{
+   const char* str = *memaddr;
+   cond->type = CHEEVOS_COND_TYPE_STANDARD;
+
+   if (*str != 0 && str[1] == ':')
+   {
+      int skip = 2;
+
+      switch (*str)
+      {
+      case 'R':
+         cond->type = CHEEVOS_COND_TYPE_RESET_IF;
+         break;
+      case 'P':
+         cond->type = CHEEVOS_COND_TYPE_PAUSE_IF;
+         break;
+      case 'A':
+         cond->type = CHEEVOS_COND_TYPE_ADD_SOURCE;
+         break;
+      case 'B':
+         cond->type = CHEEVOS_COND_TYPE_SUB_SOURCE;
+         break;
+      case 'C':
+         cond->type = CHEEVOS_COND_TYPE_ADD_HITS;
+         break;
+      default:
+         skip = 0;
+         break;
+      }
+
+      str += skip;
+   }
+
+   cheevos_var_parse(&cond->source, &str);
+   cond->op = cheevos_cond_parse_operator(&str);
+   cheevos_var_parse(&cond->target, &str);
+   cond->curr_hits = 0;
+
+   if (*str == '(' || *str == '.')
+   {
+      char* end;
+      cond->req_hits = (unsigned)strtol(str + 1, &end, 10);
+      str = end + (*end == ')' || *end == '.');
+   }
+   else
+      cond->req_hits = 0;
+
+   *memaddr = str;
+}
+
+unsigned cheevos_cond_count_in_set(const char* memaddr, unsigned which)
+{
+   cheevos_cond_t dummy;
+   unsigned index = 0;
+   unsigned count = 0;
+
+   for (;;)
+   {
+      for (;;)
+      {
+         cheevos_cond_parse(&dummy, &memaddr);
+
+         if (index == which)
+            count++;
+
+         if (*memaddr != '_')
+            break;
+
+         memaddr++;
+      }
+
+      index++;
+
+      if (*memaddr != 'S')
+         break;
+
+      memaddr++;
+   }
+
+   return count;
+}
+
+void cheevos_cond_parse_in_set(cheevos_cond_t* cond, const char* memaddr, unsigned which)
+{
+   cheevos_cond_t dummy;
+   unsigned index = 0;
+
+   for (;;)
+   {
+      for (;;)
+      {
+         if (index == which)
+         {
+            cheevos_cond_parse(cond, &memaddr);
+#ifdef CHEEVOS_VERBOSE
+            /*cheevos_log_cond(cond);*/
+#endif
+            cond++;
+         }
+         else
+            cheevos_cond_parse(&dummy, &memaddr);
+
+         if (*memaddr != '_')
+            break;
+
+         memaddr++;
+      }
+
+      index++;
+
+      if (*memaddr != 'S')
+         break;
+
+      memaddr++;
+   }
+}
@@ -0,0 +1,62 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2017 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_CHEEVOS_COND_H
+#define __RARCH_CHEEVOS_COND_H
+
+#include "var.h"
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+typedef enum
+{
+   CHEEVOS_COND_TYPE_STANDARD,
+   CHEEVOS_COND_TYPE_PAUSE_IF,
+   CHEEVOS_COND_TYPE_RESET_IF,
+   CHEEVOS_COND_TYPE_ADD_SOURCE,
+   CHEEVOS_COND_TYPE_SUB_SOURCE,
+   CHEEVOS_COND_TYPE_ADD_HITS
+} cheevos_cond_type_t;
+
+typedef enum
+{
+   CHEEVOS_COND_OP_EQUALS,
+   CHEEVOS_COND_OP_LESS_THAN,
+   CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL,
+   CHEEVOS_COND_OP_GREATER_THAN,
+   CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL,
+   CHEEVOS_COND_OP_NOT_EQUAL_TO
+} cheevos_cond_op_t;
+
+typedef struct
+{
+   cheevos_cond_type_t type;
+   unsigned            req_hits;
+   unsigned            curr_hits;
+
+   cheevos_var_t       source;
+   cheevos_cond_op_t   op;
+   cheevos_var_t       target;
+} cheevos_cond_t;
+
+void     cheevos_cond_parse(cheevos_cond_t* cond, const char** memaddr);
+unsigned cheevos_cond_count_in_set(const char* memaddr, unsigned which);
+void     cheevos_cond_parse_in_set(cheevos_cond_t* cond, const char* memaddr, unsigned which);
+
+RETRO_END_DECLS
+
+#endif /* __RARCH_CHEEVOS_COND_H */
@@ -18,8 +18,7 @@ Released under the CC0: https://creativecommons.org/publicdomain/zero/1.0/

 /* Use at the end of the coroutine */
 #define CORO_LEAVE() \
-  } \
-  } \
+  } } \
  do { return 0; } while ( 0 )

 /* Go to the x label */
@@ -30,7 +29,6 @@ Released under the CC0: https://creativecommons.org/publicdomain/zero/1.0/
  } while ( 0 )

 /* Go to a subroutine, execution continues until the subroutine returns via RET */
-/* x is the subroutine label, y and z are the A and B arguments */
 #define CORO_GOSUB( x ) \
  do { \
    coro->stack[ coro->sp++ ] = __LINE__; \
@@ -54,30 +52,24 @@ Released under the CC0: https://creativecommons.org/publicdomain/zero/1.0/
    case __LINE__: ; \
  } while ( 0 )

+/* The coroutine entry point, never use 0 as a label */
+#define CORO_BEGIN 0
+
+/* Sets up the coroutine */
+#define CORO_SETUP() \
+  do { \
+    coro->step = CORO_BEGIN; \
+    coro->sp   = 0; \
+  } while ( 0 )
+
 #define CORO_STOP() \
  do { \
    return 0; \
  } while ( 0 )

-/* The coroutine entry point, never use 0 as a label */
-#define CORO_BEGIN 0
-
-/* Sets up a coroutine, x is a pointer to coro_t */
-#define CORO_SETUP( x ) \
-  do { \
-    ( x )->step = CORO_BEGIN; \
-    ( x )->sp = 0; \
-  } while ( 0 )
-
-#define CORO_VAR( x ) ( coro->x )
-
-/* A coroutine */
-typedef struct
-{
-  CORO_VARS
-  int step, sp;
+/* Add this macro to your coro_t structure containing the variables for the coroutine */
+#define CORO_FIELDS \
+  int step, sp; \
  int stack[ 8 ];
-}
-coro_t;

 #endif /* CORO_H */
@@ -0,0 +1,433 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2017 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <ctype.h>
+#include <stdint.h>
+
+#include <libretro.h>
+
+#include "var.h"
+
+#include "../retroarch.h"
+#include "../core.h"
+#include "../verbosity.h"
+
+static void STUB_LOG(const char *fmt, ...)
+{
+   (void)fmt;
+}
+
+#ifdef CHEEVOS_VERBOSE
+#define CHEEVOS_LOG RARCH_LOG
+#else
+#define CHEEVOS_LOG STUB_LOG
+#endif
+
+/*****************************************************************************
+Parsing
+*****************************************************************************/
+
+static cheevos_var_size_t cheevos_var_parse_prefix(const char** memaddr)
+{
+   /* Careful not to use ABCDEF here, this denotes part of an actual variable! */
+   const char* str = *memaddr;
+   cheevos_var_size_t size;
+
+   switch (toupper((unsigned char)*str++))
+   {
+      case 'M':
+         size = CHEEVOS_VAR_SIZE_BIT_0;
+         break;
+      case 'N':
+         size = CHEEVOS_VAR_SIZE_BIT_1;
+         break;
+      case 'O':
+         size = CHEEVOS_VAR_SIZE_BIT_2;
+         break;
+      case 'P':
+         size = CHEEVOS_VAR_SIZE_BIT_3;
+         break;
+      case 'Q':
+         size = CHEEVOS_VAR_SIZE_BIT_4;
+         break;
+      case 'R':
+         size = CHEEVOS_VAR_SIZE_BIT_5;
+         break;
+      case 'S':
+         size = CHEEVOS_VAR_SIZE_BIT_6;
+         break;
+      case 'T':
+         size = CHEEVOS_VAR_SIZE_BIT_7;
+         break;
+      case 'L':
+         size = CHEEVOS_VAR_SIZE_NIBBLE_LOWER;
+         break;
+      case 'U':
+         size = CHEEVOS_VAR_SIZE_NIBBLE_UPPER;
+         break;
+      case 'H':
+         size = CHEEVOS_VAR_SIZE_EIGHT_BITS;
+         break;
+      case 'X':
+         size = CHEEVOS_VAR_SIZE_THIRTYTWO_BITS;
+         break;
+      default:
+         str--;
+         /* fall through */
+      case ' ':
+         size = CHEEVOS_VAR_SIZE_SIXTEEN_BITS;
+         break;
+   }
+
+   *memaddr = str;
+   return size;
+}
+
+static size_t cheevos_var_reduce(size_t addr, size_t mask)
+{
+   while (mask)
+   {
+      size_t tmp = (mask - 1) & ~mask;
+      addr = (addr & tmp) | ((addr >> 1) & ~tmp);
+      mask = (mask & (mask - 1)) >> 1;
+   }
+
+   return addr;
+}
+
+static size_t cheevos_var_highest_bit(size_t n)
+{
+   n |= n >>  1;
+   n |= n >>  2;
+   n |= n >>  4;
+   n |= n >>  8;
+   n |= n >> 16;
+
+   return n ^ (n >> 1);
+}
+
+void cheevos_var_parse(cheevos_var_t* var, const char** memaddr)
+{
+   char *end       = NULL;
+   const char *str = *memaddr;
+   unsigned base   = 16;
+
+   var->is_bcd = false;
+
+   if (toupper((unsigned char)*str) == 'D' && str[1] == '0' && toupper((unsigned char)str[2]) == 'X')
+   {
+      /* d0x + 4 hex digits */
+      str += 3;
+      var->type = CHEEVOS_VAR_TYPE_DELTA_MEM;
+   }
+   else if (toupper((unsigned char)*str) == 'B' && str[1] == '0' && toupper((unsigned char)str[2]) == 'X')
+   {
+      /* b0x (binary-coded decimal) */
+      str += 3;
+      var->is_bcd = true;
+      var->type = CHEEVOS_VAR_TYPE_ADDRESS;
+   }
+   else if (*str == '0' && toupper((unsigned char)str[1]) == 'X')
+   {
+      /* 0x + 4 hex digits */
+      str += 2;
+      var->type = CHEEVOS_VAR_TYPE_ADDRESS;
+   }
+   else
+   {
+      var->type = CHEEVOS_VAR_TYPE_VALUE_COMP;
+
+      if (toupper((unsigned char)*str) == 'H')
+         str++;
+      else
+      {
+         if (toupper((unsigned char)*str) == 'V')
+            str++;
+
+         base = 10;
+      }
+   }
+
+   if (var->type != CHEEVOS_VAR_TYPE_VALUE_COMP)
+   {
+      var->size = cheevos_var_parse_prefix(&str);
+   }
+
+   var->value = (unsigned)strtol(str, &end, base);
+   *memaddr   = end;
+}
+
+void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console)
+{
+   rarch_system_info_t *system = runloop_get_system_info();
+
+   var->bank_id = -1;
+
+   if (console == CHEEVOS_CONSOLE_NINTENDO)
+   {
+      if (var->value >= 0x0800 && var->value < 0x2000)
+      {
+         CHEEVOS_LOG(CHEEVOS_TAG "NES memory address in mirrorred RAM %X, adjusted to %X\n", var->value, var->value & 0x07ff);
+         var->value &= 0x07ff;
+      }
+   }
+   else if (console == CHEEVOS_CONSOLE_GAMEBOY_COLOR)
+   {
+      if (var->value >= 0xe000 && var->value <= 0xfdff)
+      {
+         CHEEVOS_LOG(CHEEVOS_TAG "GBC memory address in echo RAM %X, adjusted to %X\n", var->value, var->value - 0x2000);
+         var->value -= 0x2000;
+      }
+   }
+   else if (console == CHEEVOS_CONSOLE_NEOGEO_POCKET)
+   {
+      if (var->value >= 0x4000 && var->value <= 0x7fff)
+      CHEEVOS_LOG(CHEEVOS_TAG "NGP memory address %X adjusted to %X\n", var->value, var->value - 0x004000);
+      var->value -= 0x4000;
+   }
+
+   if (system->mmaps.num_descriptors != 0)
+   {
+      const rarch_memory_descriptor_t *desc = NULL;
+      const rarch_memory_descriptor_t *end  = NULL;
+
+      /* Patch the address to correctly map it to the mmaps */
+      if (console == CHEEVOS_CONSOLE_GAMEBOY_ADVANCE)
+      {
+         if (var->value < 0x8000) /* Internal RAM */
+         {
+            CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", var->value, var->value + 0x3000000);
+            var->value += 0x3000000;
+         }
+         else /* Work RAM */
+         {
+            CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", var->value, var->value + 0x2000000 - 0x8000);
+            var->value += 0x2000000 - 0x8000;
+         }
+      }
+      else if (console == CHEEVOS_CONSOLE_PC_ENGINE)
+      {
+         CHEEVOS_LOG(CHEEVOS_TAG "PCE memory address %X adjusted to %X\n", var->value, var->value + 0x1f0000);
+         var->value += 0x1f0000;
+      }
+      else if (console == CHEEVOS_CONSOLE_SUPER_NINTENDO)
+      {
+         if (var->value < 0x020000) /* Work RAM */
+         {
+            CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", var->value, var->value + 0x7e0000);
+            var->value += 0x7e0000;
+         }
+         else /* Save RAM */
+         {
+            CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", var->value, var->value + 0x006000 - 0x020000);
+            var->value += 0x006000 - 0x020000;
+         }
+      }
+
+      desc = system->mmaps.descriptors;
+      end  = desc + system->mmaps.num_descriptors;
+
+      for (; desc < end; desc++)
+      {
+         if (((desc->core.start ^ var->value) & desc->core.select) == 0)
+         {
+            unsigned addr = var->value;
+            var->bank_id  = (int)(desc - system->mmaps.descriptors);
+            var->value    = (unsigned)cheevos_var_reduce(
+               (addr - desc->core.start) & desc->disconnect_mask,
+               desc->core.disconnect);
+
+            if (var->value >= desc->core.len)
+               var->value -= cheevos_var_highest_bit(var->value);
+
+            var->value += desc->core.offset;
+
+            CHEEVOS_LOG(CHEEVOS_TAG "address %X set to descriptor %d at offset %X\n", addr, var->bank_id + 1, var->value);
+            break;
+         }
+      }
+   }
+   else
+   {
+      unsigned i;
+
+      for (i = 0; i < 4; i++)
+      {
+         retro_ctx_memory_info_t meminfo;
+
+         switch (i)
+         {
+            case 0:
+               meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
+               break;
+            case 1:
+               meminfo.id = RETRO_MEMORY_SAVE_RAM;
+               break;
+            case 2:
+               meminfo.id = RETRO_MEMORY_VIDEO_RAM;
+               break;
+            case 3:
+               meminfo.id = RETRO_MEMORY_RTC;
+               break;
+         }
+
+         core_get_memory(&meminfo);
+
+         if (var->value < meminfo.size)
+         {
+            var->bank_id = i;
+            break;
+         }
+
+         /* HACK subtract the correct amount of bytes to reach the save RAM */
+         if (i == 0 && console == CHEEVOS_CONSOLE_NINTENDO)
+            var->value -= 0x6000;
+         else
+            var->value -= meminfo.size;
+      }
+   }
+}
+
+/*****************************************************************************
+Testing
+*****************************************************************************/
+
+uint8_t* cheevos_var_get_memory(const cheevos_var_t* var)
+{
+   uint8_t* memory = NULL;
+
+   if (var->bank_id >= 0)
+   {
+      rarch_system_info_t* system = runloop_get_system_info();
+
+      if (system->mmaps.num_descriptors != 0)
+         memory = (uint8_t*)system->mmaps.descriptors[var->bank_id].core.ptr;
+      else
+      {
+         retro_ctx_memory_info_t meminfo = {NULL, 0, 0};
+
+         switch (var->bank_id)
+         {
+            case 0:
+               meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
+               break;
+            case 1:
+               meminfo.id = RETRO_MEMORY_SAVE_RAM;
+               break;
+            case 2:
+               meminfo.id = RETRO_MEMORY_VIDEO_RAM;
+               break;
+            case 3:
+               meminfo.id = RETRO_MEMORY_RTC;
+               break;
+            default:
+               RARCH_ERR(CHEEVOS_TAG "invalid bank id: %s\n", var->bank_id);
+               break;
+         }
+
+         core_get_memory(&meminfo);
+         memory = (uint8_t*)meminfo.data;
+      }
+
+      if (memory)
+         memory += var->value;
+   }
+
+   return memory;
+}
+
+unsigned cheevos_var_get_value(cheevos_var_t* var)
+{
+   const uint8_t* memory = NULL;
+   unsigned value        = 0;
+
+   switch (var->type)
+   {
+      case CHEEVOS_VAR_TYPE_VALUE_COMP:
+         value = var->value;
+         break;
+
+      case CHEEVOS_VAR_TYPE_ADDRESS:
+      case CHEEVOS_VAR_TYPE_DELTA_MEM:
+         memory = cheevos_var_get_memory(var);
+
+         if (memory)
+         {
+            value = memory[0];
+
+            switch (var->size)
+            {
+               case CHEEVOS_VAR_SIZE_BIT_0:
+                  value &= 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_1:
+                  value = (value >> 1) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_2:
+                  value = (value >> 2) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_3:
+                  value = (value >> 3) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_4:
+                  value = (value >> 4) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_5:
+                  value = (value >> 5) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_6:
+                  value = (value >> 6) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_BIT_7:
+                  value = (value >> 7) & 1;
+                  break;
+               case CHEEVOS_VAR_SIZE_NIBBLE_LOWER:
+                  value &= 0x0f;
+                  break;
+               case CHEEVOS_VAR_SIZE_NIBBLE_UPPER:
+                  value = (value >> 4) & 0x0f;
+                  break;
+               case CHEEVOS_VAR_SIZE_EIGHT_BITS:
+                  break;
+               case CHEEVOS_VAR_SIZE_SIXTEEN_BITS:
+                  value |= memory[1] << 8;
+                  break;
+               case CHEEVOS_VAR_SIZE_THIRTYTWO_BITS:
+                  value |= memory[1] << 8;
+                  value |= memory[2] << 16;
+                  value |= memory[3] << 24;
+                  break;
+            }
+         }
+
+         if (var->type == CHEEVOS_VAR_TYPE_DELTA_MEM)
+         {
+            unsigned previous = var->previous;
+            var->previous     = value;
+            value = previous;
+         }
+
+         break;
+
+      case CHEEVOS_VAR_TYPE_DYNAMIC_VAR:
+         /* We shouldn't get here... */
+         break;
+   }
+
+   if(var->is_bcd)
+      return (((value >> 4) & 0xf) * 10) + (value & 0xf);
+   else
+      return value;
+}
@@ -0,0 +1,78 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2017 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __RARCH_CHEEVOS_VAR_H
+#define __RARCH_CHEEVOS_VAR_H
+
+#include <stdint.h>
+
+#include "cheevos.h"
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+typedef enum
+{
+   CHEEVOS_VAR_SIZE_BIT_0 = 0,
+   CHEEVOS_VAR_SIZE_BIT_1,
+   CHEEVOS_VAR_SIZE_BIT_2,
+   CHEEVOS_VAR_SIZE_BIT_3,
+   CHEEVOS_VAR_SIZE_BIT_4,
+   CHEEVOS_VAR_SIZE_BIT_5,
+   CHEEVOS_VAR_SIZE_BIT_6,
+   CHEEVOS_VAR_SIZE_BIT_7,
+   CHEEVOS_VAR_SIZE_NIBBLE_LOWER,
+   CHEEVOS_VAR_SIZE_NIBBLE_UPPER,
+   /* Byte, */
+   CHEEVOS_VAR_SIZE_EIGHT_BITS, /* =Byte, */
+   CHEEVOS_VAR_SIZE_SIXTEEN_BITS,
+   CHEEVOS_VAR_SIZE_THIRTYTWO_BITS
+} cheevos_var_size_t;
+
+typedef enum
+{
+   /* compare to the value of a live address in RAM */
+   CHEEVOS_VAR_TYPE_ADDRESS = 0,
+
+   /* a number. assume 32 bit */
+   CHEEVOS_VAR_TYPE_VALUE_COMP,
+
+   /* the value last known at this address. */
+   CHEEVOS_VAR_TYPE_DELTA_MEM,
+
+   /* a custom user-set variable */
+   CHEEVOS_VAR_TYPE_DYNAMIC_VAR
+} cheevos_var_type_t;
+
+typedef struct
+{
+   cheevos_var_size_t size;
+   cheevos_var_type_t type;
+   int                bank_id;
+   bool               is_bcd;
+   unsigned           value;
+   unsigned           previous;
+} cheevos_var_t;
+
+void cheevos_var_parse(cheevos_var_t* var, const char** memaddr);
+void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console);
+
+uint8_t* cheevos_var_get_memory(const cheevos_var_t* var);
+unsigned cheevos_var_get_value(cheevos_var_t* var);
+
+RETRO_END_DECLS
+
+#endif /* __RARCH_CHEEVOS_VAR_H */
@@ -2,7 +2,7 @@
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2016 - Daniel De Matteis
 *  Copyright (C) 2016 - Brad Parker
- * 
+ *
 *  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.
@@ -61,6 +61,8 @@ enum event_command
   /* Quits RetroArch. */
   CMD_EVENT_QUIT,
   /* Reinitialize all drivers. */
+   CMD_EVENT_REINIT_FROM_TOGGLE,
+   /* Reinitialize all drivers. */
   CMD_EVENT_REINIT,
   /* Toggles cheevos hardcore mode. */
   CMD_EVENT_CHEEVOS_HARDCORE_MODE_TOGGLE,
@@ -134,6 +136,8 @@ enum event_command
   CMD_EVENT_REBOOT,
   /* Resume RetroArch when in menu. */
   CMD_EVENT_RESUME,
+   /* Add a playlist entry to favorites. */
+   CMD_EVENT_ADD_TO_FAVORITES,
   /* Toggles pause. */
   CMD_EVENT_PAUSE_TOGGLE,
   /* Pauses RetroArch. */
@@ -175,8 +179,6 @@ enum event_command
   CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED,
   /* Deinitializes netplay system. */
   CMD_EVENT_NETPLAY_DEINIT,
-   /* Flip netplay players. */
-   CMD_EVENT_NETPLAY_FLIP_PLAYERS,
   /* Switch between netplay gaming and watching. */
   CMD_EVENT_NETPLAY_GAME_WATCH,
   /* Initializes BSV movie. */
@@ -191,6 +193,10 @@ enum event_command
   CMD_EVENT_REMOTE_INIT,
   /* Deinitializes remote gamepad interface. */
   CMD_EVENT_REMOTE_DEINIT,
+   /* Initializes keyboard to gamepad mapper interface. */
+   CMD_EVENT_MAPPER_INIT,
+   /* Deinitializes keyboard to gamepad mapper interface. */
+   CMD_EVENT_MAPPER_DEINIT,
   /* Reinitializes audio driver. */
   CMD_EVENT_AUDIO_REINIT,
   /* Resizes windowed scale. Will reinitialize video driver. */
@@ -218,17 +224,14 @@ enum event_command
   CMD_EVENT_MIXER_VOLUME_UP,
   CMD_EVENT_MIXER_VOLUME_DOWN,
   CMD_EVENT_DISABLE_OVERRIDES,
+   CMD_EVENT_RESTORE_REMAPS,
   CMD_EVENT_RESTORE_DEFAULT_SHADER_PRESET,
   CMD_EVENT_LIBUI_TEST
 };

 bool command_set_shader(const char *arg);

-#ifdef HAVE_COMMAND
-#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD)
 bool command_network_send(const char *cmd_);
-#endif
-#endif

 bool command_network_new(
      command_t *handle,
@@ -246,8 +249,6 @@ bool command_set(command_handle_t *handle);

 bool command_free(command_t *handle);

-bool command_event_quit(void);
-
 /**
 * command_event:
 * @cmd                  : Command index.
@@ -258,6 +259,20 @@ bool command_event_quit(void);
 **/
 bool command_event(enum event_command action, void *data);

+void command_playlist_push_write(
+      void *data,
+      const char *path,
+      const char *label,
+      const char *core_path,
+      const char *core_name);
+
+void command_playlist_update_write(
+      void *data,
+      size_t idx,
+      const char *core_display_name,
+      const char *label,
+      const char *path);
+
 RETRO_END_DECLS

 #endif
@@ -19,6 +19,7 @@
 #define __CONFIG_DEF_H

 #include <boolean.h>
+#include <audio/audio_resampler.h>
 #include "gfx/video_defines.h"
 #include "input/input_driver.h"

@@ -26,6 +27,10 @@
 #include "config.h"
 #endif

+#ifdef HAVE_NETWORKING
+#include "network/netplay/netplay.h"
+#endif
+
 #if defined(HW_RVL)
 #define MAX_GAMMA_SETTING 30
 #elif defined(GEKKO)
@@ -58,12 +63,17 @@ static bool bundle_assets_extract_enable = true;
 static bool bundle_assets_extract_enable = false;
 #endif

+#ifdef HAVE_MATERIALUI
+static bool materialui_icons_enable      = true;
+#endif
+
 static const bool def_history_list_enable = true;
 static const bool def_playlist_entry_remove = true;
+static const bool def_playlist_entry_rename = true;

 static const unsigned int def_user_language = 0;

-#if (defined(_WIN32) && !defined(_XBOX)) || (defined(__linux) && !defined(ANDROID) && !defined(HAVE_LAKKA)) || (defined(__MACH__) && !defined(IOS))
+#if (defined(_WIN32) && !defined(_XBOX)) || (defined(__linux) && !defined(ANDROID) && !defined(HAVE_LAKKA)) || (defined(__MACH__) && !defined(IOS)) || defined(EMSCRIPTEN)
 static const bool def_mouse_enable = true;
 #else
 static const bool def_mouse_enable = false;
@@ -110,6 +120,14 @@ static const unsigned window_y = 0;
 static const unsigned fullscreen_x = 0;
 static const unsigned fullscreen_y = 0;

+/* Amount of transparency to use for the main window.
+ * 1 is the most transparent while 100 is opaque.
+ */
+static const unsigned window_opacity = 100;
+
+/* Whether to show the usual window decorations like border, titlebar etc. */
+static const bool window_decorations = true;
+
 #if defined(RARCH_CONSOLE) || defined(__APPLE__)
 static const bool load_dummy_on_core_shutdown = false;
 #else
@@ -159,7 +177,7 @@ static unsigned swap_interval = 1;
 static const bool video_threaded = false;

 #if defined(HAVE_THREADS)
-#if defined(GEKKO) || defined(PSP) || defined(_3DS) || defined(_XBOX1)
+#if defined(GEKKO) || defined(PSP) || defined(_3DS)
 /* For single-core consoles right now it's better to have this be disabled. */
 static const bool threaded_data_runloop_enable = false;
 #else
@@ -231,17 +249,57 @@ static const bool display_keyboard_overlay = false;

 static bool default_block_config_read    = true;

-static bool menu_show_online_updater     = true;
+static bool quick_menu_show_take_screenshot      = true;
+static bool quick_menu_show_save_load_state      = true;
+static bool quick_menu_show_undo_save_load_state = true;
+static bool quick_menu_show_add_to_favorites     = true;
+static bool quick_menu_show_options              = true;
+static bool quick_menu_show_controls             = true;
+static bool quick_menu_show_cheats               = true;
+static bool quick_menu_show_shaders              = true;
+static bool quick_menu_show_save_core_overrides  = true;
+static bool quick_menu_show_save_game_overrides  = true;
+static bool quick_menu_show_information          = true;

-#if defined(HAVE_LAKKA) || defined(VITA)
+static bool kiosk_mode_enable            = false;
+
+static bool menu_show_online_updater     = true;
+static bool menu_show_load_core          = true;
+static bool menu_show_load_content       = true;
+static bool menu_show_information        = true;
+static bool menu_show_configurations     = true;
+static bool menu_show_help               = true;
+static bool menu_show_quit_retroarch     = true;
+static bool menu_show_reboot             = true;
+#if defined(HAVE_LAKKA) || defined(VITA) || defined(_3DS)
 static bool menu_show_core_updater       = false;
 #else
 static bool menu_show_core_updater       = true;
 #endif

+static bool content_show_settings    = true;
+static bool content_show_favorites   = true;
+#ifdef HAVE_IMAGEVIEWER
+static bool content_show_images      = true;
+#endif
+static bool content_show_music       = true;
+#ifdef HAVE_FFMPEG
+static bool content_show_video       = true;
+#endif
+#ifdef HAVE_NETWORKING
+static bool content_show_netplay     = true;
+#endif
+static bool content_show_history     = true;
+#ifdef HAVE_LIBRETRODB
+static bool content_show_add     	 = true;
+#endif
+
 #ifdef HAVE_XMB
 static unsigned xmb_scale_factor = 100;
 static unsigned xmb_alpha_factor = 75;
+static unsigned menu_font_color_red = 255;
+static unsigned menu_font_color_green = 255;
+static unsigned menu_font_color_blue = 255;
 static unsigned xmb_icon_theme   = XMB_ICON_THEME_MONOCHROME;
 static unsigned xmb_theme        = XMB_THEME_ELECTRIC_BLUE;
 #ifdef HAVE_LAKKA
@@ -249,23 +307,12 @@ static bool xmb_shadows_enable   = false;
 #else
 static bool xmb_shadows_enable   = true;
 #endif
-static bool xmb_show_settings    = true;
-#ifdef HAVE_IMAGEVIEWER
-static bool xmb_show_images      = true;
-#endif
-static bool xmb_show_music       = true;
-#ifdef HAVE_FFMPEG
-static bool xmb_show_video       = true;
-#endif
-#ifdef HAVE_NETWORKING
-static bool xmb_show_netplay     = true;
-#endif
-static bool xmb_show_history     = true;
-#ifdef HAVE_LIBRETRODB
-static bool xmb_show_add     	 = true;
-#endif
 #endif

+static bool automatically_add_content_to_playlist = false;
+
+static float menu_framebuffer_opacity = 0.900;
+
 static float menu_wallpaper_opacity = 0.300;

 static float menu_footer_opacity = 1.000;
@@ -285,6 +332,7 @@ static const uint32_t menu_title_color        = 0xff64ff64;

 #else
 static bool default_block_config_read = false;
+static bool automatically_add_content_to_playlist = false;
 #endif

 static bool default_game_specific_options = true;
@@ -295,6 +343,11 @@ static bool default_auto_shaders_enable = true;
 static bool default_sort_savefiles_enable = false;
 static bool default_sort_savestates_enable = false;

+static bool default_savestates_in_content_dir = false;
+static bool default_savefiles_in_content_dir = false;
+static bool default_systemfiles_in_content_dir = false;
+static bool default_screenshots_in_content_dir = false;
+
 #if defined(__CELLOS_LV2__) || defined(_XBOX1) || defined(_XBOX360)
 static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L3_R3;
 #elif defined(VITA)
@@ -308,6 +361,8 @@ static unsigned input_backtouch_enable       = false;
 static unsigned input_backtouch_toggle       = false;
 #endif

+static bool show_physical_inputs             = true;
+
 static bool all_users_control_menu = false;

 #if defined(ANDROID) || defined(_WIN32)
@@ -339,6 +394,12 @@ static const float message_pos_offset_y = 0.05;
 * RGB hex value. */
 static const uint32_t message_color = 0xffff00;

+static const bool message_bgcolor_enable = false;
+static const uint32_t message_bgcolor_red = 0;
+static const uint32_t message_bgcolor_green = 0;
+static const uint32_t message_bgcolor_blue = 0;
+static const float message_bgcolor_opacity = 1.0f;
+
 /* Record post-filtered (CPU filter) video,
 * rather than raw game output. */
 static const bool post_filter_record = false;
@@ -346,6 +407,9 @@ static const bool post_filter_record = false;
 /* Screenshots post-shaded GPU output if available. */
 static const bool gpu_screenshot = true;

+/* Watch shader files for changes and auto-apply as necessary. */
+static const bool video_shader_watch_files = false;
+
 /* Screenshots named automatically. */
 static const bool auto_screenshot_filename = true;

@@ -438,6 +502,9 @@ static const int wasapi_sh_buffer_length = -16; /* auto */
 /* Enables displaying the current frames per second. */
 static const bool fps_show = false;

+/* Show frame count on FPS display */
+static const bool framecount_show = true;
+
 /* Enables use of rewind. This will incur some memory footprint
 * depending on the save state buffer. */
 static const bool rewind_enable = false;
@@ -483,10 +550,18 @@ static const bool netplay_nat_traversal = false;

 static const unsigned netplay_delay_frames = 16;

-static const int netplay_check_frames = 30;
+static const int netplay_check_frames = 600;

 static const bool netplay_use_mitm_server = false;

+static const char *netplay_mitm_server = "nyc";
+
+#ifdef HAVE_NETWORKING
+static const unsigned netplay_share_digital = RARCH_NETPLAY_SHARE_DIGITAL_NO_PREFERENCE;
+
+static const unsigned netplay_share_analog = RARCH_NETPLAY_SHARE_ANALOG_NO_PREFERENCE;
+#endif
+
 /* On save state load, block SRAM from being overwritten.
 * This could potentially lead to buggy games. */
 static const bool block_sram_overwrite = false;
@@ -581,6 +656,14 @@ static const bool ui_companion_start_on_boot = true;

 static const bool ui_companion_enable = false;

+#if defined(__QNX__) || defined(_XBOX1) || defined(_XBOX360) || defined(__CELLOS_LV2__) || (defined(__MACH__) && defined(IOS)) || defined(ANDROID) || defined(WIIU) || defined(HAVE_NEON) || defined(GEKKO) || defined(__ARM_NEON__)
+static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWER;
+#elif defined(PSP) || defined(_3DS) || defined(VITA)
+static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWEST;
+#else
+static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_NORMAL;
+#endif
+
 #if defined(ANDROID)
 #if defined(ANDROID_ARM)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/";
@@ -605,16 +688,20 @@ static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/
 #endif
 #elif defined(_WIN32) && !defined(_XBOX)
 #if _MSC_VER == 1600
-#if defined(__x86_64__)
+#if defined(__x86_64__) || defined(_M_X64)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86_64/latest/";
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86/latest/";
 #endif
+#elif _MSC_VER == 1400
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2005/x86/latest/";
+#elif _MSC_VER == 1310
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/";
 #else
-#if defined(__x86_64__)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/win-x86_64/latest/";
+#if defined(__x86_64__) || defined(_M_X64)
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/x86_64/latest/";
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/win-x86/latest/";
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/x86/latest/";
 #endif
 #endif
 #elif defined(__linux__)
@@ -622,11 +709,19 @@ static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/win-x8
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/linux/x86_64/latest/";
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/linux/x86/latest/";
+#elif defined(__arm__) && __ARM_ARCH == 7 && defined(__ARM_PCS_VFP)
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/linux/armhf/latest/";
 #else
 static char buildbot_server_url[] = "";
 #endif
 #elif defined(WIIU)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/";
+#elif defined(__CELLOS_LV2__) && defined(DEX_BUILD)
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/playstation/ps3/latest/dex-ps3/";
+#elif defined(__CELLOS_LV2__) && defined(CEX_BUILD)
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/playstation/ps3/latest/cex-ps3/";
+#elif defined(__CELLOS_LV2__) && defined(ODE_BUILD)
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/playstation/ps3/latest/ode-ps3/";
 #else
 static char buildbot_server_url[] = "";
 #endif
@@ -22,163 +22,200 @@

 /* User 1 */
 static const struct retro_keybind retro_keybinds_1[] = {
-    /*     | RetroPad button              | enum                           | keyboard key  | js btn   | js axis | */
+    /*     | RetroPad button              | enum                                             | keyboard key  | m-btn | js btn   | js axis | */
 #ifdef __QNX__
-   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,              RETROK_k,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,              RETROK_i,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,         RETROK_v,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,          RETROK_b,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,             RETROK_e,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,           RETROK_s,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,           RETROK_w,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,          RETROK_d,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,              RETROK_l,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,              RETROK_o,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,              RETROK_f,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,              RETROK_j,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,             RETROK_r,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,             RETROK_u,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,             RETROK_g,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,             RETROK_h,       NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,              RETROK_k,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,              RETROK_i,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,         RETROK_v,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,          RETROK_b,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,             RETROK_e,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,           RETROK_s,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,           RETROK_w,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,          RETROK_d,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,              RETROK_l,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,              RETROK_o,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,              RETROK_f,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,              RETROK_j,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,             RETROK_r,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,             RETROK_u,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,             RETROK_g,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,             RETROK_h,       NO_BTN, NO_BTN, 0, AXIS_NONE },

-   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },

-   { true, RARCH_TURBO_ENABLE,             MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FAST_FORWARD_KEY,         MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,     RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FAST_FORWARD_HOLD_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LOAD_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,       RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SAVE_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,       RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FULLSCREEN_TOGGLE_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_QUIT_KEY,                 MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_STATE_SLOT_PLUS,          MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,      RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_STATE_SLOT_MINUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,     RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_REWIND,                   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,               RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_MOVIE_RECORD_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_PAUSE_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FRAMEADVANCE,             MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_RESET,                    MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,                RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SHADER_NEXT,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SHADER_PREV,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_INDEX_PLUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,     RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_INDEX_MINUS,        MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SCREENSHOT,               MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,           RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_MUTE,                     MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,                 RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_OSK,                      MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,                  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_NETPLAY_FLIP,             MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_NETPLAY_GAME_WATCH,       MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SLOWMOTION,               MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION,           RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ENABLE_HOTKEY,            MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,        RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_VOLUME_UP,                MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,            RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_VOLUME_DOWN,              MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_OVERLAY_NEXT,             MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_EJECT_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_NEXT,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,            RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_PREV,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,            RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_GRAB_MOUSE_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_GAME_FOCUS_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_MENU_TOGGLE,              MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,          RETROK_SPACE,   NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_TRIGGER,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_TRIGGER,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_RELOAD,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_RELOAD,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_AUX_A,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_A,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_AUX_B,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_B,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_AUX_C,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_C,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_START,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_START,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_SELECT,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_SELECT,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_DPAD_UP,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_UP,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_DPAD_DOWN,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_DOWN,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_DPAD_LEFT,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_LEFT,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_DPAD_RIGHT,     MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+
+   { true, RARCH_TURBO_ENABLE,             MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+
+   { true, RARCH_FAST_FORWARD_KEY,         MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,     RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FAST_FORWARD_HOLD_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LOAD_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SAVE_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FULLSCREEN_TOGGLE_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_QUIT_KEY,                 MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_STATE_SLOT_PLUS,          MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_STATE_SLOT_MINUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,     RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_REWIND,                   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,               RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_MOVIE_RECORD_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_PAUSE_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FRAMEADVANCE,             MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_RESET,                    MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,                RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SHADER_NEXT,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SHADER_PREV,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_CHEAT_INDEX_PLUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,     RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_CHEAT_INDEX_MINUS,        MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_CHEAT_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SCREENSHOT,               MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,           RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_MUTE,                     MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,                 RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_OSK,                      MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,                  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_NETPLAY_GAME_WATCH,       MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SLOWMOTION,               MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION,           RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ENABLE_HOTKEY,            MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_VOLUME_UP,                MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_VOLUME_DOWN,              MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_OVERLAY_NEXT,             MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_DISK_EJECT_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_DISK_NEXT,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_DISK_PREV,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_GRAB_MOUSE_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_GAME_FOCUS_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_MENU_TOGGLE,              MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,          RETROK_SPACE,   NO_BTN, NO_BTN, 0, AXIS_NONE },
 #else
-   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,              RETROK_z,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,              RETROK_a,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,         RETROK_RSHIFT,  NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,          RETROK_RETURN,  NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,             RETROK_UP,      NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,           RETROK_DOWN,    NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,           RETROK_LEFT,    NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,          RETROK_RIGHT,   NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,              RETROK_x,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,              RETROK_s,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,              RETROK_q,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,              RETROK_w,       NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,              RETROK_z,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,              RETROK_a,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,         RETROK_RSHIFT,  NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,          RETROK_RETURN,  NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,             RETROK_UP,      NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,           RETROK_DOWN,    NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,           RETROK_LEFT,    NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,          RETROK_RIGHT,   NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,              RETROK_x,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,              RETROK_s,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,              RETROK_q,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,              RETROK_w,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },

-   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },

-   { true, RARCH_TURBO_ENABLE,             MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FAST_FORWARD_KEY,         MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,     RETROK_SPACE,   NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FAST_FORWARD_HOLD_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,RETROK_l,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_LOAD_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,       RETROK_F4,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SAVE_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,       RETROK_F2,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FULLSCREEN_TOGGLE_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,RETROK_f,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_QUIT_KEY,                 MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,             RETROK_ESCAPE,  NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_STATE_SLOT_PLUS,          MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,      RETROK_F7,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_STATE_SLOT_MINUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,     RETROK_F6,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_REWIND,                   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,               RETROK_r,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_MOVIE_RECORD_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE,  RETROK_o,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_PAUSE_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,         RETROK_p,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_FRAMEADVANCE,             MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,         RETROK_k,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_RESET,                    MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,                RETROK_h,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SHADER_NEXT,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,          RETROK_m,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SHADER_PREV,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,          RETROK_n,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_INDEX_PLUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,     RETROK_y,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_INDEX_MINUS,        MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,    RETROK_t,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_CHEAT_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,         RETROK_u,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SCREENSHOT,               MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,           RETROK_F8,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_MUTE,                     MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,                 RETROK_F9,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_OSK,                      MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,                  RETROK_F12,      NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_NETPLAY_FLIP,             MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_NETPLAY_GAME_WATCH,       MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,   RETROK_i,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_SLOWMOTION,               MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION,           RETROK_e,       NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ENABLE_HOTKEY,            MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,        RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_VOLUME_UP,                MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,            RETROK_KP_PLUS, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_VOLUME_DOWN,              MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,          RETROK_KP_MINUS,NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_OVERLAY_NEXT,             MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_EJECT_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_NEXT,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,            RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_DISK_PREV,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,            RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_GRAB_MOUSE_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,    RETROK_F11,     NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_GAME_FOCUS_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,    RETROK_SCROLLOCK,  NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_MENU_TOGGLE,              MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,          RETROK_F1,      NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_TRIGGER,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_TRIGGER,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_RELOAD,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_RELOAD,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_AUX_A,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_A,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_AUX_B,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_B,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_AUX_C,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_C,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_START,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_START,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_SELECT,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_SELECT,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_DPAD_UP,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_UP,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_DPAD_DOWN,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_DOWN,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_DPAD_LEFT,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_LEFT,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_DPAD_RIGHT,     MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+
+   { true, RARCH_TURBO_ENABLE,             MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+
+   { true, RARCH_FAST_FORWARD_KEY,         MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,     RETROK_SPACE,   NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FAST_FORWARD_HOLD_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,RETROK_l,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LOAD_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,       RETROK_F4,      NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SAVE_STATE_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,       RETROK_F2,      NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FULLSCREEN_TOGGLE_KEY,    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,RETROK_f,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_QUIT_KEY,                 MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,             RETROK_ESCAPE,  NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_STATE_SLOT_PLUS,          MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,      RETROK_F7,      NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_STATE_SLOT_MINUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,     RETROK_F6,      NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_REWIND,                   MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,               RETROK_r,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_MOVIE_RECORD_TOGGLE,      MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE,  RETROK_o,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_PAUSE_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,         RETROK_p,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_FRAMEADVANCE,             MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,         RETROK_k,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_RESET,                    MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,                RETROK_h,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SHADER_NEXT,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,          RETROK_m,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SHADER_PREV,              MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,          RETROK_n,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_CHEAT_INDEX_PLUS,         MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,     RETROK_y,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_CHEAT_INDEX_MINUS,        MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,    RETROK_t,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_CHEAT_TOGGLE,             MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,         RETROK_u,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SCREENSHOT,               MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,           RETROK_F8,      NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_MUTE,                     MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,                 RETROK_F9,      NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_OSK,                      MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,                  RETROK_F12,     NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_NETPLAY_GAME_WATCH,       MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,   RETROK_i,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SLOWMOTION,               MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION,           RETROK_e,       NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ENABLE_HOTKEY,            MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_VOLUME_UP,                MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,            RETROK_KP_PLUS, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_VOLUME_DOWN,              MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,          RETROK_KP_MINUS,NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_OVERLAY_NEXT,             MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_DISK_EJECT_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_DISK_NEXT,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_DISK_PREV,                MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,            RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_GRAB_MOUSE_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,    RETROK_F11,     NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_GAME_FOCUS_TOGGLE,        MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,    RETROK_SCROLLOCK,  NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_MENU_TOGGLE,              MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,          RETROK_F1,      NO_BTN, NO_BTN, 0, AXIS_NONE },
 #endif
 };

 /* Users 2 to MAX_USERS */
 static const struct retro_keybind retro_keybinds_rest[] = {
-    /*     | RetroPad button              | desc                           | keyboard key  | js btn   | js axis | */
-   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,         RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,           RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,           RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,             RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+    /*     | RetroPad button              | desc                                             | keyboard key  | js btn   | js axis | */
+   { true, RETRO_DEVICE_ID_JOYPAD_B,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_Y,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_SELECT, MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,         RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_START,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_UP,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_DOWN,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,           RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_LEFT,   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,           RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_RIGHT,  MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_A,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_X,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R,      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,              RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R2,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_L3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RETRO_DEVICE_ID_JOYPAD_R3,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,             RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },

-   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
-   { true, RARCH_TURBO_ENABLE,            MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,          RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_X_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_X_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_Y_PLUS,      MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_LEFT_Y_MINUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_X_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_X_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_Y_PLUS,     MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_ANALOG_RIGHT_Y_MINUS,    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,  RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+
+   { true, RARCH_LIGHTGUN_TRIGGER,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_TRIGGER,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_RELOAD,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_RELOAD,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_AUX_A,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_A,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_AUX_B,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_B,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_AUX_C,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_C,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_START,          MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_START,        RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_SELECT,         MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_SELECT,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_DPAD_UP,        MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_UP,      RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_DPAD_DOWN,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_DOWN,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_DPAD_LEFT,      MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_LEFT,    RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_LIGHTGUN_DPAD_RIGHT,     MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT,   RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+
+   { true, RARCH_TURBO_ENABLE,            MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,          RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
 };

 #endif
@@ -260,12 +260,6 @@ static const bool _sdl_image_supp = true;
 static const bool _sdl_image_supp = false;
 #endif

-#ifdef HAVE_FBO
-static const bool _fbo_supp = true;
-#else
-static const bool _fbo_supp = false;
-#endif
-
 #ifdef HAVE_DYNAMIC
 static const bool _dynamic_supp = true;
 #else
@@ -25,12 +25,33 @@
 #include <retro_common_api.h>
 #include <retro_miscellaneous.h>

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gfx/video_driver.h"
 #include "input/input_defines.h"
+#include "led/led_defines.h"
+
+#define configuration_set_float(settings, var, newvar) \
+{ \
+   settings->modified = true; \
+   var = newvar; \
+}
+
+#define configuration_set_bool(settings, var, newvar) \
+{ \
+   settings->modified = true; \
+   var = newvar; \
+}
+
+#define configuration_set_uint(settings, var, newvar) \
+{ \
+   settings->modified = true; \
+   var = newvar; \
+}
+
+#define configuration_set_int(settings, var, newvar) \
+{ \
+   settings->modified = true; \
+   var = newvar; \
+}

 enum override_type
 {
@@ -53,15 +74,14 @@ typedef struct settings
      bool video_vsync;
      bool video_hard_sync;
      bool video_black_frame_insertion;
-#ifdef GEKKO
      bool video_vfilter;
-#endif
      bool video_smooth;
      bool video_force_aspect;
      bool video_crop_overscan;
      bool video_aspect_ratio_auto;
      bool video_scale_integer;
      bool video_shader_enable;
+      bool video_shader_watch_files;
      bool video_threaded;
      bool video_font_enable;
      bool video_disable_composition;
@@ -72,15 +92,15 @@ typedef struct settings
      bool video_shared_context;
      bool video_force_srgb_disable;
      bool video_fps_show;
+      bool video_framecount_show;
+      bool video_msg_bgcolor_enable;

      /* Audio */
      bool audio_enable;
      bool audio_sync;
      bool audio_rate_control;
-#ifdef HAVE_WASAPI
      bool audio_wasapi_exclusive_mode;
      bool audio_wasapi_float_format;
-#endif

      /* Input */
      bool input_remap_binds_enable;
@@ -88,20 +108,16 @@ typedef struct settings
      bool input_overlay_enable;
      bool input_overlay_enable_autopreferred;
      bool input_overlay_hide_in_menu;
+      bool input_overlay_show_physical_inputs;
      bool input_descriptor_label_show;
      bool input_descriptor_hide_unbound;
      bool input_all_users_control_menu;
      bool input_menu_swap_ok_cancel_buttons;
-#if defined(VITA)
      bool input_backtouch_enable;
      bool input_backtouch_toggle;
-#endif
-#if TARGET_OS_IPHONE
      bool input_small_keyboard_enable;
-#endif
      bool input_keyboard_gamepad_enable;

-#ifdef HAVE_MENU
      /* Menu */
      bool filter_by_current_core;
      bool menu_show_start_screen;
@@ -119,30 +135,49 @@ typedef struct settings
      bool menu_show_advanced_settings;
      bool menu_throttle_framerate;
      bool menu_linear_filter;
+      bool menu_horizontal_animation;
      bool menu_show_online_updater;
      bool menu_show_core_updater;
+      bool menu_show_load_core;
+      bool menu_show_load_content;
+      bool menu_show_information;
+      bool menu_show_configurations;
+      bool menu_show_help;
+      bool menu_show_quit_retroarch;
+      bool menu_show_reboot;
+      bool menu_materialui_icons_enable;
      bool menu_xmb_shadows_enable;
-      bool menu_xmb_show_settings;
-      bool menu_xmb_show_images;
-      bool menu_xmb_show_music;
-      bool menu_xmb_show_video;
-      bool menu_xmb_show_netplay;
-      bool menu_xmb_show_history;
-      bool menu_xmb_show_add;
+      bool menu_content_show_settings;
+      bool menu_content_show_favorites;
+      bool menu_content_show_images;
+      bool menu_content_show_music;
+      bool menu_content_show_video;
+      bool menu_content_show_netplay;
+      bool menu_content_show_history;
+      bool menu_content_show_add;
      bool menu_unified_controls;
-#endif
+      bool quick_menu_show_take_screenshot;
+      bool quick_menu_show_save_load_state;
+      bool quick_menu_show_undo_save_load_state;
+      bool quick_menu_show_add_to_favorites;
+      bool quick_menu_show_options;
+      bool quick_menu_show_controls;
+      bool quick_menu_show_cheats;
+      bool quick_menu_show_shaders;
+      bool quick_menu_show_save_core_overrides;
+      bool quick_menu_show_save_game_overrides;
+      bool quick_menu_show_information;
+      bool kiosk_mode_enable;

-#ifdef HAVE_NETWORKING
      /* Netplay */
      bool netplay_public_announce;
      bool netplay_start_as_spectator;
      bool netplay_allow_slaves;
      bool netplay_require_slaves;
      bool netplay_stateless_mode;
-      bool netplay_swap_input;
      bool netplay_nat_traversal;
      bool netplay_use_mitm_server;
-#endif
+      bool netplay_request_devices[MAX_USERS];

      /* Network */
      bool network_buildbot_auto_extract_archive;
@@ -153,13 +188,13 @@ typedef struct settings
      bool ui_companion_start_on_boot;
      bool ui_companion_enable;

-#ifdef HAVE_CHEEVOS
      /* Cheevos */
      bool cheevos_enable;
      bool cheevos_test_unofficial;
      bool cheevos_hardcore_mode_enable;
+      bool cheevos_leaderboards_enable;
+      bool cheevos_badges_enable;
      bool cheevos_verbose_enable;
-#endif

      /* Camera */
      bool camera_allow;
@@ -179,13 +214,12 @@ typedef struct settings
      bool bundle_assets_extract_enable;

      /* Misc. */
-#ifdef HAVE_THREADS
      bool threaded_data_runloop_enable;
-#endif
      bool set_supports_no_game_enable;
      bool auto_screenshot_filename;
      bool history_list_enable;
      bool playlist_entry_remove;
+      bool playlist_entry_rename;
      bool rewind_enable;
      bool pause_nonactive;
      bool block_sram_overwrite;
@@ -195,6 +229,7 @@ typedef struct settings
      bool savestate_thumbnail_enable;
      bool network_cmd_enable;
      bool stdin_cmd_enable;
+      bool keymapper_enable;
      bool network_remote_enable;
      bool network_remote_enable_user[MAX_USERS];
      bool load_dummy_on_core_shutdown;
@@ -209,11 +244,17 @@ typedef struct settings
      bool sort_savestates_enable;
      bool config_save_on_exit;
      bool show_hidden_files;
-#ifdef HAVE_LAKKA
+
+      bool savefiles_in_content_dir;
+      bool savestates_in_content_dir;
+      bool screenshots_in_content_dir;
+      bool systemfiles_in_content_dir;
      bool ssh_enable;
      bool samba_enable;
      bool bluetooth_enable;
-#endif
+
+      bool automatically_add_content_to_playlist;
+      bool video_window_show_decorations;
   } bools;

   struct
@@ -228,8 +269,10 @@ typedef struct settings
      float video_msg_color_r;
      float video_msg_color_g;
      float video_msg_color_b;
+      float video_msg_bgcolor_opacity;

      float menu_wallpaper_opacity;
+      float menu_framebuffer_opacity;
      float menu_footer_opacity;
      float menu_header_opacity;

@@ -251,10 +294,7 @@ typedef struct settings
      int location_update_interval_ms;
      int location_update_interval_distance;
      int state_slot;
-
-#ifdef HAVE_WASAPI
      int audio_wasapi_sh_buffer_length;
-#endif
   } ints;

   struct
@@ -263,16 +303,8 @@ typedef struct settings
      unsigned audio_out_rate;
      unsigned audio_block_frames;
      unsigned audio_latency;
-      unsigned input_remap_ids[MAX_USERS][RARCH_BIND_LIST_END];

-      /* Set by autoconfiguration in joypad_autoconfig_dir.
-       * Does not override main binds. */
-      unsigned input_libretro_device[MAX_USERS];
-      unsigned input_analog_dpad_mode[MAX_USERS];
-
-      unsigned input_joypad_map[MAX_USERS];
-      unsigned input_device[MAX_USERS];
-      unsigned input_mouse_index[MAX_USERS];
+      unsigned audio_resampler_quality;

      unsigned input_turbo_period;
      unsigned input_turbo_duty_cycle;
@@ -285,6 +317,8 @@ typedef struct settings
      unsigned netplay_port;
      unsigned netplay_input_latency_frames_min;
      unsigned netplay_input_latency_frames_range;
+      unsigned netplay_share_digital;
+      unsigned netplay_share_analog;
      unsigned bundle_assets_extract_version_current;
      unsigned bundle_assets_extract_last_version;
      unsigned content_history_size;
@@ -293,8 +327,10 @@ typedef struct settings
      unsigned autosave_interval;
      unsigned network_cmd_port;
      unsigned network_remote_base_port;
+      unsigned keymapper_port;
      unsigned video_window_x;
      unsigned video_window_y;
+      unsigned video_window_opacity;
      unsigned video_monitor_index;
      unsigned video_fullscreen_x;
      unsigned video_fullscreen_y;
@@ -302,11 +338,12 @@ typedef struct settings
      unsigned video_swap_interval;
      unsigned video_hard_sync_frames;
      unsigned video_frame_delay;
-#ifdef GEKKO
      unsigned video_viwidth;
-#endif
      unsigned video_aspect_ratio_idx;
      unsigned video_rotation;
+      unsigned video_msg_bgcolor_red;
+      unsigned video_msg_bgcolor_green;
+      unsigned video_msg_bgcolor_blue;

      unsigned menu_thumbnails;
      unsigned menu_dpi_override_value;
@@ -319,52 +356,78 @@ typedef struct settings
      unsigned menu_xmb_theme;
      unsigned menu_xmb_color_theme;
      unsigned menu_materialui_color_theme;
+      unsigned menu_font_color_red;
+      unsigned menu_font_color_green;
+      unsigned menu_font_color_blue;

      unsigned camera_width;
      unsigned camera_height;
+
+      unsigned input_overlay_show_physical_inputs_port;
+
+      unsigned input_joypad_map[MAX_USERS];
+      unsigned input_device[MAX_USERS];
+      unsigned input_mouse_index[MAX_USERS];
+      /* Set by autoconfiguration in joypad_autoconfig_dir.
+       * Does not override main binds. */
+      unsigned input_libretro_device[MAX_USERS];
+      unsigned input_analog_dpad_mode[MAX_USERS];
+
+      unsigned input_keymapper_ids[RARCH_CUSTOM_BIND_LIST_END];
+
+      unsigned input_remap_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
+
+      unsigned led_map[MAX_LEDS];
   } uints;

   struct
   {
      char placeholder;

-      char playlist_names[PATH_MAX_LENGTH];
-      char playlist_cores[PATH_MAX_LENGTH];
      char video_driver[32];
      char record_driver[32];
      char camera_driver[32];
      char wifi_driver[32];
+      char led_driver[32];
      char location_driver[32];
-#ifdef HAVE_MENU
      char menu_driver[32];
-#endif
-      char audio_device[255];
-      char camera_device[255];
-#ifdef HAVE_CHEEVOS
      char cheevos_username[32];
      char cheevos_password[32];
-#endif
      char video_context_driver[32];
      char audio_driver[32];
      char audio_resampler[32];
      char input_driver[32];
      char input_joypad_driver[32];
+
      char input_keyboard_layout[64];
+
+      char audio_device[255];
+      char camera_device[255];
+
+      char playlist_names[PATH_MAX_LENGTH];
+      char playlist_cores[PATH_MAX_LENGTH];
      char bundle_assets_src[PATH_MAX_LENGTH];
      char bundle_assets_dst[PATH_MAX_LENGTH];
      char bundle_assets_dst_subdir[PATH_MAX_LENGTH];
+
+      char netplay_mitm_server[255];
   } arrays;

   struct
   {
      char placeholder;

-
+      char username[32];
+      char netplay_password[128];
+      char netplay_spectate_password[128];
+      char netplay_server[255];
+      char network_buildbot_url[255];
+      char network_buildbot_assets_url[255];
      char browse_url[4096];

-#ifdef HAVE_MENU
      char path_menu_xmb_font[PATH_MAX_LENGTH];
-#endif
+      char menu_content_show_settings_password[PATH_MAX_LENGTH];
+      char kiosk_mode_password[PATH_MAX_LENGTH];
      char path_cheat_database[PATH_MAX_LENGTH];
      char path_content_database[PATH_MAX_LENGTH];
      char path_overlay[PATH_MAX_LENGTH];
@@ -373,6 +436,7 @@ typedef struct settings
      char path_softfilter_plugin[PATH_MAX_LENGTH];
      char path_core_options[PATH_MAX_LENGTH];
      char path_content_history[PATH_MAX_LENGTH];
+      char path_content_favorites[PATH_MAX_LENGTH];
      char path_content_music_history[PATH_MAX_LENGTH];
      char path_content_image_history[PATH_MAX_LENGTH];
      char path_content_video_history[PATH_MAX_LENGTH];
@@ -381,14 +445,13 @@ typedef struct settings
      char path_shader[PATH_MAX_LENGTH];
      char path_font[PATH_MAX_LENGTH];

-      char network_buildbot_url[255];
-      char network_buildbot_assets_url[255];

      char directory_audio_filter[PATH_MAX_LENGTH];
      char directory_autoconfig[PATH_MAX_LENGTH];
      char directory_video_filter[PATH_MAX_LENGTH];
      char directory_video_shader[PATH_MAX_LENGTH];
      char directory_content_history[PATH_MAX_LENGTH];
+      char directory_content_favorites[PATH_MAX_LENGTH];
      char directory_libretro[PATH_MAX_LENGTH];
      char directory_cursor[PATH_MAX_LENGTH];
      char directory_input_remapping[PATH_MAX_LENGTH];
@@ -404,12 +467,6 @@ typedef struct settings
      char directory_thumbnails[PATH_MAX_LENGTH];
      char directory_menu_config[PATH_MAX_LENGTH];
      char directory_menu_content[PATH_MAX_LENGTH];
-#ifdef HAVE_NETWORKING
-      char netplay_server[255];
-      char netplay_password[128];
-      char netplay_spectate_password[128];
-#endif
-      char username[32];
   } paths;

   bool modified;
@@ -419,22 +476,6 @@ typedef struct settings
   size_t rewind_buffer_size;
 } settings_t;

-#define configuration_set_float(settings, var, newvar) \
-   settings->modified = true; \
-   var = newvar
-
-#define configuration_set_bool(settings, var, newvar) \
-   settings->modified = true; \
-   var = newvar
-
-#define configuration_set_uint(settings, var, newvar) \
-   settings->modified = true; \
-   var = newvar
-
-#define configuration_set_int(settings, var, newvar) \
-   settings->modified = true; \
-   var = newvar
-
 /**
 * config_get_default_camera:
 *
@@ -507,7 +548,6 @@ const char *config_get_default_input(void);
 **/
 const char *config_get_default_joypad(void);

-#ifdef HAVE_MENU
 /**
 * config_get_default_menu:
 *
@@ -516,7 +556,6 @@ const char *config_get_default_joypad(void);
 * Returns: Default menu driver.
 **/
 const char *config_get_default_menu(void);
-#endif

 const char *config_get_default_record(void);

@@ -25,6 +25,7 @@

 #include <boolean.h>
 #include <retro_common_api.h>
+#include <retro_miscellaneous.h>

 #include "frontend/frontend_driver.h"

@@ -81,6 +82,28 @@ bool content_reset_savestate_backups(void);
 bool content_undo_load_buf_is_empty(void);
 bool content_undo_save_buf_is_empty(void);

+/* Clears the pending subsystem rom buffer*/
+bool content_is_subsystem_pending_load(void);
+
+/* Clears the pending subsystem rom buffer*/
+void content_clear_subsystem(void);
+
+/* Set the current subsystem*/
+void content_set_subsystem(unsigned subsystem);
+
+/* Get the current subsystem*/
+int content_get_subsystem();
+
+/* Add a rom to the subsystem rom buffer */
+void content_add_subsystem(const char* path);
+
+/* Get the current subsystem rom id */
+int content_get_subsystem_rom_id();
+
+/* Set environment variables before a subsystem load */
+void content_set_subsystem_info();
+
+
 RETRO_END_DECLS

 #endif
@@ -30,14 +30,14 @@ RETRO_BEGIN_DECLS

 enum
 {
-   /* Polling is performed before 
+   /* Polling is performed before
    * call to retro_run. */
   POLL_TYPE_EARLY = 0,

   /* Polling is performed when requested. */
   POLL_TYPE_NORMAL,

-   /* Polling is performed on first call to 
+   /* Polling is performed on first call to
    * retro_input_state per frame. */
   POLL_TYPE_LATE
 };
@@ -65,7 +65,7 @@ typedef struct rarch_system_info
   const char *input_desc_btn[MAX_USERS][RARCH_FIRST_META_KEY];
   char valid_extensions[255];

-   struct retro_disk_control_callback  disk_control_cb; 
+   struct retro_disk_control_callback  disk_control_cb;
   struct retro_location_callback      location_cb;

   struct
@@ -79,7 +79,7 @@ typedef struct rarch_system_info
      struct retro_controller_info *data;
      unsigned size;
   } ports;
-   
+
   rarch_memory_map_t mmaps;
 } rarch_system_info_t;

@@ -20,6 +20,7 @@
 #include <file/file_path.h>
 #include <lists/dir_list.h>
 #include <file/archive_file.h>
+#include <streams/file_stream.h>

 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -46,9 +47,6 @@ static void core_info_list_resolve_all_extensions(
   size_t all_ext_len    = 0;
   char *all_ext         = NULL;

-   if (!core_info_list)
-      return;
-
   for (i = 0; i < core_info_list->count; i++)
   {
      if (core_info_list->list[i].supported_extensions)
@@ -187,21 +185,26 @@ static void core_info_list_free(core_info_list_t *core_info_list)

 static bool core_info_list_iterate(
      char *s, size_t len,
+      const char *path_basedir,
      struct string_list *contents, size_t i)
 {
-   char info_path_base[PATH_MAX_LENGTH];
-#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP) && !defined(_3DS) && !defined(VITA))
-   char                       *substr   = NULL;
-#endif
-   settings_t                 *settings = config_get_ptr();
+   size_t info_path_base_size = PATH_MAX_LENGTH * sizeof(char);
+   char *info_path_base       = NULL;
+   char             *substr   = NULL;
+   const char *current_path   = contents ? contents->elems[i].data : NULL;

-   if (!contents || !contents->elems[i].data)
+   (void)substr;
+
+   if (!current_path)
      return false;

+   info_path_base             = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+
   info_path_base[0] = '\0';

-   fill_pathname_base_noext(info_path_base, contents->elems[i].data,
-         sizeof(info_path_base));
+   fill_pathname_base_noext(info_path_base,
+         current_path,
+         info_path_base_size);

 #if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP) && !defined(_3DS) && !defined(VITA) && !defined(HW_WUP))
   substr = strrchr(info_path_base, '_');
@@ -211,13 +214,13 @@ static bool core_info_list_iterate(

   strlcat(info_path_base,
         file_path_str(FILE_PATH_CORE_INFO_EXTENSION),
-         sizeof(info_path_base));
+         info_path_base_size);

   fill_pathname_join(s,
-         (!string_is_empty(settings->paths.path_libretro_info)) ?
-         settings->paths.path_libretro_info : settings->paths.directory_libretro,
+         path_basedir,
         info_path_base, len);

+   free(info_path_base);
   return true;
 }

@@ -228,10 +231,14 @@ static core_info_list_t *core_info_list_new(const char *path)
   core_info_list_t *core_info_list = NULL;
   struct string_list *contents     = dir_list_new_special(
                                      path, DIR_LIST_CORES, NULL);
+   settings_t             *settings = config_get_ptr();
+   const char       *path_basedir   = !string_is_empty(settings->paths.path_libretro_info) ?
+      settings->paths.path_libretro_info : settings->paths.directory_libretro;

   if (!contents)
      return NULL;

+
   core_info_list = (core_info_list_t*)calloc(1, sizeof(*core_info_list));
   if (!core_info_list)
      goto error;
@@ -245,13 +252,14 @@ static core_info_list_t *core_info_list_new(const char *path)

   for (i = 0; i < contents->size; i++)
   {
-      char info_path[PATH_MAX_LENGTH];
+      size_t info_path_size = PATH_MAX_LENGTH * sizeof(char);
+      char *info_path       = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));

-      info_path[0]        = '\0';
+      info_path[0]          = '\0';

-      if ( 
-            core_info_list_iterate(info_path, sizeof(info_path),
-            contents, i) 
+      if (
+            core_info_list_iterate(info_path, info_path_size,
+               path_basedir, contents, i)
            && path_is_valid(info_path))
      {
         char *tmp           = NULL;
@@ -259,30 +267,36 @@ static core_info_list_t *core_info_list_new(const char *path)
         unsigned count      = 0;
         config_file_t *conf = config_file_new(info_path);

+         free(info_path);
+
         if (!conf)
            continue;

-         if (config_get_string(conf, "display_name", &tmp) && !string_is_empty(tmp))
+         if (config_get_string(conf, "display_name", &tmp)
+               && !string_is_empty(tmp))
         {
            core_info[i].display_name = strdup(tmp);
            free(tmp);
            tmp = NULL;
         }
-         if (config_get_string(conf, "corename", &tmp) && !string_is_empty(tmp))
+         if (config_get_string(conf, "corename", &tmp)
+               && !string_is_empty(tmp))
         {
            core_info[i].core_name = strdup(tmp);
            free(tmp);
            tmp = NULL;
         }

-         if (config_get_string(conf, "systemname", &tmp) && !string_is_empty(tmp))
+         if (config_get_string(conf, "systemname", &tmp)
+               && !string_is_empty(tmp))
         {
            core_info[i].systemname = strdup(tmp);
            free(tmp);
            tmp = NULL;
         }

-         if (config_get_string(conf, "manufacturer", &tmp) && !string_is_empty(tmp))
+         if (config_get_string(conf, "manufacturer", &tmp)
+               && !string_is_empty(tmp))
         {
            core_info[i].system_manufacturer = strdup(tmp);
            free(tmp);
@@ -293,7 +307,8 @@ static core_info_list_t *core_info_list_new(const char *path)

         core_info[i].firmware_count = count;

-         if (config_get_string(conf, "supported_extensions", &tmp) && !string_is_empty(tmp))
+         if (config_get_string(conf, "supported_extensions", &tmp)
+               && !string_is_empty(tmp))
         {
            core_info[i].supported_extensions      = strdup(tmp);
            core_info[i].supported_extensions_list =
@@ -303,7 +318,8 @@ static core_info_list_t *core_info_list_new(const char *path)
            tmp = NULL;
         }

-         if (config_get_string(conf, "authors", &tmp) && !string_is_empty(tmp))
+         if (config_get_string(conf, "authors", &tmp)
+               && !string_is_empty(tmp))
         {
            core_info[i].authors      = strdup(tmp);
            core_info[i].authors_list =
@@ -313,7 +329,8 @@ static core_info_list_t *core_info_list_new(const char *path)
            tmp = NULL;
         }

-         if (config_get_string(conf, "permissions", &tmp) && !string_is_empty(tmp))
+         if (config_get_string(conf, "permissions", &tmp)
+               && !string_is_empty(tmp))
         {
            core_info[i].permissions      = strdup(tmp);
            core_info[i].permissions_list =
@@ -323,7 +340,8 @@ static core_info_list_t *core_info_list_new(const char *path)
            tmp = NULL;
         }

-         if (config_get_string(conf, "license", &tmp) && !string_is_empty(tmp))
+         if (config_get_string(conf, "license", &tmp)
+               && !string_is_empty(tmp))
         {
            core_info[i].licenses      = strdup(tmp);
            core_info[i].licenses_list =
@@ -333,7 +351,8 @@ static core_info_list_t *core_info_list_new(const char *path)
            tmp = NULL;
         }

-         if (config_get_string(conf, "categories", &tmp) && !string_is_empty(tmp))
+         if (config_get_string(conf, "categories", &tmp)
+               && !string_is_empty(tmp))
         {
            core_info[i].categories      = strdup(tmp);
            core_info[i].categories_list =
@@ -343,7 +362,8 @@ static core_info_list_t *core_info_list_new(const char *path)
            tmp = NULL;
         }

-         if (config_get_string(conf, "database", &tmp) && !string_is_empty(tmp))
+         if (config_get_string(conf, "database", &tmp)
+               && !string_is_empty(tmp))
         {
            core_info[i].databases      = strdup(tmp);
            core_info[i].databases_list =
@@ -353,7 +373,8 @@ static core_info_list_t *core_info_list_new(const char *path)
            tmp = NULL;
         }

-         if (config_get_string(conf, "notes", &tmp) && !string_is_empty(tmp))
+         if (config_get_string(conf, "notes", &tmp)
+               && !string_is_empty(tmp))
         {
            core_info[i].notes     = strdup(tmp);
            core_info[i].note_list = string_split(core_info[i].notes, "|");
@@ -370,8 +391,14 @@ static core_info_list_t *core_info_list_new(const char *path)
               &tmp_bool))
            core_info[i].supports_no_game = tmp_bool;

+         if (config_get_bool(conf, "database_match_archive_member",
+               &tmp_bool))
+            core_info[i].database_match_archive_member = tmp_bool;
+
         core_info[i].config_data = conf;
      }
+      else
+         free(info_path);

      if (!string_is_empty(contents->elems[i].data))
         core_info[i].path = strdup(contents->elems[i].data);
@@ -381,10 +408,11 @@ static core_info_list_t *core_info_list_new(const char *path)
            strdup(path_basename(core_info[i].path));
   }

-   core_info_list_resolve_all_extensions(core_info_list);
-
   if (core_info_list)
+   {
+      core_info_list_resolve_all_extensions(core_info_list);
      core_info_list_resolve_all_firmware(core_info_list);
+   }

   dir_list_free(contents);
   return core_info_list;
@@ -493,27 +521,30 @@ static bool core_info_list_update_missing_firmware_internal(
      const char *systemdir)
 {
   size_t i;
-   char path[PATH_MAX_LENGTH];
-   core_info_t          *info = NULL;
+   core_info_t      *info = NULL;
+   char             *path = NULL;
+   size_t       path_size = PATH_MAX_LENGTH * sizeof(char);

   if (!core_info_list || !core)
      return false;

-   path[0] = '\0';
-   info    = core_info_find_internal(core_info_list, core);
+   info                   = core_info_find_internal(core_info_list, core);

   if (!info)
      return false;

+   path                   = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   path[0]                = '\0';
   rarch_ctl(RARCH_CTL_UNSET_MISSING_BIOS, NULL);
+
   for (i = 0; i < info->firmware_count; i++)
   {
      if (string_is_empty(info->firmware[i].path))
         continue;

      fill_pathname_join(path, systemdir,
-            info->firmware[i].path, sizeof(path));
-      info->firmware[i].missing = !path_file_exists(path);
+            info->firmware[i].path, path_size);
+      info->firmware[i].missing = !filestream_exists(path);
      if (info->firmware[i].missing && !info->firmware[i].optional)
      {
         rarch_ctl(RARCH_CTL_SET_MISSING_BIOS, NULL);
@@ -521,6 +552,7 @@ static bool core_info_list_update_missing_firmware_internal(
      }
   }

+   free(path);
   return true;
 }

@@ -564,7 +596,7 @@ static void core_info_list_get_missing_firmware(
   {
      fill_pathname_join(path, systemdir,
            info->firmware[i].path, sizeof(path));
-      info->firmware[i].missing = !path_file_exists(path);
+      info->firmware[i].missing = !filestream_exists(path);
      *num_firmware += info->firmware[i].missing;
   }

@@ -726,30 +758,41 @@ void core_info_get_name(const char *path, char *s, size_t len)
   struct string_list *contents     = dir_list_new_special(
         settings->paths.directory_libretro,
         DIR_LIST_CORES, NULL);
+   const char       *path_basedir   = !string_is_empty(settings->paths.path_libretro_info) ?
+      settings->paths.path_libretro_info : settings->paths.directory_libretro;

   if (!contents)
      return;

   for (i = 0; i < contents->size; i++)
   {
-      char info_path[PATH_MAX_LENGTH];
+      size_t path_size                = PATH_MAX_LENGTH * sizeof(char);
+      char *info_path                 = NULL;
      config_file_t *conf             = NULL;
      char *new_core_name             = NULL;
+      const char *current_path        = contents->elems[i].data;

+      if (!string_is_equal(current_path, path))
+         continue;
+
+      info_path                       = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
      info_path[0]                    = '\0';

-      if (!string_is_equal(contents->elems[i].data, path))
-         continue;
-
      if (!core_info_list_iterate(info_path,
-               sizeof(info_path), contents, i)
+               path_size, path_basedir, contents, i)
            && path_is_valid(info_path))
+      {
+         free(info_path);
         continue;
+      }

      conf = config_file_new(info_path);

      if (!conf)
+      {
+         free(info_path);
         continue;
+      }

      if (config_get_string(conf, "corename",
            &new_core_name))
@@ -759,6 +802,7 @@ void core_info_get_name(const char *path, char *s, size_t len)
      }

      config_file_free(conf);
+      free(info_path);
      break;
   }

@@ -784,43 +828,44 @@ size_t core_info_list_num_info_files(core_info_list_t *core_info_list)
   return num;
 }

-bool core_info_unsupported_content_path(const char *path)
+bool core_info_database_match_archive_member(const char *database_path)
 {
-   size_t i;
-   const char *archive_path = NULL;
-   const char *delim        = path_get_archive_delim(path);
+   char *database           = NULL;
+   const char *new_path     = path_basename(database_path);

-   if (delim)
-      archive_path = delim - 1;
-
-   if (!core_info_curr_list)
+   if (string_is_empty(new_path))
      return false;

-   /* if the path contains a compressed file and the core supports archives,
-    * we don't want to look at this file */
-   if (archive_path)
+   database                 = strdup(new_path);
+
+   if (string_is_empty(database))
+      goto error;
+
+   path_remove_extension(database);
+
+   if (core_info_curr_list)
   {
+      size_t i;
+
      for (i = 0; i < core_info_curr_list->count; i++)
      {
         const core_info_t *info = &core_info_curr_list->list[i];

-         if (     !string_list_find_elem(info->supported_extensions_list, "zip")
-               && !string_list_find_elem(info->supported_extensions_list, "7z"))
-            continue;
+         if (!info->database_match_archive_member)
+             continue;

-         return false;
+         if (!string_list_find_elem(info->databases_list, database))
+             continue;
+
+         free(database);
+         return true;
      }
   }

-   for (i = 0; i < core_info_curr_list->count; i++)
-   {
-      const core_info_t *info = &core_info_curr_list->list[i];
-
-      if (string_list_find_elem(info->supported_extensions_list, path_get_extension(path)))
-         return false;
-   }
-
-   return true;
+error:
+   if (database)
+      free(database);
+   return false;
 }

 bool core_info_database_supports_content_path(const char *database_path, const char *path)
@@ -834,43 +879,13 @@ bool core_info_database_supports_content_path(const char *database_path, const c
   database                 = strdup(new_path);

   if (string_is_empty(database))
-   {
-      if (database)
-         free(database);
-      return false;
-   }
+      goto error;

   path_remove_extension(database);

   if (core_info_curr_list)
   {
      size_t i;
-      const char *delim           = path_get_archive_delim(path);
-
-      if (delim)
-      {
-         const char *archive_path = delim - 1;
-
-         /* if the path contains a compressed file and the core supports archives,
-          * we don't want to look at this file */
-         if (archive_path)
-         {
-            for (i = 0; i < core_info_curr_list->count; i++)
-            {
-               const core_info_t *info = &core_info_curr_list->list[i];
-
-               if (!string_list_find_elem(info->databases_list, database))
-                  continue;
-
-               if (     !string_list_find_elem(info->supported_extensions_list, "zip")
-                     && !string_list_find_elem(info->supported_extensions_list, "7z"))
-                  continue;
-
-               free(database);
-               return false;
-            }
-         }
-      }

      for (i = 0; i < core_info_curr_list->count; i++)
      {
@@ -888,7 +903,9 @@ bool core_info_database_supports_content_path(const char *database_path, const c
      }
   }

-   free(database);
+error:
+   if (database)
+      free(database);
   return false;
 }

@@ -2,7 +2,7 @@
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2017 - Daniel De Matteis
 *  Copyright (C) 2016-2017 - Brad Parker
- * 
+ *
 *  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.
@@ -37,6 +37,9 @@ typedef struct

 typedef struct
 {
+   bool supports_no_game;
+   bool database_match_archive_member;
+   size_t firmware_count;
   char *path;
   void *config_data;
   char *display_name;
@@ -57,10 +60,7 @@ typedef struct
   struct string_list *authors_list;
   struct string_list *permissions_list;
   struct string_list *licenses_list;
-
   core_info_firmware_t *firmware;
-   size_t firmware_count;
-   bool supports_no_game;
   void *userdata;
 } core_info_t;

@@ -121,6 +121,8 @@ bool core_info_load(core_info_ctx_find_t *info);

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

+bool core_info_database_match_archive_member(const char *database_path);
+
 bool core_info_unsupported_content_path(const char *path);

 RETRO_END_DECLS
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
 *  Copyright (C) 2011-2017 - Daniel De Matteis
- * 
+ *
 *  RetroArch is free software: you can redistribute it and/or modify it under the terms
 *  of the GNU General Public License as published by the Free Software Found-
 *  ation, either version 3 of the License, or (at your option) any later version.
@@ -16,7 +16,7 @@
 #ifndef __CORE_TYPE_H
 #define __CORE_TYPE_H

-enum rarch_core_type 
+enum rarch_core_type
 {
   CORE_TYPE_PLAIN = 0,
   CORE_TYPE_DUMMY,
@@ -2,7 +2,7 @@
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2017 - Daniel De Matteis
 *  Copyright (C) 2012-2015 - Michael Lelli
- * 
+ *
 *  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.
@@ -2,7 +2,7 @@
 *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
 *  Copyright (C) 2011-2017 - Daniel De Matteis
 *  Copyright (C) 2012-2015 - Michael Lelli
- * 
+ *
 *  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.
@@ -20,11 +20,15 @@

 #include <boolean.h>
 #include <libretro.h>
+#include <retro_common_api.h>
+#include <retro_environment.h>

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

+RETRO_BEGIN_DECLS
+
 void libretro_dummy_retro_init(void);

 void libretro_dummy_retro_deinit(void);
@@ -300,4 +304,6 @@ size_t libretro_videoprocessor_retro_get_memory_size(unsigned id);

 #endif

+RETRO_END_DECLS
+
 #endif
@@ -1,3 +1,4 @@
+#include <retro_common_api.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
@@ -214,7 +215,7 @@ void CORE_PREFIX(retro_init)(void)

   av_register_all();
 #if 0
-   /* FIXME: Occasionally crashes inside libavdevice 
+   /* FIXME: Occasionally crashes inside libavdevice
    * for some odd reason on reentrancy. Likely a libavdevice bug. */
   avdevice_register_all();
 #endif
@@ -272,7 +273,7 @@ void CORE_PREFIX(retro_set_environment)(retro_environment_t cb)
 {
   static const struct retro_variable vars[] = {
 #if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
-      { "ffmpeg_temporal_interp", "Temporal Interpolation; enabled|disabled" },
+      { "ffmpeg_temporal_interp", "Temporal Interpolation; disabled|enabled" },
 #ifdef HAVE_GL_FFT
      { "ffmpeg_fft_resolution", "FFT Resolution; 1280x720|1920x1080|2560x1440|3840x2160|640x360|320x180" },
      { "ffmpeg_fft_multisample", "FFT Multisample; 1x|2x|4x" },
@@ -548,7 +549,7 @@ void CORE_PREFIX(retro_run)(void)

   frame_cnt++;

-   /* Have to decode audio before video 
+   /* Have to decode audio before video
    * incase there are PTS fuckups due
    * to seeking. */
   if (audio_streams_num > 0)
@@ -679,20 +680,20 @@ void CORE_PREFIX(retro_run)(void)

         if (!temporal_interpolation)
            mix_factor = 1.0f;
-         
+
         glBindFramebuffer(GL_FRAMEBUFFER, hw_render.get_current_framebuffer());
         glClearColor(0, 0, 0, 1);
         glClear(GL_COLOR_BUFFER_BIT);
         glViewport(0, 0, media.width, media.height);
         glUseProgram(prog);
-         
+
         glUniform1f(mix_loc, mix_factor);
         glActiveTexture(GL_TEXTURE1);
         glBindTexture(GL_TEXTURE_2D, frames[1].tex);
         glActiveTexture(GL_TEXTURE0);
         glBindTexture(GL_TEXTURE_2D, frames[0].tex);
-         
-         
+
+
         glBindBuffer(GL_ARRAY_BUFFER, vbo);
         glVertexAttribPointer(vertex_loc, 2, GL_FLOAT, GL_FALSE,
               4 * sizeof(GLfloat), (const GLvoid*)(0 * sizeof(GLfloat)));
@@ -701,17 +702,17 @@ void CORE_PREFIX(retro_run)(void)
         glEnableVertexAttribArray(vertex_loc);
         glEnableVertexAttribArray(tex_loc);
         glBindBuffer(GL_ARRAY_BUFFER, 0);
-         
+
         glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
         glDisableVertexAttribArray(vertex_loc);
         glDisableVertexAttribArray(tex_loc);
-         
+
         glUseProgram(0);
         glActiveTexture(GL_TEXTURE1);
         glBindTexture(GL_TEXTURE_2D, 0);
         glActiveTexture(GL_TEXTURE0);
         glBindTexture(GL_TEXTURE_2D, 0);
-         
+
         CORE_PREFIX(video_cb)(RETRO_HW_FRAME_BUFFER_VALID,
               media.width, media.height, media.width * sizeof(uint32_t));
      }
@@ -731,10 +732,10 @@ void CORE_PREFIX(retro_run)(void)
      while (frames)
      {
         unsigned to_read = frames;
-         
+
         /* FFT size we use (1 << 11). Really shouldn't happen,
          * unless we use a crazy high sample rate. */
-         if (to_read > (1 << 11)) 
+         if (to_read > (1 << 11))
            to_read = 1 << 11;

         fft_step_fft(fft, buffer, to_read);
@@ -861,7 +862,7 @@ static bool open_codecs(void)
            break;

         case AVMEDIA_TYPE_VIDEO:
-            if (     !vctx 
+            if (     !vctx
                  && !codec_is_image(fctx->streams[i]->codec->codec_id))
            {
               if (!open_codec(&vctx, i))
@@ -872,7 +873,7 @@ static bool open_codecs(void)

         case AVMEDIA_TYPE_SUBTITLE:
 #ifdef HAVE_SSA
-            if (     subtitle_streams_num < MAX_STREAMS 
+            if (     subtitle_streams_num < MAX_STREAMS
                  && codec_id_is_ass(fctx->streams[i]->codec->codec_id))
            {
               int size;
@@ -923,7 +924,7 @@ static bool init_media_info(void)
   {
      media.width  = vctx->width;
      media.height = vctx->height;
-      media.aspect = (float)vctx->width * 
+      media.aspect = (float)vctx->width *
         av_q2d(vctx->sample_aspect_ratio) / vctx->height;
   }

@@ -1149,7 +1150,7 @@ static void render_ass_img(AVFrame *conv_frame, ASS_Image *img)
            dst_g = (g * src_alpha + dst_g * dst_alpha) >> 8;
            dst_b = (b * src_alpha + dst_b * dst_alpha) >> 8;

-            dst[x] = (0xffu << 24) | (dst_r << 16) | 
+            dst[x] = (0xffu << 24) | (dst_r << 16) |
               (dst_g << 8) | (dst_b << 0);
         }
      }
@@ -1171,7 +1172,7 @@ static void decode_thread(void *data)
   struct SwsContext *sws  = NULL;

   (void)data;
-   
+
   if (video_stream >= 0)
      sws = sws_getCachedContext(NULL,
            media.width, media.height, vctx->pix_fmt,
@@ -1295,7 +1296,7 @@ static void decode_thread(void *data)
               int stride;
               unsigned y;
               const uint8_t *src = NULL;
-               
+
               fifo_write(video_decode_fifo, &pts, sizeof(pts));
               src    = conv_frame->data[0];
               stride = conv_frame->linesize[0];
@@ -1377,8 +1378,8 @@ static void context_destroy(void)

 #include "gl_shaders/ffmpeg.glsl.vert.h"

-/* OpenGL ES note about main() -  Get format as GL_RGBA/GL_UNSIGNED_BYTE. 
- * Assume little endian, so we get ARGB -> BGRA byte order, and 
+/* OpenGL ES note about main() -  Get format as GL_RGBA/GL_UNSIGNED_BYTE.
+ * Assume little endian, so we get ARGB -> BGRA byte order, and
 * we have to swizzle to .BGR. */
 #ifdef HAVE_OPENGLES
 #include "gl_shaders/ffmpeg_es.glsl.frag.h"
@@ -1445,7 +1446,7 @@ static void context_reset(void)
 #if !defined(HAVE_OPENGLES)
      glGenBuffers(1, &frames[i].pbo);
      glBindBuffer(GL_PIXEL_UNPACK_BUFFER, frames[i].pbo);
-      glBufferData(GL_PIXEL_UNPACK_BUFFER, media.width 
+      glBufferData(GL_PIXEL_UNPACK_BUFFER, media.width
            * media.height * sizeof(uint32_t), NULL, GL_STREAM_DRAW);
      glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
 #endif
@@ -1611,7 +1612,7 @@ bool CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)

   if (video_stream >= 0 || is_fft)
   {
-      video_decode_fifo = fifo_new(media.width 
+      video_decode_fifo = fifo_new(media.width
            * media.height * sizeof(uint32_t) * 32);

 #if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
@@ -45,7 +45,7 @@ struct Pass
   GLuint parameter_tex;
 };

-struct GLFFT 
+struct GLFFT
 {
   GLuint ms_rb_color;
   GLuint ms_rb_ds;
@@ -102,7 +102,7 @@ static GLuint fft_compile_shader(fft_t *fft, GLenum type, const char *source)

   glShaderSource(shader, 1, (const GLchar**)&source, NULL);
   glCompileShader(shader);
-   
+
   glGetShaderiv(shader, GL_COMPILE_STATUS, &status);

   if (!status)
@@ -153,7 +153,7 @@ typedef float stub_matrix4x4[4][4];
 static INLINE unsigned log2i(unsigned x)
 {
   unsigned res;
-   
+
   for (res = 0; x; x >>= 1)
      res++;
   return res - 1;
@@ -297,7 +297,7 @@ static void fft_init(fft_t *fft)
   glUniform1i(glGetUniformLocation(fft->prog_complex, "sTexture"), 0);
   glUniform1i(glGetUniformLocation(fft->prog_complex, "sParameterTexture"), 1);
   glUniform4fv(glGetUniformLocation(fft->prog_complex, "uOffsetScale"), 1, unity);
-   
+
   glUseProgram(fft->prog_resolve);
   glUniform1i(glGetUniformLocation(fft->prog_resolve, "sFFT"), 0);
   glUniform4fv(glGetUniformLocation(fft->prog_resolve, "uOffsetScale"), 1, unity);
@@ -478,7 +478,7 @@ static bool fft_context_reset(fft_t *fft, unsigned fft_steps,
   return true;
 }

-/* GLFFT requires either GLES3 or 
+/* GLFFT requires either GLES3 or
 * desktop GL with ES3_compat (supported by MESA on Linux) extension. */
 fft_t *fft_new(unsigned fft_steps, rglgen_proc_address_t proc)
 {
@@ -621,14 +621,14 @@ void fft_step_fft(fft_t *fft, const GLshort *audio_buffer, unsigned frames)
      if (i == fft->steps - 1)
      {
         glBindFramebuffer(GL_FRAMEBUFFER, fft->output.fbo);
-         glUniform1i(glGetUniformLocation(i == 0 
+         glUniform1i(glGetUniformLocation(i == 0
                  ? fft->prog_real : fft->prog_complex, "uViewportOffset"),
               fft->output_ptr);
         glViewport(0, fft->output_ptr, fft->size, 1);
      }
      else
      {
-         glUniform1i(glGetUniformLocation(i == 0 
+         glUniform1i(glGetUniformLocation(i == 0
                  ? fft->prog_real : fft->prog_complex, "uViewportOffset"), 0);
         glBindFramebuffer(GL_FRAMEBUFFER, fft->passes[i].target.fbo);
         glClear(GL_COLOR_BUFFER_BIT);
@@ -7,7 +7,7 @@ static const char *fragment_source = GLSL(
      uniform float uMix;

      void main() {
-         gl_FragColor = vec4(pow(mix(pow(texture2D(sTex0, vTex).bgr, vec3(2.2)), pow(texture2D(sTex1, vTex).bgr, vec3(2.2)), uMix), vec3(1.0 / 2.2)), 1.0); 
+         gl_FragColor = vec4(pow(mix(pow(texture2D(sTex0, vTex).bgr, vec3(2.2)), pow(texture2D(sTex1, vTex).bgr, vec3(2.2)), uMix), vec3(1.0 / 2.2)), 1.0);
      }
 );