win32_get_refresh_rate not available on Xbox

XMB fix crash with scale factor under 100

.github/PULL_REQUEST_TEMPLATE.md

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

.gitignore

@@ -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,11 +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

.travis.yml

@@ -10,7 +10,7 @@ matrix:
             - 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
+        - CROSS_COMPILE=i686-w64-mingw32- ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
     - compiler: mingw-x64
       addons:
         apt:
@@ -18,7 +18,7 @@ matrix:
             - 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
+        - CROSS_COMPILE=x86_64-w64-mingw32- ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
     - compiler: gcc
     - compiler: clang
       addons:
@@ -55,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"
@@ -63,3 +64,5 @@ addons:
     build_command_prepend: "./configure; make clean"
     build_command:   "make"
     branch_pattern: coverity_scan
+notifications:
+  email: false

.vscode/c_cpp_properties.json

@@ -0,0 +1,127 @@
+{
+    "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": ""
+            },
+            "cStandard": "c11",
+            "cppStandard": "c++17"
+        },
+        {
+            "name": "msys2-mingw32",
+            "includePath": [
+                "C:/msys64/mingw32/include",
+                "C:/msys64/mingw32/i686-w64-mingw32/include",
+                "${workspaceRoot}/libretro-common/include",
+                "${workspaceRoot}/include",
+                "${workspaceRoot}"
+            ],
+            "defines": [
+                "_DEBUG",
+                "UNICODE"
+            ],
+            "intelliSenseMode": "msvc-x64",
+            "browse": {
+                "path": [
+                    "C:/msys64/mingw32/include",
+                    "C:/msys64/mingw32/i686-w64-mingw32/include",
+                    "${workspaceRoot}/libretro-common/include",
+                    "${workspaceRoot}/include",
+                    "${workspaceRoot}"
+                ],
+                "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
+}

.vscode/launch.json

@@ -0,0 +1,45 @@
+{
+   // 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": "(gdb) Launch",
+         "type": "cppdbg",
+         "request": "launch",
+         "program": "${workspaceFolder}/retroarch.exe",
+         "args": ["-v"],
+         "stopAtEntry": false,
+         "cwd": "${workspaceFolder}",
+         "environment": [],
+         "externalConsole": false,
+         "MIMode": "gdb",
+         "miDebuggerPath": "c:\\msys64\\mingw64\\bin\\gdb.exe",
+         "setupCommands": [
+             {
+                 "description": "Enable pretty-printing for gdb",
+                 "text": "-enable-pretty-printing",
+                 "ignoreFailures": true
+             }
+         ]
+      },
+      { 
+         "name": "(gdb) Attach",
+         "type": "cppdbg",
+         "request": "attach",
+         "program": "${workspaceFolder}/retroarch.exe",
+         "processId": "${command:pickProcess}",
+         "MIMode": "gdb",
+         "miDebuggerPath": "c:\\msys64\\mingw64\\bin\\gdb.exe",
+         "setupCommands": [
+             {
+                 "description": "Enable pretty-printing for gdb",
+                 "text": "-enable-pretty-printing",
+                 "ignoreFailures": true
+             }
+         ]
+      },
+
+   ]
+}

.vscode/settings.json

@@ -0,0 +1,18 @@
+{
+   "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"
+   },
+   "C_Cpp.dimInactiveRegions": false,
+}

.vscode/tasks.json

@@ -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"
+               ]
+            }
+         }
+      }
+   ]
+}

CHANGES.md

@@ -1,4 +1,182 @@
-# 1.7.0 (future)
+# 1.7.3 (future)
+
+# 1.7.2
+- ANDROID/OPENSL: Prevent crashes when setting audio latency too low (buffer count can never be lower than 2 now).
+- CRT: Added CRT SwitchRes.
+- COMMON: Hide the 'Core delete' option if the 'Core updater' is also hidden.
+- COMMON: Add way to reset core association for playlist entry.
+- COMMON: Fix invalid long command line options causing infinite loop on Windows
+- COMMON: Add OSD statistics for video/audio/core.
+- COMMON: Added runahead system; allows you to drive down latency even further.
+- COMMON: Fix buggy behavior that could happen with ZIP file reading on some platforms as a result of not initializing struct.
+- CHEEVOS: Support Atari 2600, Virtual Boy, and Arcade (only Neo Geo, CPS-1, CPS-2 and CPS-3 and only with fbalpha core).
+- CHEEVOS: Add option to automatically take a screenshot when an achievement is triggered.
+- CHEEVOS: Fixed incompatibilities with Neo Geo Pocket achievement sets.
+- CHEEVOS: Store only login token, not password.
+- D3D10: Added D3D10 driver to release build. Has working shaders (Slang), overlay, and menu display driver support. Should be on par capabilities wise
+with D3D11 driver except for there being no hardware rendering right now.
+- D3D11: Experimental hardware renderer. Allows for libretro cores to use D3D11 for hardware rendering. First core to use this is PPSSPP.
+- D3D11: Increase backwards compatibility, shaders compile with Shader Model 4.0 now, added support for more feature levels.
+- D3D10/D3D11/D3D12: Fix crashes with completely black or white thumbnail textures in XMB.
+- GUI: Support disabling window decorations on Windows and Linux.
+- LIBRETRO: Addition - Functions to enable and disable audio and video, and an environment function to query status of audio and video enables.
+- LOCALIZATION: Update Italian translation.
+- LOCALIZATION: Update Polish translation.
+- MENU: Add Rewind/Latency/Overlay settings to Quick Menu, add options to show/hide them (User Interface -> Views -> Quick Menu)
+- MENU/RGUI: Only show Menu Linear Filter for RGUI and only show it for
+video drivers that implement it (D3D8/9/10/11/12/GL)
+- MENU/RGUI: Add User Interface -> Appearance options.
+- MENU/RGUI: D3D8/D3D9: Hookup Menu Linear Filter
+- MENU/XMB: Disable XMB shadow icons by default for PowerPC and ARM for performance reasons.
+- MENU/XMB: Left/right thumbnails are now automatically scaled according to layout.
+- MENU/XMB: Add Left Thumbnails (additional to the right). 
+- MENU/XMB: Fixed left/right tab regression.
+- MENU/XMB: Fix scaling of tall images that were cut on bottom previously.
+- MENU/XMB: Menu scale factor setting now changes texts length, image scaling and margins.
+- MENU/XMB: Mouse cursor scales correctly now.
+- MENU/XMB: Add toggle to show/hide Playlist tabs.
+- MENU/XMB: Add menu layout - can switch between Desktop, Handheld and Auto.
+- MENU/XMB: Don't load menu pipeline shaders unless XMB is selected (D3D10/D3D11/D3D12/GL/Vulkan)
+- MENU/VIDEO: Only show black frame insertion for the video drivers/context drivers
+that support it (so far this includes - D3D8/D3D9, OpenGL, Vulkan)
+- MENU/VIDEO:  Only show max swapchain images if supported by video driver and/or context driver (so far this includes - DRM EGL context driver, VideoCore EGL context driver, Vulkan)
+- MENU/MaterialUI: Automatic DPI Scaling should be much improved now, now scales as expected at 1440p and 4K resolutions.
+- MENU/MaterialUI: Fix wrong calculation of an entry height causing long playlists to end up outside of screen range. This also could cause crashes on low DPI screens.
+- IOS: Fixed crash when opening downloaded roms from Safari or using the "Open in.." functionality. Added the compiler flag to support keyboard remapping to controls.
+- IOS: Fixed buffer overlap that caused a crash while trying to download GLSL shaders from the buildbot.
+- PS3: fix URLS
+- SCANNER: Should be able to scan dual-layer Wii disc images now, filestream code now supports files larger than 4GB.
+- SHADERS/SLANG: Slang shaders should work again on Android version and MSVC versions (basically all the Griffin-based versions).
+- SHADERS: If GL context is GLES2/3/Core context, Cg shaders are unavailable. Applies to shader list too.
+- SHADERS: Hide cg/glsl shaders from being able to be selected if D3D8/9/10/11/Vulkan video drivers are selected.
+- SHADERS: Hide slang shaders from being able to be selected if D3D8/9/OpenGL video drivers are selected.
+- SHADERS: Prevent crashes from occurring if we have the GL video driver in use and we try to skip to a slang shader through next/previous hotkeys
+- SHADERS: Fix shader parameter increase / decrease functions
+- SUBSYSTEM: handle savestates properly (cart1 + cart2.state0)
+- VULKAN/X11: Fix X11 Vulkan bug from Wayland driver.
+- VULKAN: Fix multi-line text spacing in menus with Vulkan driver.
+- WINDOWS XP: Add Cheevos support.
+- WINDOWS/MSVC 2003/2005/2010/2013/2015/2017: Add Cheevos support.
+- VITA: Bugfix for 'PS Vita takes many time to start to accept input' issue.
+- X11: Allow compositor disabling on X11 fullscreen through _NET_WM_BYPASS_COMPOSITOR
+- X11: Prioritize _NET_WM_STATE_FULLSCREEN_ in true fullscreen mode
+- WIIU: Fix OOB read/write in keyboard driver.
+
+# 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, --sysconfdir, --bindir, --docdir and --mandir.
+- QB: Deprecated --global-config-dir, --with-bin_dir and --with-man_dir.
+- 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.
@@ -162,7 +340,7 @@ Skipped this one.
 - MISC: Various frontend optimizations.
 - NET: Fix bug #4703 (https://github.com/libretro/RetroArch/issues/4703)
 - OSX/MACOS: Fixes serious memory leak
-- THUMBNAILS: Thumbnails show up now in Load Content -> Collection, Information -> Database 
+- THUMBNAILS: Thumbnails show up now in Load Content -> Collection, Information -> Database
 - VIDEO: Fix threaded video regression; tickering of menu entries would no longer work.
 - VITA: Fix 30fps menu (poke into input now instead of reading the entire input buffer which apparently is slow)
 - VITA: Fix frame throttle

Makefile

@@ -9,13 +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 ($(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)),)
@@ -35,7 +46,7 @@ endif
 include Makefile.common
 
 ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang"),1)
-   DEFINES +=  -Wno-invalid-source-encoding
+   DEFINES +=  -Wno-invalid-source-encoding -Wno-incompatible-ms-struct
 endif
 
 ifeq ($(shell $(CC) -v 2>&1 | grep -c "tcc"),1)
@@ -66,6 +77,7 @@ endif
 
 ifeq ($(DEBUG), 1)
    OPTIMIZE_FLAG = -O0 -g
+   DEFINES += -DDEBUG -D_DEBUG
 else
    OPTIMIZE_FLAG = -O3 -ffast-math
 endif
@@ -74,7 +86,7 @@ ifneq ($(findstring Win32,$(OS)),)
    LDFLAGS += -mwindows
 endif
 
-CFLAGS   += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) $(DEBUG_FLAG) -I. -Ideps -Ideps/stb
+CFLAGS   += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb
 
 APPEND_CFLAGS := $(CFLAGS)
 CXXFLAGS += $(APPEND_CFLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS
@@ -119,10 +131,16 @@ endif
 
 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
 
+ifneq ($(X86),)
+   CFLAGS += -m32
+   CXXFLAGS += -m32
+   LDFLAGS += -m32
+endif
+
 ifneq ($(SANITIZER),)
-    CFLAGS   := -fsanitize=$(SANITIZER) $(CFLAGS)
-    CXXFLAGS := -fsanitize=$(SANITIZER) $(CXXFLAGS)
-    LDFLAGS  := -fsanitize=$(SANITIZER) $(LDFLAGS)
+   CFLAGS   := -fsanitize=$(SANITIZER) $(CFLAGS)
+   CXXFLAGS := -fsanitize=$(SANITIZER) $(CXXFLAGS)
+   LDFLAGS  := -fsanitize=$(SANITIZER) $(LDFLAGS)
 endif
 
 ifneq ($(findstring $(GPERFTOOLS),profiler),)
@@ -183,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/retrosystem/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
 
@@ -213,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
 

Makefile.common

@@ -115,6 +115,13 @@ else
    OSX := 0
 endif
 
+ifneq ($(findstring Haiku,$(OS)),)
+   LIBS += -lroot -lnetwork
+	HAVE_UNIX = 1
+else
+   LIBS += -lm
+endif
+
 ifneq ($(findstring Linux,$(OS)),)
    LIBS += -lrt
    OBJ += input/drivers/linuxraw_input.o \
@@ -127,13 +134,8 @@ ifeq ($(HAVE_UNIX), 1)
 	OBJ += frontend/drivers/platform_unix.o
 endif
 
-ifeq ($(findstring Haiku,$(OS)),)
-   LIBS += -lm
-   DEBUG_FLAG = -g
-else
-   LIBS += -lroot -lnetwork
-   # stable and nightly haiku builds are stuck on gdb 6.x but we use gcc4
-   DEBUG_FLAG = -gdwarf-2
+ifeq ($(TARGET), retroarch_3ds)
+	OBJ += frontend/drivers/platform_ctr.o
 endif
 
 # Git
@@ -170,6 +172,7 @@ OBJ += frontend/frontend.o \
        tasks/task_audio_mixer.o \
        $(LIBRETRO_COMM_DIR)/encodings/encoding_utf.o \
        $(LIBRETRO_COMM_DIR)/encodings/encoding_crc32.o \
+       $(LIBRETRO_COMM_DIR)/compat/fopen_utf8.o \
        $(LIBRETRO_COMM_DIR)/lists/file_list.o \
        $(LIBRETRO_COMM_DIR)/lists/dir_list.o \
        $(LIBRETRO_COMM_DIR)/file/retro_dirent.o \
@@ -178,12 +181,17 @@ OBJ += frontend/frontend.o \
        $(LIBRETRO_COMM_DIR)/streams/file_stream_transforms.o \
        $(LIBRETRO_COMM_DIR)/streams/interface_stream.o \
        $(LIBRETRO_COMM_DIR)/streams/memory_stream.o \
+       $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.o \
        $(LIBRETRO_COMM_DIR)/lists/string_list.o \
        $(LIBRETRO_COMM_DIR)/string/stdstring.o \
        $(LIBRETRO_COMM_DIR)/memmap/memalign.o \
 		 setting_list.o \
        list_special.o \
        $(LIBRETRO_COMM_DIR)/file/nbio/nbio_stdio.o \
+       $(LIBRETRO_COMM_DIR)/file/nbio/nbio_linux.o \
+       $(LIBRETRO_COMM_DIR)/file/nbio/nbio_unixmmap.o \
+       $(LIBRETRO_COMM_DIR)/file/nbio/nbio_windowsmmap.o \
+       $(LIBRETRO_COMM_DIR)/file/nbio/nbio_intf.o \
        $(LIBRETRO_COMM_DIR)/file/file_path.o \
        file_path_special.o \
        file_path_str.o \
@@ -191,8 +199,13 @@ OBJ += frontend/frontend.o \
        audio/audio_driver.o \
        $(LIBRETRO_COMM_DIR)/audio/audio_mixer.o \
        input/input_driver.o \
+		 input/input_mapper.o \
+       led/led_driver.o \
+       led/drivers/led_null.o \
        gfx/video_coord_array.o \
+       gfx/video_display_server.o \
        gfx/video_driver.o \
+	   gfx/video_crt_switch.o \
        camera/camera_driver.o \
        wifi/wifi_driver.o \
        location/location_driver.o \
@@ -209,8 +222,6 @@ OBJ += frontend/frontend.o \
 		 input/input_autodetect_builtin.o \
        input/input_keymaps.o \
        input/input_remapping.o \
-       tasks/task_overlay.o \
-       input/input_overlay.o \
        $(LIBRETRO_COMM_DIR)/queues/fifo_queue.o \
        managers/core_option_manager.o \
        $(LIBRETRO_COMM_DIR)/compat/compat_fnmatch.o \
@@ -238,6 +249,7 @@ OBJ += frontend/frontend.o \
        camera/drivers/nullcamera.o \
        wifi/drivers/nullwifi.o \
        gfx/drivers/nullgfx.o \
+       gfx/display_servers/dispserv_null.o \
        audio/drivers/nullaudio.o \
        input/drivers/nullinput.o \
        input/drivers_hid/null_hid.o \
@@ -248,7 +260,18 @@ OBJ += frontend/frontend.o \
        record/drivers/record_null.o \
        $(LIBRETRO_COMM_DIR)/features/features_cpu.o \
        performance_counters.o \
-       verbosity.o
+       verbosity.o \
+
+ifeq ($(HAVE_RUNAHEAD), 1)
+DEFINES += -DHAVE_RUNAHEAD
+OBJ += runahead/copy_load_info.o \
+       runahead/dirty_input.o \
+       runahead/mem_util.o \
+       runahead/mylist.o \
+       runahead/run_ahead.o \
+       runahead/secondary_core.o
+endif
+
 
 
 ifeq ($(HAVE_CC_RESAMPLER), 1)
@@ -274,7 +297,8 @@ OBJ += intl/msg_hash_de.o \
        intl/msg_hash_ru.o \
        intl/msg_hash_vn.o \
        intl/msg_hash_chs.o \
-       intl/msg_hash_cht.o
+       intl/msg_hash_cht.o \
+       intl/msg_hash_ar.o
 
 endif
 
@@ -318,7 +342,7 @@ endif
 endif
 
 ifeq ($(HAVE_SSA),1)
-LIBS += -lass
+LIBS += $(SSA_LIBS)
 endif
 
 # LibretroDB
@@ -530,7 +554,6 @@ OBJ += deps/libui/libui_main.o
 endif
 endif
 
-
 # Miscellaneous
 
 ifeq ($(HAVE_STDIN_CMD), 1)
@@ -546,6 +569,7 @@ endif
 ifeq ($(HAVE_EMSCRIPTEN), 1)
 OBJ += frontend/drivers/platform_emscripten.o \
        input/drivers/rwebinput_input.o \
+       input/drivers_joypad/rwebpad_joypad.o \
        audio/drivers/rwebaudio.o \
        camera/drivers/rwebcam.o
 endif
@@ -565,12 +589,21 @@ ifeq ($(HAVE_CORETEXT), 1)
    OBJ += gfx/drivers_font_renderer/coretext.o
 endif
 
+ifeq ($(TARGET), retroarch_3ds)
+	OBJ += gfx/drivers_font/ctr_font.o
+endif
+
 ifeq ($(HAVE_OSS), 1)
    OBJ += audio/drivers/oss.o
 else ifeq ($(HAVE_OSS_BSD), 1)
    OBJ += audio/drivers/oss.o
 endif
 
+ifeq ($(TARGET), retroarch_3ds)
+	OBJ += audio/drivers/ctr_csnd_audio.o \
+			 audio/drivers/ctr_dsp_audio.o
+endif
+
 ifeq ($(HAVE_ALSA), 1)
    OBJ += audio/drivers/alsa.o
 
@@ -597,7 +630,7 @@ ifeq ($(HAVE_AL), 1)
    ifeq ($(OSX),1)
       LIBS += -framework OpenAL
    else
-      LIBS += -lopenal
+      LIBS += $(AL_LIBS)
    endif
 endif
 
@@ -630,7 +663,8 @@ endif
 ifeq ($(HAVE_DSOUND), 1)
    OBJ += audio/drivers/dsound.o
    DEFINES += -DHAVE_DSOUND
-   LIBS += -ldxguid -ldsound
+	HAVE_DX_COMMON  = 1
+   LIBS += -ldsound
 endif
 
 ifeq ($(HAVE_WASAPI), 1)
@@ -651,13 +685,7 @@ ifeq ($(HAVE_NEON),1)
    OBJ += $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/sinc_resampler_neon.o \
           audio/drivers_resampler/cc_resampler_neon.o \
           memory/neon/memcpy-neon.o
-   # When compiled without this, tries to attempt to compile sinc lerp,
-   # which will error out
-   #
-   # TODO - we need to make quality levels of sinc
-   # runtime toggleable instead of going by compile-time
-   # defines
-   DEFINES += -DSINC_LOWER_QUALITY
+	DEFINES += -DHAVE_NEON
 endif
 
 OBJ += $(LIBRETRO_COMM_DIR)/audio/conversion/s16_to_float.o \
@@ -670,14 +698,6 @@ ifeq ($(HAVE_NEON),1)
           $(LIBRETRO_COMM_DIR)/audio/conversion/float_to_s16_neon.o
 endif
 
-ifneq ($(findstring Win32,$(OS)),)
-   # if user explicitly sets --disable-vulkan on Windows, then disable it
-   ifneq ($(HAVE_NO_VULKAN),1)
-      HAVE_VULKAN=1
-      DEFINES += -DHAVE_VULKAN
-   endif
-endif
-
 HW_CONTEXT_MENU_DRIVERS=$(HAVE_RGUI)
 
 ifeq ($(HW_CONTEXT_MENU_DRIVERS),0)
@@ -753,13 +773,13 @@ ifeq ($(HAVE_MENU_COMMON), 1)
           menu/menu_event.o \
           menu/menu_entries.o \
           menu/menu_setting.o \
+          menu/menu_networking.o \
           menu/menu_shader.o \
 			 menu/widgets/menu_filebrowser.o \
 			 menu/widgets/menu_dialog.o \
 			 menu/widgets/menu_input_dialog.o \
 			 menu/widgets/menu_input_bind_dialog.o \
           menu/widgets/menu_entry.o \
-			 menu/widgets/menu_list.o \
 			 menu/widgets/menu_osk.o \
           menu/menu_cbs.o \
           menu/cbs/menu_cbs_ok.o \
@@ -788,6 +808,10 @@ endif
 
 ifeq ($(HAVE_OVERLAY), 1)
    DEFINES += -DHAVE_OVERLAY
+   OBJ += \
+	  tasks/task_overlay.o \
+	  input/input_overlay.o \
+	  led/drivers/led_overlay.o
 endif
 
 ifeq ($(HAVE_STB_FONT), 1)
@@ -808,7 +832,7 @@ ifeq ($(HAVE_THREADS), 1)
           audio/audio_thread_wrapper.o
    DEFINES += -DHAVE_THREADS
    ifeq ($(findstring Haiku,$(OS)),)
-      LIBS += -lpthread
+      LIBS += $(THREADS_LIBS)
    endif
 endif
 
@@ -840,6 +864,20 @@ endif
 	CFLAGS  += -I$(DEPS_DIR)/libvita2d/include
 endif
 
+ifeq ($(TARGET), retroarch_3ds)
+	OBJ += gfx/drivers/ctr_gfx.o \
+			 menu/drivers_display/menu_display_ctr.o \
+			 input/drivers/ctr_input.o \
+			 input/drivers_joypad/ctr_joypad.o
+endif
+
+ifeq ($(TARGET), retroarch_switch)
+	OBJ += gfx/drivers/switch_gfx.o \
+			input/drivers/switch_input.o \
+                        input/drivers_joypad/switch_joypad.o \
+                        audio/drivers/switch_audio.o
+endif
+
 ifeq ($(HAVE_WAYLAND), 1)
  OBJ += gfx/drivers_context/wayland_ctx.o \
 		  input/drivers/wayland_input.o
@@ -850,7 +888,8 @@ endif
 #Input
 
 ifeq ($(HAVE_DINPUT), 1)
-   LIBS += -ldinput8 -ldxguid -lole32
+	HAVE_DX_COMMON  = 1
+   LIBS += -ldinput8 -lole32
    DEFINES += -DHAVE_DINPUT
    OBJ += input/drivers/dinput.o \
           input/drivers_joypad/dinput_joypad.o
@@ -870,12 +909,12 @@ endif
 ifeq ($(HAVE_X11), 1)
    OBJ += input/common/input_x11_common.o \
           input/drivers/x11_input.o \
-			 gfx/common/dbus_common.o \
           gfx/common/x11_common.o \
-			 gfx/common/xinerama_common.o
+          gfx/common/xinerama_common.o \
+          gfx/display_servers/dispserv_x11.o
 
    LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
-   DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
+   DEFINES += -DHAVE_X11 $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
 ifeq ($(HAVE_XCB),1)
    LIBS    += -lX11-xcb
 endif
@@ -898,6 +937,7 @@ endif
 ifeq ($(HAVE_DBUS), 1)
 	LIBS += $(DBUS_LIBS)
 	CFLAGS += $(DBUS_CFLAGS)
+	OBJ += gfx/common/dbus_common.o
 endif
 
 ifeq ($(HAVE_UDEV), 1)
@@ -912,7 +952,11 @@ ifeq ($(HAVE_THREADS), 1)
 ifeq ($(HAVE_HID), 1)
    DEFINES += -DHAVE_LIBUSB
    OBJ += input/drivers_hid/libusb_hid.o
-   LIBS += -lusb-1.0
+   ifneq ($(findstring BSD,$(OS)),)
+      LIBS += -lusb
+   else
+      LIBS += -lusb-1.0
+   endif
 endif
 endif
 endif
@@ -991,9 +1035,6 @@ ifeq ($(HAVE_PLAIN_DRM), 1)
    LIBS += -ldrm
 endif
 
-OBJ += \
-		 gfx/drivers_renderchain/null_renderchain.o
-
 ifeq ($(HAVE_GL_CONTEXT), 1)
    DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
    OBJ += gfx/drivers/gl.o \
@@ -1062,7 +1103,7 @@ endif
    else
       DEFINES += -DHAVE_GL_SYNC
       OBJ += $(LIBRETRO_COMM_DIR)/glsym/glsym_gl.o
-      GL_LIBS := -lGL
+      GL_LIBS := $(OPENGL_LIBS)
       ifeq ($(OSX), 1)
          GL_LIBS := -framework OpenGL
          OBJ += gfx/drivers_context/cgl_ctx.o
@@ -1078,6 +1119,8 @@ endif
 endif
 
 ifeq ($(HAVE_EGL), 1)
+   DEFINES += -DHAVE_EGL $(EGL_CFLAGS)
+   LIBS += $(EGL_LIBS)
    OBJ += gfx/common/egl_common.o
 endif
 
@@ -1120,55 +1163,18 @@ endif
 
 ifeq ($(HAVE_VULKAN), 1)
    ifneq ($(findstring Win32,$(OS)),)
-      GLSLANG_PLATFORM := Windows
-		WANT_WGL = 1
-   else
-      GLSLANG_PLATFORM := Unix
-   endif
-
-   GLSLANG_SOURCES := \
-      $(wildcard $(DEPS_DIR)/glslang/*.cpp) \
-      $(wildcard $(DEPS_DIR)/glslang/glslang/SPIRV/*.cpp) \
-      $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/GenericCodeGen/*.cpp) \
-      $(wildcard $(DEPS_DIR)/glslang/glslang/OGLCompilersDLL/*.cpp) \
-      $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent/*.cpp) \
-      $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \
-      $(wildcard $(DEPS_DIR)/glslang/glslang/hlsl/*.cpp) \
-      $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp)
-
-   SPIRV_CROSS_SOURCES := $(DEPS_DIR)/SPIRV-Cross/spirv_cross.cpp \
-								  $(DEPS_DIR)/SPIRV-Cross/spirv_cfg.cpp
-   ifneq ($(findstring Win32,$(OS)),)
+      WANT_WGL = 1
       # Trivial temporary workaround for MinGW and glslang.
       CXXFLAGS += -fpermissive
    endif
 
-   DEFINES += \
-           -I$(DEPS_DIR)/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \
-           -I$(DEPS_DIR)/glslang/glslang/OGLCompilersDLL \
-           -I$(DEPS_DIR)/glslang/glslang \
-           -I$(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent \
-           -I$(DEPS_DIR)/glslang/glslang/glslang/Public \
-           -I$(DEPS_DIR)/glslang/glslang/SPIRV \
-           -I$(DEPS_DIR)/glslang \
-           -I$(DEPS_DIR)/SPIRV-Cross
-
-   CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -Wno-parentheses -Igfx/include
-   CFLAGS  += -Igfx/include
-
-   GLSLANG_OBJ     := $(GLSLANG_SOURCES:.cpp=.o)
-   SPIRV_CROSS_OBJ := $(SPIRV_CROSS_SOURCES:.cpp=.o)
+   CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -Wno-parentheses
 
    OBJ += gfx/drivers/vulkan.o \
           gfx/common/vulkan_common.o \
           $(LIBRETRO_COMM_DIR)/vulkan/vulkan_symbol_wrapper.o \
           gfx/drivers_font/vulkan_raster_font.o \
-          gfx/drivers_shader/shader_vulkan.o \
-          gfx/drivers_shader/glslang_util.o \
-          gfx/drivers_shader/slang_reflection.o \
-          gfx/drivers_shader/slang_preprocess.o \
-          $(GLSLANG_OBJ) \
-          $(SPIRV_CROSS_OBJ)
+          gfx/drivers_shader/shader_vulkan.o
 
    ifeq ($(HAVE_VULKAN_DISPLAY), 1)
       OBJ += gfx/drivers_context/khr_display_ctx.o
@@ -1177,12 +1183,12 @@ ifeq ($(HAVE_VULKAN), 1)
       OBJ += menu/drivers_display/menu_display_vulkan.o
    endif
    LIBS += -lstdc++
-   DEFINES += -DHAVE_SLANG
-endif
+   DEFINES += -DHAVE_VULKAN
+   INCLUDE_DIRS += -Igfx/include
 
-ifeq ($(WANT_WGL), 1)
-	OBJ += gfx/drivers_context/wgl_ctx.o
-LIBS += -lcomctl32
+   HAVE_SLANG       = 1
+   HAVE_GLSLANG     = 1
+   HAVE_SPIRV_CROSS = 1
 endif
 
 ifeq ($(HAVE_OMAP), 1)
@@ -1232,8 +1238,18 @@ endif
 
 ifeq ($(HAVE_D3D9), 1)
 	HAVE_D3D_COMMON = 1
+	HAVE_D3DX = 1
    DEFINES += -DHAVE_D3D9
-   LIBS += -ld3d9 -ld3dx9 -ldxguid
+ifeq ($(HAVE_D3DX), 1)
+   DEFINES += -DHAVE_D3DX
+endif
+ifneq ($(HAVE_DYLIB), 1)
+   LIBS += -ld3d9
+ifeq ($(HAVE_D3DX), 1)
+   LIBS += -ld3dx9
+endif
+endif
+	HAVE_DX_COMMON  = 1
    OBJ  += gfx/drivers_font/d3d_w32_font.o
    ifeq ($(HAVE_CG), 1)
       LIBS += -lcgD3D9
@@ -1241,29 +1257,141 @@ ifeq ($(HAVE_D3D9), 1)
    endif
 
    ifeq ($(HAVE_HLSL), 1)
-      LIBS += -lcgD3D9
       OBJ  += gfx/drivers_renderchain/d3d9_hlsl_renderchain.o \
 				  gfx/drivers_shader/shader_hlsl.o
    endif
 endif
 
+ifeq ($(HAVE_D3D10), 1)
+   OBJ += gfx/drivers/d3d10.o \
+			 gfx/common/d3d10_common.o \
+			 gfx/drivers_font/d3d10_font.o \
+			 menu/drivers_display/menu_display_d3d10.o
+   DEFINES += -DHAVE_D3D10
+endif
+
+ifeq ($(HAVE_D3D11), 1)
+   OBJ += gfx/drivers/d3d11.o \
+			 gfx/common/d3d11_common.o \
+			 gfx/drivers_font/d3d11_font.o \
+			 menu/drivers_display/menu_display_d3d11.o
+   DEFINES += -DHAVE_D3D11
+   HAVE_SLANG       = 1
+   HAVE_GLSLANG     = 1
+   HAVE_SPIRV_CROSS = 1
+endif
+
+ifeq ($(HAVE_D3D12), 1)
+   OBJ += gfx/drivers/d3d12.o \
+			 gfx/common/d3d12_common.o \
+			 gfx/drivers_font/d3d12_font.o \
+			 menu/drivers_display/menu_display_d3d12.o
+   DEFINES += -DHAVE_D3D12
+   HAVE_SLANG       = 1
+   HAVE_GLSLANG     = 1
+   HAVE_SPIRV_CROSS = 1
+endif
+
+ifneq ($(findstring 1, $(HAVE_D3D10) $(HAVE_D3D11) $(HAVE_D3D12)),)
+   INCLUDE_DIRS += -isystemgfx/include/dxsdk
+   OBJ += gfx/common/d3dcompiler_common.o \
+			 gfx/common/dxgi_common.o
+   CFLAGS += -Wno-unknown-pragmas
+endif
+
 ifeq ($(HAVE_D3D8), 1)
 	HAVE_D3D_COMMON = 1
+   HAVE_DX_COMMON  = 1
    DEFINES += -DHAVE_D3D8
-   LIBS += -ld3d8 -ld3dx8 -ldxguid
+ifneq ($(HAVE_DYLIB), 1)
+   LIBS += -ld3d8
+ifeq ($(HAVE_D3DX), 1)
+   LIBS += -ld3dx8
+endif
+endif
+endif
 
-   OBJ += gfx/drivers_renderchain/d3d8_renderchain.o
+ifeq ($(HAVE_DX_COMMON), 1)
+	LIBS += -ldxguid
+endif
+
+ifeq ($(HAVE_D3D8), 1)
+	DEFINES += -DHAVE_D3D8
+	OBJ += gfx/drivers/d3d8.o
+	OBJ += gfx/common/d3d8_common.o
+
+ifeq ($(HAVE_MENU_COMMON), 1)
+	OBJ += menu/drivers_display/menu_display_d3d8.o
+endif
+endif
+
+ifeq ($(HAVE_D3D9), 1)
+	DEFINES += -DHAVE_D3D9
+	OBJ += gfx/drivers/d3d9.o
+	OBJ += gfx/common/d3d9_common.o
+
+ifeq ($(HAVE_MENU_COMMON), 1)
+	OBJ += menu/drivers_display/menu_display_d3d9.o
+endif
 endif
 
 ifeq ($(HAVE_D3D_COMMON), 1)
 	DEFINES += -DHAVE_D3D
-   OBJ += gfx/drivers/d3d.o \
-          gfx/common/d3d_common.o \
-          gfx/drivers_context/d3d_ctx.o
+	OBJ     += gfx/common/d3d_common.o
+endif
 
-   ifeq ($(HAVE_MENU_COMMON), 1)
-      OBJ += menu/drivers_display/menu_display_d3d.o
+ifeq ($(HAVE_SLANG),1)
+   DEFINES += -DHAVE_SLANG
+   OBJ += gfx/drivers_shader/slang_process.o
+   OBJ += gfx/drivers_shader/slang_preprocess.o
+   OBJ += gfx/drivers_shader/glslang_util.o
+   OBJ += gfx/drivers_shader/slang_reflection.o
+endif
+
+ifeq ($(HAVE_GLSLANG), 1)
+   DEFINES      += -DHAVE_GLSLANG
+
+   ifneq ($(findstring Win32,$(OS)),)
+      GLSLANG_PLATFORM := Windows
+   else
+      GLSLANG_PLATFORM := Unix
    endif
+
+   INCLUDE_DIRS += \
+      -I$(DEPS_DIR)/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \
+      -I$(DEPS_DIR)/glslang/glslang/OGLCompilersDLL \
+      -I$(DEPS_DIR)/glslang/glslang \
+      -I$(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent \
+      -I$(DEPS_DIR)/glslang/glslang/glslang/Public \
+      -I$(DEPS_DIR)/glslang/glslang/SPIRV \
+      -I$(DEPS_DIR)/glslang
+
+   GLSLANG_SOURCES := \
+      $(wildcard $(DEPS_DIR)/glslang/*.cpp) \
+      $(wildcard $(DEPS_DIR)/glslang/glslang/SPIRV/*.cpp) \
+      $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/GenericCodeGen/*.cpp) \
+      $(wildcard $(DEPS_DIR)/glslang/glslang/OGLCompilersDLL/*.cpp) \
+      $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent/*.cpp) \
+      $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \
+      $(wildcard $(DEPS_DIR)/glslang/glslang/hlsl/*.cpp) \
+      $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp)
+
+   OBJ += $(GLSLANG_SOURCES:.cpp=.o)
+endif
+
+ifeq ($(HAVE_SPIRV_CROSS), 1)
+	DEFINES += -DHAVE_SPIRV_CROSS
+   INCLUDE_DIRS += -I$(DEPS_DIR)/SPIRV-Cross
+   OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_cross.o
+   OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_cfg.o
+   OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_glsl.o
+   OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_hlsl.o
+   OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_msl.o
+endif
+
+ifeq ($(WANT_WGL), 1)
+	OBJ += gfx/drivers_context/wgl_ctx.o
+   LIBS += -lcomctl32
 endif
 
 #ifeq ($(HAVE_LIBXML2), 1)
@@ -1301,9 +1429,15 @@ ifeq ($(HAVE_7ZIP),1)
 			  $(7ZOBJ)
 endif
 
-ifeq ($(HAVE_FLAC),1)
-   CFLAGS  += -I$(DEPS_DIR)/libFLAC/include
-   DEFINES += -DHAVE_FLAC -DHAVE_STDINT_H -DHAVE_LROUND -DFLAC__HAS_OGG=0 \
+ifeq ($(HAVE_IBXM), 1)
+   DEFINES += -DHAVE_IBXM
+   OBJ += $(DEPS_DIR)/ibxm/ibxm.o
+endif
+
+ifeq ($(HAVE_BUILTINFLAC),1)
+   HAVE_FLAC = 1
+   CFLAGS  += -DHAVE_FLAC -I$(DEPS_DIR)/libFLAC/include
+   DEFINES += -DHAVE_STDINT_H -DHAVE_LROUND -DFLAC__HAS_OGG=0 \
               -DFLAC_PACKAGE_VERSION="\"retroarch\""
    FLACOBJ = $(DEPS_DIR)/libFLAC/bitmath.o \
              $(DEPS_DIR)/libFLAC/bitreader.o \
@@ -1327,19 +1461,57 @@ ifeq ($(HAVE_FLAC),1)
       FLACOBJ += $(DEPS_DIR)/libFLAC/windows_unicode_filenames.o
    endif
    OBJ += $(FLACOBJ)
+else ifeq ($(HAVE_FLAC),1)
+   LIBS += $(FLAC_LIBS)
 endif
 
 ifeq ($(HAVE_ZLIB), 1)
    OBJ += $(LIBRETRO_COMM_DIR)/file/archive_file_zlib.o \
           $(LIBRETRO_COMM_DIR)/streams/trans_stream_zlib.o
-   OBJ += $(ZLIB_OBJS)
    DEFINES += -DHAVE_ZLIB
    HAVE_COMPRESSION = 1
    ifeq ($(HAVE_BUILTINZLIB), 1)
+      OBJ += $(DEPS_DIR)/libz/adler32.o \
+             $(DEPS_DIR)/libz/compress.o \
+             $(DEPS_DIR)/libz/libz-crc32.o \
+             $(DEPS_DIR)/libz/deflate.o \
+             $(DEPS_DIR)/libz/gzclose.o \
+             $(DEPS_DIR)/libz/gzlib.o \
+             $(DEPS_DIR)/libz/gzread.o \
+             $(DEPS_DIR)/libz/gzwrite.o \
+             $(DEPS_DIR)/libz/inffast.o \
+             $(DEPS_DIR)/libz/inflate.o \
+             $(DEPS_DIR)/libz/inftrees.o \
+             $(DEPS_DIR)/libz/trees.o \
+             $(DEPS_DIR)/libz/uncompr.o \
+             $(DEPS_DIR)/libz/zutil.o
       INCLUDE_DIRS += -I$(LIBRETRO_COMM_DIR)/include/compat
       DEFINES += -DWANT_ZLIB
    else
-      LIBS += -lz
+      LIBS += $(ZLIB_LIBS)
+   endif
+endif
+
+ifeq ($(HAVE_CHD), 1)
+   CFLAGS  += -I$(LIBRETRO_COMM_DIR)/formats/libchdr
+	DEFINES += -DHAVE_CHD -DWANT_SUBCODE -DWANT_RAW_DATA_SECTOR
+   OBJ     += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_bitstream.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_cdrom.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_chd.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_huffman.o \
+              $(LIBRETRO_COMM_DIR)/streams/chd_stream.o
+	
+   ifeq ($(HAVE_FLAC), 1)
+      OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac.o \
+				 $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac_codec.o
+   endif
+
+   ifeq ($(HAVE_7ZIP), 1)
+      OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_lzma.o
+   endif
+
+   ifeq ($(HAVE_ZLIB), 1)
+      OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_zlib.o
    endif
 endif
 
@@ -1364,11 +1536,6 @@ ifeq ($(HAVE_RBMP), 1)
    OBJ += $(LIBRETRO_COMM_DIR)/formats/bmp/rbmp.o
 endif
 
-ifeq ($(HAVE_IBXM), 1)
-   DEFINES += -DHAVE_IBXM
-   OBJ += $(DEPS_DIR)/ibxm/ibxm.o
-endif
-
 OBJ += $(LIBRETRO_COMM_DIR)/formats/bmp/rbmp_encode.o \
        $(LIBRETRO_COMM_DIR)/formats/json/jsonsax.o \
        $(LIBRETRO_COMM_DIR)/formats/json/jsonsax_full.o \
@@ -1378,40 +1545,6 @@ ifdef HAVE_COMPRESSION
    DEFINES += -DHAVE_COMPRESSION
 endif
 
-ifeq ($(HAVE_BUILTINZLIB),1)
-   OBJ += $(DEPS_DIR)/libz/adler32.o \
-          $(DEPS_DIR)/libz/compress.o \
-          $(DEPS_DIR)/libz/crc32.o \
-          $(DEPS_DIR)/libz/deflate.o \
-          $(DEPS_DIR)/libz/gzclose.o \
-          $(DEPS_DIR)/libz/gzlib.o \
-          $(DEPS_DIR)/libz/gzread.o \
-          $(DEPS_DIR)/libz/gzwrite.o \
-          $(DEPS_DIR)/libz/inffast.o \
-          $(DEPS_DIR)/libz/inflate.o \
-          $(DEPS_DIR)/libz/inftrees.o \
-          $(DEPS_DIR)/libz/trees.o \
-          $(DEPS_DIR)/libz/uncompr.o \
-          $(DEPS_DIR)/libz/zutil.o
-else
-ifeq ($(HAVE_ZLIB),1)
-OBJ += $(ZLIB_OBJS)
-endif
-endif
-
-ifeq ($(HAVE_7ZIP),1)
-ifeq ($(HAVE_FLAC),1)
-     DEFINES += -DHAVE_CHD -DWANT_SUBCODE -DWANT_RAW_DATA_SECTOR
-     CFLAGS += -I$(LIBRETRO_COMM_DIR)/formats/libchdr
-     OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/bitstream.o \
-            $(LIBRETRO_COMM_DIR)/formats/libchdr/cdrom.o \
-            $(LIBRETRO_COMM_DIR)/formats/libchdr/chd.o \
-            $(LIBRETRO_COMM_DIR)/formats/libchdr/flac.o \
-            $(LIBRETRO_COMM_DIR)/formats/libchdr/huffman.o \
-            $(LIBRETRO_COMM_DIR)/streams/chd_stream.o
-endif
-endif
-
 # Video4Linux 2
 
 ifeq ($(HAVE_V4L2),1)
@@ -1464,6 +1597,7 @@ ifeq ($(HAVE_NETWORKING), 1)
 			network/netplay/netplay_handshake.o \
 			network/netplay/netplay_init.o \
 			network/netplay/netplay_io.o \
+			network/netplay/netplay_keyboard.o \
 			network/netplay/netplay_sync.o \
 			network/netplay/netplay_discovery.o \
 			network/netplay/netplay_buf.o \
@@ -1476,39 +1610,34 @@ ifeq ($(HAVE_NETWORKING), 1)
       OBJ += cheevos/cheevos.o \
          cheevos/var.o \
          cheevos/cond.o \
+         cheevos/badges.o \
          $(LIBRETRO_COMM_DIR)/utils/md5.o
    endif
 
-   ifeq ($(HAVE_KEYMAPPER), 1)
-      OBJ += input/input_mapper.o
-   endif
-
    ifeq ($(HAVE_NETWORKGAMEPAD), 1)
       OBJ += input/input_remote.o \
              cores/libretro-net-retropad/net_retropad_core.o
    endif
 
-   ifeq ($(HAVE_MINIUPNPC), 1)
-      ifeq ($(HAVE_BUILTINMINIUPNPC), 1)
-         DEFINES += -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR
-			DEFINES += -I$(DEPS_DIR)
-         OBJ     += \
-					 $(DEPS_DIR)/miniupnpc/igd_desc_parse.o \
-					 $(DEPS_DIR)/miniupnpc/upnpreplyparse.o \
-					 $(DEPS_DIR)/miniupnpc/upnpcommands.o \
-					 $(DEPS_DIR)/miniupnpc/upnperrors.o \
-					 $(DEPS_DIR)/miniupnpc/connecthostport.o \
-					 $(DEPS_DIR)/miniupnpc/portlistingparse.o \
-					 $(DEPS_DIR)/miniupnpc/receivedata.o \
-					 $(DEPS_DIR)/miniupnpc/upnpdev.o \
-					 $(DEPS_DIR)/miniupnpc/minissdpc.o \
-					 $(DEPS_DIR)/miniupnpc/miniwget.o \
-					 $(DEPS_DIR)/miniupnpc/miniupnpc.o \
-					 $(DEPS_DIR)/miniupnpc/minixml.o \
-					 $(DEPS_DIR)/miniupnpc/minisoap.o
-		else
-		   LIBS += -lminiupnpc
-      endif
+   ifeq ($(HAVE_BUILTINMINIUPNPC), 1)
+      HAVE_MINIUPNPC = 1
+      DEFINES += -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR
+      DEFINES += -I$(DEPS_DIR)
+      OBJ     += $(DEPS_DIR)/miniupnpc/igd_desc_parse.o \
+                 $(DEPS_DIR)/miniupnpc/upnpreplyparse.o \
+                 $(DEPS_DIR)/miniupnpc/upnpcommands.o \
+                 $(DEPS_DIR)/miniupnpc/upnperrors.o \
+                 $(DEPS_DIR)/miniupnpc/connecthostport.o \
+                 $(DEPS_DIR)/miniupnpc/portlistingparse.o \
+                 $(DEPS_DIR)/miniupnpc/receivedata.o \
+                 $(DEPS_DIR)/miniupnpc/upnpdev.o \
+                 $(DEPS_DIR)/miniupnpc/minissdpc.o \
+                 $(DEPS_DIR)/miniupnpc/miniwget.o \
+                 $(DEPS_DIR)/miniupnpc/miniupnpc.o \
+                 $(DEPS_DIR)/miniupnpc/minixml.o \
+                 $(DEPS_DIR)/miniupnpc/minisoap.o
+   else ifeq ($(HAVE_MINIUPNPC), 1)
+      LIBS    += $(MINIUPNPC_LIBS)
    endif
 endif
 
@@ -1520,9 +1649,10 @@ ifneq ($(findstring Win32,$(OS)),)
    OBJ += gfx/drivers/gdi_gfx.o \
           gfx/drivers_context/gdi_ctx.o \
           gfx/drivers_font/gdi_font.o \
+          gfx/display_servers/dispserv_win32.o \
           menu/drivers_display/menu_display_gdi.o
 
-   LIBS += -lmsimg32
+   LIBS += -lmsimg32 -lhid -lsetupapi
 endif
 
 ifeq ($(HAVE_AVFOUNDATION), 1)
@@ -1574,3 +1704,54 @@ ifneq ($(findstring DOS,$(OS)),)
       OBJ += menu/drivers_display/menu_display_vga.o
    endif
 endif
+
+ifeq ($(HAVE_STATIC_VIDEO_FILTERS), 1)
+OBJ += gfx/video_filters/2xsai.o \
+		 gfx/video_filters/super2xsai.o \
+		 gfx/video_filters/supereagle.o \
+		 gfx/video_filters/2xbr.o \
+		 gfx/video_filters/darken.o \
+		 gfx/video_filters/epx.o \
+		 gfx/video_filters/scale2x.o \
+		 gfx/video_filters/blargg_ntsc_snes.o \
+		 gfx/video_filters/lq2x.o \
+		 gfx/video_filters/phosphor2x.o
+endif
+
+ifeq ($(WANT_IOSUHAX), 1)
+DEFINES += -I$(DEPS_DIR)/libiosuhax
+CFLAGS  += -I$(DEPS_DIR)/libiosuhax
+OBJ += $(DEPS_DIR)/libiosuhax/iosuhax.o \
+		 $(DEPS_DIR)/libiosuhax/iosuhax_devoptab.o \
+		 $(DEPS_DIR)/libiosuhax/iosuhax_disc_interface.o
+endif
+
+ifeq ($(WANT_LIBFAT), 1)
+DEFINES += -I$(DEPS_DIR)/libfat/include
+CFLAGS  += -I$(DEPS_DIR)/libfat/include
+OBJ += $(DEPS_DIR)/libfat/cache.o \
+		 $(DEPS_DIR)/libfat/directory.o \
+		 $(DEPS_DIR)/libfat/disc.o \
+		 $(DEPS_DIR)/libfat/fatdir.o \
+		 $(DEPS_DIR)/libfat/fatfile.o \
+		 $(DEPS_DIR)/libfat/file_allocation_table.o \
+		 $(DEPS_DIR)/libfat/filetime.o \
+		 $(DEPS_DIR)/libfat/libfat.o \
+		 $(DEPS_DIR)/libfat/lock.o \
+		 $(DEPS_DIR)/libfat/partition.o
+endif
+
+ifeq ($(HAVE_STATIC_AUDIO_FILTERS), 1)
+OBJ += libretro-common/audio/dsp_filters/echo.o \
+		 libretro-common/audio/dsp_filters/eq.o \
+		 libretro-common/audio/dsp_filters/chorus.o \
+		 libretro-common/audio/dsp_filters/iir.o \
+		 libretro-common/audio/dsp_filters/panning.o \
+		 libretro-common/audio/dsp_filters/phaser.o \
+		 libretro-common/audio/dsp_filters/reverb.o \
+		 libretro-common/audio/dsp_filters/wahwah.o
+endif
+
+ifeq ($(HAVE_RPILED), 1)
+   OBJ += led/drivers/led_rpi.o
+endif

Makefile.ctr

@@ -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)),)
@@ -144,7 +126,7 @@ endif
 
 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 $@

Makefile.ctr.salamander

@@ -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
 
@@ -35,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
@@ -44,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)
@@ -110,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++
@@ -121,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
@@ -160,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

Makefile.emscripten

@@ -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,29 +18,28 @@ HAVE_RPNG   = 1
 HAVE_EMSCRIPTEN = 1
 HAVE_RGUI = 1
 HAVE_SDL = 0
-HAVE_SDL2 = 1
+HAVE_SDL2 = 0
 HAVE_ZLIB = 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
@@ -47,30 +47,15 @@ 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 -Ideps -Ideps/stb
 libretro = libretro_emscripten.bc
 
@@ -82,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)
@@ -91,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

Makefile.griffin

@@ -11,6 +11,13 @@ PC_DEVELOPMENT_UDP_PORT    = 3490
 RARCH_CONSOLE        = 0
 USBGECKO       = 0
 
+SPACE :=
+SPACE := $(SPACE) $(SPACE)
+BACKSLASH :=
+BACKSLASH := \$(BACKSLASH)
+filter_out1 = $(filter-out $(firstword $1),$1)
+filter_out2 = $(call filter_out1,$(call filter_out1,$1))
+
 UNAME_ARCH = $(shell uname -m)
 
 ifeq ($(UNAME_ARCH),x86_64)
@@ -171,6 +178,7 @@ else ifeq ($(libogc_platform), 1)
 
    CFLAGS += -DGEKKO -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int
 
+   HAVE_RUNAHEAD            := 1
    HAVE_FILTERS_BUILTIN     := 1
    HAVE_THREADS             := 1
    HAVE_RPNG                := 1
@@ -334,7 +342,7 @@ else ifeq ($(platform), windows_msvc6_x86)
    PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0351 -D__STDC_CONSTANT_MACROS -D_MBCS
    LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib
 
-   VCDIR ?= $(shell reg query "HKLM\SOFTWARE\Wow6432Node\Microsoft\DevStudio\6.0\Products\Microsoft Visual C++" -v "ProductDir" | grep -o '[A-Z]:\\.*')
+   VCDIR ?= $(shell reg query "HKLM\SOFTWARE\Wow6432Node\Microsoft\DevStudio\6.0\Products\Microsoft Visual C++" -v "ProductDir" | grep -io '[A-Z]:\\.*')
 
    PATH := $(shell IFS=$$'\n'; cygpath "$(VCDIR)/bin"):$(PATH)
    PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VCDIR)/../Common/MSDev98/Bin")
@@ -493,8 +501,8 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
    PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
    INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS100COMNTOOLS)../../VC/include")
 
-   WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
-   WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
+   WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -io '[A-Z]:\\.*')
+   WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -io '[A-Z]:\\.*')
    WindowsSdkDir := $(WindowsSdkDir:\=)
 
    ifeq ($(HAVE_DIRECTX), 1)
@@ -568,7 +576,7 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
    PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS110COMNTOOLS)../IDE")
    INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS110COMNTOOLS)../../VC/include")
 
-   WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots" -v "KitsRoot81" | grep -o '[A-Z]:\\.*')
+   WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots" -v "KitsRoot81" | grep -io '[A-Z]:\\.*')
    WindowsSdkDir := $(WindowsSdkDir:\=)
 
    ifeq ($(HAVE_DIRECTX), 1)
@@ -642,7 +650,7 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
    PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS120COMNTOOLS)../IDE")
    INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS120COMNTOOLS)../../VC/include")
 
-   WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots" -v "KitsRoot81" | grep -o '[A-Z]:\\.*')
+   WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Windows Kits\Installed Roots" -v "KitsRoot81" | grep -io '[A-Z]:\\.*')
    WindowsSdkDir := $(WindowsSdkDir:\=)
 
    ifeq ($(HAVE_DIRECTX), 1)
@@ -654,6 +662,95 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
       export INCLUDE := $(INCLUDE);$(WindowsSdkDir)\Include\um;$(WindowsSdkDir)\Include\shared;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
       export LIB := $(LIB);$(WindowsSdkDir)\$(PlatLib)
    endif
+else ifneq (,$(findstring windows_msvc2015,$(platform)))
+   HAVE_RPNG                := 1
+   HAVE_RJPEG               := 1
+   HAVE_RBMP                := 1
+   HAVE_RTGA                := 1
+   HAVE_ZLIB                := 1
+   WANT_ZLIB                := 1
+   HAVE_7ZIP                := 1
+   HAVE_NETWORKING          := 1
+   HAVE_NETWORK_CMD         := 1
+   HAVE_OVERLAY             := 1
+   HAVE_MATERIALUI          := 1
+   HAVE_XMB                 := 1
+   HAVE_STB_FONT            := 1
+   HAVE_THREADS             := 1
+   HAVE_LIBRETRODB          := 1
+   HAVE_COMMAND             := 1
+   HAVE_STDIN_CMD           := 1
+   HAVE_CMD                 := 1
+   HAVE_DYLIB               := 1
+   HAVE_DYNAMIC             := 1
+   HAVE_GRIFFIN_CPP         := 1
+   HAVE_DIRECTX             ?= 1
+
+   EXT_TARGET := $(TARGET_NAME).exe
+   EXT_INTER_TARGET := $(TARGET_NAME).exe
+   CC = cl.exe
+   CXX = cl.exe
+   LD = link.exe
+
+   PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
+   PLATCFLAGS += -D__i686__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DWIN32
+   LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib
+
+   PlatformSuffix = $(subst windows_msvc2015_,,$(platform))
+
+   ifneq (,$(findstring x64,$(PlatformSuffix)))
+      ifeq ($(HOST_ARCH),x86)
+         # cross-compile for x64 from x86 host
+         PATH := $(shell IFS=$$'\n'; cygpath "$(VS140COMNTOOLS)../../VC/bin/x86_amd64"):$(PATH)
+      else
+         PATH := $(shell IFS=$$'\n'; cygpath "$(VS140COMNTOOLS)../../VC/bin/amd64"):$(PATH)
+      endif
+
+      LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS140COMNTOOLS)../../VC/lib/amd64")
+      WinArch = x64
+      PlatLib = um\x64
+      VCLib = amd64
+   else ifneq (,$(findstring arm,$(PlatformSuffix)))
+      PATH := $(shell IFS=$$'\n'; cygpath "$(VS140COMNTOOLS)../../VC/bin/x86_arm"):$(PATH)
+      LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS140COMNTOOLS)../../VC/lib/arm")
+      HAVE_DIRECTX = 0
+      WinArch = arm
+      PlatLib = um\arm
+      VCLib = arm
+   else
+      PATH := $(shell IFS=$$'\n'; cygpath "$(VS140COMNTOOLS)../../VC/bin"):$(PATH)
+      LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS140COMNTOOLS)../../VC/lib")
+      WinArch = x86
+      PlatLib = um\x86
+      VCLib =
+   endif
+
+   PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS140COMNTOOLS)../IDE")
+   INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS140COMNTOOLS)../../VC/include")
+
+   reg_query = $(call filter_out2,$(subst $2,,$(shell reg query "$2" -v "$1" 2>nul)))
+   fix_path = $(subst $(SPACE),\ ,$(subst \,/,$1))
+   WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0)
+   WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_CURRENT_USER\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0)
+   WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0)
+   WindowsSdkDir ?= $(call reg_query,InstallationFolder,HKEY_CURRENT_USER\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0)
+   WindowsSdkDir := $(WindowsSdkDir)
+
+   WindowsSDKVersion ?= $(firstword $(foreach folder,$(subst $(subst \,/,$(WindowsSdkDir)Include/),,$(wildcard $(call fix_path,$(WindowsSdkDir)Include\*))),$(if $(wildcard $(call fix_path,$(WindowsSdkDir)Include/$(folder)/um/Windows.h)),$(folder),)))$(BACKSLASH)
+   WindowsSDKVersion := $(WindowsSDKVersion)
+
+   export INCLUDE := $(INCLUDE);$(VCINSTALLDIR)INCLUDE;$(VCINSTALLDIR)ATLMFC\INCLUDE;$(WindowsSdkDir)include\$(WindowsSDKVersion)ucrt;$(WindowsSdkDir)include\$(WindowsSDKVersion)shared;$(WindowsSdkDir)include\$(WindowsSDKVersion)um
+   export LIB := $(LIB);$(VCINSTALLDIR)LIB$(VCLib);$(VCINSTALLDIR)ATLMFC\LIB$(VCLib);$(WindowsSdkDir)lib\$(WindowsSDKVersion)ucrt\$(WinArch);$(WindowsSdkDir)lib\$(WindowsSDKVersion)$(PlatLib)
+
+   ifeq ($(HAVE_DIRECTX), 1)
+      PLATCFLAGS += -DHAVE_DINPUT -DHAVE_DSOUND -DHAVE_D3D -DHAVE_D3D9 -DHAVE_XAUDIO -DHAVE_XINPUT
+      DXSDK_DIR := $(DXSDK_DIR:\=)
+      export INCLUDE := $(INCLUDE);$(DXSDK_DIR)\Include;libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
+      export LIB := $(LIB);$(DXSDK_DIR)\Lib\$(WinArch)
+   else
+      export INCLUDE := $(INCLUDE);libretro-common\include;libretro-common\include\compat\msvc;gfx\include;deps;deps\stb
+      export LIB := $(LIB)
+   endif
 endif
 
 ifneq (,$(findstring msvc,$(platform)))
@@ -671,6 +768,10 @@ ifeq ($(HAVE_GRIFFIN_CPP), 1)
    OBJ += griffin/griffin_cpp.o
 endif
 
+ifeq ($(WANT_GLSLANG), 1)
+	OBJ += griffin/griffin_glslang.o
+endif
+
 ifeq ($(HAVE_LOGGER), 1)
    CFLAGS      += -DHAVE_LOGGER
    CFLAGS      += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
@@ -740,6 +841,10 @@ ifeq ($(HAVE_IMAGEVIEWER), 1)
    CFLAGS      += -DHAVE_IMAGEVIEWER
 endif
 
+ifeq ($(HAVE_RUNAHEAD), 1)
+   CFLAGS      += -DHAVE_RUNAHEAD
+endif
+
 ifeq ($(HAVE_7ZIP), 1)
    CFLAGS      += -DHAVE_7ZIP
 endif
@@ -763,7 +868,7 @@ endif
 ifneq (,$(findstring msvc,$(platform)))
    CFLAGS += -DHAVE_RGUI -DHAVE_MENU -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL
 else
-   CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DHAVE_MENU -DHAVE_GRIFFIN=1 -Wno-char-subscripts -DRARCH_INTERNAL
+   CFLAGS += -std=gnu99 -DHAVE_RGUI -DHAVE_MENU -DHAVE_GRIFFIN=1 -Wno-char-subscripts -DRARCH_INTERNAL
 endif
 
 ifeq ($(HAVE_MATERIALUI), 1)
@@ -832,7 +937,8 @@ ifeq ($(DEBUG), 1)
          CFLAGS += -Wp64
       endif
 
-      CFLAGS += -Od -Zi -D_DEBUG -MTd -TP
+      CFLAGS += -Od -Zi -D_DEBUG -MTd
+      LDFLAGS += -DEBUG
    else
       CFLAGS += -O0 -g -DDEBUG
    endif
@@ -843,9 +949,10 @@ else ifeq ($(platform), vita)
 else ifneq (,$(findstring msvc,$(platform)))
    ifeq ($(platform), windows_msvc2003_x86)
       CFLAGS += -Wp64
+      LDFLAGS += -SUBSYSTEM:WINDOWS -ENTRY:mainCRTStartup
    endif
 
-   CFLAGS += -O2 -DNDEBUG -MT -TP
+   CFLAGS += -O2 -DNDEBUG -MT
 else
    CFLAGS += -O3
 endif

Makefile.msvc

@@ -0,0 +1,272 @@
+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_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)))

Makefile.openpandora

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

Makefile.ps3

@@ -4,7 +4,7 @@ include version.all
 #set to GCC for debug builds for use with debugger
 CELL_BUILD_TOOLS	= SNC
 CELL_GPU_TYPE	   	= RSX
-CELL_PSGL_VERSION	= ultra-opt
+CELL_PSGL_VERSION	= opt
 
 ASSETS_DIR  := media/assets
 
@@ -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 -DHAVE_RUNAHEAD
+
+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
@@ -84,8 +96,7 @@ ifeq ($(CELL_BUILD_TOOLS), SNC)
 	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
 	PPU_CXX	= $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
 	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-else
-ifneq($(system_platform), win)
+else ifneq ($(system_platform), win)
 	PPU_CXX	= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
 	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
 	PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
@@ -101,14 +112,14 @@ 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_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
 
 ifeq ($(DEBUG), 1)
    PPU_OPTIMIZE_LV	:= -O0 -g
 else
-   PPU_OPTIMIZE_LV	:= -O3 -g
+   PPU_OPTIMIZE_LV	:= -O2 -g
 endif
 
 ifeq ($(HAVE_LOGGER), 1)

Makefile.ps3.cobra

@@ -2,7 +2,7 @@ include version.all
 
 #which compiler to build  with - GCC or SNC
 #set to GCC for debug builds for use with debugger
-CELL_BUILD_TOOLS	= SNC
+CELL_BUILD_TOOLS	= GCC
 CELL_GPU_TYPE	   	= RSX
 CELL_PSGL_VERSION	= ultra-opt
 
@@ -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
@@ -82,8 +94,7 @@ ifeq ($(CELL_BUILD_TOOLS), SNC)
 	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
 	PPU_CXX	= $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
 	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-else
-ifneq($(system_platform), win)
+else ifneq($(system_platform), win)
 	PPU_CXX	= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
 	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
 	PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
@@ -99,7 +110,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_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

Makefile.ps3.salamander

@@ -1,4 +1,4 @@
-CELL_BUILD_TOOLS	= SNC
+CELL_BUILD_TOOLS	= GCC
 CELL_SDK		?= /usr/local/cell
 HAVE_LOGGER		= 0
 CELL_MK_DIR ?= $(CELL_SDK)/samples/mk
@@ -27,6 +27,18 @@ STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
 INCFLAGS    = -I. -Idefines -Ilibretro-common/include -Ideps/libz
 DEFINES     = -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
 
+ifeq ($(DEX_BUILD), 1)
+DEFINES += -DDEX_BUILD
+endif
+
+ifeq ($(CEX_BUILD), 1)
+DEFINES += -DCEX_BUILD
+endif
+
+ifeq ($(ODE_BUILD), 1)
+DEFINES += -DODE_BUILD
+endif
+
 PPU_CFLAGS	:= $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
 PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES)
 
@@ -44,6 +56,7 @@ PPU_SRCS		= frontend/frontend_salamander.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

Makefile.psp1

@@ -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 deps/stb 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 =

Makefile.psp1.salamander

@@ -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
@@ -45,6 +46,7 @@ OBJS = frontend/frontend_salamander.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 \

Makefile.switch

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

Makefile.vita

@@ -16,7 +16,7 @@ DEFINES :=
 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
 	DEFINES += -DHAVE_GRIFFIN=1
-	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB
+	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB DEFINES -DHAVE_KEYMAPPER
 	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
 	ifeq ($(DEBUG), 1)
 		DEFINES += -DHAVE_NETLOGGER
@@ -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
 
 

Makefile.vita.salamander

@@ -46,6 +46,7 @@ OBJS = frontend/frontend_salamander.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

Makefile.wii.salamander

@@ -61,6 +61,7 @@ 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 \

Makefile.wiiu

@@ -1,109 +1,176 @@
 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
+HAVE_RUNAHEAD              = 1
+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
 
-PC_DEVELOPMENT_IP_ADDRESS  ?=
-PC_DEVELOPMENT_TCP_PORT	   ?=
-
 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_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
-
-	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
 
-DEFINES += -DHAVE_KEYMAPPER
+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
+
+ifeq ($(HAVE_RUNAHEAD),1)
+	DEFINES += -DHAVE_RUNAHEAD
+endif
+
+   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_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")
@@ -133,7 +200,6 @@ else
    ELF2RPL   := $(ELF2RPL).exe
 endif
 
-
 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
 
@@ -145,6 +211,7 @@ ifeq ($(DEBUG), 1)
 else
    CFLAGS += -O3
 endif
+
 LDFLAGS := $(CFLAGS)
 
 ASFLAGS := $(CFLAGS) -mregnames
@@ -153,34 +220,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
@@ -198,64 +259,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
+%: $(BUILD_DIR)/%
+	cp $< $@
+
+
+$(BUILD_DIR)/%.o: %.cpp %.depend
 	@$(if $(Q), echo CXX $<,)
-	$(Q)$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(Q)$(POSTCOMPILE)
+	@mkdir -p $(dir $@)
+	$(Q)$(CXX) -c -o $@ $< $(CXXFLAGS) $(DEFINES) $(INCDIRS) $(DEPFLAGS)
 
-%.o: %.c
-%.o: %.c %.depend
+$(BUILD_DIR)/%.o: %.c %.depend
 	@$(if $(Q), echo CC $<,)
-	$(Q)$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(Q)$(POSTCOMPILE)
+	@mkdir -p $(dir $@)
+	$(Q)$(CC) -c -o $@ $< $(CFLAGS) $(DEFINES) $(INCDIRS) $(DEPFLAGS)
 
-
-%.o: %.S
-%.o: %.S %.depend
+$(BUILD_DIR)/%.o: %.S %.depend
 	@$(if $(Q), echo AS $<,)
-	$(Q)$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(Q)$(POSTCOMPILE)
+	@mkdir -p $(dir $@)
+	$(Q)$(CC) -c -o $@ $< $(ASFLAGS) $(DEFINES) $(INCDIRS) $(DEPFLAGS)
 
-%.o: %.s
-%.o: %.s %.depend
+$(BUILD_DIR)/%.o: %.s %.depend
 	@$(if $(Q), echo AS $<,)
+	@mkdir -p $(dir $@)
 	$(Q)$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(Q)$(POSTCOMPILE)
 %.a:
 	@$(if $(Q), echo AR $<,)
+	@mkdir -p $(dir $@)
 	$(Q)$(AR) -rc $@ $^
 
 %.depend: ;
-
+%.last: ;
 
 $(ELF2RPL):
 	@$(if $(Q), echo MAKE $@,)
 	$(Q)$(MAKE) -C wiiu/wut/elf2rpl/
 
-$(TARGET).elf: $(OBJ) $(HBL_ELF_OBJ) libretro_wiiu.a wiiu/link_elf.ld
+$(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
+$(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)
+$(BUILD_DIR)/$(TARGET).rpx: $(BUILD_DIR)/$(TARGET).rpx.elf $(ELF2RPL) .$(TARGET).rpx.last
 	@$(if $(Q), echo ELF2RPL $@,)
-	$(Q)-$(ELF2RPL) $(TARGET).rpx.elf $@
+	@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)

Makefile.wiiu.salamander

@@ -1,176 +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/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/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)
-

README.md

@@ -4,7 +4,7 @@
 # RetroArch
 
 RetroArch is the reference frontend for the libretro API.
-Popular examples of implementations for this API includes videogame system emulators and game engines, but also
+Popular examples of implementations for this API includes videogame system emulators and game engines as well as
 more generalized 3D programs.
 These programs are instantiated as dynamic libraries. We refer to these as "libretro cores".
 
@@ -18,7 +18,7 @@ These programs are instantiated as dynamic libraries. We refer to these as "libr
 
 [libretro](http://libretro.com) is an API that exposes generic audio/video/input callbacks.
 A frontend for libretro (such as RetroArch) handles video output, audio output, input and application lifecycle.
-A libretro core written in portable C or C++ can run seamlessly on many platforms with very little/no porting effort.
+A libretro core written in portable C or C++ can run seamlessly on many platforms with very little to no porting effort.
 
 While RetroArch is the reference frontend for libretro, several other projects have used the libretro
 interface to include support for emulators and/or game engines. libretro is completely open and free for anyone to use.
@@ -49,7 +49,7 @@ More developer-centric stuff is found [here](https://github.com/libretro/libretr
 
 ## Philosophy
 
-RetroArch attempts to be small and lean,
+RetroArch attempts to be small and lean
 while still having all the useful core features expected from an emulator.
 It is designed to be very portable and features a gamepad-centric UI.
 It also has a full-featured command-line interface.
@@ -63,18 +63,25 @@ RetroArch also emphasizes on being easy to integrate into various launcher front
 
 RetroArch has been ported to the following platforms:
 
+   - DOS
    - Windows
    - Linux
+   - Emscripten
    - FreeBSD
    - NetBSD
-   - MacOS
+   - OpenBSD
+   - Haiku
+   - Solaris
+   - MacOS X
    - PlayStation 3
    - PlayStation Portable
-   - Original Xbox
-   - Xbox 360 (Libxenon/XeXDK)
-   - Wii, GameCube (Libogc)
-   - WiiU
+   - PlayStation Vita
+   - Original Microsoft Xbox
+   - Microsoft Xbox 360 (Libxenon/XeXDK)
+   - Nintendo Wii, GameCube (Libogc)
+   - Nintendo WiiU
    - Nintendo 3DS
+   - Nintendo Switch
    - Raspberry Pi
    - Android
    - iOS
@@ -114,7 +121,7 @@ RetroArch needs at least one of these audio driver libraries:
    - DirectSound (Win32, Xbox 1)
    - CoreAudio (OSX, iOS)
 
-To run properly, RetroArch requires a libretro implementation present, however, as it's typically loaded
+To run properly, RetroArch requires a libretro implementation present; however, as it's typically loaded
 dynamically, it's not required at build time.
 
 ## Dependencies (Console ports, mobile)
@@ -124,12 +131,12 @@ anything other than what the respective SDKs provide.
 
 ## Configuring
 
-The default configuration is defined in config.def.h.
+The default configuration is defined in `config.def.h`.
 It is not recommended to change this unless you know what you're doing.
 These can later be tweaked by using a config file.
-A sample configuration file is installed to /etc/retroarch.cfg. This is the system-wide config file.
+A sample configuration file is installed to `/etc/retroarch.cfg`. This is the system-wide config file.
 
-RetroArch will on startup create a config file in $XDG\_CONFIG\_HOME/retroarch/retroarch.cfg if doesn't exist.
+RetroArch will on startup create a config file in `$XDG\_CONFIG\_HOME/retroarch/retroarch.cfg` if it does not exist.
 Users only need to configure a certain option if the desired value deviates from the value defined in config.def.h.
 
 To configure joypads, use the built-in menu or the `retroarch-joyconfig` command-line tool.
@@ -137,3 +144,115 @@ To configure joypads, use the built-in menu or the `retroarch-joyconfig` command
 ## Compiling and installing
 
 Instructions for compiling and installing RetroArch can be found in the [Libretro/RetroArch Documentation Center](https://docs.libretro.com/).
+
+## CRT 15Khz Resolution Switching
+
+CRT Switch res will turn on, on the fly. However, you will need to restart retroarch to disable it. With CRT SwitchRes enable Retroarch will start in 2560 x 480 @ 60.  
+
+If you are running windows, before enabling the CRT SwitchRes options pleasae make sure you have installed CRTEmudriver and installed some modelines. The minimum modelins for all games to switch correctly are:
+
+- 2560 x 192 @ 60.000000
+- 2560 x 200 @ 60.000000
+- 2560 x 240 @ 60.000000
+- 2560 x 224 @ 60.000000
+- 2560 x 237 @ 60.000000
+- 2560 x 256 @ 50.000000
+- 2560 x 254 @ 55.000000
+- 2560 x 448 @ 60.000000
+- 2560 x 480 @ 60.000000
+
+Install these modelines replacing 2560 with your desired super resuloution. The above resolutions are NTSC only so if you would be playing any PAL content please add pal modelines:
+
+- 2560 x 192 @ 50.000000
+- 2560 x 200 @ 50.000000
+- 2560 x 240 @ 50.000000
+- 2560 x 224 @ 50.000000
+- 2560 x 288 @ 50.000000
+- 2560 x 237 @ 50.000000
+- 2560 x 254 @ 55.000000
+- 2560 x 448 @ 50.000000
+- 2560 x 480 @ 50.000000
+
+Some games will require heigher PAL resolutions which should also be installed:
+
+- 2560 x 512 @ 50.000000
+- 2560 x 576 @ 50.000000
+
+Ideally install all these modelines and everything will work great.
+
+## Super Resolutions
+
+The default super resolution is 2560. It is displayed just under the CRT switch option, which can be found in video settings. This can be changed within the retroarch.cfg. The only compatible resolutions are 1920, 2560 and 3840. Any other resolutions will be ignored and native swithing will be activated.
+
+## Native Resolutions
+
+If native reolutions are activeted you will need a whole new set of modelines:
+
+- 512 x 240 @ 50.006977 SNESpal
+- 512 x 224 @ 50.006977 SNESpal
+- 512 x 448 @ 50.006977 SNESpal
+- 512 x 240 @ 60.098812 SNESntsc
+- 512 x 224 @ 60.098812 SNESntsc
+- 512 x 448 @ 60.098812 SNESntsc
+- 256 x 240 @ 50.006977 SNESpal
+- 256 x 448 @ 50.006977 SNESpal
+- 256 x 240 @ 60.098812 SNESntsc
+- 256 x 448 @ 60.098812 SNESntsc
+- 320 x 240 @ 59.922745 MDntsc
+- 320 x 448 @ 59.922745 MDntp
+- 320 x 480 @ 59.922745 MDntsc
+- 256 x 192 @ 59.922745 MDntsc
+- 320 x 224 @ 59.922745 MDntsc
+- 256 x 224 @ 59.922745 MDntsc
+- 320 x 288 @ 49.701458 MDpal
+- 320 x 576 @ 49.701458 MDpal
+- 256 x 192 @ 49.701458 MDpal
+- 320 x 224 @ 49.701458 MDpal
+- 320 x 240 @ 49.701458 MDpal
+- 320 x 448 @ 49.701458 MDpal
+- 320 x 480 @ 49.701458 MDpal
+- 256 x 224 @ 49.701458 MDpal
+- 256 x 288 @ 49.701458 MSYSpal
+- 256 x 240 @ 60.098812 NESntsc
+- 256 x 240 @ 50.006977 NESpal
+
+- 640 x 480 @ 60.130001 N64ntsc
+- 640 x 237 @ 60.130001 N64ntsc
+- 640 x 240 @ 60.130001 N64ntsc
+- 640 x 480 @ 50.000000 N64pal
+- 640 x 576 @ 50.000000 n64pal
+- 640 x 288 @ 50.000000 n64pal
+
+- 256 x 252 @ 49.759998 PSXpal
+- 384 x 252 @ 49.759998 PSXpal
+- 640 x 540 @ 49.759998 PSXpal
+- 320 x 252 @ 49.759998 PSXpal
+- 640 x 252 @ 49.759998 PSXpal
+
+- 384 x 240 @ 59.941002 PSXntsc
+- 256 x 480 @ 59.941002 PSXntsc
+
+- 352 x 240 @ 59.820000 Saturn/SGFX_NTSCp
+- 704 x 240 @ 59.820000 SaturnNTSCp
+- 352 x 480 @ 59.820000 SaturnNTSCi
+- 704 x 480 @ 59.820000 SaturnNTSCi
+- 352 x 288 @ 49.701458 SaturnPALp
+- 704 x 288 @ 49.701458 SaturnPALp
+- 352 x 576 @ 49.701458 SaturnPALi
+- 704 x 576 @ 49.701458 SaturnPALi
+
+- 240 x 160 @ 59.730000 GBA
+- 320 x 200 @ 60.000000 Doom
+
+// Arcade
+
+- 400 x 254 @ 54.706841 MK
+- 384 x 224 @ 59.637405 CPS1
+
+These modelines are more acurate giving exact hz. However, some games may have unwanted results. This is due to mid-scanline resolution chages on the orgiginal hardware. For the best results super resolutions are the way to go.
+
+## CRT resolution switching & Mame
+
+Some arecade resolutions can be alot different. There is resolution detection to ensure mame games will be diplayed in the closest available resolution but drawn at their native resolution within this resolution. Meaning that the mame game will look just like the original hardware.
+
+Mame roms that run in a vertical aspect like DoDonPachi need to be roted within mame before rolution swithing and aspect correction will work. Do this before enableing CRT switchRes so that Retroarch will run in your desktop resolution. Once you have roted any games that may need it switch CRT SwitchRes on.

audio/audio_driver.c

@@ -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,
@@ -150,7 +152,7 @@ static uint64_t audio_driver_free_samples_count          = 0;
 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,17 +181,27 @@ static void *audio_driver_resampler_data                 = NULL;
 static const audio_driver_t *current_audio               = NULL;
 static void *audio_driver_context_audio_data             = NULL;
 
+static bool audio_suspended                              = false;
+
+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;
+}
+
 /**
  * compute_audio_buffer_statistics:
  *
  * Computes audio buffer statistics.
  *
  **/
-static void compute_audio_buffer_statistics(void)
+bool compute_audio_buffer_statistics(audio_statistics_t *stats)
 {
    unsigned i, low_water_size, high_water_size, avg, stddev;
-   float avg_filled              = 0.0f;
-   float deviation               = 0.0f;
    uint64_t accum                = 0;
    uint64_t accum_var            = 0;
    unsigned low_water_count      = 0;
@@ -198,9 +210,21 @@ static void compute_audio_buffer_statistics(void)
          (unsigned)audio_driver_free_samples_count,
          AUDIO_BUFFER_FREE_SAMPLES_COUNT);
 
-   if (samples < 3)
-      return;
+   if (!stats || samples < 3)
+      return false;
 
+   stats->samples                = (unsigned)audio_driver_free_samples_count;
+
+#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;
+#elif defined(_MSC_VER) && _MSC_VER <= 1200
+   /* FIXME: error C2520: conversion from unsigned __int64 
+    * to double not implemented, use signed __int64 */
+   (void)stddev;
+#else
    for (i = 1; i < samples; i++)
       accum += audio_driver_free_samples_buf[i];
 
@@ -208,17 +232,19 @@ static void compute_audio_buffer_statistics(void)
 
    for (i = 1; i < samples; i++)
    {
-      int diff = avg - audio_driver_free_samples_buf[i];
-      accum_var += diff * diff;
+      int diff     = avg - audio_driver_free_samples_buf[i];
+      accum_var   += diff * diff;
    }
 
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-   /* FIXME: error C2520: conversion from unsigned __int64 to double not implemented, use signed __int64 */
-#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;
+   stddev                                = (unsigned)
+      sqrt((double)accum_var / (samples - 2));
+
+   stats->average_buffer_saturation      = (1.0f - (float)avg 
+         / audio_driver_buffer_size) * 100.0;
+   stats->std_deviation_percentage       = ((float)stddev 
+         / audio_driver_buffer_size)  * 100.0;
 #endif
+
    low_water_size  = (unsigned)(audio_driver_buffer_size * 3 / 4);
    high_water_size = (unsigned)(audio_driver_buffer_size     / 4);
 
@@ -230,11 +256,28 @@ 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));
+   stats->close_to_underrun      = (100.0 * low_water_count)  / (samples - 1);
+   stats->close_to_blocking      = (100.0 * high_water_count) / (samples - 1);
+
+   return true;
+}
+
+static void report_audio_buffer_statistics(void)
+{
+   audio_statistics_t audio_stats = {0.0f};
+   if (!compute_audio_buffer_statistics(&audio_stats))
+      return;
+
+#ifdef DEBUG
+   RARCH_LOG("[Audio]: Average audio buffer saturation: %.2f %%,"
+         " standard deviation (percentage points): %.2f %%.\n"
+         "[Audio]: Amount of time spent close to underrun: %.2f %%."
+         " Close to blocking: %.2f %%.\n",
+         audio_stats.average_buffer_saturation,
+         audio_stats.std_deviation_percentage,
+         audio_stats.close_to_underrun,
+         audio_stats.close_to_blocking);
+#endif
 }
 
 /**
@@ -320,7 +363,7 @@ static bool audio_driver_deinit_internal(void)
 
    command_event(CMD_EVENT_DSP_FILTER_DEINIT, NULL);
 
-   compute_audio_buffer_statistics();
+   report_audio_buffer_statistics();
 
    return true;
 }
@@ -335,13 +378,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);
@@ -379,9 +422,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))
@@ -393,7 +436,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,
@@ -414,7 +457,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;
 
@@ -439,6 +482,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",
@@ -470,7 +514,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
          )
    {
@@ -478,7 +522,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;
       }
@@ -516,8 +560,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;
 }
 
@@ -528,11 +572,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;
@@ -541,7 +582,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;
@@ -556,10 +597,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);
@@ -594,29 +636,29 @@ 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
+      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   = 
+      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
    }
 
@@ -632,9 +674,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);
@@ -656,12 +698,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;
 }
 
 /**
@@ -673,13 +710,16 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
  **/
 void audio_driver_sample(int16_t left, int16_t right)
 {
+   if (audio_suspended)
+      return;
+
    audio_driver_output_samples_conv_buf[audio_driver_data_ptr++] = left;
    audio_driver_output_samples_conv_buf[audio_driver_data_ptr++] = 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;
@@ -700,6 +740,9 @@ size_t audio_driver_sample_batch(const int16_t *data, size_t frames)
    if (frames > (AUDIO_CHUNK_SIZE_NONBLOCKING >> 1))
       frames = AUDIO_CHUNK_SIZE_NONBLOCKING >> 1;
 
+   if (audio_suspended)
+      return frames;
+
    audio_driver_flush(data, frames << 1);
 
    return frames;
@@ -710,8 +753,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)
@@ -725,9 +768,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
@@ -800,9 +843,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;
 
@@ -852,13 +895,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);
 
@@ -882,7 +928,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;
@@ -1003,7 +1049,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;
 
@@ -1132,7 +1178,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;
@@ -1152,7 +1198,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;
@@ -1191,8 +1237,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;
@@ -1200,7 +1246,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))
@@ -1218,7 +1264,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())
@@ -1260,11 +1306,31 @@ bool audio_driver_owns_driver(void)
    return audio_driver_data_own;
 }
 
+void audio_driver_suspend(void)
+{
+   audio_suspended = true;
+}
+
+bool audio_driver_is_suspended(void)
+{
+   return audio_suspended;
+}
+
+void audio_driver_resume(void)
+{
+   audio_suspended = false;
+}
+
 void audio_driver_set_active(void)
 {
    audio_driver_active = true;
 }
 
+bool audio_driver_is_active(void)
+{
+   return audio_driver_active;
+}
+
 void audio_driver_destroy(void)
 {
    audio_driver_active   = false;

audio/audio_driver.h

@@ -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
@@ -45,6 +46,15 @@ enum audio_action
    AUDIO_ACTION_MIXER
 };
 
+typedef struct audio_statistics
+{
+   float average_buffer_saturation;
+   float std_deviation_percentage;
+   float close_to_underrun;
+   float close_to_blocking;
+   unsigned samples;
+} audio_statistics_t;
+
 typedef struct audio_driver
 {
    /* Creates and initializes handle to audio driver.
@@ -90,7 +100,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 +113,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
@@ -151,8 +161,16 @@ void audio_driver_set_own_driver(void);
 
 void audio_driver_unset_own_driver(void);
 
+void audio_driver_suspend(void);
+
+bool audio_driver_is_suspended(void);
+
+void audio_driver_resume(void);
+
 void audio_driver_set_active(void);
 
+bool audio_driver_is_active(void);
+
 void audio_driver_destroy(void);
 
 void audio_driver_deinit_resampler(void);
@@ -255,6 +273,10 @@ 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);
+
+bool compute_audio_buffer_statistics(audio_statistics_t *stats);
+
 extern audio_driver_t audio_rsound;
 extern audio_driver_t audio_oss;
 extern audio_driver_t audio_alsa;
@@ -277,6 +299,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;
 

audio/audio_thread_wrapper.c

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

audio/audio_thread_wrapper.h

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

audio/drivers/alsa.c

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

audio/drivers/alsa_qsa.c

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

audio/drivers/alsathread.c

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

audio/drivers/coreaudio.c

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

audio/drivers/ctr_csnd_audio.c

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

audio/drivers/dsound.c

@@ -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. */
 

audio/drivers/gx_audio.c

@@ -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.
@@ -83,12 +83,13 @@ static void *gx_audio_init(const char *device,
    AIInit(NULL);
    AIRegisterDMACallback(dma_callback);
 
-   if (rate < 33000)
+   //ranges 0-32000 (default low) and 40000-47999 (in settings going down from 48000) -> set to 32000 hz
+   if (rate <= 32000 || (rate >= 40000 && rate < 48000))
    {
       AISetDSPSampleRate(AI_SAMPLERATE_32KHZ);
       *new_rate = 32000;
    }
-   else
+   else //ranges 32001-39999 (in settings going up from 32000) and 48000-max (default high) -> set to 48000 hz
    {
       AISetDSPSampleRate(AI_SAMPLERATE_48KHZ);
       *new_rate = 48000;
@@ -129,9 +130,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);
 

audio/drivers/jack.c

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

audio/drivers/nullaudio.c

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

audio/drivers/openal.c

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

audio/drivers/opensl.c

@@ -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.
@@ -133,6 +133,9 @@ static void *sl_init(const char *device, unsigned rate, unsigned latency,
    sl->buf_count    = (latency * 4 * rate + 500) / 1000;
    sl->buf_count    = (sl->buf_count + sl->buf_size / 2) / sl->buf_size;
 
+   if (sl->buf_count < 2)
+      sl->buf_count = 2;
+
    sl->buffer       = (uint8_t**)calloc(sizeof(uint8_t*), sl->buf_count);
    if (!sl->buffer)
       goto error;
@@ -200,7 +203,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;

audio/drivers/oss.c

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

audio/drivers/ps3_audio.c

@@ -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"};

audio/drivers/psp_audio.c

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

audio/drivers/pulse.c

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

audio/drivers/roar.c

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

audio/drivers/rsound.c

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

audio/drivers/rsound.h

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

audio/drivers/rwebaudio.c

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

audio/drivers/sdl_audio.c

@@ -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. */

audio/drivers/switch_audio.c

@@ -0,0 +1,301 @@
+/*  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<libtransistor/alloc_pages.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;
+
+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 = alloc_pages(sample_buffer_size, sample_buffer_size, NULL);
+      swa->buffers[i].buffer_size = sample_buffer_size;
+      swa->buffers[i].data_size   = sample_buffer_size;
+      swa->buffers[i].unknown     = 0;
+
+      if(swa->buffers[i].sample_data == NULL)
+	      goto fail_audio_output;
+      
+      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 */
+};

audio/drivers/tinyalsa.c

@@ -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 */
@@ -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;
 }
 

audio/drivers/wasapi.c

@@ -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>
@@ -40,7 +40,7 @@ DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0
 
 #ifdef __cplusplus
 #define _IMMDeviceCollection_Item(This,nDevice,ppdevice) (This)->Item(nDevice,ppdevice)
-#define _IAudioClient_Start(This)	( (This)->Start() ) 
+#define _IAudioClient_Start(This)	( (This)->Start() )
 #define _IAudioClient_Stop(This)	( (This)->Stop() )
 #define _IAudioClient_GetCurrentPadding(This,pNumPaddingFrames)	\
     ( (This)->GetCurrentPadding(pNumPaddingFrames) )
@@ -62,7 +62,7 @@ DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0
 #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_Start(This)	( (This)->lpVtbl -> Start(This) )
 #define _IAudioClient_Stop(This)	( (This)->lpVtbl -> Stop(This) )
 #define _IAudioClient_GetCurrentPadding(This,pNumPaddingFrames)	\
     ( (This)->lpVtbl -> GetCurrentPadding(This,pNumPaddingFrames) )
@@ -163,7 +163,7 @@ 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 = _IMMDevice_GetId(device, &dev_id);
    WASAPI_HR_CHECK(hr, "IMMDevice::GetId", goto error);
 
@@ -306,7 +306,7 @@ static IAudioClient *wasapi_init_client_sh(IMMDevice *device,
    bool float_fmt_res   = *float_fmt;
    unsigned rate_res    = *rate;
    HRESULT hr           = _IMMDevice_Activate(device,
-         IID_IAudioClient, 
+         IID_IAudioClient,
          CLSCTX_ALL, NULL, (void**)&client);
    WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
 
@@ -336,9 +336,10 @@ static IAudioClient *wasapi_init_client_sh(IMMDevice *device,
 
          if (hr == AUDCLNT_E_ALREADY_INITIALIZED)
          {
+            HRESULT hr;
             WASAPI_RELEASE(client);
-            HRESULT hr           = _IMMDevice_Activate(device,
-                  IID_IAudioClient, 
+            hr           = _IMMDevice_Activate(device,
+                  IID_IAudioClient,
                   CLSCTX_ALL, NULL, (void**)&client);
             WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
 
@@ -390,7 +391,7 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
    REFERENCE_TIME buffer_duration = 0;
    UINT32 buffer_length           = 0;
    HRESULT hr                     = _IMMDevice_Activate(device,
-         IID_IAudioClient, 
+         IID_IAudioClient,
          CLSCTX_ALL, NULL, (void**)&client);
    WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
 
@@ -432,7 +433,7 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
 
             WASAPI_RELEASE(client);
             hr                     = _IMMDevice_Activate(device,
-                  IID_IAudioClient, 
+                  IID_IAudioClient,
                   CLSCTX_ALL, NULL, (void**)&client);
             WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
 
@@ -451,7 +452,7 @@ static IAudioClient *wasapi_init_client_ex(IMMDevice *device,
          {
             WASAPI_RELEASE(client);
             hr                     = _IMMDevice_Activate(device,
-                  IID_IAudioClient, 
+                  IID_IAudioClient,
                   CLSCTX_ALL, NULL, (void**)&client);
             WASAPI_HR_CHECK(hr, "IMMDevice::Activate", return NULL);
 
@@ -668,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);
@@ -1044,7 +1045,7 @@ static size_t wasapi_write_avail(void *wh)
 
    hr = _IAudioClient_GetCurrentPadding(w->client, &padding);
    WASAPI_HR_CHECK(hr, "IAudioClient::GetCurrentPadding", return 0);
-   
+
    return w->engine_buffer_size - padding * w->frame_size;
 }
 

audio/drivers/xaudio.c

@@ -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,13 +59,13 @@ typedef struct
    size_t bufsize;
 } xa_t;
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(CINTERFACE)
 struct xaudio2 : public IXAudio2VoiceCallback
 #else
 struct xaudio2
 #endif
 {
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(CINTERFACE)
    xaudio2() :
       buf(0), pXAudio2(0), pMasterVoice(0),
       pSourceVoice(0), hEvent(0), buffers(0), bufsize(0),
@@ -69,7 +75,7 @@ struct xaudio2
    virtual ~xaudio2() {}
 
    STDMETHOD_(void, OnBufferStart) (void *) {}
-   STDMETHOD_(void, OnBufferEnd) (void *) 
+   STDMETHOD_(void, OnBufferEnd) (void *)
    {
       InterlockedDecrement((LONG volatile*)&buffers);
       SetEvent(hEvent);
@@ -95,28 +101,28 @@ struct xaudio2
    unsigned write_buffer;
 };
 
-#ifndef __cplusplus
-static void WINAPI voice_on_buffer_end(void *handle_, void *data)		
-{		
-   xaudio2_t *handle = (xaudio2_t*)handle_;		
-   (void)data;		
-   InterlockedDecrement((LONG volatile*)&handle->buffers);		
-   SetEvent(handle->hEvent);		
-}		
+#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(void *handle, void *data) { (void)handle; (void)data; }		
-static void WINAPI dummy_nil(void *handle) { (void)handle; }		
-static void WINAPI dummy_uint32(void *handle, UINT32 dummy) { (void)handle; (void)dummy; }		
-static void WINAPI dummy_voidp_hresult(void *handle, void *data, HRESULT dummy) { (void)handle; (void)data; (void)dummy; }		
+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,		
+const struct IXAudio2VoiceCallbackVtbl voice_vtable = {
+   dummy_uint32,
+   dummy_nil,
+   dummy_nil,
+   dummy_voidp,
+   voice_on_buffer_end,
+   dummy_voidp,
+   dummy_voidp_hresult,
 };
 #endif
 
@@ -183,17 +189,13 @@ static void xaudio2_free(xaudio2_t *handle)
 
    free(handle->buf);
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(CINTERFACE)
    delete handle;
 #else
    free(handle);
 #endif
 }
 
-#ifndef COINIT_MULTITHREADED
-#define COINIT_MULTITHREADED 0x00
-#endif
-
 static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
       size_t size, unsigned device)
 {
@@ -204,7 +206,7 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
    CoInitializeEx(0, COINIT_MULTITHREADED);
 #endif
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(CINTERFACE)
    handle = new xaudio2;
 #else
    handle = (xaudio2_t*)calloc(1, sizeof(*handle));
@@ -213,7 +215,7 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
    if (!handle)
       goto error;
 
-#ifndef __cplusplus
+#if !defined(__cplusplus) || defined(CINTERFACE)
    handle->lpVtbl = &voice_vtable;
 #endif
 
@@ -225,9 +227,9 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
 
    xaudio2_set_wavefmt(&wfx, channels, samplerate);
 
-   if (FAILED(IXAudio2_CreateSourceVoice(handle->pXAudio2,		
-               &handle->pSourceVoice, &wfx,		
-               XAUDIO2_VOICE_NOSRC, XAUDIO2_DEFAULT_FREQ_RATIO,		
+   if (FAILED(IXAudio2_CreateSourceVoice(handle->pXAudio2,
+               &handle->pSourceVoice, &wfx,
+               XAUDIO2_VOICE_NOSRC, XAUDIO2_DEFAULT_FREQ_RATIO,
                (IXAudio2VoiceCallback*)handle, 0, 0)))
       goto error;
 
@@ -240,7 +242,7 @@ static xaudio2_t *xaudio2_new(unsigned samplerate, unsigned channels,
    if (!handle->buf)
       goto error;
 
-   if (FAILED(IXAudio2SourceVoice_Start(handle->pSourceVoice, 0, 
+   if (FAILED(IXAudio2SourceVoice_Start(handle->pSourceVoice, 0,
                XAUDIO2_COMMIT_NOW)))
       goto error;
 
@@ -251,21 +253,15 @@ 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 * 
+      memcpy(handle->buf + handle->write_buffer *
             handle->bufsize + handle->bufptr,
             buffer, need);
 
@@ -344,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;
@@ -352,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;
@@ -408,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)

audio/drivers/xaudio.h

@@ -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.
@@ -26,7 +26,7 @@
 /* All structures defined in this file use tight field packing */
 #pragma pack(push, 1)
 
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(CINTERFACE)
 #define X2DEFAULT(x) = (x)
 #else
 #define X2DEFAULT(x)
@@ -58,7 +58,7 @@ DEFINE_IID(IXAudio2, 8bcf1f58, 9fe7, 4583, 8a, c6, e2, ad, c4, 65, c8, bb);
 #include <mmreg.h>
 
 #ifndef __cplusplus
-#undef OPAQUE		
+#undef OPAQUE
 #define OPAQUE struct
 #endif
 
@@ -131,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
@@ -183,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;
@@ -194,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() \
@@ -235,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();
@@ -255,6 +267,8 @@ DECLARE_INTERFACE_(IXAudio2SourceVoice, IXAudio2Voice)
    STDMETHOD_(void, GetFrequencyRatio) (THIS_ float* pRatio) PURE;
 };
 
+#undef INTERFACE
+#define INTERFACE IXAudio2
 
 DECLARE_INTERFACE_(IXAudio2, IUnknown)
 {
@@ -292,30 +306,30 @@ DECLARE_INTERFACE_(IXAudio2, IUnknown)
          void *pReserved X2DEFAULT(NULL)) PURE;
 };
 
-#ifdef __cplusplus
+#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)		
+#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(THIS,a,b) (THIS)->lpVtbl->Initialize(THIS, a, b)		
-#define IXAudio2_Release(THIS) (THIS)->lpVtbl->Release(THIS)		
-#define IXAudio2_CreateSourceVoice(THIS,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain) (THIS)->lpVtbl->CreateSourceVoice(THIS, ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain)		
-#define IXAudio2_CreateMasteringVoice(THIS,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceIndex,pEffectChain) (THIS)->lpVtbl->CreateMasteringVoice(THIS, ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceIndex,pEffectChain)		
-#define IXAudio2_GetDeviceCount(THIS, puCount) (THIS)->lpVtbl->GetDeviceCount(THIS, puCount)		
-#define IXAudio2_GetDeviceDetails(THIS, Index,pDeviceDetails) (THIS)->lpVtbl->GetDeviceDetails(THIS, Index, pDeviceDetails)		
-#define IXAudio2SourceVoice_Start(THIS, Flags, OperationSet) (THIS)->lpVtbl->Start(THIS, Flags, OperationSet)		
-#define IXAudio2SourceVoice_Stop(THIS, Flags, OperationSet) (THIS)->lpVtbl->Stop(THIS, Flags, OperationSet)		
-#define IXAudio2SourceVoice_SubmitSourceBuffer(THIS, pBuffer, pBufferWMA) (THIS)->lpVtbl->SubmitSourceBuffer(THIS, pBuffer, pBufferWMA)		
-#define IXAudio2SourceVoice_DestroyVoice(THIS) (THIS)->lpVtbl->DestroyVoice(THIS)		
-#define IXAudio2MasteringVoice_DestroyVoice(THIS) (THIS)->lpVtbl->DestroyVoice(THIS)
+#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
@@ -324,16 +338,11 @@ STDAPI XAudio2Create(__deref_out IXAudio2** ppXAudio2, UINT32 Flags X2DEFAULT(0)
 #else
 static INLINE HRESULT XAudio2Create(IXAudio2 **ppXAudio2, UINT32 flags, XAUDIO2_PROCESSOR proc)
 {
-   HRESULT hr;
    IXAudio2 *pXAudio2 = NULL;
-
-   (void)flags;
-   (void)proc;
-
 #ifdef __cplusplus
-   hr = CoCreateInstance(CLSID_XAudio2, NULL, CLSCTX_INPROC_SERVER, IID_IXAudio2, (void**)&pXAudio2);
+   HRESULT hr = CoCreateInstance(CLSID_XAudio2, NULL, CLSCTX_INPROC_SERVER, IID_IXAudio2, (void**)&pXAudio2);
 #else
-   hr = CoCreateInstance(&CLSID_XAudio2, NULL, CLSCTX_INPROC_SERVER, &IID_IXAudio2, (void**)&pXAudio2);
+   HRESULT hr = CoCreateInstance(&CLSID_XAudio2, NULL, CLSCTX_INPROC_SERVER, &IID_IXAudio2, (void**)&pXAudio2);
 #endif
 
    if (SUCCEEDED(hr))
@@ -342,9 +351,7 @@ static INLINE HRESULT XAudio2Create(IXAudio2 **ppXAudio2, UINT32 flags, XAUDIO2_
       if (SUCCEEDED(hr))
          *ppXAudio2 = pXAudio2;
       else
-      {
          IXAudio2_Release(pXAudio2);
-      }
    }
    return hr;
 }

audio/drivers/xenon360_audio.c

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

audio/drivers_resampler/cc_resampler.c

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

audio/librsound.c

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

autosave.h

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

bootstrap/psp1/kernel_functions_prx/Makefile

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

bootstrap/psp1/kernel_functions_prx/main.c

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

bootstrap/vita/threading.c

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

camera/camera_driver.c

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

camera/camera_driver.h

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

camera/drivers/android.c

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

camera/drivers/nullcamera.c

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

camera/drivers/rwebcam.c

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

camera/drivers/video4linux2.c

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

cheevos/badges.c

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

cheevos/badges.h

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

cheevos/cheevos.h

@@ -47,6 +47,7 @@ typedef struct cheevos_ctx_desc
 
 typedef enum
 {
+   CHEEVOS_CONSOLE_NONE = 0,
    /* Don't change those, the values match the console IDs
     * at retroachievements.org. */
    CHEEVOS_CONSOLE_MEGA_DRIVE      = 1,
@@ -62,8 +63,8 @@ typedef enum
    CHEEVOS_CONSOLE_MASTER_SYSTEM   = 11,
    CHEEVOS_CONSOLE_PLAYSTATION     = 12,
    CHEEVOS_CONSOLE_ATARI_LYNX      = 13,
-   CHEEVOS_CONSOLE_NEOGEO          = 14,
-   CHEEVOS_CONSOLE_XBOX_360        = 15,
+   CHEEVOS_CONSOLE_NEOGEO_POCKET   = 14,
+   CHEEVOS_CONSOLE_GAME_GEAR       = 15,
    CHEEVOS_CONSOLE_GAMECUBE        = 16,
    CHEEVOS_CONSOLE_ATARI_JAGUAR    = 17,
    CHEEVOS_CONSOLE_NINTENDO_DS     = 18,
@@ -117,7 +118,7 @@ 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);
 

cheevos/coro.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 */

cheevos/var.c

@@ -24,10 +24,15 @@
 #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(...)
+#define CHEEVOS_LOG STUB_LOG
 #endif
 
 /*****************************************************************************
@@ -251,7 +256,7 @@ void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console)
    else
    {
       unsigned i;
-      
+
       for (i = 0; i < 4; i++)
       {
          retro_ctx_memory_info_t meminfo;
@@ -347,7 +352,7 @@ unsigned cheevos_var_get_value(cheevos_var_t* var)
       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);

command.c

@@ -24,6 +24,7 @@
 #include <file/file_path.h>
 #include <lists/dir_list.h>
 #include <string/stdstring.h>
+#include <streams/file_stream.h>
 #include <streams/stdin_stream.h>
 
 #ifdef HAVE_CONFIG_H
@@ -123,12 +124,14 @@ struct command
 #endif
 };
 
+#if defined(HAVE_COMMAND) && defined(HAVE_CHEEVOS)
 static bool command_read_ram(const char *arg);
 static bool command_write_ram(const char *arg);
+#endif
 
 static const struct cmd_action_map action_map[] = {
    { "SET_SHADER",      command_set_shader,  "<shader path>" },
-#ifdef HAVE_CHEEVOS
+#if defined(HAVE_COMMAND) && defined(HAVE_CHEEVOS)
    { "READ_CORE_RAM",   command_read_ram,    "<address> <number of bytes>" },
    { "WRITE_CORE_RAM",  command_write_ram,   "<address> <byte1> <byte2> ..." },
 #endif
@@ -137,6 +140,8 @@ static const struct cmd_action_map action_map[] = {
 static const struct cmd_map map[] = {
    { "FAST_FORWARD",           RARCH_FAST_FORWARD_KEY },
    { "FAST_FORWARD_HOLD",      RARCH_FAST_FORWARD_HOLD_KEY },
+   { "SLOWMOTION",             RARCH_SLOWMOTION_KEY },
+   { "SLOWMOTION_HOLD",        RARCH_SLOWMOTION_HOLD_KEY },
    { "LOAD_STATE",             RARCH_LOAD_STATE_KEY },
    { "SAVE_STATE",             RARCH_SAVE_STATE_KEY },
    { "FULLSCREEN_TOGGLE",      RARCH_FULLSCREEN_TOGGLE_KEY },
@@ -156,9 +161,7 @@ static const struct cmd_map map[] = {
    { "SCREENSHOT",             RARCH_SCREENSHOT },
    { "MUTE",                   RARCH_MUTE },
    { "OSK",                    RARCH_OSK },
-   { "NETPLAY_FLIP",           RARCH_NETPLAY_FLIP },
    { "NETPLAY_GAME_WATCH",     RARCH_NETPLAY_GAME_WATCH },
-   { "SLOWMOTION",             RARCH_SLOWMOTION },
    { "VOLUME_UP",              RARCH_VOLUME_UP },
    { "VOLUME_DOWN",            RARCH_VOLUME_DOWN },
    { "OVERLAY_NEXT",           RARCH_OVERLAY_NEXT },
@@ -217,25 +220,13 @@ static bool command_reply(const char * data, size_t len)
 bool command_set_shader(const char *arg)
 {
    char msg[256];
-   enum rarch_shader_type type = RARCH_SHADER_NONE;
+   bool is_preset                  = false;
+   struct video_shader    *shader  = menu_shader_get();
+   enum rarch_shader_type     type = video_shader_get_type_from_ext(
+         path_get_extension(arg), &is_preset);
 
-   switch (msg_hash_to_file_type(msg_hash_calculate(path_get_extension(arg))))
-   {
-      case FILE_TYPE_SHADER_GLSL:
-      case FILE_TYPE_SHADER_PRESET_GLSLP:
-         type = RARCH_SHADER_GLSL;
-         break;
-      case FILE_TYPE_SHADER_CG:
-      case FILE_TYPE_SHADER_PRESET_CGP:
-         type = RARCH_SHADER_CG;
-         break;
-      case FILE_TYPE_SHADER_SLANG:
-      case FILE_TYPE_SHADER_PRESET_SLANGP:
-         type = RARCH_SHADER_SLANG;
-         break;
-      default:
-         return false;
-   }
+   if (type == RARCH_SHADER_NONE)
+      return false;
 
    snprintf(msg, sizeof(msg), "Shader: \"%s\"", arg);
    runloop_msg_queue_push(msg, 1, 120, true);
@@ -243,16 +234,16 @@ bool command_set_shader(const char *arg)
          msg_hash_to_str(MSG_APPLYING_SHADER),
          arg);
 
-   return video_driver_set_shader(type, arg);
+   retroarch_set_shader_preset(arg);
+   return menu_shader_manager_set_preset(shader, type, arg);
 }
 
+#if defined(HAVE_COMMAND) && defined(HAVE_CHEEVOS)
 static bool command_read_ram(const char *arg)
 {
-#if defined(HAVE_COMMAND) && defined(HAVE_CHEEVOS)
    cheevos_var_t var;
    unsigned i;
-   unsigned nbytes;
-   char reply[256];
+   char reply[256]      = {0};
    const uint8_t * data = NULL;
    char *reply_at       = NULL;
 
@@ -282,15 +273,10 @@ static bool command_read_ram(const char *arg)
    }
 
    return true;
-#else
-   return false;
-#endif
 }
 
 static bool command_write_ram(const char *arg)
 {
-#if defined(HAVE_COMMAND) && defined(HAVE_CHEEVOS)
-   int i;
    cheevos_var_t var;
    unsigned nbytes   = 0;
    uint8_t *data     = NULL;
@@ -310,10 +296,9 @@ static bool command_write_ram(const char *arg)
       return true;
    }
 
-#endif
-
    return false;
 }
+#endif
 
 static bool command_get_arg(const char *tok,
       const char **arg, unsigned *index)
@@ -356,28 +341,6 @@ static bool command_get_arg(const char *tok,
    return false;
 }
 
-static void command_parse_sub_msg(command_t *handle, const char *tok)
-{
-   const char *arg = NULL;
-   unsigned index  = 0;
-
-   if (command_get_arg(tok, &arg, &index))
-   {
-      if (arg)
-      {
-         if (!action_map[index].action(arg))
-            RARCH_ERR("Command \"%s\" failed.\n", arg);
-      }
-      else
-         handle->state[map[index].id] = true;
-   }
-   else
-      RARCH_WARN("%s \"%s\" %s.\n",
-            msg_hash_to_str(MSG_UNRECOGNIZED_COMMAND),
-            tok,
-            msg_hash_to_str(MSG_RECEIVED));
-}
-
 #if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD) && defined(HAVE_COMMAND)
 static bool command_network_init(command_t *handle, uint16_t port)
 {
@@ -433,6 +396,28 @@ static bool command_verify(const char *cmd)
 }
 
 #ifdef HAVE_COMMAND
+static void command_parse_sub_msg(command_t *handle, const char *tok)
+{
+   const char *arg = NULL;
+   unsigned index  = 0;
+
+   if (command_get_arg(tok, &arg, &index))
+   {
+      if (arg)
+      {
+         if (!action_map[index].action(arg))
+            RARCH_ERR("Command \"%s\" failed.\n", arg);
+      }
+      else
+         handle->state[map[index].id] = true;
+   }
+   else
+      RARCH_WARN("%s \"%s\" %s.\n",
+            msg_hash_to_str(MSG_UNRECOGNIZED_COMMAND),
+            tok,
+            msg_hash_to_str(MSG_RECEIVED));
+}
+
 static void command_parse_msg(command_t *handle, char *buf, enum cmd_source_t source)
 {
    char *save      = NULL;
@@ -610,7 +595,7 @@ static void command_stdin_poll(command_t *handle)
    handle->stdin_buf_ptr                    += ret;
    handle->stdin_buf[handle->stdin_buf_ptr]  = '\0';
 
-   last_newline                              = 
+   last_newline                              =
       strrchr(handle->stdin_buf, '\n');
 
    if (!last_newline)
@@ -1028,7 +1013,7 @@ static void command_event_init_controllers(void)
             break;
          case RETRO_DEVICE_JOYPAD:
             /* Ideally these checks shouldn't be required but if we always
-             * call core_set_controller_port_device input won't work on 
+             * call core_set_controller_port_device input won't work on
              * cores that don't set port information properly */
             if (info && info->ports.size != 0 && i < info->ports.size)
                set_controller = true;
@@ -1102,7 +1087,7 @@ static void command_event_load_auto_state(void)
 #endif
 
 #ifdef HAVE_CHEEVOS
-   if (settings->bools.cheevos_hardcore_mode_enable)
+   if (cheevos_loaded && settings->bools.cheevos_hardcore_mode_enable)
       goto error;
 #endif
 
@@ -1114,7 +1099,7 @@ static void command_event_load_auto_state(void)
             file_path_str(FILE_PATH_AUTO_EXTENSION),
             savestate_name_auto_size);
 
-   if (!path_file_exists(savestate_name_auto))
+   if (!filestream_exists(savestate_name_auto))
       goto error;
 
    ret = content_load_state(savestate_name_auto, false, true);
@@ -1126,7 +1111,7 @@ static void command_event_load_auto_state(void)
          msg_hash_to_str(MSG_AUTOLOADING_SAVESTATE_FROM),
          savestate_name_auto, ret ? "succeeded" : "failed");
    RARCH_LOG("%s\n", msg);
-   
+
    free(savestate_name_auto);
 
    return;
@@ -1220,6 +1205,8 @@ static bool event_init_content(void)
    if (rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
       return true;
 
+   content_set_subsystem_info();
+
    if (!contentless)
       path_fill_names();
 
@@ -1298,27 +1285,13 @@ static void command_event_disable_overrides(void)
       return;
 
    /* reload the original config */
-
    config_unload_override();
    rarch_ctl(RARCH_CTL_UNSET_OVERRIDES_ACTIVE, NULL);
 }
 
 static void command_event_restore_default_shader_preset(void)
 {
-   if (!path_is_empty(RARCH_PATH_DEFAULT_SHADER_PRESET))
-   {
-      /* auto shader preset: reload the original shader */
-      settings_t *settings = config_get_ptr();
-
-      RARCH_LOG("%s %s\n",
-            msg_hash_to_str(MSG_RESTORING_DEFAULT_SHADER_PRESET_TO),
-            path_get(RARCH_PATH_DEFAULT_SHADER_PRESET));
-      strlcpy(settings->paths.path_shader,
-            path_get(RARCH_PATH_DEFAULT_SHADER_PRESET),
-            sizeof(settings->paths.path_shader));
-   }
-
-   path_clear(RARCH_PATH_DEFAULT_SHADER_PRESET);
+   retroarch_unset_shader_preset();
 }
 
 static void command_event_restore_remaps(void)
@@ -1334,7 +1307,7 @@ static bool command_event_save_auto_state(void)
    bool is_inited              = false;
    char *savestate_name_auto   = (char*)
       calloc(PATH_MAX_LENGTH, sizeof(*savestate_name_auto));
-   size_t 
+   size_t
       savestate_name_auto_size = PATH_MAX_LENGTH * sizeof(char);
    settings_t *settings        = config_get_ptr();
    global_t   *global          = global_get_ptr();
@@ -1352,7 +1325,7 @@ static bool command_event_save_auto_state(void)
       goto error;
 
 #ifdef HAVE_CHEEVOS
-   if (settings->bools.cheevos_hardcore_mode_enable)
+   if (cheevos_loaded && settings->bools.cheevos_hardcore_mode_enable)
       goto error;
 #endif
 
@@ -1374,24 +1347,32 @@ error:
    return false;
 }
 
-static bool command_event_save_config(const char *config_path,
+static bool command_event_save_config(
+      const char *config_path,
       char *s, size_t len)
 {
-   if (string_is_empty(config_path) || !config_save_file(config_path))
+   bool path_exists = !string_is_empty(config_path);
+   const char *str  = path_exists ? config_path :
+      path_get(RARCH_PATH_CONFIG);
+
+   if (path_exists && config_save_file(config_path))
+   {
+      snprintf(s, len, "[Config]: %s \"%s\".",
+            msg_hash_to_str(MSG_SAVED_NEW_CONFIG_TO),
+            config_path);
+      RARCH_LOG("%s\n", s);
+      return true;
+   }
+
+   if (!string_is_empty(str))
    {
       snprintf(s, len, "%s \"%s\".",
             msg_hash_to_str(MSG_FAILED_SAVING_CONFIG_TO),
-            path_get(RARCH_PATH_CONFIG));
+            str);
       RARCH_ERR("%s\n", s);
-
-      return false;
    }
 
-   snprintf(s, len, "[Config]: %s \"%s\".",
-         msg_hash_to_str(MSG_SAVED_NEW_CONFIG_TO),
-         path_get(RARCH_PATH_CONFIG));
-   RARCH_LOG("%s\n", s);
-   return true;
+   return false;
 }
 
 /**
@@ -1408,30 +1389,41 @@ static bool command_event_save_core_config(void)
    bool ret                        = false;
    bool found_path                 = false;
    bool overrides_active           = false;
-   char *config_dir                = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-   char *config_name               = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-   char *config_path               = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   const char *core_path           = NULL;
+   char *config_name               = NULL;
+   char *config_path               = NULL;
+   char *config_dir                = NULL;
    size_t config_size              = PATH_MAX_LENGTH * sizeof(char);
    settings_t *settings            = config_get_ptr();
 
-   config_dir[0]  = config_name[0] =
-   config_path[0] = msg[0]         = '\0';
+   msg[0]                          = '\0';
 
-   if (!string_is_empty(settings->paths.directory_menu_config))
-      strlcpy(config_dir, settings->paths.directory_menu_config,
-            config_size);
+   if (settings && !string_is_empty(settings->paths.directory_menu_config))
+      config_dir = strdup(settings->paths.directory_menu_config);
    else if (!path_is_empty(RARCH_PATH_CONFIG)) /* Fallback */
+   {
+      config_dir                   = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+      config_dir[0]                = '\0';
       fill_pathname_basedir(config_dir, path_get(RARCH_PATH_CONFIG),
             config_size);
-   else
+   }
+
+   if (string_is_empty(config_dir))
    {
       runloop_msg_queue_push(msg_hash_to_str(MSG_CONFIG_DIRECTORY_NOT_SET), 1, 180, true);
       RARCH_ERR("[Config]: %s\n", msg_hash_to_str(MSG_CONFIG_DIRECTORY_NOT_SET));
-      goto error;
+      free (config_dir);
+      return false;
    }
 
+   core_path                       = path_get(RARCH_PATH_CORE);
+   config_name                     = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   config_path                     = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   config_name[0]                  = '\0';
+   config_path[0]                  = '\0';
+
    /* Infer file name based on libretro core. */
-   if (!string_is_empty(path_get(RARCH_PATH_CORE)) && path_file_exists(path_get(RARCH_PATH_CORE)))
+   if (!string_is_empty(core_path) && filestream_exists(core_path))
    {
       unsigned i;
       RARCH_LOG("%s\n", msg_hash_to_str(MSG_USING_CORE_NAME_FOR_NEW_CONFIG));
@@ -1443,7 +1435,7 @@ static bool command_event_save_core_config(void)
 
          fill_pathname_base_noext(
                config_name,
-               path_get(RARCH_PATH_CORE),
+               core_path,
                config_size);
 
          fill_pathname_join(config_path, config_dir, config_name,
@@ -1459,7 +1451,7 @@ static bool command_event_save_core_config(void)
                   sizeof(tmp));
 
          strlcat(config_path, tmp, config_size);
-         if (!path_file_exists(config_path))
+         if (!filestream_exists(config_path))
          {
             found_path = true;
             break;
@@ -1490,7 +1482,8 @@ static bool command_event_save_core_config(void)
 
    command_event_save_config(config_path, msg, sizeof(msg));
 
-   runloop_msg_queue_push(msg, 1, 180, true);
+   if (!string_is_empty(msg))
+      runloop_msg_queue_push(msg, 1, 180, true);
 
    if (overrides_active)
       rarch_ctl(RARCH_CTL_SET_OVERRIDES_ACTIVE, NULL);
@@ -1501,12 +1494,6 @@ static bool command_event_save_core_config(void)
    free(config_name);
    free(config_path);
    return ret;
-
-error:
-   free(config_dir);
-   free(config_name);
-   free(config_path);
-   return false;
 }
 
 /**
@@ -1686,6 +1673,59 @@ static bool command_event_resize_windowed_scale(void)
    return true;
 }
 
+void command_playlist_push_write(
+      void *data,
+      const char *path,
+      const char *label,
+      const char *core_path,
+      const char *core_name)
+{
+   playlist_t *playlist = (playlist_t*)data;
+
+   if (!playlist)
+      return;
+
+   if (playlist_push(
+         playlist,
+         path,
+         label,
+         core_path,
+         core_name,
+         NULL,
+         NULL
+         ))
+      playlist_write_file(playlist);
+}
+
+void command_playlist_update_write(
+      void *data,
+      size_t idx,
+      const char *path,
+      const char *label,
+      const char *core_path,
+      const char *core_display_name,
+      const char *crc32,
+      const char *db_name)    
+{
+   playlist_t *plist    = (playlist_t*)data;
+   playlist_t *playlist = plist ? plist : playlist_get_cached();
+
+   if (!playlist)
+      return;
+
+   playlist_update(
+         playlist,
+         idx,
+         path,
+         label,
+         core_path,
+         core_display_name,
+         crc32,
+         db_name);
+
+   playlist_write_file(playlist);
+}
+
 /**
  * command_event:
  * @cmd                  : Event command index.
@@ -1696,6 +1736,7 @@ static bool command_event_resize_windowed_scale(void)
  **/
 bool command_event(enum event_command cmd, void *data)
 {
+   settings_t *settings      = config_get_ptr();
    bool boolean              = false;
 
    switch (cmd)
@@ -1734,18 +1775,23 @@ bool command_event(enum event_command cmd, void *data)
          {
 #ifdef HAVE_MENU
             core_info_ctx_find_t info_find;
-            rarch_system_info_t *system_info = runloop_get_system_info();
-            struct retro_system_info *system = &system_info->info;
+            rarch_system_info_t *system_info = NULL;
+            struct retro_system_info *system = NULL;
+            const char *core_path            = NULL;
+            system_info                      = runloop_get_system_info();
+            system                           = &system_info->info;
+            core_path                        = path_get(RARCH_PATH_CORE);
 
 #if defined(HAVE_DYNAMIC)
-            if (string_is_empty(path_get(RARCH_PATH_CORE)))
+            if (string_is_empty(core_path))
                return false;
 #endif
+
             libretro_get_system_info(
-                  path_get(RARCH_PATH_CORE),
+                  core_path,
                   system,
                   &system_info->load_no_content);
-            info_find.path = path_get(RARCH_PATH_CORE);
+            info_find.path = core_path;
 
             if (!core_info_load(&info_find))
             {
@@ -1771,7 +1817,7 @@ bool command_event(enum event_command cmd, void *data)
 #ifdef HAVE_CHEEVOS
          {
             settings_t *settings      = config_get_ptr();
-            if (settings->bools.cheevos_hardcore_mode_enable)
+            if (cheevos_loaded && settings->bools.cheevos_hardcore_mode_enable)
                return false;
          }
 #endif
@@ -1813,7 +1859,7 @@ bool command_event(enum event_command cmd, void *data)
          {
             settings_t *settings      = config_get_ptr();
 #ifdef HAVE_CHEEVOS
-            if (settings->bools.cheevos_hardcore_mode_enable)
+            if (cheevos_loaded && settings->bools.cheevos_hardcore_mode_enable)
                return false;
 #endif
 
@@ -1879,16 +1925,30 @@ bool command_event(enum event_command cmd, void *data)
          cheevos_toggle_hardcore_mode();
 #endif
          break;
+      /* this fallthrough is on purpose, it should do 
+         a CMD_EVENT_REINIT too */
+      case CMD_EVENT_REINIT_FROM_TOGGLE:
+         retroarch_unset_forced_fullscreen();
       case CMD_EVENT_REINIT:
-         video_driver_reinit();
-         /* Poll input to avoid possibly stale data to corrupt things. */
-         input_driver_poll();
-         command_event(CMD_EVENT_GAME_FOCUS_TOGGLE, (void*)(intptr_t)-1);
+         {
+            video_driver_reinit();
+            {
+               const input_driver_t *input_drv = input_get_ptr();
+               void *input_data                = input_get_data();
+               /* Poll input to avoid possibly stale data to corrupt things. */
+               if (input_drv && input_drv->poll)
+                  input_drv->poll(input_data);
+            }
+            command_event(CMD_EVENT_GAME_FOCUS_TOGGLE, (void*)(intptr_t)-1);
 #ifdef HAVE_MENU
-         menu_display_set_framebuffer_dirty_flag();
-         if (menu_driver_is_alive())
-            command_event(CMD_EVENT_VIDEO_SET_BLOCKING_STATE, NULL);
+            menu_display_set_framebuffer_dirty_flag();
+            if (settings->bools.video_fullscreen)
+               video_driver_hide_mouse();
+
+            if (menu_driver_is_alive())
+               command_event(CMD_EVENT_VIDEO_SET_BLOCKING_STATE, NULL);
 #endif
+         }
          break;
       case CMD_EVENT_CHEATS_DEINIT:
          cheat_manager_state_free();
@@ -1904,7 +1964,7 @@ bool command_event(enum event_command cmd, void *data)
          {
 #ifdef HAVE_CHEEVOS
             settings_t *settings      = config_get_ptr();
-            if (settings->bools.cheevos_hardcore_mode_enable)
+            if (cheevos_loaded && settings->bools.cheevos_hardcore_mode_enable)
                return false;
 #endif
 
@@ -1915,7 +1975,7 @@ bool command_event(enum event_command cmd, void *data)
          {
             settings_t *settings      = config_get_ptr();
 #ifdef HAVE_CHEEVOS
-            if (settings->bools.cheevos_hardcore_mode_enable)
+            if (cheevos_loaded && settings->bools.cheevos_hardcore_mode_enable)
                return false;
 #endif
             if (settings->bools.rewind_enable)
@@ -2136,11 +2196,22 @@ TODO: Add a setting for these tweaks */
          break;
       case CMD_EVENT_CORE_INFO_INIT:
          {
+            char ext_name[255];
             settings_t *settings      = config_get_ptr();
+
+            ext_name[0]               = '\0';
+
             command_event(CMD_EVENT_CORE_INFO_DEINIT, NULL);
 
+            if (!frontend_driver_get_core_extension(ext_name, sizeof(ext_name)))
+               return false;
+
             if (!string_is_empty(settings->paths.directory_libretro))
-               core_info_init_list();
+               core_info_init_list(settings->paths.path_libretro_info,
+                     settings->paths.directory_libretro,
+                     ext_name,
+                     settings->bools.show_hidden_files
+                     );
          }
          break;
       case CMD_EVENT_CORE_DEINIT:
@@ -2254,19 +2325,37 @@ TODO: Add a setting for these tweaks */
          if (!string_is_empty(global->name.label))
             label = global->name.label;
 
-         playlist_push(
+         command_playlist_push_write(
                g_defaults.content_favorites,
                (const char*)data,
                label,
                core_path,
-               core_name,
-               NULL,
-               NULL
+               core_name
                );
-         playlist_write_file(g_defaults.content_favorites);
          runloop_msg_queue_push(msg_hash_to_str(MSG_ADDED_TO_FAVORITES), 1, 180, true);
          break;
+
       }
+      case CMD_EVENT_RESET_CORE_ASSOCIATION:
+      {
+         const char *core_name          = "DETECT";
+         const char *core_path          = "DETECT";
+         size_t *playlist_index         = (size_t*)data;
+
+         command_playlist_update_write(
+            NULL,
+            *playlist_index,
+            NULL,
+            NULL,
+            core_path,
+            core_name,
+            NULL,
+            NULL);
+
+         runloop_msg_queue_push(msg_hash_to_str(MSG_RESET_CORE_ASSOCIATION), 1, 180, true);
+         break;
+
+      }      
       case CMD_EVENT_RESTART_RETROARCH:
          if (!frontend_driver_set_fork(FRONTEND_FORK_RESTART))
             return false;
@@ -2472,9 +2561,6 @@ TODO: Add a setting for these tweaks */
 #endif
          }
          break;
-      case CMD_EVENT_NETPLAY_FLIP_PLAYERS:
-         netplay_driver_ctl(RARCH_NETPLAY_CTL_FLIP_PLAYERS, NULL);
-         break;
       case CMD_EVENT_NETPLAY_GAME_WATCH:
          netplay_driver_ctl(RARCH_NETPLAY_CTL_GAME_WATCH, NULL);
          break;
@@ -2485,22 +2571,27 @@ TODO: Add a setting for these tweaks */
       case CMD_EVENT_NETPLAY_INIT:
       case CMD_EVENT_NETPLAY_INIT_DIRECT:
       case CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED:
-      case CMD_EVENT_NETPLAY_FLIP_PLAYERS:
       case CMD_EVENT_NETPLAY_GAME_WATCH:
          return false;
 #endif
       case CMD_EVENT_FULLSCREEN_TOGGLE:
          {
             settings_t *settings      = config_get_ptr();
-            bool new_fullscreen_state = !settings->bools.video_fullscreen;
+            bool new_fullscreen_state = !settings->bools.video_fullscreen 
+               && !retroarch_is_forced_fullscreen();
             if (!video_driver_has_windowed())
                return false;
 
-            /* If we go fullscreen we drop all drivers and
-             * reinitialize to be safe. */
+            /* we toggled manually, write the new value to settings */
             configuration_set_bool(settings, settings->bools.video_fullscreen,
                   new_fullscreen_state);
 
+            /* we toggled manually, the cli arg is irrelevant now */
+            if (retroarch_is_forced_fullscreen())
+               retroarch_unset_forced_fullscreen();
+
+            /* If we go fullscreen we drop all drivers and
+             * reinitialize to be safe. */
             command_event(CMD_EVENT_REINIT, NULL);
             if (settings->bools.video_fullscreen)
                video_driver_hide_mouse();

command.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,
@@ -136,6 +138,8 @@ enum event_command
    CMD_EVENT_RESUME,
    /* Add a playlist entry to favorites. */
    CMD_EVENT_ADD_TO_FAVORITES,
+   /* Reset playlist entry associated core to DETECT */
+   CMD_EVENT_RESET_CORE_ASSOCIATION,   
    /* Toggles pause. */
    CMD_EVENT_PAUSE_TOGGLE,
    /* Pauses RetroArch. */
@@ -177,8 +181,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. */
@@ -259,6 +261,23 @@ bool command_free(command_t *handle);
  **/
 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 *path,      
+      const char *label,
+      const char *core_path,
+      const char *core_display_name,
+      const char *crc32,
+      const char *db_name);
+
 RETRO_END_DECLS
 
 #endif

config.def.h

@@ -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)
@@ -62,13 +67,17 @@ static bool bundle_assets_extract_enable = false;
 static bool materialui_icons_enable      = true;
 #endif
 
+static const bool crt_switch_resolution = false; 	
+static const int crt_switch_resolution_super = 2560; 
+
+
 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;
@@ -115,6 +124,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
@@ -164,7 +181,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
@@ -258,41 +275,48 @@ 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)
+#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
+static bool content_show_playlists   = true;
+
 #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_menu_layout  = 0;
 static unsigned xmb_icon_theme   = XMB_ICON_THEME_MONOCHROME;
 static unsigned xmb_theme        = XMB_THEME_ELECTRIC_BLUE;
-#ifdef HAVE_LAKKA
+#if defined(HAVE_LAKKA) || defined(__arm__) || defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__)
 static bool xmb_shadows_enable   = false;
 #else
 static bool xmb_shadows_enable   = true;
 #endif
-static bool xmb_show_settings    = true;
-static bool xmb_show_favorites   = 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;
@@ -314,6 +338,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;
@@ -333,6 +358,8 @@ static bool default_screenshots_in_content_dir = false;
 static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L3_R3;
 #elif defined(VITA)
 static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_L1_R1_START_SELECT;
+#elif defined(SWITCH)
+static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_START_SELECT;
 #else
 static unsigned menu_toggle_gamepad_combo    = INPUT_TOGGLE_NONE;
 #endif
@@ -388,6 +415,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;
 
@@ -532,6 +562,14 @@ 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;
@@ -557,6 +595,12 @@ static const float slowmotion_ratio = 3.0;
 /* Maximum fast forward ratio. */
 static const float fastforward_ratio = 0.0;
 
+/* Run core logic one or more frames ahead then load the state back to reduce perceived input lag. */
+static const unsigned run_ahead_frames = 1;
+
+/* When using the Run Ahead feature, use a secondary instance of the core. */
+static const bool run_ahead_secondary_instance = true;
+
 /* Enable stdin/network command interface. */
 static const bool network_cmd_enable = false;
 static const uint16_t network_cmd_port = 55355;
@@ -569,11 +613,7 @@ static const unsigned default_content_history_size = 100;
 /* Show Menu start-up screen on boot. */
 static const bool default_menu_show_start_screen = true;
 
-#ifdef RARCH_MOBILE
 static const bool menu_dpi_override_enable = false;
-#else
-static const bool menu_dpi_override_enable = true;
-#endif
 
 #ifdef RARCH_MOBILE
 static const unsigned menu_dpi_override_value = 72;
@@ -618,6 +658,10 @@ static const unsigned input_bind_timeout = 5;
 
 static const unsigned menu_thumbnails_default = 3;
 
+static const unsigned menu_left_thumbnails_default = 0;
+
+static const bool xmb_vertical_thumbnails = false;
+
 #ifdef IOS
 static const bool ui_companion_start_on_boot = false;
 #else
@@ -626,6 +670,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/";
@@ -650,19 +702,17 @@ 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
-#if defined(__x86_64__)
-static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2005/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-msvc2005/x86/latest/";
-#endif
+#elif _MSC_VER == 1310
+static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/";
 #else
-#if defined(__x86_64__)
+#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/windows/x86/latest/";
@@ -680,6 +730,12 @@ 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://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/dex-ps3/";
+#elif defined(__CELLOS_LV2__) && defined(CEX_BUILD)
+static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/cex-ps3/";
+#elif defined(__CELLOS_LV2__) && defined(ODE_BUILD)
+static char buildbot_server_url[] = "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/ode-ps3/";
 #else
 static char buildbot_server_url[] = "";
 #endif

config.def.keybinds.h

@@ -22,163 +22,202 @@
 
 /* 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_SLOWMOTION_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SLOWMOTION_HOLD_KEY,      MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_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_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_SLOWMOTION_KEY,           MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,       RETROK_UNKNOWN, NO_BTN, NO_BTN, 0, AXIS_NONE },
+   { true, RARCH_SLOWMOTION_HOLD_KEY,      MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,       RETROK_e,       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_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

configuration.h

@@ -27,23 +27,31 @@
 
 #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
+   var = newvar; \
+}
 
 #define configuration_set_bool(settings, var, newvar) \
+{ \
    settings->modified = true; \
-   var = newvar
+   var = newvar; \
+}
 
 #define configuration_set_uint(settings, var, newvar) \
+{ \
    settings->modified = true; \
-   var = newvar
+   var = newvar; \
+}
 
 #define configuration_set_int(settings, var, newvar) \
+{ \
    settings->modified = true; \
-   var = newvar
-
+   var = newvar; \
+}
 
 enum override_type
 {
@@ -73,6 +81,7 @@ typedef struct settings
       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;
@@ -83,8 +92,10 @@ typedef struct settings
       bool video_shared_context;
       bool video_force_srgb_disable;
       bool video_fps_show;
+      bool video_statistics_show;
       bool video_framecount_show;
       bool video_msg_bgcolor_enable;
+      bool crt_switch_resolution;  
 
       /* Audio */
       bool audio_enable;
@@ -136,16 +147,24 @@ typedef struct settings
       bool menu_show_help;
       bool menu_show_quit_retroarch;
       bool menu_show_reboot;
+      bool menu_show_latency;
+      bool menu_show_rewind;
+      bool menu_show_overlays;
       bool menu_materialui_icons_enable;
+      bool menu_rgui_background_filler_thickness_enable;
+      bool menu_rgui_border_filler_thickness_enable;
+      bool menu_rgui_border_filler_enable;
       bool menu_xmb_shadows_enable;
-      bool menu_xmb_show_settings;
-      bool menu_xmb_show_favorites;
-      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_xmb_vertical_thumbnails;
+      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_content_show_playlists;
       bool menu_unified_controls;
       bool quick_menu_show_take_screenshot;
       bool quick_menu_show_save_load_state;
@@ -166,9 +185,9 @@ typedef struct settings
       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;
+      bool netplay_request_devices[MAX_USERS];
 
       /* Network */
       bool network_buildbot_auto_extract_archive;
@@ -184,7 +203,9 @@ typedef struct settings
       bool cheevos_test_unofficial;
       bool cheevos_hardcore_mode_enable;
       bool cheevos_leaderboards_enable;
+      bool cheevos_badges_enable;
       bool cheevos_verbose_enable;
+      bool cheevos_auto_screenshot;
 
       /* Camera */
       bool camera_allow;
@@ -211,6 +232,8 @@ typedef struct settings
       bool playlist_entry_remove;
       bool playlist_entry_rename;
       bool rewind_enable;
+      bool run_ahead_enabled;
+      bool run_ahead_secondary_instance;
       bool pause_nonactive;
       bool block_sram_overwrite;
       bool savestate_auto_index;
@@ -242,6 +265,9 @@ typedef struct settings
       bool ssh_enable;
       bool samba_enable;
       bool bluetooth_enable;
+
+      bool automatically_add_content_to_playlist;
+      bool video_window_show_decorations;
    } bools;
 
    struct
@@ -291,7 +317,7 @@ typedef struct settings
       unsigned audio_block_frames;
       unsigned audio_latency;
 
-
+      unsigned audio_resampler_quality;
 
       unsigned input_turbo_period;
       unsigned input_turbo_duty_cycle;
@@ -304,6 +330,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;
@@ -315,6 +343,8 @@ typedef struct settings
       unsigned keymapper_port;
       unsigned video_window_x;
       unsigned video_window_y;
+      unsigned video_window_opacity;
+      unsigned crt_switch_resolution_super;  
       unsigned video_monitor_index;
       unsigned video_fullscreen_x;
       unsigned video_fullscreen_y;
@@ -330,16 +360,21 @@ typedef struct settings
       unsigned video_msg_bgcolor_blue;
 
       unsigned menu_thumbnails;
+      unsigned menu_left_thumbnails;
       unsigned menu_dpi_override_value;
       unsigned menu_entry_normal_color;
       unsigned menu_entry_hover_color;
       unsigned menu_title_color;
+      unsigned menu_xmb_layout;
       unsigned menu_xmb_shader_pipeline;
       unsigned menu_xmb_scale_factor;
       unsigned menu_xmb_alpha_factor;
       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;
@@ -354,9 +389,13 @@ typedef struct settings
       unsigned input_libretro_device[MAX_USERS];
       unsigned input_analog_dpad_mode[MAX_USERS];
 
-      unsigned input_keymapper_ids[RARCH_CUSTOM_BIND_LIST_END];
+      unsigned input_keymapper_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
 
       unsigned input_remap_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
+
+      unsigned led_map[MAX_LEDS];
+
+      unsigned run_ahead_frames;
    } uints;
 
    struct
@@ -367,10 +406,12 @@ typedef struct settings
       char record_driver[32];
       char camera_driver[32];
       char wifi_driver[32];
+      char led_driver[32];
       char location_driver[32];
       char menu_driver[32];
       char cheevos_username[32];
       char cheevos_password[32];
+      char cheevos_token[32];
       char video_context_driver[32];
       char audio_driver[32];
       char audio_resampler[32];
@@ -387,6 +428,8 @@ typedef struct settings
       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
@@ -402,7 +445,7 @@ typedef struct settings
       char browse_url[4096];
 
       char path_menu_xmb_font[PATH_MAX_LENGTH];
-      char menu_xmb_show_settings_password[PATH_MAX_LENGTH];
+      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];

content.h

@@ -25,6 +25,7 @@
 
 #include <boolean.h>
 #include <retro_common_api.h>
+#include <retro_miscellaneous.h>
 
 #include "frontend/frontend_driver.h"
 
@@ -81,6 +82,27 @@ 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(void);
+
+/* Add a rom to the subsystem rom buffer */
+void content_add_subsystem(const char* path);
+
+/* Get the current subsystem rom id */
+unsigned content_get_subsystem_rom_id(void);
+
+/* Set environment variables before a subsystem load */
+void content_set_subsystem_info(void);
+
 RETRO_END_DECLS
 
 #endif

core.h

@@ -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;
 
@@ -170,6 +170,9 @@ bool core_set_poll_type(unsigned *type);
 /* Runs the core for one frame. */
 bool core_run(void);
 
+/* Runs the core for one frame, but does not trigger any input polling */
+bool core_run_no_input_polling(void);
+
 bool core_init(void);
 
 bool core_deinit(void *data);

core_impl.c

@@ -44,6 +44,11 @@
 #include "gfx/video_driver.h"
 #include "audio/audio_driver.h"
 
+#ifdef HAVE_RUNAHEAD
+#include "runahead/copy_load_info.h"
+#include "runahead/secondary_core.h"
+#endif
+
 struct                     retro_callbacks retro_ctx;
 struct                     retro_core_t current_core;
 
@@ -262,6 +267,11 @@ bool core_set_controller_port_device(retro_ctx_controller_info_t *pad)
 {
    if (!pad)
       return false;
+
+#ifdef HAVE_RUNAHEAD
+   remember_controller_port_device(pad->port, pad->device);
+#endif
+
    current_core.retro_set_controller_port_device(pad->port, pad->device);
    return true;
 }
@@ -280,6 +290,11 @@ bool core_load_game(retro_ctx_load_content_info_t *load_info)
    bool contentless = false;
    bool is_inited   = false;
 
+#ifdef HAVE_RUNAHEAD
+   set_load_content_info(load_info);
+   clear_controller_port_map();
+#endif
+
    content_get_status(&contentless, &is_inited);
 
    if (load_info && load_info->special)
@@ -424,6 +439,12 @@ bool core_run(void)
    return true;
 }
 
+bool core_run_no_input_polling(void)
+{
+   current_core.retro_run();
+   return true;
+}
+
 bool core_load(unsigned poll_type_behavior)
 {
    current_core.poll_type = poll_type_behavior;

core_info.c

@@ -17,22 +17,20 @@
 
 #include <compat/strl.h>
 #include <string/stdstring.h>
+#include <file/config_file.h>
 #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"
 #endif
 
-#include "retroarch.h"
 #include "verbosity.h"
 
-#include "config.def.h"
 #include "core_info.h"
-#include "configuration.h"
 #include "file_path_special.h"
-#include "list_special.h"
 
 static const char *core_info_tmp_path               = NULL;
 static const struct string_list *core_info_tmp_list = NULL;
@@ -184,22 +182,25 @@ 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)
 {
    size_t info_path_base_size = PATH_MAX_LENGTH * sizeof(char);
-   char *info_path_base       = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP) && !defined(_3DS) && !defined(VITA))
+   char *info_path_base       = NULL;
    char             *substr   = NULL;
-#endif
-   settings_t       *settings = config_get_ptr();
+   const char *current_path   = contents ? contents->elems[i].data : NULL;
 
-   if (!contents || !contents->elems[i].data)
-      goto error;
+   (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,
+         current_path,
          info_path_base_size);
 
 #if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP) && !defined(_3DS) && !defined(VITA) && !defined(HW_WUP))
@@ -213,27 +214,27 @@ static bool core_info_list_iterate(
          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;
-
-error:
-   free(info_path_base);
-   return false;
 }
 
-static core_info_list_t *core_info_list_new(const char *path)
+static core_info_list_t *core_info_list_new(const char *path,
+      const char *libretro_info_dir,
+      const char *exts,
+      bool show_hidden_files)
 {
    size_t i;
    core_info_t *core_info           = NULL;
    core_info_list_t *core_info_list = NULL;
-   struct string_list *contents     = dir_list_new_special(
-                                      path, DIR_LIST_CORES, NULL);
-
+   const char       *path_basedir   = libretro_info_dir;
+   struct string_list *contents     = dir_list_new(
+                                      path, exts,
+                                      false,
+                                      show_hidden_files,
+                                      false, false);
    if (!contents)
       return NULL;
 
@@ -255,9 +256,9 @@ static core_info_list_t *core_info_list_new(const char *path)
 
       info_path[0]          = '\0';
 
-      if ( 
+      if (
             core_info_list_iterate(info_path, info_path_size,
-            contents, i) 
+               path_basedir, contents, i)
             && path_is_valid(info_path))
       {
          char *tmp           = NULL;
@@ -270,14 +271,14 @@ static core_info_list_t *core_info_list_new(const char *path)
          if (!conf)
             continue;
 
-         if (config_get_string(conf, "display_name", &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) 
+         if (config_get_string(conf, "corename", &tmp)
                && !string_is_empty(tmp))
          {
             core_info[i].core_name = strdup(tmp);
@@ -285,7 +286,7 @@ static core_info_list_t *core_info_list_new(const char *path)
             tmp = NULL;
          }
 
-         if (config_get_string(conf, "systemname", &tmp) 
+         if (config_get_string(conf, "systemname", &tmp)
                && !string_is_empty(tmp))
          {
             core_info[i].systemname = strdup(tmp);
@@ -293,7 +294,7 @@ static core_info_list_t *core_info_list_new(const char *path)
             tmp = NULL;
          }
 
-         if (config_get_string(conf, "manufacturer", &tmp) 
+         if (config_get_string(conf, "manufacturer", &tmp)
                && !string_is_empty(tmp))
          {
             core_info[i].system_manufacturer = strdup(tmp);
@@ -305,7 +306,7 @@ 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) 
+         if (config_get_string(conf, "supported_extensions", &tmp)
                && !string_is_empty(tmp))
          {
             core_info[i].supported_extensions      = strdup(tmp);
@@ -316,7 +317,7 @@ static core_info_list_t *core_info_list_new(const char *path)
             tmp = NULL;
          }
 
-         if (config_get_string(conf, "authors", &tmp) 
+         if (config_get_string(conf, "authors", &tmp)
                && !string_is_empty(tmp))
          {
             core_info[i].authors      = strdup(tmp);
@@ -327,7 +328,7 @@ static core_info_list_t *core_info_list_new(const char *path)
             tmp = NULL;
          }
 
-         if (config_get_string(conf, "permissions", &tmp) 
+         if (config_get_string(conf, "permissions", &tmp)
                && !string_is_empty(tmp))
          {
             core_info[i].permissions      = strdup(tmp);
@@ -338,7 +339,7 @@ static core_info_list_t *core_info_list_new(const char *path)
             tmp = NULL;
          }
 
-         if (config_get_string(conf, "license", &tmp) 
+         if (config_get_string(conf, "license", &tmp)
                && !string_is_empty(tmp))
          {
             core_info[i].licenses      = strdup(tmp);
@@ -349,7 +350,7 @@ static core_info_list_t *core_info_list_new(const char *path)
             tmp = NULL;
          }
 
-         if (config_get_string(conf, "categories", &tmp) 
+         if (config_get_string(conf, "categories", &tmp)
                && !string_is_empty(tmp))
          {
             core_info[i].categories      = strdup(tmp);
@@ -360,7 +361,7 @@ static core_info_list_t *core_info_list_new(const char *path)
             tmp = NULL;
          }
 
-         if (config_get_string(conf, "database", &tmp) 
+         if (config_get_string(conf, "database", &tmp)
                && !string_is_empty(tmp))
          {
             core_info[i].databases      = strdup(tmp);
@@ -371,7 +372,7 @@ static core_info_list_t *core_info_list_new(const char *path)
             tmp = NULL;
          }
 
-         if (config_get_string(conf, "notes", &tmp) 
+         if (config_get_string(conf, "notes", &tmp)
                && !string_is_empty(tmp))
          {
             core_info[i].notes     = strdup(tmp);
@@ -516,23 +517,25 @@ static core_info_t *core_info_find_internal(
 static bool core_info_list_update_missing_firmware_internal(
       core_info_list_t *core_info_list,
       const char *core,
-      const char *systemdir)
+      const char *systemdir,
+      bool *set_missing_bios)
 {
    size_t i;
    core_info_t      *info = NULL;
+   char             *path = NULL;
    size_t       path_size = PATH_MAX_LENGTH * sizeof(char);
-   char             *path = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
 
    if (!core_info_list || !core)
-      goto error;
+      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)
-      goto error;
+      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))
@@ -540,20 +543,16 @@ static bool core_info_list_update_missing_firmware_internal(
 
       fill_pathname_join(path, systemdir,
             info->firmware[i].path, path_size);
-      info->firmware[i].missing = !path_file_exists(path);
+      info->firmware[i].missing = !filestream_exists(path);
       if (info->firmware[i].missing && !info->firmware[i].optional)
       {
-         rarch_ctl(RARCH_CTL_SET_MISSING_BIOS, NULL);
+         *set_missing_bios = true;
          RARCH_WARN("Firmware missing: %s\n", info->firmware[i].path);
       }
    }
 
    free(path);
    return true;
-
-error:
-   free(path);
-   return false;
 }
 
 #if 0
@@ -596,7 +595,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;
    }
 
@@ -635,14 +634,13 @@ void core_info_deinit_list(void)
    core_info_curr_list = NULL;
 }
 
-bool core_info_init_list(void)
+bool core_info_init_list(const char *path_info, const char *dir_cores,
+      const char *exts, bool show_hidden_files)
 {
-   settings_t *settings = config_get_ptr();
-
-   if (settings)
-      core_info_curr_list = core_info_list_new(settings->paths.directory_libretro);
-
-   if (!core_info_curr_list)
+   if (!(core_info_curr_list = core_info_list_new(dir_cores,
+               !string_is_empty(path_info) ? path_info : dir_cores,
+               exts,
+               show_hidden_files)))
       return false;
    return true;
 }
@@ -655,13 +653,15 @@ bool core_info_get_list(core_info_list_t **core)
    return true;
 }
 
-bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info)
+bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info,
+      bool *set_missing_bios)
 {
    if (!info)
       return false;
    return core_info_list_update_missing_firmware_internal(
          core_info_curr_list,
-         info->path, info->directory.system);
+         info->path, info->directory.system,
+         set_missing_bios);
 }
 
 bool core_info_load(core_info_ctx_find_t *info)
@@ -751,41 +751,41 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
    *num_infos = supported;
 }
 
-void core_info_get_name(const char *path, char *s, size_t len)
+void core_info_get_name(const char *path, char *s, size_t len,
+      const char *path_info, const char *dir_cores,
+      const char *exts, bool show_hidden_files)
 {
    size_t i;
-   settings_t             *settings = config_get_ptr();
-   struct string_list *contents     = dir_list_new_special(
-         settings->paths.directory_libretro,
-         DIR_LIST_CORES, NULL);
-
+   const char       *path_basedir   = !string_is_empty(path_info) ?
+      path_info : dir_cores;
+   struct string_list *contents     = dir_list_new(
+         dir_cores, exts, false, show_hidden_files, false, false);
    if (!contents)
       return;
 
    for (i = 0; i < contents->size; i++)
    {
       size_t path_size                = PATH_MAX_LENGTH * sizeof(char);
-      char *info_path                 = (char*)malloc(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))
-      {
-         free(info_path);
-         continue;
-      }
-
       if (!core_info_list_iterate(info_path,
-               path_size, contents, i)
+               path_size, path_basedir, contents, i)
             && path_is_valid(info_path))
       {
          free(info_path);
          continue;
       }
 
-      conf = config_file_new(info_path);
+      conf                            = config_file_new(info_path);
 
       if (!conf)
       {

core_info.h

@@ -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.
@@ -97,7 +97,9 @@ bool core_info_list_get_display_name(core_info_list_t *list,
 
 bool core_info_get_display_name(const char *path, char *s, size_t len);
 
-void core_info_get_name(const char *path, char *s, size_t len);
+void core_info_get_name(const char *path, char *s, size_t len,
+      const char *path_info, const char *dir_cores,
+      const char *exts, bool show_hidden_files);
 
 core_info_t *core_info_get(core_info_list_t *list, size_t i);
 
@@ -109,11 +111,13 @@ bool core_info_get_current_core(core_info_t **core);
 
 void core_info_deinit_list(void);
 
-bool core_info_init_list(void);
+bool core_info_init_list(const char *path_info, const char *dir_cores,
+      const char *exts, bool show_hidden_files);
 
 bool core_info_get_list(core_info_list_t **core);
 
-bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info);
+bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info,
+      bool *set_missing_bios);
 
 bool core_info_find(core_info_ctx_find_t *info, const char *name);
 

core_type.h

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

cores/dynamic_dummy.c

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

cores/internal_cores.h

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

cores/libretro-ffmpeg/ffmpeg_core.c

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

cores/libretro-ffmpeg/ffmpeg_fft.c

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

cores/libretro-ffmpeg/gl_shaders/ffmpeg_es.glsl.frag.h

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

cores/libretro-ffmpeg/gl_shaders/fft_heightmap.glsl.vert.h

@@ -21,7 +21,7 @@ static const char *fft_vertex_program_heightmap = GLSL_300(
 
      float lod = log2(world_pos.z + 1.0) - 6.0;
      vec4 heights = textureLod(sHeight, tex_coord, lod);
-   
+
      float cangle = cos(angle);
      float sangle = sin(angle);
 

cores/libretro-imageviewer/LICENSE

@@ -0,0 +1,7 @@
+Copyright 2010-2018 The RetroArch team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

cores/libretro-imageviewer/Makefile

@@ -0,0 +1,20 @@
+image_core.so: image_core.c
+	gcc \
+		-g \
+		-DHAVE_STB_IMAGE \
+		image_core.c \
+		-I../../libretro-common/include/ \
+		-I../../deps/stb/ \
+		../../libretro-common/compat/compat_strcasestr.c \
+		../../libretro-common/compat/compat_strl.c \
+		../../libretro-common/file/file_path.c \
+		../../libretro-common/file/retro_dirent.c \
+		../../libretro-common/lists/dir_list.c \
+		../../libretro-common/lists/string_list.c \
+		../../libretro-common/streams/file_stream.c \
+		../../libretro-common/vfs/vfs_implementation.c \
+		-shared \
+		-fPIC \
+		-Wl,--no-undefined \
+		-lm \
+		-o image_core.so

cores/libretro-imageviewer/image_core.c

@@ -10,6 +10,8 @@
 #include <compat/strl.h>
 #include <retro_environment.h>
 
+#include <streams/file_stream.h>
+
 #if defined(HAVE_RPNG) || defined(HAVE_RJPEG) || defined(HAVE_RTGA) || defined(HAVE_RBMP)
 #define PREFER_NON_STB_IMAGE
 #endif
@@ -157,10 +159,19 @@ void IMAGE_CORE_PREFIX(retro_set_environment)(retro_environment_t cb)
    static const struct retro_variable vars[] = {
       { NULL, NULL },
    };
+#ifndef RARCH_INTERNAL
+   struct retro_vfs_interface_info vfs_iface_info = { 1, NULL };
+#endif
 
    IMAGE_CORE_PREFIX(environ_cb) = cb;
 
    cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars);
+   
+#ifndef RARCH_INTERNAL
+   /* I don't trust filestream_vfs_init to work inside rarch */
+   if (environ_cb(RETRO_ENVIRONMENT_GET_VFS_INTERFACE, &vfs_iface_info))
+      filestream_vfs_init(&vfs_iface_info);
+#endif
 }
 
 void IMAGE_CORE_PREFIX(retro_set_video_refresh)(retro_video_refresh_t cb)
@@ -227,6 +238,9 @@ static bool imageviewer_load(const char *path, int image_index)
 {
 #ifdef STB_IMAGE_IMPLEMENTATION
    int comp;
+   RFILE* f;
+   size_t len;
+   void* buf;
 #endif
 #ifdef RARCH_INTERNAL
    extern bool video_driver_supports_rgba(void);
@@ -235,12 +249,17 @@ static bool imageviewer_load(const char *path, int image_index)
    imageviewer_free_image();
 
 #ifdef STB_IMAGE_IMPLEMENTATION
-   image_buffer           = (uint32_t*)stbi_load(
-         path,
-         &image_width,
-         &image_height,
-         &comp,
-         4);
+   f = filestream_open(path, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE);
+   len = filestream_get_size(f);
+   buf = malloc(len);
+   filestream_read(f, buf, len);
+   filestream_close(f);
+   
+   image_buffer           = (uint32_t*)stbi_load_from_memory(
+         buf, len,
+         &image_width, &image_height,
+         &comp, 4);
+   free(buf);
 #else
 #ifdef RARCH_INTERNAL
    image_texture.supports_rgba = video_driver_supports_rgba();
@@ -274,7 +293,7 @@ bool IMAGE_CORE_PREFIX(retro_load_game)(const struct retro_game_info *info)
    dir_list_sort(file_list, false);
    free(dir);
 
-  
+
    if (!IMAGE_CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt))
    {
       if (IMAGE_CORE_PREFIX(log_cb))
@@ -437,7 +456,7 @@ void IMAGE_CORE_PREFIX(retro_run)(void)
          {
             uint32_t pixel = *buf;
             uint32_t a = pixel >> 24;
-            
+
             if (a == 255)
                *buf = (pixel & 0x0000ff00) | ((pixel << 16) & 0x00ff0000) | ((pixel >> 16) & 0x000000ff);
             else
@@ -446,11 +465,11 @@ void IMAGE_CORE_PREFIX(retro_run)(void)
                uint32_t g = (pixel & 0x00ff00) >> 8;
                uint32_t b = (pixel & 0xff0000) >> 16;
                uint32_t bg = ((x & 8) ^ (y & 8)) ? 0x66 : 0x99;
-               
+
                r = a * r / 255 + (255 - a) * bg / 255;
                g = a * g / 255 + (255 - a) * bg / 255;
                b = a * b / 255 + (255 - a) * bg / 255;
-               
+
                *buf = r << 16 | g << 8 | b;
             }
          }

cores/libretro-mpv/LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program 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 Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

cores/libretro-mpv/Makefile

@@ -0,0 +1,153 @@
+STATIC_LINKING	:= 0
+AR				:= ar
+DEBUG			:= 0
+TARGET_NAME		:= mpv
+PREFIX			:= /usr
+LIBDIR			:= $(PREFIX)/lib
+LIBRETRO_DIR	:= libretro
+
+ifeq ($(platform),)
+   platform = unix
+   ifeq ($(shell uname -s),)
+      EXE_EXT = .exe
+      platform = win
+   else ifneq ($(findstring MINGW,$(shell uname -s)),)
+      platform = win
+   else ifneq ($(findstring Darwin,$(shell uname -s)),)
+      platform = osx
+      ifeq ($(shell uname -p),powerpc)
+         arch = ppc
+      else
+         arch = intel
+      endif
+   else ifneq ($(findstring win,$(shell uname -s)),)
+      platform = win
+   endif
+else ifneq (,$(findstring armv,$(platform)))
+   override platform += unix
+else ifneq (,$(findstring rpi3,$(platform)))
+   override platform += unix
+endif
+
+ifeq ($(ARCHFLAGS),)
+ifeq ($(archs),ppc)
+	ARCHFLAGS = -arch ppc -arch ppc64
+else
+	ARCHFLAGS = -arch i386 -arch x86_64
+endif
+endif
+
+ifeq ($(platform), osx)
+ifndef ($(NOUNIVERSAL))
+	CFLAGS += $(ARCHFLAGS)
+	LFLAGS += $(ARCHFLAGS)
+endif
+endif
+
+ifeq ($(STATIC_LINKING), 1)
+	EXT := a
+endif
+
+ifneq (,$(findstring unix,$(platform)))
+	EXT ?= so
+	TARGET := $(TARGET_NAME)_libretro.$(EXT)
+	fpic := -fPIC
+	SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+else ifneq (,$(findstring osx,$(platform)))
+	TARGET := $(TARGET_NAME)_libretro.dylib
+	fpic := -fPIC
+	SHARED := -dynamiclib
+else ifneq (,$(findstring ios,$(platform)))
+	TARGET := $(TARGET_NAME)_libretro_ios.dylib
+	fpic := -fPIC
+	SHARED := -dynamiclib
+ifeq ($(IOSSDK),)
+	IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
+endif
+	DEFINES := -DIOS
+	CC = cc -arch armv7 -isysroot $(IOSSDK)
+ifeq ($(platform),ios9)
+CC     += -miphoneos-version-min=8.0
+CFLAGS += -miphoneos-version-min=8.0
+else
+CC     += -miphoneos-version-min=5.0
+CFLAGS += -miphoneos-version-min=5.0
+endif #ifneq ios
+else ifneq (,$(findstring qnx,$(platform)))
+	TARGET := $(TARGET_NAME)_libretro_qnx.so
+	fpic := -fPIC
+	SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+else ifeq ($(platform), emscripten)
+	TARGET := $(TARGET_NAME)_libretro_emscripten.bc
+	fpic := -fPIC
+	SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+else ifeq ($(platform), vita)
+	TARGET := $(TARGET_NAME)_vita.a
+	CC = arm-vita-eabi-gcc
+	AR = arm-vita-eabi-ar
+	CFLAGS += -Wl,-q -Wall -O3
+	STATIC_LINKING = 1
+else
+	CC = gcc
+	TARGET := $(TARGET_NAME)_libretro.dll
+	SHARED := -shared -static-libgcc -static-libstdc++ \
+		-Wl,--version-script=link.T -Wl,--no-undefined
+endif
+
+ifneq (,$(findstring gles,$(platform)))
+   CFLAGS += -DHAVE_OPENGLES
+endif
+
+# Locale support should be enabled by default, as it's most common.
+ifneq ($(locale),false)
+	CFLAGS += -DHAVE_LOCALE
+endif
+
+# Always have some debugging information.
+CFLAGS += -g
+ifeq ($(DEBUG), 1)
+   CFLAGS += -Og
+else
+   CFLAGS += -Ofast
+endif
+
+CFLAGS   += -I../../libretro-common/include
+
+OBJECTS	:= mpv-libretro.o
+LDFLAGS	+= -lmpv -ldl -lm
+CFLAGS	+= -Wall -pedantic
+
+all: $(TARGET)
+
+$(TARGET): $(OBJECTS)
+ifeq ($(STATIC_LINKING), 1)
+	$(AR) rcs $@ $(OBJECTS)
+else
+	$(CC) $(fpic) $(SHARED) $(CFLAGS) -o $@ $(OBJECTS) $(LDFLAGS)
+endif
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(fpic) -c -o $@ $<
+
+clean:
+	rm -f $(OBJECTS) $(TARGET)
+
+install:
+	install -D -m 755 $(TARGET) $(DESTDIR)$(LIBDIR)/$(LIBRETRO_DIR)/$(TARGET)
+
+install-snip:
+	install -D -s -m 755 $(TARGET) $(DESTDIR)$(LIBDIR)/$(LIBRETRO_DIR)/$(TARGET)
+
+uninstall:
+	rm $(DESTDIR)$(LIBDIR)/$(LIBRETRO_DIR)/$(TARGET)
+
+help:
+	@echo 'make <target> [flags]'
+	@echo 'Targets:'
+	@echo ' clean install install-snip uninstall help'
+	@echo 'Flags:'
+	@echo ' platform	String containing platform details.'
+	@echo ' locale		Support toolchain with locale support.'
+	@echo '       		false: disable support, otherwise enabled (default).'
+
+.PHONY: clean

cores/libretro-mpv/README.md

@@ -0,0 +1,17 @@
+# libretro-mpv
+
+mpv media player as a libretro core. A proof of concept release is now available.
+
+Aims to use features already established in mpv that are not currently available in Retroarch movieplayer.
+
+I want to be able to use Retroarch as my movie player on my embedded devices (Raspberry Pi) and desktop using hardware acceleration without having to use Kodi or mpv directly. Thus allowing for a more integrated experience, and smaller root filesystem.
+
+## Compiling
+
+Retroarch must be compiled with `--disable-ffmpeg` to stop the integrated movieplayer from playing the input file.
+
+FFmpeg (preferably master branch) must be compiled with `--enable-shared`.
+
+mpv must be compiled with `--enable-libmpv-shared`.
+
+Then run `make` in the mpv-libretro folder.