(Wii) Bump up to version 1.2.2

(Android) Bump up APK version code; bump up version
(OSX) Bump up to version 1.2.2
2026-11-08 17:28:49 -10:00 · 2015-07-19 11:50:27 +02:00 · 2015-07-19 11:50:00 +02:00 · 2015-07-19 00:14:31 +02:00 · 2015-07-18 23:49:58 +02:00 · 2015-07-18 23:41:42 +02:00
8539 changed files with 185080 additions and 1970669 deletions
@@ -1,20 +0,0 @@
-# EditorConfig: http://EditorConfig.org
-
-# Top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-charset = utf-8
-
-# 3 space indentation
-[*.{c,h,js,css,html}]
-indent_style = space
-indent_size = 3
-
-# Tab indentation
-[Makefile*]
-indent_style = tab
@@ -1,35 +0,0 @@
-# First and foremost consider this:
- Only RetroArch bugs should be filed here. Not core bugs or game bugs
- This is not a forum or a help section, this is strictly developer oriented
-
-## Description
-
-[Description of the bug]
-
-### Expected behavior
-
-[What you expected to happen]
-
-### Actual behavior
-
-[What is actually happening]
-
-### Steps to reproduce the bug
-
-1. [First step]
-2. [Second step]
-3. [and so on...]
-
-### Bisect Results
-
-[Try to bisect and tell us when this started happening]
-
-### Version/Commit
-You can find this information under Information/System Information
-
- RetroArch: [version/commit]
-
-### Environment information
-
- OS: [The operating system you're running]
- Compiler: [In case you are running local builds]
@@ -1,22 +0,0 @@
-## Guidelines
-
-1. Rebase before opening a pull request
-2. If you are sending several unrelated fixes or features, use a branch and a separate pull request for each
-3. If possible try squashing everything in a single commit. This is particularly beneficial in the case of feature merges since it allows easy bisecting when a problem arises
-
-
-## Description
-
-[Description of the pull request, detail any issues you are fixing or any features you are implementing]
-
-## Related Issues
-
-[Any issues this pull request may be addressing]
-
-## Related Pull Requests
-
-[Any other PRs from related repositories that might be needed for this pull request to work]
-
-## Reviewers
-
-[If possible @mention all the people that should review your pull request]
@@ -7,19 +7,10 @@
 *.elf
 *.dol
 *.map
-*.swp
-.tmp
-.tmp.c
-.tmp.cxx
-.moc.h
-.moc.cpp
 config.log
-/.project
-/.externalToolBuilders/
 /retroarch
 /retroarch.cfg
 /retroarch.exe
-/retroarch_debug.exe
 /config.h
 /config.mk
 /tools/retroarch-joyconfig
@@ -32,7 +23,7 @@ Debug
 Release
 ipch
 *.user
-/bootstrap/gx/wii/app_booter/app_booter.bin
+/wii/app_booter/app_booter.bin
 *.zip
 RetroArch-w32/
 RetroArch-w64/
@@ -69,49 +60,14 @@ apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
 .pc
 /media/shaders_glsl/
 /obj-w32/
-.cproject
-.settings
-libretro-super
-run.sh
-convert_rumble.awk
-*~
-assets
-
-# Wii U
-*.depend
-*.rpx
-*.last
-wiiu/wut/elf2rpl/elf2rpl
-/pkg/wiiu/retroarch
-/pkg/wiiu/wiiu
-/pkg/wiiu/rpx
-/wiiu-devel.properties
-
-
-# 3ds
-/.lst
-*.3dsx
-*.cia
-*.3ds
-*.bnr
-*.smdh
-/retroarch_3ds.core
-/retroarch_3ds.icn
-/retroarch_3ds_salamander.icn
-
-# Ctags
-/tags
-
-# CLion
-/cmake-build-debug/

 # Android
-/pkg/android/phoenix/obj/
-/pkg/android/phoenix/assets/
-/pkg/android/phoenix/libs/
-/pkg/android/phoenix/bin/
-/pkg/android/phoenix/gen/
-/pkg/android/phoenix/local.properties
+/android/phoenix/obj/
+/android/phoenix/assets/
+/android/phoenix/libs/
+/android/phoenix/bin/
+/android/phoenix/gen/
+/android/phoenix/local.properties

 # Cloned by libretro-fetch.sh
 /media/assets/
@@ -120,57 +76,8 @@ wiiu/wut/elf2rpl/elf2rpl
 /media/shaders_cg/
 /media/libretrodb/

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

 obj-unix/
 .vagrant/
-
-/pkg/msvc/Release Cg/*.exe
-/pkg/msvc/Release Cg/*.iobj
-/pkg/msvc/Release Cg/*.ipdb
-/pkg/msvc/Release Cg/*.pdb
-/pkg/msvc/Release Cg/*.lpl
-/pkg/msvc/Release Cg/*.cfg
-/pkg/msvc/*.db
-/pkg/msvc/.vs
-/pkg/msvc/*/.vs
-/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
-
-# Switch
-*.d
-exefs/*
-retroarch_switch.pfs0
-retroarch_switch.lst
-retroarch_switch.nacp
-retroarch_switch.nro
-retroarch_switch.nso
-
-# Wayland
-gfx/common/wayland/idle-inhibit-unstable-v1.c
-gfx/common/wayland/idle-inhibit-unstable-v1.h
-gfx/common/wayland/xdg-shell-unstable-v6.c
-gfx/common/wayland/xdg-shell-unstable-v6.h
-gfx/common/wayland/xdg-decoration-unstable-v1.h
-gfx/common/wayland/xdg-decoration-unstable-v1.c
-gfx/common/wayland/xdg-shell.c
-gfx/common/wayland/xdg-shell.h
@@ -5,23 +5,7 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 </projectDescription>
@@ -1,80 +0,0 @@
-# Use 'generic' to be able to override CC/CXX for clang
-language: generic
-
-matrix:
-  include:
-    - compiler: mingw-x86
-      addons:
-        apt:
-          packages:
-            - g++-mingw-w64-i686
-            - mingw-w64-i686-dev
-      script:
-        - ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib
-        - make
-      env: CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: mingw-x64
-      addons:
-        apt:
-          packages:
-            - g++-mingw-w64-x86-64
-            - mingw-w64-x86-64-dev
-      script:
-        - ./configure --disable-d3d8 --disable-d3d9 --disable-d3d10 --disable-d3d11 --disable-d3d12 --enable-builtinzlib
-        - make
-      env: CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
-    - compiler: gcc
-      # Install a more recent gcc than the default
-      before_install:
-        - sudo apt-get install -y g++-8
-      env: CC=gcc-8 CXX=g++-8
-    - compiler: clang
-      # Install a more recent clang than the default
-      before_install:
-        - sudo apt-get install -y libstdc++-7-dev
-        - sudo apt-get install -y clang-6.0
-      env: CC=clang-6.0 CXX=clang++-6.0
-    - os: osx
-      osx_image: xcode8
-      script:
-        - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
-    - os: osx
-      osx_image: xcode10.1
-      script:
-        - brew install --force-bottle qt5
-        - xcodebuild -target RetroArchQt -configuration Release -project pkg/apple/RetroArch_Metal.xcodeproj
-      deploy:
-        skip_cleanup: true
-        provider: script
-        script: bash travis_metal_deploy.sh
-        on:
-          branch: master
-
-script:
-  - ./configure
-  - make
-
-env:
-  global:
-   - MAKEFLAGS="-j2"
-   - secure: "qc91ReC3OlzSh2gFaSH6TYzC2qIQvgA2AZff6J13eaH8xijAhuMzttZ0rMQJ0DWCIhPeUb0kIzVyaGoe4MwPALzpw1C1AznIWiZJ53HN+hWCOcS/af7YVPk6HPySnwqrS+Wv3AIIvIKFV2mxv21F/JbT/N+pArlRrp904Xj+KPo="
-addons:
-  apt:
-    packages:
-      - libsdl2-dev
-      - libusb-1.0-0-dev
-      - qtbase5-dev
-      - qtdeclarative5-dev
-    sources:
-      - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-6.0
-  coverity_scan:
-    project:
-      name: "RetroArch"
-      description: "RetroArch is the official reference frontend for the libretro API."
-    notification_email: [email protected]
-    build_command_prepend: "./configure; make clean"
-    build_command:   "make"
-    branch_pattern: coverity_scan
-notifications:
-  email: false
@@ -1,131 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Mac",
-            "includePath": [
-                "/usr/include",
-                "/usr/local/include",
-                "${workspaceRoot}",
-                "${workspaceRoot}/libretro-common/include"
-            ],
-            "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "macFrameworkPath": [
-                "/System/Library/Frameworks",
-                "/Library/Frameworks"
-            ]
-        },
-        {
-            "name": "Linux",
-            "includePath": [
-                "/usr/include",
-                "/usr/local/include",
-                "${workspaceRoot}",
-                "${workspaceFolder}/libretro-common/include",
-                "${workspaceRoot}/libretro-common/include"
-            ],
-            "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "${workspaceRoot}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            }
-        },
-        {
-            "name": "Win32",
-            "includePath": [
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
-                "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-                "${workspaceRoot}",
-                "${workspaceFolder}/libretro-common/include"
-            ],
-            "defines": [
-                "_DEBUG",
-                "UNICODE"
-            ],
-            "intelliSenseMode": "msvc-x64",
-            "browse": {
-                "path": [
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
-                    "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-                    "${workspaceRoot}"
-                ],
-                "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": 4
-}
@@ -1,45 +0,0 @@
-{
-   // 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": true,
-         "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
-             }
-         ]
-      },
-
-   ]
-}
@@ -1,48 +0,0 @@
-{
-   "terminal.integrated.shell.windows":    "C:\\msys64\\usr\\bin\\bash.exe",
-   "terminal.integrated.env.windows": {
-      "PATH": "/mingw64/lib/ccache/bin:/mingw64/lib/ccache/bin:/mingw64/lib/ccache/bin:/mingw64/bin:/usr/local/bin:/usr/bin:/bin:$PATH",
-      "MSYSTEM": "MINGW64",
-   },
-   "terminal.integrated.cursorBlinking": true,
-
-   "editor.tabSize": 3,
-   "editor.detectIndentation": false,
-   "editor.renderWhitespace": "all",
-   "editor.insertSpaces": true,
-   "files.associations": {
-      "frontend_driver.h": "c",
-      "*.in": "c",
-      "*.rh": "c",
-      "array": "c",
-      "file_stream.h": "c",
-      "driver.h": "c",
-      "iosfwd": "c",
-      "xlocbuf": "c",
-      "xmemory0": "c",
-      "ios": "c",
-      "list": "c",
-      "input_driver.h": "c",
-      "video_driver.h": "c",
-      "menu_driver.h": "c",
-      "file_path.h": "c",
-      "unordered_map": "c",
-      "unordered_set": "c",
-      "sstream": "cpp",
-      "hash_map": "c",
-      "hash_set": "c",
-      "initializer_list": "c",
-      "string_view": "c",
-      "utility": "c",
-      "menu_input.h": "c",
-      "tasks_internal.h": "c",
-      "ozone.h": "c",
-      "ozone_theme.h": "c",
-      "ozone_texture.h": "c",
-      "string_list.h": "c",
-      "core_info.h": "c"
-      "thread": "c",
-      "xlocale": "c"
-   },
-   "C_Cpp.dimInactiveRegions": false,
-}
@@ -1,128 +0,0 @@
-{
-   // See https://go.microsoft.com/fwlink/?LinkId=733558
-   // for the documentation about the tasks.json format
-   "version": "2.0.0",
-   "tasks": [
-      {
-         "label": "linux clean build",
-         "type": "shell",
-         "group": "build",
-         "command": "make clean && ./configure && make -j12"
-      },
-      {
-         "label": "linux clean",
-         "type": "shell",
-         "group": "build",
-         "command": "make clean"
-      },
-      {
-         "label": "linux build with debug symbols",
-         "type": "shell",
-         "group": "build",
-         "command": "DEBUG=1 make -j12"
-      },
-      {
-         "label": "linux build",
-         "type": "shell",
-         "group": "build",
-         "command": "make -j12"
-      },
-      {
-         "label": "linux build and run",
-         "type": "shell",
-         "group": "build",
-         "command": "make -j12 && ./retroarch -v"
-      },
-      {
-         "label": "linux build and run with debug symbols",
-         "type": "shell",
-         "group": "build",
-         "command": "DEBUG=1 make -j12 && ./retroarch -v"
-      },
-      {
-         "label": "msys2-mingw64 build",
-         "type": "shell",
-
-         "group": {
-            "kind": "build",
-            "isDefault": true 
-         },
-
-         "command": "./configure; make -j2",
-         "options": {
-            "shell": {
-               "executable": "C:\\msys64\\usr\\bin\\bash.exe",
-               "args": [
-                  "-c"
-               ]
-            }
-         }
-      },
-      {
-         "label": "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"
-               ]
-            }
-         }
-      },
-      {
-         "label": "msys2-mingw64 rebuild",
-         "type": "shell",
-
-         "group": "build",
-
-         "command": "make -j2",
-         "options": {
-            "shell": {
-               "executable": "C:\\msys64\\usr\\bin\\bash.exe",
-               "args": [
-                  "-c"
-               ]
-            }
-         }
-      },
-      {
-         "label": "msys2-mingw64 clean",
-         "type": "shell",
-
-         "group": "build",
-
-         "command": "make clean",
-         "options": {
-            "shell": {
-               "executable": "C:\\msys64\\usr\\bin\\bash.exe",
-               "args": [
-                  "-c"
-               ]
-            }
-         }
-      },
-      {
-         "label": "msys2-mingw64 run",
-         "type": "shell",
-
-         "group": {
-            "kind": "test",
-            "isDefault": true },
-
-         "command": "./retroarch -v",
-         "options": {
-            "shell": {
-               "executable": "C:\\msys64\\usr\\bin\\bash.exe",
-               "args": [
-                  "-c"
-               ]
-            }
-         }
-      }
-   ]
-}
@@ -1,96 +0,0 @@
-diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c
-index b90a8e40c3..e57c4df194 100644
--- a/gfx/drivers_context/wgl_ctx.c
-+++ b/gfx/drivers_context/wgl_ctx.c
-@@ -78,6 +78,47 @@
- #ifndef WGL_CONTEXT_DEBUG_BIT_ARB
- #define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001
- #endif
-+
-+#ifndef WGL_ACCELERATION_ARB
-+#define WGL_ACCELERATION_ARB                    0x2003
-+#endif
-+
-+#ifndef WGL_FULL_ACCELERATION_ARB
-+#define WGL_FULL_ACCELERATION_ARB               0x2027
-+#endif
-+
-+#ifndef WGL_DRAW_TO_WINDOW_ARB
-+#define WGL_DRAW_TO_WINDOW_ARB                  0x2001
-+#endif
-+
-+#ifndef WGL_DOUBLE_BUFFER_ARB
-+#define WGL_DOUBLE_BUFFER_ARB                   0x2011
-+#endif
-+
-+#ifndef WGL_RED_BITS_ARB
-+#define WGL_RED_BITS_ARB                        0x2015
-+#endif
-+
-+#ifndef WGL_GREEN_BITS_ARB
-+#define WGL_GREEN_BITS_ARB                      0x2017
-+#endif
-+
-+#ifndef WGL_BLUE_BITS_ARB
-+#define WGL_BLUE_BITS_ARB                       0x2019
-+#endif
-+
-+#ifndef WGL_ALPHA_BITS_ARB
-+#define WGL_ALPHA_BITS_ARB                      0x201B
-+#endif
-+
-+#ifndef WGL_PIXEL_TYPE_ARB
-+#define WGL_PIXEL_TYPE_ARB                      0x2013
-+#endif
-+
-+#ifndef WGL_TYPE_RGBA_ARB
-+#define WGL_TYPE_RGBA_ARB                       0x202B
-+#endif
-+
- #endif
- 
- #if defined(HAVE_OPENGL)
-@@ -313,6 +354,43 @@ static void create_gl_context(HWND hwnd, bool *quit)
-          RARCH_LOG("[WGL]: Adaptive VSync supported.\n");
-          wgl_adaptive_vsync = true;
-       }
-+      if (wgl_has_extension("WGL_ARB_pixel_format", extensions))
-+      {
-+         BOOL (WINAPI * wglChoosePixelFormatARB)
-+         (HDC hdc,
-+                                 const int *piAttribIList,
-+                                 const FLOAT *pfAttribFList,
-+                                 UINT nMaxFormats,
-+                                 int *piFormats,
-+                                 UINT *nNumFormats);
-+         UINT nMatchingFormats;
-+         int index = 0;
-+         int attribsDesired[] = {
-+            WGL_DRAW_TO_WINDOW_ARB, 1,
-+            WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB,
-+            WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB,
-+            WGL_RED_BITS_ARB, 10,
-+            WGL_GREEN_BITS_ARB, 10,
-+            WGL_BLUE_BITS_ARB, 10,
-+            WGL_ALPHA_BITS_ARB, 2,
-+            WGL_DOUBLE_BUFFER_ARB, 1,
-+            0,0
-+         };
-+         wglChoosePixelFormatARB = (BOOL (WINAPI *) (HDC, const int *,
-+                  const FLOAT*, UINT, int*, UINT*))
-+            gfx_ctx_wgl_get_proc_address("wglChoosePixelFormatARB");
-+
-+         RARCH_LOG("[WGL]: ARB pixel format supported.\n");
-+
-+         if (wglChoosePixelFormatARB(win32_hdc, attribsDesired,
-+                  NULL, 1, &index, &nMatchingFormats))
-+         {
-+            if (nMatchingFormats == 0)
-+            {
-+               RARCH_WARN("No 10bpc WGL_ARB_pixel_formats found!\n");
-+            }
-+         }
-+      }
-    }
- }
- #endif
@@ -0,0 +1,73 @@
+Hans-Kristian Arntzen - <[email protected]>
+   - Main code
+   - Initial Gamecube/Wii libogc port
+
+Daniel De Matteis - <[email protected]>
+   - Maintainer
+   - Main code
+
+Devin J. Pohly - <[email protected]>
+   - Joypad axis support
+
+Chris Moeller - <[email protected]> 
+   - CoreAudio audio driver
+
+Tobias Jakobi - <TBA>
+   - OMAP graphics driver
+
+Jason Fetters - <TBA>
+   - Phoenix Java frontend
+   - Android port patches
+   - iOS port
+
+CatalystG - <[email protected]>
+   - Blackberry 10/Playbook input driver
+   - Blackberry 10/Playbook patches
+
+David Reichelt - <[email protected]>
+   - XBox 1 port
+
+tukuyomi - <[email protected]>
+   - Cleanups in quickbuild
+
+Michael Lelli - <[email protected]>
+   - Gamecube/Wii libogc port
+   - Raspberry Pi video driver
+   - Linux Raw keyboard input driver
+   - Android port patches
+
+Ali Bouhlel - <[email protected]>
+   - PSP port
+   - Convoluted Cosine resampler
+
+Darren Alton -
+   - OpenPandora port
+
+Fabian Knopf -
+   - WGL multi-monitor support
+   - D3D9 overlay, multi-monitor and menu support
+
+Gražvydas Ignotas -
+   - ARM Linux patches
+
+Saggi Mizrahi - 
+   - RetroLaunch utility
+
+Alfred Agrell - <[email protected]>
+   - Rewritten savestate manager
+   
+Jean-André Santoni - <[email protected]>
+   - Lakka menu driver
+
+Morgane Alonso -
+   - Lakka menu driver (graphic design)
+
+Timo Strunk - <[email protected]>
+   - 7zip support
+
+Higor Euripedes - <TBA>
+   - SDL2 drivers
+
+Jay McCarthy - <[email protected]>
+   - CoreText font driver
+   - (Apple) CFRunLoop improvements
@@ -1,276 +0,0 @@
-static const char *retroarch_contributors_list = R"(
-RetroArch and the libretro team would like to
-acknowledge the following contributors:
-
-1ch (L0sted)
-Aaahh Ahh (Aaahh)
-Aaron Oneal (aarononeal)
-Adam Mechtley (amechtley)
-Adolfo Ketzer (reztek)
-AdrianoML
-ajefr
-Alberto Simon (asimonf)
-Alcaro
-Alessandro Mangone (Vektor) (zevektor)
-Alex Eckhart (alex34567)
-Alex Folland (AlexFolland)
-Alexander Spady (alkaseltzerspadt)
-Alexandre Garcia (Alexandre-Garcia)
-Alfredo Monclus (alfrix)
-aliaspider
-alphanu1
-altiereslima
-Alwin Garside (Yogarine)
-Amiga1200Gamer (amigagamer)
-Andre Leiradella (leiradel)
-Andrés (fr500)
-Anthony J. Bentley (bentley)
-Antonio Jose Ramos Marquez (psxdev)
-AridRayne
-Arto Vainiolehto (arakerlu)
-asako (asakous)
-Ash (QuarkTheAwesome)
-Ashura (CoalaJoe)
-Autechre64
-Avton1
-barbudreadmon
-bearoso
-blackgur
-Boris Timofeev (btimofeev)
-bparker06
-Brandon Johnson (Denu8thell)
-Brian Koropoff (bkoropoff)
-Brian S. Stephan (bsstephan)
-Brunnis
-bubuleur
-Casey Borders (CaseyB)
-ceb33
-celerizer
-Chris Merrett (chrisfu)
-chu (9chu)
-CidVonHighwind
-clienthax
-Conn O'Griofa (psyke83)
-cpsw
-Cray Elliott (MP2E)
-Cristian Sandu (crazyquark)
-ctult
-cubtekki
-cucholix
-cudencuden
-cxd4
-dalter
-Dan Weiss (Dwedit)
-danieljg
-Daniil Zhilin (GeneralFailer)
-dankcushions
-Danny Glover (DannyGlover)
-Dave (freakdave)
-Dave Leaver (danzel)
-David Demelier (markand)
-David Erickson (daviderickson)
-David Shah (daveshah1)
-David Walters (hiddenasbestos)
-DEX357
-diablodiab
-dibas
-Diego A. (SuperrSonic)
-Diego Viola (diegoviola)
-Diogo Barros (BlueKore)
-DogParty
-dor3k
-Dudu Akiva (duduke)
-duganchen
-duskgao
-ekipan
-ensra
-erbridge
-esoptron
-Ethan Lee (flibitijibibo)
-Ezio-PS
-Fabio (Oibaf66)
-Fabio Ritrovato (Sephiroth87)
-Fayne Aldan (FayneAldan)
-FIX94
-Flame Sage (chris062689)
-flyinghead
-Francisco José García García (frangarcj)
-Francisco Javier Trujillo Mata (fjtrujy)
-GameDragon2k
-Garrett Brown (garbear)
-gblues
-Geoffrey Plitt (GeoffreyPlitt)
-Glenn Hevey (hevey)
-Googer
-gouchi
-Gregor Richards (GregorR)
-Gui Andrade (archshift)
-Gustavo Maciel Dias Vieira (gmdvieira)
-gvbr
-H. İbrahim Güngör (igungor)
-hadess
-Hans-Kristian Arntzen (Themaister)
-Henri Gomez (hgomez)
-Henri Gomez (hgomez-sonarsource)
-Higor Eurípedes (heuripedes)
-hizzlekizzle
-Hugo B. (777sha)
-hunterk
-Hyllian
-i30817
-iAmGhost
-Jack (jakcron)
-James Le Cuirot (chewi)
-James Sexton (Bezier89)
-Jan Holthuis (Holzhaus)
-Jay McCarthy (jeapostrophe)
-Jean-André Santoni (kivutar)
-Jean-Paul Mari (djipi)
-Jean-Sébastien Guay (Skylark13)
-Jesse Bryan (winneon)
-Joel (joel16)
-Joerg Sonnenberger (jsonn)
-Johannes Schickel (lordhoto)
-John Regan (jprjr)
-Jon Maddox (maddox)
-Jonathan Relf (jonathanrelf)
-Joohan Lee (losernator)
-Jools Wills (joolswills)
-Joseph Carter (iKarith)
-Joseph Conan Montgomery (Grotke)
-Josh Palmer (ShiftyAxel)
-JuanVCS
-Justin Jacobs (dorkster)
-Justin Weiss (justinweiss)
-Ken Rossato (rossato)
-Krzysztof Haładyn (krzys_h)
-kurumushi
-kwyxz
-l3iggs
-lasers
-Lawrence Kesteloot (lkesteloot)
-liffy (lifning)
-Lionel Flandrin (simias)
-littleguy77
-Logan (loganmc10)
-lordashram
-Lothar Serra Mari (lotharsm)
-Lubosz Sarnecki (lubosz)
-lucianposton
-lxerandrew
-Mahyar Koshkouei (deltabeard)
-Marcelo Munhoz Pélos (mpelos)
-markwkidd
-Maschell
-Mat M. (lioncash)
-Matt Sephton (gingerbeardman)
-Maxime Gauduin (alucryd)
-mcrisostomo
-meancoot
-meepingsnesroms
-meleu
-Michael K. (kuxii2016)
-Michał Durak (micechal)
-Mico Chopitea (micochops)
-miguelpinheiro
-Mike Swanson (chungy)
-miqlas (extrowerk)
-misson20000
-Monroe88
-mprobinson
-MrHuu
-muzuiget
-mwtremblay
-Nathan S. (natinusala)
-nattycleopatra
-netux79
-nfnty
-Nicolas Adenis-Lamarre (nadenislamarre)
-Nicolas Guillaumin (nguillaumin)
-Nicolas Lopez Fernandez (pyroesp)
-Nikita Vakhrushev (JesterIOS)
-Nikola Kocic (nikola-kocic)
-Niouby
-nosh01
-not6 (r-type)
-notaz
-nstCactus
-nurupo
-Oggom
-Oleg Shevchenko (olsh)
-opendata26
-orbea
-OV2
-pamapa
-Paolo Bonzini (bonzini)
-Paul McCarty (a-shark)
-Pedro Ribeiro (pedrib)
-pinumbernumber
-pponso1
-Ramiro Morales (ramiro)
-retro-wertz
-Richard Howell (rmaz)
-Rob Loach (RobLoach)
-Romain Gay (vikbez)
-Romain Graillot (notnotme)
-Romain TISSERAND (rtissera)
-Roman Kalashnikov (lunixoid)
-Royerson
-rrooij
-rsn8887
-Ryunam
-rz5
-Saggi Mizrahi (ficoos)
-SAKUJ0
-Sam Pagenkopf (44100hertz)
-Sam Stenvall (Jalle19)
-Scheiker
-Sebastien Ronsse (sronsse)
-Sergi Granell (xerpi)
-Sergio Padrino (sergiou87)
-sergio-br2 (sergiobenrocha2)
-Seth Kingsley (sethk)
-Shane Mouton (ismouton)
-Shizeeg Unadequatov (shizeeg)
-Skarsnik
-slotek
-sparklewind
-spec-chum
-Stefan (gizmo98)
-stefan-gr
-Steven M. Vascellaro (stevoisiak)
-Stuart Carnie (stuartcarnie)
-Sunguk Lee (d3m3vilurr)
-Supernature2k
-Sven (RetroSven)
-Swizzy
-Tatsuya79
-Terry Lewis (terry-au)
-The Last Cabra (vanfanel)
-thedax
-theheroGAC
-TheOfficialFloW
-thiolliere
-Toad King (ToadKing)
-Tobias Jakobi (tobiasjakobi)
-Tomáš Kelemen (ToKe79)
-Torsten Paul (t-paul)
-TotalCaesar659
-TroggleMonkey
-Twinaphex
-URBANsUNITED
-vgmoose
-Vicky C Lau (vickychenglau)
-Vladimir Panteleev (CyberShadow)
-Víctor "IlDucci" (IlDucci)
-Wang Vincent (susemm)
-webgeek1234
-Wiktor Strzębała (wiktorek140)
-xhp-creations
-Yarsan Hoessain (hyarsan)
-Yongwoon Cho (ssangkong)
-yoshisuga
-zeromus
-zlice
-Zoran Vuckovic (casdevel)
-)";
@@ -1,583 +0,0 @@
-# 1.7.7 (future)
-
-# 1.7.6
- ANDROID: Fix Xperia Play input binding.
- CHEEVOS: Reset when hardcore mode is toggled.
- CHEEVOS: Update the hashing methods to identify NES, SNES and Lynx games (more accurate and accepting headerless ROMs).
- COMMON: Add new JSON playlist format.
- COMMON: Fix playlist corruption when deleting items.
- COMMON: Fix archive progress display calculation.
- COMMON: Fix playlist entries appearing with previously used names.
- COMMON: Fix screenshot filename with no core or content.
- COMMON: Allow compiling without menu support.
- CORE UPDATER: Allow sideloading cores from the menu.
- CPU FILTERS: Add Normal2x filter.
- CRT/LINUX: New Linux switching method partially implemented.
- CRT/LINUX: Linux restore desktop resolution fixed.
- CRT/LINUX: Monitor index switching and auto enumerate for output detection in Linux (still working on the windows method).
- CRT/RASPBERRY PI: Initial support.
- DATE: Add Date / Time style options.
- DEBUGGING: Add an integrated crash handler for debug builds (see https://docs.libretro.com/tech/debugging)
- DISCORD: Register the application name properly.
- DISK CONTROL: Remember the last used folder / current active folder to make disk-swapping faster.
- INPUT: Add new menu toggle (hold start button for 2 seconds)
- INPUT: Fix arrow keys being incorrectly bound as numpad keys
- INPUT/SDL: Flush the joypad events. Decreases cpu usage over time with the SDL joypad driver.
- LOCALIZATION: Add Greek translation.
- LOCALIZATION: Update German translation.
- LOCALIZATION: Update Italian translation.
- LOCALIZATION: Update Japanese translation.
- LOCALIZATION: Update Simplified Chinese translation.
- LOCALIZATION: Update Spanish translation.
- MENU: New "ozone" menu driver.
- MENU: Only show CRT SwitchRes if video display server is implemented (Windows/Linux for now)
- MENU: User Interface -> Appearance -> 'Menu Font Green/Blue Color' settings now work properly.
- MENU: Add option to enable in-menu sound effects.
- MENU/D3D: Scissoring support (will be used for Ozone and menu widgets).
- MENU/QT/WIMP: Allow building with MSVC2017.
- MENU/QT/WIMP: Add detailed file browser table.
- MENU/QT/WIMP: New grid view implementation that is faster and loads thumbnails on-demand.
- MENU/QT/WIMP: Thumbnail drag and drop support.
- MENU/RGUI: Overhaul custom theme interface + add wallpaper support.
- MENU/RGUI: Thumbnail support and thumbnail downscaling.
- MENU: Hide password values.
- MENU/SOUNDS: Implement in-menu sound effects (not enabled by default for now, still experimental).
- MIDI: Add a Linux ALSA driver for MIDI.
- NETPLAY: Force fast-save-states when netplay is enabled.
- NETPLAY: Allow quick joining subsystem lobbies.
- OSX: Initial CoreAudio V3 audio driver (not yet used in release builds).
- OSX: OpenGL 3.2 Core support for cores.
- PS2: Initial PlayStation2 port.
- PS4: Initial PlayStation4 port.
- RECORDING: Implement recording options in the menu complete with quality profiles, streaming, and proper file naming
- SCANNER: Fix GDI disc scanning.
- SHADERS: Fix auto shader preset loading on D3D10, D3D11, D3D12
- SUBSYSTEM: Allow more than 10 subsystems
- SUBSYSTEM: Cores that use subsystem for complex scenarios can now load content without starting a regular content first
- SUBSYSTEM: Remember the last used folder to make loading subsystem type content faster
- SWITCH/LIBNX: Improve touch scaling calculation.
- SWITCH: Proper button labels.
- TVOS: Initial tvOS port.
- VULKAN: Fix RGUI crashing at startup.
- VULKAN/RGUI: Enable 'Menu Linear Filter' option.
- VULKAN: Fix secondary screens in overlays not working.
- WAYLAND: Implement idle-inhibit support (needed for screensaver suspend).
- WAYLAND: Fix fullscreen toggle.
- WIIU: Initial netplay peer-to-peer support. Network information working.
- WINDOWS/WSA: Network Information info is blank until first network operation.
- WINDOWS: Fix an ancient bug that caused wrong mappings for keyboard arrows.
- WINDOWS: Remember window size and position if so desired.
- WINDOWS: SSL/TLS connections now work properly.
- WINDOWS: Fall back to GDI driver if no accelerated graphics driver is found.
- UWP: Initial UWP port.
- VFS: Update to version 3.
- XBONE: Initial Xbox One port.
- XMB/OZONE: Add more icons
- XMB: Add Automatic Inverted theme
- ???: Easter Egg
-
-# 1.7.5
- CAMERA: Fix Video4Linux2 driver that broke years ago.
- CONFIG: Add 'Reset To Defaults' setting in Configurations. Thi will reset your config file to defaults.
- CHEATS: Add support for Rumble when increase or decrease by the rumble value.
- CHEATS: Add cheat variables to allow for updating large portions of memory.
- CHEEVOS: Prevent loading states before achievements are fully loaded.
- CRT: New porches and interlaced bug fix.
- CRT: New functionality, ability to switch between 15KHz and 31KHz, etc.
- COMMON: Support for "OEM-102" key (usually '\' on Euro keyboards).
- DISCORD: Add 'Ask To Join' Feature.
- EMSCRIPTEN: Add stb_font support.
- INPUT: Add new menu toggle combos 'L3 + R' and 'L + R' (useful for Switch).
- IOS: Use safe area to account for notch for iPhone X and adjust main view.
- LOCALIZATION: Update Portuguese / Brazilian translation.
- LOCALIZATION: Update Japanese translation.
- LOCALIZATION: Update Polish translation.
- LOCALIZATION: Update Spanish translation.
- MENU: Add dropdown lists for many settings.
- MENU: Fix crash that could happen when changing core's options on Android.
- MENU/QT/WIMP: Add option to rename playlists.
- MENU/QT/WIMP: Add option to filter extensions inside archives when adding to a playlist.
- MENU/QT/WIMP: Rename playlist entries with 2 single clicks.
- MENU/QT/WIMP: Fix shader parameter checkboxes not working
- METAL: Add screenshot support.
- NETPLAY: Save lobby details received back from server after first announcement.
- OPENGL/GLX: Implement Adaptive VSync - GLX_EXT_swap_control_tear.
- OPENGL/WGL: Implement Adaptive VSync - WGL_EXT_swap_control_tear.
- RUNAHEAD: Fix performance degradation that could happen over time (after approx. 30 mins). Fixed input IDs outside of range 0-35 causing slow performance in runahead.
- SWITCH: Add stb_font support.
- SWITCH: Add Retro Achievements support.
- SWITCH: Add networking support.
- SWITCH: Add touchscreen support.
- SWITCH: Add OpenGL support.
- SWITCH: Merging of RetroNX Nintendo Switch port, based on libnx SDK.
- VULKAN: Fix race condition in threaded mailbox emulation.
- VULKAN: Maintenance fixes.
- WIIU: Fix menu lag when built with DevKitPro r32.
-
-# 1.7.4
- ANDROID: Add sustained performance mode, can be turned on/off in Power Management settings menu.
- ANDROID: Powerstate/battery level support.
- CHEEVOS: Fix crash when scrolling Achievement List while Unofficial Achievements enabled (#6732).
- CHEEVOS: Added hitcounts support for PauseIf/ResetIf (#6817).
- COMMON: Automatically hide "Configuration Override options" in Quick Menu.
- COMMON: Small Bugfix to not trigger savestate code when pressing Reset.
- COMMON: Added libsixel video driver.
- EMSCRIPTEN: Fix Game Focus Toggle.
- HID/OSX: Fix to set hid device registration deterministic (#6497), to address issue #6640 re-adding dynamic device registration.
- LOCALIZATION: Update Italian translation.
- LOCALIZATION: Update Japanese translation.
- LOCALIZATION: Update Polish translation.
- LOCALIZATION: Update Portuguese / Brazilian translation.
- LOCALIZATION: Update Russian translation.
- LOCALIZATION: Update Spanish translation.
- MIDI: Add MIDI support to the libretro API. Dosbox is the first proof of concept core implementing libretro MIDI.
- MIDI: Add a Windows driver for MIDI, based on winmm.
- MENU/QT/WIMP: Qt QSlider styling for Dark Theme.
- MENU/QT/WIMP: Remove button ghostly inside highlighting.
- MENU/QT/WIMP: Initial grid view.
- MENU/QT/WIMP: Drag&drop to add new playlist items, add option to add/edit/delete playlists.
- MENU/QT/WIMP: Add menu option to update RetroArch (Windows only for now).
- MENU/QT/WIMP: Add menu option to manage shaders.
- MENU/QT/WIMP: Add menu option to manage core options.
- MENU/XMB: Add new icons for the settings
- MENU/XMB: Add an option to show the desktop ui
- METAL: Initial work-in-progress video driver for Metal. macOS-only right now, and currently requires macOS 10.13.
- METAL: Supports XMB/MaterialUI, has a menu display driver. Has a font rendering driver.
- METAL/SLANG: Slang shaders should be compatible with Metal video driver.
- NETWORK: Enable SSL/TLS support by default for desktop platforms.
- QNX: Fix Game Focus Toggle.
- PS3: Add audio mixer support for FLAC and MP3.
- PSP: Use proper button labels, fix inverted R-Stick Y axis.
- REMAPS: Fix the way offsets are calculated for keyboard remapping.
- RUNAHEAD: Fix full-screen mode change breaking Secondary Core's environment variables.
- VITA: Use proper button labels, fix inverted R-Stick Y axis.
- VITA: Add imc0: mount.
- VITA: Use sceCtrlIsMultiControllerSupported to detect.
- VULKAN: Fix two validation errors.
- VULKAN: Try to avoid creating swapchains redundantly. Should fix black screen and having to alt tab out of window again to get display working on Nvidia GPUs (Windows).
- VULKAN/OSX: Initial MoltenVK support. Not enabled yet, several MoltenVK bugs should be fixed first before we can have it fully working.
- WINDOWS/DINPUT: Add rumble support.
- WINDOWS/DINPUT: Fix Game Focus Toggle.
- WINDOWS/RAWINPUT: Fix Game Focus Toggle.
- X11: Fix Game Focus Toggle.
- WII: Change deflicker setting to work in 480p or higher, and always enables vfilter so that the user can easily change brightness.
- WIIU: Fix out-of-bounds rendering bug
- WIIU: Implement UDP broadcast network logging on Wii U.
- WIIU: Audio should no longer clip.
-
-# 1.7.3
- AUDIO: Audio mixer supports FLAC/MP3 file types now!
- COMMON: Fixed bug 'crashing in cores that don't range check retro_set_controller_type'. Some people were having crashes when device is set to RETRO_DEVICE_NONE and the cores don't check the number of ports, in VBAM's case it was overflowing and crashing. QuickNES was crashing too.
- COMMON: Fixed buffer overflow in url encoding (affecting MSVC2010/2013).
- COMMON: (QuickMenu) Added Configuration Override submenu.
- HID: Merge new HID subsystem.
- HID: Fix WaveBird support for the Wii U GCA.
- HID/OSX: Fix regression with IODHIDManager - gamepads which are connected later would not be autoconfigured.
- LOCALIZATION: Update Italian translation.
- LOCALIZATION: Update Japanese translation.
- LOCALIZATION: Update Portuguese translation.
- MENU: New WIMP Qt GUI!
- MENU: Audio mixer now works in the menu without any cores loaded. You have to enable the setting 'Enable menu audio' for this to work.
- REMAPPING/OVERLAYS: Fix regression - overlays could no longer be remapped.
- SCANNER: Add Wii Backup File WBFS support.
- X11: CRT SwitchRes support for X11/Linux.
-
-# 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
- REMAPS: Mapping keyboard keys from more than one gamepad (works with dosbox)
- REMAPS: Mapping more than one button to the same action
- REMAPS: Unmapping buttons
- REMAPS: Unmapping analogs
- REMAPS: Mapping a button to trigger an analog response (tested with mupen, can run on SM64 with the d-pad now, triggers a full analog tilt)
- REMAPS: Mapping an analog to another analog (having more than one analog mapped to the same output causes issues)
- REMAPS: Mapping an analog to produce a button response
- 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.
- NETPLAY: Fix network command only working once.
-
-# 1.6.8
- Audio: Fix the Audio DSP picker
- CHEEVOS: Add support for Atari Lynx cheevos.
- CHEEVOS: Add support for RetroAchievements Leaderboards.
- GUI: (MaterialUI) Fix crash that happened on context reset with Vulkan.
- GUI: (MaterialUI) Skip querying and drawing items that are not visible; Cache content height and bbox calculation.
- GUI: (MaterialUI) Fix entry box highlight calculation.
- GUI: (XMB) Skip drawing the fading list when it is already transparent. Optimization.
- GUI: (XMB) Comment out visible item calculation in xmb_draw_items().
- GUI: (RGUI) Prevent crashes when using a non-English language reliant on UTF8.
- GUI: Add menu option for OSD background color.
- GUI: Add menu option for OSD text color.
- GUI: Add menu option to remove frame count from OSD.
- GUI: Allow wraparound of int/float settings when pressing the left key
- INPUT/LIBRETRO: Add support for more mouse buttons (buttons 4/5)
- INPUT/LIBRETRO: Add support for analog buttons
- INPUT: Always show the controls menu even if descriptors are not set
- INPUT: Fix input descriptors not being set on cores that don't implement the controllers interface
- INPUT: Apply descriptors only for the amount of cores the core supports
- INPUT: Implement keyboard to gamepad input remapping (limited to one gamepad device for now)
- INPUT: Fix absolute mouse move handling on the winraw driver
- INPUT: Ignore keyboard input if window is not active on udev driver
- INPUT: Sanitize the filenames of autoconfig profiles before saving
- LOBBIES: Fix crash on navigating left / right from the lobby menu
- LOCALIZATION: Update Dutch translation
- LOCALIZATION: Update Italian translation.
- LOCALIZATION: Update Japanese translation.
- LOCALIZATION: Update Portuguese-Brazilian translation.
- LOCALIZATION: Update Russian translation.
- LINUX/ARMHF: Set buildbot updater URL to armhf location instead of blank string
- LINUX/PI: Broadcom VC4: Add Videocore config option
- LINUX/UDEV: Fix - RetroArch reads keyboard input when not focused with the udev input driver.
- NETPLAY: Fix disconnection not fully deinitializing Netplay.
- NETPLAY: Fix lan rooms when there is more than one room
- NETPLAY: Fix lan rooms on systems where all addresses are treated as IPv6
- COMMON: Fix clear/free loop conditionals in playlists.
- WINDOWS/GDI: Fix flickering of text.
- WINDOWS/GDI: Fix graphics corruption on Windows 98
- WINDOWS/GDI: Allow compiling without DirectInput8 for NT support
- WINDOWS/WGL: Try to use wglSwapLayerBuffers instead of SwapBuffers if possible (for more optimal performance).
- WINDOWS: Fix menubar text corruption on Japanese locale systems
- WINDOWS: Support Unicode file I/O (can now display CJK characters in file browser for example).
- WINDOWS: Support Windows 95, NT3.51, NT4
- WINDOWS: add Makefile.griffin targets for msvc6,2003,2005,2010,2012,2013
- WII: Use custom, embedded libogc SDK.
- WIIU: Initial touchscreen support for WiiU gamepad.
- WIIU: Add Cheevos support.
- SCANNER: Fix archive scanning.
- SCANNER: Support CHD files.
- SCANNER: Support Gamecube ISO scanning.
- SCANNER: Use primary data track of disc images for CRC lookups rather than cue files.  This is slower but finds matches more reliably, and is necessary for CHD files to work at all.  Update your databases!
- SCANNER: Fall back on looking inside archives when matching MAME/FBA content (most recent cores only).  If you had difficulty with content being detected before, you may have better luck now.  Update your databases and core info!
-
-# 1.6.7
- SCANNER: Fix directory scanning.
- SCANNER: Fix file scanning.
- COMMON: Fix 'Disk Image Append' option.
- FREEBSD: Compatibility fixes for Video4Linux2 camera driver.
- GUI: (MaterialUI) Add disk image append icons.
- GUI: (MaterialUI) Improve word wrapping when menu icons are enabled.
- GUI: (MaterialUI) Add User Interface -> Appearance -> Menu Icons Enable. You can turn on/off the icons on the lefthand side of the menu entries.
- GUI: Performance optimizations for XMB menu driver - only calculates visible items.
- LOCALIZATION: Update Italian translation.
-
-# 1.6.6
- 3DS: Fixes serious performance regression that affected every core; rewind was always implicitly enabled.
- AUDIO: MOD/S3M/XM sound should now be properly mixed in with the core's sound.
- GUI: Visual makeover of MaterialUI.
- GUI: Added 'Music', 'Images' and 'Video' collection options to RGUI/MaterialUI.
- GUI: Allow the user to add 'Favorites'.
- GUI: Allow the user to rename entries.
- GUI: Performance optimizations for XMB menu driver.
- LOCALIZATION: Update Italian translation
- INPUT: Overlay controller response - when we press buttons on the gamepad or keyboard, the corresponding buttons on the overlay will be highlighted as well.
- NETBSD: Silence some compilation warnings.
- COMMON: Fixed bug 'Deleting an entry from a playlist would not update the list view inside XMB'.
- COMMON: Fix inet_ntop_compat on Unix
- LOBBY: Add skeleton to add help descriptions to lobbies
-
-# 1.6.5
-Skipped this one.
-
-# 1.6.4
-
- ANDROID: Fire Stick & Fire TV remote overrides gamepad port 0 on button press and viceversa like SHIELD devices
- ANDROID: Provide default save / system / state / screenshot locations
- AUDIO: Audio mixer supports MOD/S3M/XM file types now!
- INPUT: input swap override flag (for remotes) is cleared correctly
- INPUT: allow specifying libretro device in remap files
- INPUT: allow specifying analog dpad mode in remap files
- INPUT: allow saving libretro device to remap files
- INPUT: allow saving analog dpad mode to remap files
- INPUT: allow removing core and game remap files from the menu
- COMMON: Cores can now request to set a 'shared context'. You no longer need to explicitly enable 'Shared Hardware Context' for Citra/OpenLara/Dolphin.
- COMMON: Add 'Delete Core' option to Core Information menu.
- COMMON: Allow Max Timing Skew to be set to 0.
- COMMON: Change the "content dir" behavior so it works on either a flag or an empty directory setting, now platform drivers can provide defaults for save / system / state / screenshot dirs and still allow the content dir functionality, these settings are under settings / saving and flagged as advanced
- GUI: You can turn on/off 'Horizontal Animation' now for the XMB menu. Turning animations off can result in a performance boost.
- GUI: Fix sublabel word-wrapping in XMB where multi-byte languages were cut off too soon
- LOCALIZATION: Update Dutch translation
- LOCALIZATION: Update Traditional Chinese translation
- LOCALIZATION: Update Italian translation
- LOCALIZATION: Update Russian translation
- WINDOWS: Provide default save / system / state / screenshot locations
- LOBBIES: Show what country the host is in
- MENU: Enable OSD text rendering for gdi and libcaca drivers
- WINDOWS 98/ME/2K: Set default directory for MSVC 2005 RetroArch version.
- WII: Better V-Sync handling, backported from SuperrSonic.
- WIIU: Exception handler rewritten.
-
-# 1.6.3
- IOS: Fix GL regression - 32bit color format cores were no longer rendering
- CHEEVOS: Add support for N64 cheevos and other small fixes.
- CHEEVOS: Add 'Achievements -> Achievements Verbose Mode'. Ability to display cheevos related messages in OSD, useful for RetroAchievements users.
- AUDIO: Audio mixer's volume can now be independently increased/decreased, and muted.
- AUDIO: Mute now no longer disables/enables audio but instead properly mutes the audio volume. Mute is also independent from the audio mixer volume.
- INPUT: Add mouse index selection; ability now to select between different mice
- INPUT: Fix 'All Users Control Menu' setting
- LINUX: Add a tinyalsa audio driver. Doesn't require asoundlib, should be self-contained and lower-level.
- LOBBIES: Announce the RetroArch version too
- LOCALIZATION: Add Traditional Chinese translation
- LOCALIZATION: Update French translation
- LOCALIZATION: Update Italian translation
- LOCALIZATION: Update Japanese translation
- LOCALIZATION: Update Russian translation
- MENU: Add 'User Interface -> Views'. Ability to display/hide online updater and core updater options.
- NETPLAY: Disconnecting one client shouldn't cause everyone to disconnect anymore
- NETWORK: SSL/TLS support, disabled by default
- SCANNER: Fix PS1 game scanning
- SCANNER: Move content list builder into scanner task with progress, fixes menu freeze with large playlists
- SDL2: Fix 'SDL2 driver does not see the hat on wired Xbox 360 controller"
- SETTINGS: Fix regression 'Custom Viewport is no longer overridable per-core or per-game'
- VITA: Add cheevos support
- VITA: Add support for external USB if mounted
- WAYLAND: Fix menu mouse input
- WII: Add support for single-port 'PS1/PS2 to USB controller adapter
-
-# 1.6.0
- ANDROID: Allow remotes to retain OK/Cancel position when menu_swap_ok_cancel is enabled
- ANDROID: Improve autoconf fallback
- ANDROID: Improve shield portable/gamepad device grouping workaround
- ANDROID: Runtime permission checking
- AUDIO: Audio mixer support. Mix up to 8 streams with the game's audio.
- AUTOSAVE/SRAM - Fix bug #3829 / #4820 (https://github.com/libretro/RetroArch/issues/3829)
- ENDIANNESS: Fixed database scanning. Should fix scanning on PS3/WiiU/Wii, etc.
- LOBBIES: Fallback to filename based matching if no CRC matches are found (for people making playlists by hand)
- LOBBIES: GUI refinement, show stop hosting when a host has been started, show disconnect when playing as client
- LOBBIES: if the game is already loaded it will try to connect directly instead of re-loading content (non-fullpath cores only)
- LOBBIES: unify both netplay menus
- LOCALIZATION/GUI: Korean font should display properly now with XMB/MaterialUI's default font
- LOCALIZATION: Update German translation
- LOCALIZATION: Update Japanese translation
- LOCALIZATION: Update Russian translation
- LOCALIZATION: Update/finish French translation
- MENU: Improved rendering for XMB ribbon; using additive blending (Vulkan/GL)
- 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
- 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
- VITA: Fix slow I/O
- VULKAN: Fix some crashes on loading some thumbnails
- VULKAN: Unicode font rendering support. Should fix bad character encoding for French characters, etc.
- WII: Fix crashing issues which could occur with the dummy core
- WIIU: HID Controller support
- WIIU: Initial network/netplay support
- WIIU: XMB/MaterialUI menu driver support
- WINDOWS: Added RawInput input driver for low-latency, low-level input.
- WINDOWS: Added WASAPI audio driver for low-latency audio. Both shared and exclusive mode.
- WINDOWS: Core mouse input should be relative again in cores
-
-# 1.5.0
- ANDROID: Autoconf fallback
- ANDROID: Mouse support / Emulated mouse support
- AUTOCONF: Fix partial matches for pad name
- CHEEVOS: Fix crashes in the cheevos description menu
- CHEEVOS: WIP leaderboards support
- COMMON: 9-slice texture drawing support
- COMMON: Threading fixes
- CORETEXT/APPLE: Ability to load menu display font drivers and loading of custom font.
- DOS: Add keyboard driver
- DOS: Improve color accuracy and scaling
- GUI: Add a symbol page in the OSK
- GUI: Allow changing icon theme on the fly
- GUI: Better dialogs for XMB
- GUI: Various settings are now only visible when advanced settings is enabled
- LOCALIZATION: Add/update Korean translation
- LOCALIZATION: Rewrite German translation
- LOCALIZATION: Update several English sublabels
- LOCALIZATION: Update several Japanese labels
- MOBILE: Long-tap a setting to reset to default
- MOBILE: Single-tap for menu entry selection
- NET: Allow manual netplay content loading
- NET: Announcing network games to the public lobby is optional now
- NET: Bake in miniupnpc
- NET: Fix netplay join for contentless cores
- NET: Fix netplay rooms being pushed on the wrong tab
- NET: Lan games show next to lobbies with (lan) and connect via the private IP address
- NET: Use new lobby system with MITM support
- NUKLEAR: Update to current version
- SCANNER: Always add 7z & zip to supported extensions
- VULKAN: Add snow/bokeh shader pipeline effects - at parity with GL now
- VULKAN: Find supported composite alpha in swapchain
- WIIU: Keyboard support
- WINDOWS: Fix loading of core/content via file menu
- WINDOWS: Logging to file no longer spawns an empty window
-
-# 1.4.1
@@ -1,76 +1,30 @@
 HAVE_FILE_LOGGER=1
-HAVE_CC_RESAMPLER=1
-NEED_CXX_LINKER=0
-MISSING_DECLS   =0
-
-ifneq ($(C90_BUILD),)
-   C89_BUILD=1
-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
+JTARGET = tools/retroarch-joyconfig 

-OBJ :=
+OBJDIR := obj-unix
+
+ifeq ($(GLOBAL_CONFIG_DIR),)
+   GLOBAL_CONFIG_DIR = /etc
+endif
+
+OBJ := 
+JOYCONFIG_OBJ :=
 LIBS :=
-DEF_FLAGS :=
-ASFLAGS :=
-DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -D_FILE_OFFSET_BITS=64
+DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'

-OBJDIR_BASE := obj-unix
-
-ifeq ($(DEBUG), 1)
-   OBJDIR := $(OBJDIR_BASE)/debug
-   CFLAGS ?= -O0 -g
-   CXXFLAGS ?= -O0 -g
-   DEFINES += -DDEBUG -D_DEBUG
-else
-   OBJDIR := $(OBJDIR_BASE)/release
-   CFLAGS ?= -O3
-   CXXFLAGS ?= -O3
-   DEF_FLAGS += -ffast-math
-endif
-
-ifneq ($(findstring BSD,$(OS)),)
-   DEF_FLAGS += -DBSD
-   LDFLAGS += -L/usr/local/lib
-   UDEV_CFLAGS += -I/usr/local/include/libepoll-shim
-   UDEV_LIBS += -lepoll-shim
-endif
-
-ifneq ($(findstring DOS,$(OS)),)
-   DEF_FLAGS += -march=i386
-   LDFLAGS += -lemu
-endif
-
 ifneq ($(findstring Win32,$(OS)),)
-   LDFLAGS += -static-libgcc -lwinmm
+   LDFLAGS += -static-libgcc
 endif

 include Makefile.common

-ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang"),1)
-   DEFINES +=  -Wno-invalid-source-encoding -Wno-incompatible-ms-struct
-endif
-
-ifeq ($(shell $(CC) -v 2>&1 | grep -c "tcc"),1)
-   MD = -MD
-else
-   MD = -MMD
-endif
-
 HEADERS = $(wildcard */*/*.h) $(wildcard */*.h) $(wildcard *.h)

-ifeq ($(MISSING_DECLS), 1)
-   DEFINES += -Werror=missing-declarations
-endif
-
 ifeq ($(HAVE_DYLIB), 1)
   LIBS += $(DYLIB_LIB)
 endif
@@ -85,37 +39,27 @@ ifneq ($(V),1)
   Q := @
 endif

-ifeq ($(HAVE_DRMINGW), 1)
-   DEF_FLAGS += -DHAVE_DRMINGW
-   LDFLAGS += $(DRMINGW_LIBS)
+ifeq ($(DEBUG), 1)
+   OPTIMIZE_FLAG = -O0 -g
+else
+   OPTIMIZE_FLAG = -O3 -ffast-math
 endif

-ifneq ($(findstring Win32,$(OS)),)
-   LDFLAGS += -mwindows
-endif
-
-DEF_FLAGS += -Wall $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb
-
-CFLAGS += $(DEF_FLAGS)
-CXXFLAGS += $(DEF_FLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS
+CFLAGS   += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) $(DEBUG_FLAG) -I.
+CXXFLAGS := $(CFLAGS) -std=c++0x -D__STDC_CONSTANT_MACROS
 OBJCFLAGS :=  $(CFLAGS) -D__STDC_CONSTANT_MACROS

-ifeq ($(HAVE_CXX), 1)
-   ifeq ($(CXX_BUILD), 1)
-      LINK = $(CXX)
-      CFLAGS   := $(CXXFLAGS) -xc++
-      CFLAGS   += -DCXX_BUILD
-      CXXFLAGS += -DCXX_BUILD
-   else ifeq ($(NEED_CXX_LINKER),1)
-      LINK = $(CXX)
-   else
-      LINK = $(CC)
-   endif
+ifeq ($(CXX_BUILD), 1)
+   LINK = $(CXX)
+   CFLAGS := $(CXXFLAGS) -xc++
 else
-   LINK = $(CC)
-endif
+   ifeq ($(findstring Win32,$(OS)),)
+      LINK = $(CC)
+   else
+      # directx-related code is c++
+      LINK = $(CXX)
+   endif

-ifneq ($(CXX_BUILD), 1)
   ifneq ($(GNU90_BUILD), 1)
      ifneq ($(findstring icc,$(CC)),)
         CFLAGS += -std=c99 -D_GNU_SOURCE
@@ -124,8 +68,9 @@ ifneq ($(CXX_BUILD), 1)
      endif
   endif

-   ifneq ($(C89_BUILD),)
-      CFLAGS += -std=c89 -ansi -pedantic -Werror=pedantic -Wno-long-long
+   ifneq ($(C89_BUILD)$(C90_BUILD),)
+   #looks kinda ugly, but it makes both C89_BUILD and C90_BUILD work and refer to the same thing
+      CFLAGS += -std=c89 -ansi -pedantic -Werror=pedantic
   endif
 endif

@@ -139,71 +84,38 @@ ifeq ($(NOUNUSED_VARIABLE), yes)
 endif

 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
-
-ifneq ($(X86),)
-   CFLAGS += -m32
-   CXXFLAGS += -m32
-   LDFLAGS += -m32
-endif
+RARCH_JOYCONFIG_OBJ := $(addprefix $(OBJDIR)/,$(JOYCONFIG_OBJ))

 ifneq ($(SANITIZER),)
-   CFLAGS   := -fsanitize=$(SANITIZER) $(CFLAGS)
-   CXXFLAGS := -fsanitize=$(SANITIZER) $(CXXFLAGS)
-   LDFLAGS  := -fsanitize=$(SANITIZER) $(LDFLAGS)
+    CFLAGS   := -fsanitize=$(SANITIZER) $(CFLAGS)
+    CXXFLAGS := -fsanitize=$(SANITIZER) $(CXXFLAGS)
+    LDFLAGS  := -fsanitize=$(SANITIZER) $(LDLAGS)
 endif

-ifneq ($(findstring $(GPERFTOOLS),profiler),)
-   LIBS += -lprofiler
-endif
-ifneq ($(findstring $(GPERFTOOLS),tcmalloc),)
-   LIBS += -ltcmalloc
-endif
+all: $(TARGET) $(JTARGET) config.mk

-# Qt MOC generation, required for QObject-derived classes
-ifneq ($(MOC_HEADERS),)
-    # prefix moc_ to base filename of paths and change extension from h to cpp, so a/b/foo.h becomes a/b/moc_foo.cpp
-    MOC_SRC := $(join $(addsuffix moc_,$(addprefix $(OBJDIR)/,$(dir $(MOC_HEADERS)))), $(notdir $(MOC_HEADERS:.h=.cpp)))
-    MOC_OBJ := $(patsubst %.cpp,%.o,$(MOC_SRC))
-    RARCH_OBJ += $(MOC_OBJ)
-endif
-
-all: $(TARGET) config.mk
-
-$(MOC_SRC):
-	@$(if $(Q), $(shell echo echo MOC $<),)
-	$(eval MOC_TMP := $(patsubst %.h,%_moc.cpp,$@))
-	$(Q)QT_SELECT=$(QT_VERSION) $(MOC) -o $(MOC_TMP) $<
-
-$(foreach x,$(join $(addsuffix :,$(MOC_SRC)),$(MOC_HEADERS)),$(eval $x))
-
-$(MOC_OBJ):
-	@$(if $(Q), $(shell echo echo CXX $<),)
-	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<
-
-$(foreach x,$(join $(addsuffix :,$(MOC_OBJ)),$(MOC_SRC)),$(eval $x))
-
-ifeq ($(MAKECMDGOALS),clean)
-config.mk:
-else
-include $(RARCH_OBJ:.o=.d)
+-include $(RARCH_OBJ:.o=.d) $(RARCH_JOYCONFIG_OBJ:.o=.d)
 config.mk: configure qb/*
 	@echo "config.mk is outdated or non-existing. Run ./configure again."
 	@exit 1
-endif

 retroarch: $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
 	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)

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

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

 $(OBJDIR)/%.o: %.m
 	@mkdir -p $(dir $@)
@@ -217,6 +129,21 @@ $(OBJDIR)/git_version.o: git_version.c .FORCE
 	@$(if $(Q), $(shell echo echo CC $<),)
 	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<

+$(OBJDIR)/tools/linuxraw_joypad.o: input/linuxraw_joypad.c
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -DIS_JOYCONFIG -c -o $@ $<
+
+$(OBJDIR)/tools/parport_joypad.o: input/parport_joypad.c
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -DIS_JOYCONFIG -c -o $@ $<
+
+$(OBJDIR)/tools/udev_joypad.o: input/udev_joypad.c
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -DIS_JOYCONFIG -c -o $@ $<
+
 $(OBJDIR)/%.o: %.S config.h config.mk $(HEADERS)
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo AS $<),)
@@ -229,63 +156,35 @@ $(OBJDIR)/%.o: %.rc $(HEADERS)

 install: $(TARGET)
 	rm -f $(OBJDIR)/git_version.o
-	mkdir -p $(DESTDIR)$(BIN_DIR) 2>/dev/null || /bin/true
+	mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true
-	mkdir -p $(DESTDIR)$(DATA_DIR)/applications 2>/dev/null || /bin/true
-	mkdir -p $(DESTDIR)$(DOC_DIR) 2>/dev/null || /bin/true
-	mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true
-	mkdir -p $(DESTDIR)$(DATA_DIR)/pixmaps 2>/dev/null || /bin/true
-	cp $(TARGET) $(DESTDIR)$(BIN_DIR)
-	cp tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
-	cp retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)
-	cp 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 && test $(HAVE_ASSETS); then \
-		echo "Installing media assets..."; \
-		mkdir -p $(DESTDIR)$(ASSETS_DIR)/assets; \
-		if test $(HAVE_MATERIALUI) = 1; then \
-			cp -r media/assets/glui/ $(DESTDIR)$(ASSETS_DIR)/assets; \
-		fi; \
-		if test $(HAVE_XMB) = 1; then \
-			cp -r media/assets/xmb/ $(DESTDIR)$(ASSETS_DIR)/assets; \
-		fi; \
-		if test $(HAVE_OZONE) = 1; then \
-			cp -r media/assets/ozone/ $(DESTDIR)$(ASSETS_DIR)/assets; \
-		fi; \
-		cp media/assets/COPYING $(DESTDIR)$(DOC_DIR)/COPYING.assets; \
-		echo "Asset copying done."; \
-	fi
+	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 2>/dev/null || /bin/true
+	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
+	install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin 
+	install -m755 tools/cg2glsl.py $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
+	install -m755 $(JTARGET) $(DESTDIR)$(PREFIX)/bin
+	install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
+	install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR)
+	install -m644 docs/retroarch-cg2glsl.1 $(DESTDIR)$(MAN_DIR)
+	install -m644 docs/retroarch-joyconfig.1 $(DESTDIR)$(MAN_DIR)
+	install -m644 media/retroarch.png $(DESTDIR)$(PREFIX)/share/pixmaps
+	install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps

 uninstall:
-	rm -f $(DESTDIR)$(BIN_DIR)/retroarch
-	rm -f $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
+	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch
+	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-joyconfig
+	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
 	rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
-	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 -rf $(DESTDIR)$(ASSETS_DIR)
+	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch.1
+	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-cg2glsl.1
+	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-joyconfig.1
+	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.png
+	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.svg

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

 .PHONY: all install uninstall clean
-
-print-%:
-	@echo '$*=$($*)'
@@ -1,24 +0,0 @@
-include Makefile.common
-
-# Qt MOC generation, required for QObject-derived classes
-ifneq ($(MOC_HEADERS),)
-	# prefix moc_ to base filename of paths and change extension from h to cpp, so a/b/foo.h becomes a/b/moc_foo.cpp
-	MOC_SRC := $(join $(addsuffix moc_,$(dir $(MOC_HEADERS))), $(notdir $(MOC_HEADERS:.h=.cpp)))
-endif
-
-MOC ?= $(error missing moc path)
-
-.PHONY: generate
-
-$(MOC_SRC):
-	@$(if $(Q), $(shell echo echo MOC $<),)
-	$(eval MOC_TMP := $(patsubst %.h,%_moc.cpp,$@))
-	$(MOC) -o $(MOC_TMP) $<
-
-$(foreach x,$(join $(addsuffix :,$(MOC_SRC)),$(MOC_HEADERS)),$(eval $x))
-
-generate: $(MOC_SRC)
-	@echo $(MOC_SRC)
-	
-print-%:
-	@echo '$*=$($*)'
@@ -1,113 +0,0 @@
-# This build was put together and is maintained by ModMyClassic.com for Libretro.
-# The purpose is to give Libretro a proper "official" build platform for classic consoles.
-# If you need any help in building for the classics or have any questions then please visit
-# https://modmyclassic.com/comp and we will help in any way possible! 
-
-# Building Prerequisites ##############
-# arm-linux-gnueabihf-gcc-8
-# arm-linux-gnueabihf-g++-8
-# arm-linux-gnueabihf-as
-# arm-linux-gnueabihf-strip
-# patchelf
-# bc
-
-include version.all
-
-# Classic Readme Variables ############
-CLASSIC_ALT_VER := $(shell echo $(RARCH_VERSION) | tr . _)
-CLASSIC_MODS_VER := Official_Retroarch_v$(CLASSIC_ALT_VER)c_COptimised
-CLASSIC_MODS_NAME := RetroArch v$(RARCH_VERSION)c \(Official Classic Optimised\)
-CLASSIC_VERSION := $(RARCH_VERSION)c \(Classic+\)
-MOD_CREATOR := Libretro + ModMyClassic
-MOD_CATEGORY := RetroArch
-GIT_COMMIT := $(shell echo "`git rev-parse --short HEAD``git diff-index --quiet HEAD -- || echo '-dirty'`")
-
-# Platform dependant Variables ########
-HAKCHI_DIR := RA_Platform-Hakchi
-HAKCHI_GIT := https://github.com/Classicmods/RA_Platform-Hakchi
-
-# General Shared Variables ############
-TARGET := retroarch
-CC_V = arm-linux-gnueabihf-gcc-8
-CXX_V = arm-linux-gnueabihf-g++-8
-AS_V = arm-linux-gnueabihf-as
-CC_AS_V = arm-linux-gnueabihf-gcc-8
-
-# Libretro Defines ####################
-#HAVE_CLASSIC = Classic Hook, disable some features
-#HAVE_C_A7A7 = Classic Armv7 Cortex A7 optimisation override
-#HAVE_HAKCHI = Hakchi Hook, change default configurations etc (TODO)
-
-all: $(TARGET)
-
-retroarch:
-	#Backup vanilla version files + ammend version
-	cp version.all version_BACKUP.all && cp version.dtd version_BACKUP.dtd
-	sed -i -e 's/RARCH_VERSION="[^"]*"/RARCH_VERSION="$(CLASSIC_VERSION)"/g' version.all
-	sed -i -e 's/PACKAGE_VERSION "[^"]*"/PACKAGE_VERSION "$(CLASSIC_VERSION)"/g' version.all
-	sed -i -e 's/ENTITY version "[^"]*"/ENTITY version "$(CLASSIC_VERSION)"/g' version.dtd
-	#Build the RetroArch Binary for cross platform classics (ARMv7 Cortex A7)
-	patchelf --version #Check if you have patchelf installed... (sudo apt-get install patchelf)
-	./configure --host=arm-linux-gnueabihf --enable-mali_fbdev --disable-freetype --enable-opengles --enable-udev --enable-alsa --enable-neon --enable-floathard --disable-discord
-	make CC=$(CC_V) CXX=$(CXX_V) AS=$(AS_V) CC_AS=$(CC_AS_V) LDFLAGS_SDL=-lSDL2 HAVE_CLASSIC=1 HAVE_C_A7A7=1 HAVE_HAKCHI=1 -j #Cook it
-	arm-linux-gnueabihf-strip -v retroarch
-	patchelf --replace-needed libSDL2-2.0.so.0 libSDL2.so retroarch #libSDL2-2.0.so.0 sym link doesn't exist on native build. Just patch the binary...
-
-	#HAKCHI BUILD (NESC, SNESC)
-	#FYI this build was originally known as RetroArch 'Neo' for Hakchi.
-	@echo "** BUILDING CLASSIC_MODS HAKCHI - $(CLASSIC_MODS_VER) HMOD PACKAGE **"
-	rm -fr /tmp/$(HAKCHI_DIR)
-	cd /tmp/; git clone $(HAKCHI_GIT)
-	cp retroarch /tmp/$(HAKCHI_DIR)/bin/retroarch
-	echo $$(echo "Built by: " $$USER @ $$(date) \\\\\\ Git Commit: $(GIT_COMMIT)) > /tmp/$(HAKCHI_DIR)/etc/libretro/retroarch_version
-	cp /tmp/$(HAKCHI_DIR)/readme.md /tmp/$(HAKCHI_DIR)/readme_COPY.md
-	printf "%s\n" \
-	"---" \
-	"Name: $(CLASSIC_MODS_NAME)" \
-	"Creator: $(MOD_CREATOR)" \
-	"Category: $(MOD_CATEGORY)" \
-	"Version: $(CLASSIC_MODS_VER)" \
-	"Built on: $(shell date)" \
-	"Git commit: $(GIT_COMMIT)" \
-	"---" > /tmp/$(HAKCHI_DIR)/readme.md
-	cat /tmp/$(HAKCHI_DIR)/readme_COPY.md >> /tmp/$(HAKCHI_DIR)/readme.md
-	rm /tmp/$(HAKCHI_DIR)/readme_COPY.md
-	@echo "** COMPRESSING $(CLASSIC_MODS_VER) HMOD PACKAGE **"
-	cd /tmp/$(HAKCHI_DIR)/; tar -czvf "$(CLASSIC_MODS_VER).hmod" *
-	mv /tmp/$(HAKCHI_DIR)/$(CLASSIC_MODS_VER).hmod .
-	@echo "** BUILT CLASSIC_MODS HAKCHI - $(CLASSIC_MODS_VER) HMOD PACKAGE **"
-	rm -fr /tmp/$(HAKCHI_DIR) #clean up tmp
-
-	#COMMODORE 64 MINI BUILD (WIP)
-	
-	#Clean down dirty files
-	rm -f version.all version.dtd
-	mv version_BACKUP.all version.all && mv version_BACKUP.dtd version.dtd
-	@echo "*********************************************************************"
-	@echo "*** Classic ARM7 Cortex A7 build and packages built successfully! ***"
-	@echo "****************** Winner, Winner, Chicken Dinner! ******************"
-	@echo "*********************************************************************"
-clean:
-	rm -rf obj-unix
-	rm -f *.d
-	rm -f *.o
-	rm -f audio/*.o
-	rm -f conf/*.o
-	rm -f gfx/*.o
-	rm -f gfx/drivers_font/*.o
-	rm -f gfx/drivers_font_renderer/*.o
-	rm -f gfx/drivers_context/*.o
-	rm -f gfx/py_state/*.o
-	rm -f compat/*.o
-	rm -f record/*.o
-	rm -f input/*.o
-	rm -f tools/*.o
-	rm -f $(BINDIR)/retroarch
-	rm -f $(BINDIR)/retroarch-joyconfig
-	rm -f $(PNDDIR)/readme.html
-	rm -f retroarch
-	rm -f $(CLASSIC_MODS_VER).hmod
-	rm -f version.all version.dtd
-	mv -f version_BACKUP.all version.all || echo "Backup Doesn't Exist - Ignoring..."
-	mv -f version_BACKUP.dtd version.dtd || echo "Backup Doesn't Exist - Ignoring..."
-	rm -f *_BACKUP*
@@ -1,116 +1,30 @@
 TARGET := retroarch_3ds
-LIBRETRO =
+OBJS :=
+OBJS += gfx/drivers/ctr_sprite.o griffin/griffin.o
+#NO_SMDH = 1
+DEBUG = 0

-DEBUG                   = 0
-GRIFFIN_BUILD           = 1
-WHOLE_ARCHIVE_LINK      = 0
-BUILD_3DSX              = 1
-BUILD_3DS               = 0
-BUILD_CIA               = 1
-LIBCTRU_NO_DEPRECATION  = 1

-APP_TITLE            = RetroArch 3DS
-APP_DESCRIPTION      = RetroArch 3DS
-APP_AUTHOR           = Team Libretro
-APP_PRODUCT_CODE     = RETROARCH-3DS
-APP_UNIQUE_ID        = 0xBAC00
-APP_ICON             = pkg/ctr/assets/default.png
-APP_BANNER           = pkg/ctr/assets/libretro_banner.png
-APP_AUDIO            = pkg/ctr/assets/silent.wav
-APP_RSF              = pkg/ctr/tools/template.rsf
-APP_SYSTEM_MODE      = 64MB
-APP_SYSTEM_MODE_EXT  = 124MB
-APP_BIG_TEXT_SECTION = 0
-APP_USE_SVCHAX       = 0
-
-include pkg/ctr/Makefile.cores
-
-OBJ :=
-OBJ += gfx/drivers/ctr_shaders/ctr_sprite.o
-OBJ += ctr/ctr_system.o
-OBJ += ctr/ctr_memory.o
-OBJ += ctr/ctr_linear.o
-OBJ += ctr/gpu_old.o
-OBJ += ctr/exec-3dsx/exec_cia.o \
-	ctr/exec-3dsx/exec_3dsx.o \
-	ctr/exec-3dsx/mini-hb-menu/launch.o \
-	ctr/exec-3dsx/mini-hb-menu/loaders/rosalina.o \
-	ctr/exec-3dsx/mini-hb-menu/loaders/hax2.o \
-	ctr/exec-3dsx/mini-hb-menu/loaders/ninjhax1.o
-
-ifeq ($(APP_BIG_TEXT_SECTION), 1)
-	APP_USE_SVCHAX = 1
-	LDFLAGS  += -Wl,--defsym,__ctr_patch_services=__service_ptr
-endif
-
-ifeq ($(APP_USE_SVCHAX), 1)
-	OBJ += ctr/ctr_svchax.o
-endif
-
-DEFINES :=
-ifeq ($(GRIFFIN_BUILD), 1)
-	OBJ += griffin/griffin.o
-	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_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 -DRC_DISABLE_LUA -DHAVE_SOCKET_LEGACY -DHAVE_THREADS
-	#-DHAVE_SSL -DHAVE_BUILTINMBEDTLS -DMBEDTLS_SSL_DEBUG_ALL
-	#ssl is currently incompatible with griffin due to use of the "static" flag on repeating functions that will conflict when included in one file
-else
-	HAVE_CC_RESAMPLER = 1
-	HAVE_MENU_COMMON = 1
-	HAVE_RTGA = 1
-	HAVE_RPNG = 1
-	HAVE_RJPEG = 1
-	HAVE_RBMP = 1
-	HAVE_MENU = 1
-	HAVE_RGUI = 1
-	HAVE_ZLIB = 1
-	HAVE_7ZIP = 1
-	HAVE_BUILTINZLIB = 1
-	HAVE_LIBRETRODB = 1
-	HAVE_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
-	#HAVE_BUILTINMBEDTLS = 1
-
-	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
-	BLACKLIST :=
-	BLACKLIST += input/input_overlay.o
-	BLACKLIST += tasks/task_overlay.o
-	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-endif
-
-ifeq ($(strip $(DEVKITPRO)),)
-	$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitpro")
+ifeq ($(strip $(DEVKITARM)),)
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
 endif

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

-APP_TITLE         := $(shell echo "$(APP_TITLE)" | cut -c1-128)
-APP_DESCRIPTION   := $(shell echo "$(APP_DESCRIPTION)" | cut -c1-256)
-APP_AUTHOR        := $(shell echo "$(APP_AUTHOR)" | cut -c1-128)
-APP_PRODUCT_CODE  := $(shell echo $(APP_PRODUCT_CODE) | cut -c1-16)
-APP_UNIQUE_ID     := $(shell echo $(APP_UNIQUE_ID) | cut -c1-7)
-
-MAKEROM_ARGS_COMMON = -rsf $(APP_RSF) -exefslogo -elf $(TARGET).elf -icon $(TARGET).icn -banner $(TARGET).bnr -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" -DAPP_UNIQUE_ID=$(APP_UNIQUE_ID) -DAPP_SYSTEM_MODE=$(APP_SYSTEM_MODE) -DAPP_SYSTEM_MODE_EXT=$(APP_SYSTEM_MODE_EXT)
+ifeq ($(strip $(AEMSTRO)),)
+$(error "Please set AEMSTRO in your environment. export AEMSTRO=<path to>aemstro")
+endif

 INCDIRS := -I$(CTRULIB)/include
 LIBDIRS := -L. -L$(CTRULIB)/lib

-ARCH     := -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
+
+ARCH     := -march=armv6k -mtune=mpcore -mfloat-abi=hard

 CFLAGS	+=	-mword-relocations \
 			-fomit-frame-pointer -ffast-math \
-         -Werror=implicit-function-declaration \
 			$(ARCH)

 #CFLAGS	+= -Wall
@@ -121,60 +35,55 @@ ifeq ($(DEBUG), 1)
 else
   CFLAGS	+= -O3
 endif
+CFLAGS += -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include

-ifeq ($(LIBCTRU_NO_DEPRECATION), 1)
-   CFLAGS	+= -DLIBCTRU_NO_DEPRECATION
-endif
+CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE -DSINC_LOWEST_QUALITY
+CFLAGS += -DHAVE_GRIFFIN=1 -DHAVE_FILTERS_BUILTIN -DHAVE_MENU -DHAVE_RGUI
+CFLAGS += -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_BUILTIN_AUTOCONFIG
+#-DHAVE_LIBRETRO_MANAGEMENT -DWANT_RPNG -DHAVE_7ZIP

-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-
-CFLAGS += -I. \
-			 -Ideps \
-			 -Ideps/libz \
-			 -Ideps/7zip \
-			 -Ideps/stb \
-			 -Ilibretro-common/include
-
-CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
-CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)

 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11

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

-LIBS	:= $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lm

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

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

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

 .PHONY: $(BUILD) clean all

+#---------------------------------------------------------------------------------
 all: $(TARGET)

-$(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
-$(TARGET).3dsx: $(TARGET).elf
-$(TARGET).elf: $(OBJ) libretro_ctr.a
+clean:
+	rm -f $(OBJS)
+	rm -f $(TARGET).3dsx
+	rm -f $(TARGET).elf
+
+
+$(TARGET): $(TARGET).3dsx
+$(TARGET).3dsx	:	$(TARGET).elf
+$(TARGET).elf	:	$(OBJS)
+
+ifeq ($(strip $(APP_TITLE)),)
+APP_TITLE	:=	$(notdir $(TARGET))
+endif
+
+ifeq ($(strip $(APP_DESCRIPTION)),)
+APP_DESCRIPTION	:=	Built with devkitARM & libctru
+endif
+
+ifeq ($(strip $(APP_AUTHOR)),)
+APP_AUTHOR	:=	Unspecified Author
+endif
+
+ifeq ($(strip $(APP_ICON)),)
+APP_ICON	:=	$(CTRULIB)/default_icon.png
+endif

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

@@ -187,39 +96,17 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)

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

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

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

 %.o: %.cpp
 	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS)
@@ -238,43 +125,22 @@ endif

 %.vsh:

-$(TARGET).smdh: $(APP_ICON)
-	$(DEVKITARM)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
+#---------------------------------------------------------------------------------
+%.smdh: $(APP_ICON) $(MAKEFILE_LIST)
+	@echo building ... $(notdir $@)
+	smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@

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

-$(TARGET).elf: ctr/3dsx_custom_crt0.o
-	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
+#---------------------------------------------------------------------------------
+%.elf: .FORCE
+	@echo linking $(notdir $@)
+	$(LD) $(LDFLAGS) $(OBJS) $(LIBDIRS) $(LIBS) -o $@
 	$(NM) -CSn $@ > $(notdir $*.lst)

-$(TARGET).bnr: $(APP_BANNER) $(APP_AUDIO)
-	$(BANNERTOOL) makebanner -i "$(APP_BANNER)" -a "$(APP_AUDIO)" -o $@

-$(TARGET).icn: $(APP_ICON)
-	$(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_TITLE)" -p "$(APP_AUTHOR)" -i $(APP_ICON) -o $@
+.PHONY: .FORCE

-$(TARGET).3ds: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
-	$(MAKEROM) -f cci -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=true
-
-$(TARGET).cia: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
-	$(MAKEROM) -f cia -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=false
-
-clean:
-	rm -f $(OBJ)
-	rm -f $(TARGET).3dsx
-	rm -f $(TARGET).elf
-	rm -f $(TARGET).3ds
-	rm -f $(TARGET).cia
-	rm -f $(TARGET).smdh
-	rm -f $(TARGET).bnr
-	rm -f $(TARGET).icn
-	rm -f ctr/ctr_config_*.o
-	rm -f ctr/3dsx_custom_crt0.o
-
-.PHONY: clean
@@ -1,221 +0,0 @@
-TARGET := retroarch_3ds_salamander
-LIBRETRO =
-
-DEBUG                   = 0
-BUILD_3DSX              = 1
-BUILD_3DS               = 0
-BUILD_CIA               = 1
-
-APP_TITLE            = RetroArch 3DS
-APP_DESCRIPTION      = RetroArch 3DS
-APP_AUTHOR           = Team Libretro
-APP_PRODUCT_CODE     = RETROARCH-3DS
-APP_UNIQUE_ID        = 0xBAC00
-APP_ICON             = pkg/ctr/assets/default.png
-APP_BANNER           = pkg/ctr/assets/libretro_banner.png
-APP_AUDIO            = pkg/ctr/assets/silent.wav
-APP_RSF              = pkg/ctr/tools/template.rsf
-APP_SYSTEM_MODE      = 64MB
-APP_SYSTEM_MODE_EXT  = 124MB
-
-OBJ := ctr/ctr_system.o \
-		 ctr/ctr_memory.o \
-		 ctr/ctr_linear.o \
-		 frontend/frontend_salamander.o \
-		 frontend/frontend_driver.o \
-		 frontend/drivers/platform_ctr.o \
-		 frontend/drivers/platform_null.o \
-		 libretro-common/encodings/encoding_utf.o \
-		 libretro-common/compat/compat_strcasestr.o \
-		 libretro-common/compat/fopen_utf8.o \
-		 libretro-common/file/file_path.o \
-		 libretro-common/string/stdstring.o \
-		 libretro-common/lists/string_list.o \
-		 libretro-common/lists/dir_list.o \
-		 libretro-common/file/retro_dirent.o \
-		 libretro-common/compat/compat_strl.o \
-		 libretro-common/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
-		 
-OBJ += ctr/exec-3dsx/exec_cia.o \
-	ctr/exec-3dsx/exec_3dsx.o \
-	ctr/exec-3dsx/mini-hb-menu/launch.o \
-	ctr/exec-3dsx/mini-hb-menu/loaders/rosalina.o \
-	ctr/exec-3dsx/mini-hb-menu/loaders/hax2.o \
-	ctr/exec-3dsx/mini-hb-menu/loaders/ninjhax1.o
-
-ifeq ($(strip $(DEVKITPRO)),)
-	$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitpro")
-endif
-
-ifeq ($(strip $(CTRULIB)),)
-	CTRULIB = $(DEVKITPRO)/libctru
-endif
-
-APP_TITLE         := $(shell echo "$(APP_TITLE)" | cut -c1-128)
-APP_DESCRIPTION   := $(shell echo "$(APP_DESCRIPTION)" | cut -c1-256)
-APP_AUTHOR        := $(shell echo "$(APP_AUTHOR)" | cut -c1-128)
-APP_PRODUCT_CODE  := $(shell echo $(APP_PRODUCT_CODE) | cut -c1-16)
-APP_UNIQUE_ID     := $(shell echo $(APP_UNIQUE_ID) | cut -c1-7)
-
-MAKEROM_ARGS_COMMON = -rsf $(APP_RSF) -exefslogo -elf $(TARGET).elf -icon $(TARGET).icn -banner $(TARGET).bnr -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" -DAPP_UNIQUE_ID=$(APP_UNIQUE_ID) -DAPP_SYSTEM_MODE=$(APP_SYSTEM_MODE) -DAPP_SYSTEM_MODE_EXT=$(APP_SYSTEM_MODE_EXT)
-
-INCDIRS := -I$(CTRULIB)/include
-LIBDIRS := -L. -L$(CTRULIB)/lib
-
-ARCH     := -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
-
-CFLAGS	+=	-mword-relocations \
-			-fomit-frame-pointer -ffast-math \
-         -Werror=implicit-function-declaration \
-			$(ARCH)
-
-#CFLAGS	+= -Wall
-CFLAGS	+=	-DARM11 -D_3DS
-
-ifeq ($(DEBUG), 1)
-   CFLAGS	+= -O0 -g
-else
-   CFLAGS	+= -O3
-endif
-
-CFLAGS += -I. -Ideps/libz -Ideps/7zip -Ideps/stb -Ilibretro-common/include
-
-#CFLAGS += -DRARCH_INTERNAL
-CFLAGS += -DRARCH_CONSOLE -DIS_SALAMANDER
-
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
-
-ASFLAGS	:=	-g $(ARCH) -O3
-LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
-
-CFLAGS   += -std=gnu99 -ffast-math
-
-LIBS	:= -lctru -lm
-
-ifeq ($(BUILD_3DSX), 1)
-TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
-endif
-
-ifeq ($(BUILD_3DS), 1)
-TARGET_3DS := $(TARGET).3ds
-endif
-
-ifeq ($(BUILD_CIA), 1)
-TARGET_CIA := $(TARGET).cia
-endif
-
-.PHONY: $(BUILD) clean all
-
-all: $(TARGET)
-
-$(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
-$(TARGET).3dsx: $(TARGET).elf
-$(TARGET).elf: $(OBJ)
-
-PREFIX		:=	$(DEVKITARM)/bin/arm-none-eabi-
-
-CC      := $(PREFIX)gcc
-CXX     := $(PREFIX)g++
-AS      := $(PREFIX)as
-AR      := $(PREFIX)ar
-OBJCOPY := $(PREFIX)objcopy
-STRIP   := $(PREFIX)strip
-NM      := $(PREFIX)nm
-LD      := $(CXX)
-
-ifeq ($(strip $(CTRBANNERTOOL)),)
-	ifneq ($(findstring Linux,$(shell uname)),)
-		BANNERTOOL = pkg/ctr/tools/bannertool-linux
-	else ifneq ($(findstring Darwin,$(shell uname)),)
-		BANNERTOOL = pkg/ctr/tools/bannertool-mac
-	else
-		BANNERTOOL = pkg/ctr/tools/bannertool.exe
-	endif
-else
-	BANNERTOOL = $(CTRBANNERTOOL)
-endif
-
-ifeq ($(strip $(CTRMAKEROM)),)
-	ifneq ($(findstring Linux,$(shell uname)),)
-		MAKEROM    = pkg/ctr/tools/makerom-linux
-	else ifneq ($(findstring Darwin,$(shell uname)),)
-		MAKEROM    = pkg/ctr/tools/makerom-mac
-	else
-		MAKEROM    = pkg/ctr/tools/makerom.exe
-	endif
-else
-	MAKEROM = $(CTRMAKEROM)
-endif
-
-%.o: %.vsh %.gsh
-	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
-	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
-	rm $*.shbin
-
-%.o: %.vsh
-	$(DEVKITARM)/bin/picasso $^ -o $*.shbin
-	$(DEVKITARM)/bin/bin2s $*.shbin | $(PREFIX)as -o $@
-	rm $*.shbin
-
-%.o: %.cpp
-	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS)
-
-%.o: %.c
-	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS)
-
-%.o: %.s
-	$(CC) -c -o $@ $< $(ASFLAGS)
-
-%.o: %.S
-	$(CC) -c -o $@ $< $(ASFLAGS)
-
-%.a:
-	$(AR) -rc $@ $^
-
-%.vsh:
-
-$(TARGET).smdh: $(APP_ICON)
-	$(DEVKITARM)/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
-
-$(TARGET).3dsx: $(TARGET).elf
-ifeq ($(APP_BIG_TEXT_SECTION), 1)
-	cp pkg/ctr/big_text_section.xml $(TARGET).xml
-else
-	rm -f $(TARGET).xml
-endif
-	$(DEVKITARM)/bin/3dsxtool $< $@ $(_3DSXFLAGS)
-
-$(TARGET).elf: ctr/3dsx_custom_crt0.o
-	$(LD) $(LDFLAGS) $(OBJ) $(LIBDIRS) $(LIBS) -o $@
-	$(NM) -CSn $@ > $(notdir $*.lst)
-
-$(TARGET).bnr: $(APP_BANNER) $(APP_AUDIO)
-	$(BANNERTOOL) makebanner -i "$(APP_BANNER)" -a "$(APP_AUDIO)" -o $@
-
-$(TARGET).icn: $(APP_ICON)
-	$(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_TITLE)" -p "$(APP_AUTHOR)" -i $(APP_ICON) -o $@
-
-$(TARGET).3ds: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
-	$(MAKEROM) -f cci -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=true
-
-$(TARGET).cia: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
-	$(MAKEROM) -f cia -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=false
-
-clean:
-	rm -f $(OBJ)
-	rm -f $(TARGET).3dsx
-	rm -f $(TARGET).elf
-	rm -f $(TARGET).3ds
-	rm -f $(TARGET).cia
-	rm -f $(TARGET).smdh
-	rm -f $(TARGET).bnr
-	rm -f $(TARGET).icn
-	rm -f ctr/ctr_config_*.o
-	rm -f ctr/3dsx_custom_crt0.o
-
-.PHONY: clean
@@ -1,64 +1,53 @@
-TARGET := retroarch.js
+TARGET = retroarch.js

-EOPT = USE_ZLIB=1 # Emscripten specific options
-EOPTS = $(addprefix -s $(EMPTY), $(EOPT)) # Add '-s ' to each option
-
-PTHREAD = 0
 OS = Emscripten
 OBJ :=
-DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD)
-DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN -DHAVE_STB_FONT
+DEFINES := -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_MAIN
+DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVERLAY -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN

-HAVE_OVERLAY = 1
-HAVE_CC_RESAMPLER = 1
-HAVE_EGL    = 1
-HAVE_OPENGLES = 1
-HAVE_RJPEG  = 0
-HAVE_RPNG   = 1
+HAVE_OPENGL = 1
+HAVE_GLES = 1
 HAVE_EMSCRIPTEN = 1
-HAVE_MENU = 1
 HAVE_RGUI = 1
 HAVE_SDL = 0
-HAVE_SDL2 = 0
 HAVE_ZLIB = 1
+HAVE_FBO = 1
 WANT_ZLIB = 1
-HAVE_SHADERPIPELINE = 1
-HAVE_STATIC_VIDEO_FILTERS = 1
-HAVE_STATIC_AUDIO_FILTERS = 1
-MEMORY = 536870912
-HAVE_STB_FONT = 1
-
-PRECISE_F32 = 1
-
-OBJDIR := obj-emscripten
+MEMORY = 268435456
+LTO = 0
+# XXX: setting this to 1/2 currently crashes Firefox nightly
+PRECISE_F32 = 2

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

-#if you compile with SDL2 flag add this Emscripten flag "-s USE_SDL=2" to LDFLAGS:
-
-LIBS    := -s USE_ZLIB=1
-LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) -s NO_EXIT_RUNTIME=0 -s FULL_ES2=1 -s BINARYEN_TRAP_MODE=\"clamp\" \
-           -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_load_state', '_cmd_take_screenshot']" \
-           --js-library emscripten/library_rwebaudio.js \
-           --js-library emscripten/library_rwebcam.js
-ifneq ($(PTHREAD), 0)
-   LDFLAGS += -s USE_PTHREADS=$(PTHREAD) -s PTHREAD_POOL_SIZE=2
-endif
-
-ifeq ($(ASYNC), 1)
-   LDFLAGS += -s ASYNCIFY=$(ASYNC)
-endif
-
-ifeq ($(HAVE_SDL2), 1)
-   LIBS += -s USE_SDL=2
-   DEFINES += -DHAVE_SDL2
-endif
+LIBS    :=
+LDFLAGS := -L. -s TOTAL_MEMORY=$(MEMORY) -s OUTLINING_LIMIT=50000 --js-library emscripten/library_rwebaudio.js --js-library emscripten/library_rwebinput.js --js-library emscripten/library_rwebcam.js --no-heap-copy

 include Makefile.common

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

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

-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))
+CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ilibretro-common/include -std=gnu99

 all: $(TARGET)

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

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

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

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

 .PHONY: all clean
+
@@ -1,259 +0,0 @@
-include version.all
-
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
-endif
-
-TOPDIR ?= $(CURDIR)
-include $(DEVKITPRO)/libnx/switch_rules
-
-TARGET := retroarch_switch
-
-DEBUG                  ?= 0
-WHOLE_ARCHIVE_LINK      = 0
-GRIFFIN_BUILD           = 0
-
-OBJ := 
-
-# For threading we need to overwrite some vars with global defines because devkitPro's includes 
-# make it hard for us. This works for the pthread wrapper
-DEFINES_THREAD := -Dpthread_t=Thread -Dpthread_mutex_t=Mutex -Dpthread_mutexattr_t='void*' -Dpthread_attr_t=int -Dpthread_cond_t=CondVar -Dpthread_condattr_t='int' -D_SYS__PTHREADTYPES_H_
-DEFINES := -D__SWITCH__=1 -U__linux__ -U__linux -DGLM_FORCE_PURE=1 -DRARCH_CONSOLE -DRARCH_INTERNAL -DGLOBAL_CONFIG_DIR='"/switch"' $(DEFINES_THREAD) -DHAVE_STB_VORBIS
-
-HAVE_CC_RESAMPLER = 1
-HAVE_MENU_COMMON = 1
-HAVE_RTGA = 1
-HAVE_RPNG = 1
-HAVE_RJPEG = 1
-HAVE_RBMP = 1
-HAVE_ZLIB = 1
-HAVE_BUILTINZLIB = 1
-HAVE_LIBRETRODB = 1
-HAVE_STATIC_VIDEO_FILTERS = 1
-HAVE_STATIC_AUDIO_FILTERS = 1
-HAVE_MENU = 1
-HAVE_RUNAHEAD = 1
-HAVE_NETWORKING = 1
-HAVE_NETPLAYDISCOVERY = 1
-HAVE_STB_FONT = 1
-HAVE_CHEEVOS = 1
-HAVE_CHD = 0 # disabled due to static libretro-common and libchdr conflicts between different cores
-HAVE_STB_VORBIS = 1
-
-# RetroArch libnx useful flags
-HAVE_THREADS = 1
-HAVE_PTHREADS = 1
-HAVE_FREETYPE = 0
-HAVE_SWITCH = 1
-HAVE_LIBNX = 1
-HAVE_OPENGL = 1
-HAVE_LANGEXTRA = 1
-
-ifeq ($(HAVE_OPENGL), 1)
-  HAVE_EGL = 1
-  HAVE_SHADERPIPELINE = 1
-  HAVE_RGUI = 1
-  HAVE_MATERIALUI = 1
-  HAVE_XMB = 1
-  HAVE_OZONE = 1
-  HAVE_OVERLAY = 1
-else
-  HAVE_RGUI = 1
-  HAVE_MATERIALUI = 0
-  HAVE_XMB = 0
-  HAVE_OZONE = 0
-  HAVE_STRIPES = 0
-endif
-
-include Makefile.common
-BLACKLIST :=
-
-OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# DATA is a list of directories containing data files
-# INCLUDES is a list of directories containing header files
-# EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm".
-# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional)
-#
-# NO_ICON: if set to anything, do not use icon.
-# NO_NACP: if set to anything, no .nacp file is generated.
-# APP_TITLE is the name of the app stored in the .nacp file (Optional)
-# APP_AUTHOR is the author of the app stored in the .nacp file (Optional)
-# APP_VERSION is the version of the app stored in the .nacp file (Optional)
-# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional)
-# ICON is the filename of the icon (.jpg), relative to the project folder.
-#   If not set, it attempts to use one of the following (in this order):
-#     - <Project name>.jpg
-#     - icon.jpg
-#     - <libnx folder>/default_icon.jpg
-#---------------------------------------------------------------------------------
-BUILD := build
-SOURCES := $(CURDIR)/source
-DATA := data
-INCLUDES :=	include
-EXEFS_SRC := exefs_src
-#ROMFS := switch/romfs
-
-APP_TITLE := RetroArch
-APP_VERSION := $(RARCH_VERSION)
-APP_AUTHOR := libretro Team
-APP_ICON := pkg/libnx/retroarch.jpg
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -mcpu=cortex-a57+crc+fp+simd
-
-CFLAGS := -g -Wall -O3 -ffast-math -ffunction-sections \
-          $(ARCH) $(DEFINES) -Ideps -Ideps/libz -Ilibretro-common/include -Ideps/stb -I$(LIBNX)/include -I$(PORTLIBS)/include/ -include $(LIBNX)/include/switch.h #$(shell $(PORTLIBS)/bin/freetype-config --cflags)
-
-CFLAGS += $(INCLUDE) -DSWITCH=1 -DHAVE_LIBNX=1 -DNXLINK=1 -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DHAVE_STB_FONT #-DHAVE_FREETYPE
-
-ifeq ($(strip $(HAVE_STATIC_DUMMY)),1)
-  CFLAGS	+=	-DHAVE_STATIC_DUMMY=1
-endif
-
-# The following line works around an issue in newlib that produces a compilation
-# error in glm. It will be removed as soon as this issue is resolved.
-CFLAGS	+= -D_GLIBCXX_USE_C99_MATH_TR1 -D_LDBL_EQ_DBL
-
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
-
-ASFLAGS	:=	-g $(ARCH)
-LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs $(ARCH) -Wl,--allow-multiple-definition -Wl,-Map,$(notdir $*.map)
-
-LIBS	:= -lstdc++ -lbz2 -lpng -lz -lnx -lm
-
-ifeq ($(HAVE_OPENGL), 1)
-  LIBS := -lEGL -lglapi -ldrm_nouveau $(LIBS)
-endif
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS := $(PORTLIBS) $(LIBNX)
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(TARGET)
-export TOPDIR	:=	$(CURDIR)
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/
-
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CC)
-#---------------------------------------------------------------------------------
-else
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CXX)
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
-
-export OFILES 	:=	$(OBJ)
-
-ifeq ($(strip $(HAVE_STATIC_DUMMY)),)
-  OFILES += libretro_libnx.a
-endif
-
-export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
-
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-			-I$(CURDIR)/$(BUILD)
-
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
-
-export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC)
-
-ifeq ($(strip $(ICON)),)
-	icons := $(wildcard *.jpg)
-	ifneq (,$(findstring $(TARGET).jpg,$(icons)))
-		export APP_ICON := $(TOPDIR)/$(TARGET).jpg
-	else
-		ifneq (,$(findstring icon.jpg,$(icons)))
-			export APP_ICON := $(TOPDIR)/icon.jpg
-		endif
-	endif
-else
-	export APP_ICON := $(TOPDIR)/$(ICON)
-endif
-
-ifeq ($(strip $(NO_ICON)),)
-	export NROFLAGS += --icon=$(APP_ICON)
-endif
-
-ifeq ($(strip $(NO_NACP)),)
-	export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp
-endif
-
-ifneq ($(APP_TITLEID),)
-	export NACPFLAGS += --titleid=$(APP_TITLEID)
-endif
-
-ifneq ($(ROMFS),)
-	export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
-endif
-
-DEPENDS_TMP  := $(OFILES:.o=.d)
-DEPENDS      := $(filter-out libretro_libnx.a,$(DEPENDS_TMP))
-
-.PHONY: clean all
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-all	:	$(OUTPUT).pfs0 $(OUTPUT).nro
-
-$(OUTPUT).pfs0	:	$(OUTPUT).nso
-
-$(OUTPUT).nso	:	$(OUTPUT).elf
-
-ifeq ($(strip $(NO_NACP)),)
-$(OUTPUT).nro	:	$(OUTPUT).elf $(OUTPUT).nacp
-else
-$(OUTPUT).nro	:	$(OUTPUT).elf
-endif
-
-$(OUTPUT).elf	:	$(OBJ)
-
-clean:
-	rm -f $(DEPENDS) $(OBJ) $(OUTPUT).pfs0 $(OUTPUT).nro $(OUTPUT).elf
-
-#---------------------------------------------------------------------------------
-# you need a rule like this for each extension you use as binary data
-#---------------------------------------------------------------------------------
-%.bin.o	%_bin.h :	%.bin
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
-#---------------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------------
@@ -1,354 +0,0 @@
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro")
-endif
-
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-
-export PATH	:=	$(DEVKITPPC)/bin:$(PATH)
-
-ifeq ($(PLATFORM),)
-PLATFORM=wii
-endif
-
-#---------------------------------------------------------------------------------
-# change shell on Snow Leopard
-#---------------------------------------------------------------------------------
-UNAME_S	:=	$(shell uname -s)
-UNAME_R	:=	$(shell uname -r)
-
-ifneq (,$(findstring Darwin,$(UNAME_S)))
-	ifneq (,$(findstring 10.8.0,$(UNAME_R)))
-		export SHELL=/bin/bash
-	endif
-endif
-
-#---------------------------------------------------------------------------------
-# path to tools 
-#---------------------------------------------------------------------------------
-export PORTLIBS	:=	$(DEVKITPRO)/portlibs/ppc
-export PATH	:=	$(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH)
-
-#---------------------------------------------------------------------------------
-# the prefix on the compiler executables
-#---------------------------------------------------------------------------------
-PREFIX	:=	powerpc-eabi-
-
-export AS	:=	$(PREFIX)as
-export CC	:=	$(PREFIX)gcc
-export CXX	:=	$(PREFIX)g++
-export AR	:=	$(PREFIX)ar
-export OBJCOPY	:=	$(PREFIX)objcopy
-
-ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))
-
-#---------------------------------------------------------------------------------
-%.a:
-#---------------------------------------------------------------------------------
-	@rm -f $@
-	$(AR) -rc $@ $^
-
-#---------------------------------------------------------------------------------
-%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $< -o $@
-	
-#---------------------------------------------------------------------------------
-%.o: %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-#---------------------------------------------------------------------------------
-%.o: %.m
-	$(CC) $(OBJCFLAGS) -c $< -o $@
-
-#---------------------------------------------------------------------------------
-%.o: %.s
-	$(CC) -x assembler-with-cpp $(ASFLAGS) -c $< -o $@
-
-#---------------------------------------------------------------------------------
-%.o: %.S
-	$(CC) -x assembler-with-cpp $(ASFLAGS) -c $< -o $@
-
-#---------------------------------------------------------------------------------
-# canned command sequence for binary data
-#---------------------------------------------------------------------------------
-define bin2o
-	bin2s -a 32 $< | $(AS) -o $(@)
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
-	echo "extern const u8" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h
-	echo "extern const u32" `(echo $(<F) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(<F) | tr . _)`.h
-endef
-
-BUILD		:=	build
-
-BUILD_LITE = 1
-CURDIR   = .
-
-export BASEDIR		:= $(CURDIR)
-export DEPSDIR    := $(BASEDIR)/wii/libogc/deps
-export LWIPDIR		:= $(BASEDIR)/wii/libogc/lwip
-export OGCDIR		:= $(BASEDIR)/wii/libogc/libogc
-export DBDIR		:= $(BASEDIR)/wii/libogc/libdb
-export BTEDIR		:= $(BASEDIR)/wii/libogc/lwbt
-export WIIUSEDIR	:= $(BASEDIR)/wii/libogc/wiiuse
-export LIBWIIKEYB	:= $(BASEDIR)/wii/libogc/libwiikeyboard
-export STUBSDIR	:= $(BASEDIR)/wii/libogc/lockstubs
-export LIBS			:=	$(BASEDIR)/wii/libogc/libs
-
-export INCDIR		:=	$(BASEDIR)/wii/libogc/include
-
-export LIBDIR		:= $(LIBS)/$(PLATFORM)
-
-#---------------------------------------------------------------------------------
-BBALIB		:= $(LIBDIR)/libbba
-OGCLIB		:= $(LIBDIR)/libogc
-DBLIB			:= $(LIBDIR)/libdb
-BTELIB		:= $(LIBDIR)/libbte
-WIIUSELIB	:= $(LIBDIR)/libwiiuse
-WIIKEYBLIB	:= $(LIBDIR)/libwiikeyboard
-STUBSLIB		:= $(LIBDIR)/libgclibstubs
-
-#---------------------------------------------------------------------------------
-DEFAULTINCDIR := $(BASEDIR)/wii/libogc/include
-DEFINCS		:= -I$(DEFAULTINCDIR)
-INCLUDES	:=	$(DEFINCS) \
-				-I$(BASEDIR)/wii/libogc \
-				-I$(DEFAULTINCDIR)/netif \
-				-I$(DEFAULTINCDIR)/ipv4 \
-				-I$(DEFAULTINCDIR)/sdcard \
-				-I$(DEFAULTINCDIR)/ogc \
-				-I$(DEFAULTINCDIR)/ogc/machine \
-				-I$(DEFAULTINCDIR)/bte \
-				-I$(DEFAULTINCDIR)/sdcard \
-				-I$(DEFAULTINCDIR)/wiikeyboard \
-				-I$(DEFAULTINCDIR)/wiiuse \
-				-I$(DEFAULTINCDIR)/di
-
-MACHDEP		:= -DBIGENDIAN -DGEKKO -mcpu=750 -meabi -msdata=eabi -mhard-float -ffunction-sections -fdata-sections
-
-ifeq ($(PLATFORM),wii)
-MACHDEP		+=	-DHW_RVL
-endif
-
-ifeq ($(PLATFORM),cube)
-MACHDEP		+=	-DHW_DOL
-endif
-
-CFLAGS		:= -DLIBOGC_INTERNAL -DNDEBUG -O2 -fno-strict-aliasing -mregnames -Wall $(MACHDEP) $(INCLUDES)
-ASFLAGS		:=	$(MACHDEP) -mregnames -D_LANGUAGE_ASSEMBLY $(INCLUDES)
-
-#---------------------------------------------------------------------------------
-VPATH :=	$(LWIPDIR)				\
-			$(LWIPDIR)/arch/gc		\
-			$(LWIPDIR)/arch/gc/netif	\
-			$(LWIPDIR)/core			\
-			$(LWIPDIR)/core/ipv4	\
-			$(LWIPDIR)/netif	\
-			$(OGCDIR)			\
-			$(DBDIR)			\
-			$(DBDIR)/uIP		\
-			$(BTEDIR)		\
-			$(WIIUSEDIR)		\
-			$(SDCARDDIR)			\
-			$(LIBWIIKEYB)		\
-			$(STUBSDIR)
-
-#---------------------------------------------------------------------------------
-SOURCES_LWIP := $(LWIPDIR)/network.c \
-					 $(LWIPDIR)/netio.c \
-					 $(LWIPDIR)/arch/gc/netif/gcif.c	\
-					 $(LWIPDIR)/core/inet.c \
-					 $(LWIPDIR)/core/mem.c \
-					 $(LWIPDIR)/core/dhcp.c \
-					 $(LWIPDIR)/core/raw.c	\
-					 $(LWIPDIR)/core/memp.c \
-					 $(LWIPDIR)/core/netif.c \
-					 $(LWIPDIR)/core/pbuf.c \
-					 $(LWIPDIR)/core/stats.c \
-					 $(LWIPDIR)/core/sys.c \
-					 $(LWIPDIR)/core/tcp.c \
-					 $(LWIPDIR)/core/tcp_in.c \
-					 $(LWIPDIR)/core/tcp_out.c	\
-					 $(LWIPDIR)/core/udp.c \
-					 $(LWIPDIR)/core/ipv4/icmp.c \
-					 $(LWIPDIR)/core/ipv4/ip.c \
-					 $(LWIPDIR)/core/ipv4/ip_frag.c \
-					 $(LWIPDIR)/core/ipv4/ip_addr.c \
-					 $(LWIPDIR)/netif/etharp.c \
-					 $(LWIPDIR)/netif/loopif.c
-
-LWIPOBJ := $(SOURCES_LWIP:.c=.o)
-
-#---------------------------------------------------------------------------------
-SOURCES_OGC		:=	\
-					$(OGCDIR)/console.c \
-					$(OGCDIR)/lwp_priority.c \
-					$(OGCDIR)/lwp_queue.c \
-					$(OGCDIR)/lwp_threadq.c \
-					$(OGCDIR)/lwp_threads.c \
-					$(OGCDIR)/lwp_sema.c	\
-					$(OGCDIR)/lwp_messages.c \
-					$(OGCDIR)/lwp.c \
-					$(OGCDIR)/lwp_stack.c \
-					$(OGCDIR)/lwp_mutex.c 	\
-					$(OGCDIR)/lwp_watchdog.c \
-					$(OGCDIR)/lwp_wkspace.c \
-					$(OGCDIR)/lwp_objmgr.c \
-					$(OGCDIR)/lwp_heap.c \
-					$(OGCDIR)/sys_state.c \
-					$(OGCDIR)/exception.c \
-					$(OGCDIR)/irq.c \
-					$(OGCDIR)/semaphore.c \
-					$(OGCDIR)/video.c \
-					$(OGCDIR)/pad.c \
-					$(OGCDIR)/exi.c \
-					$(OGCDIR)/mutex.c \
-					$(OGCDIR)/arqueue.c \
-					$(OGCDIR)/arqmgr.c	\
-					$(OGCDIR)/system.c \
-					$(OGCDIR)/cond.c \
-					$(OGCDIR)/gx.c \
-					$(OGCDIR)/gu.c \
-					$(OGCDIR)/audio.c \
-					$(OGCDIR)/cache.c \
-					$(OGCDIR)/decrementer.c			\
-					$(OGCDIR)/message.c \
-					$(OGCDIR)/card.c \
-					$(OGCDIR)/aram.c \
-					$(OGCDIR)/depackrnc1.c \
-					$(OGCDIR)/dsp.c \
-					$(OGCDIR)/si.c \
-					$(OGCDIR)/tpl.c \
-					$(OGCDIR)/ipc.c \
-					$(OGCDIR)/console_font_8x16.c \
-					$(OGCDIR)/timesupp.c \
-					$(OGCDIR)/lock_supp.c \
-					$(OGCDIR)/newlibc.c \
-					$(OGCDIR)/usbgecko.c \
-					$(OGCDIR)/usbmouse.c \
-					$(OGCDIR)/sbrk.c \
-					$(OGCDIR)/malloc_lock.c \
-					$(OGCDIR)/kprintf.c \
-					$(OGCDIR)/stm.c \
-					$(OGCDIR)/ios.c \
-					$(OGCDIR)/es.c \
-					$(OGCDIR)/isfs.c \
-					$(OGCDIR)/usb.c \
-					$(OGCDIR)/network_common.c \
-					$(OGCDIR)/sdgecko_io.c \
-					$(OGCDIR)/sdgecko_buf.c \
-					$(OGCDIR)/gcsd.c \
-					$(OGCDIR)/argv.c \
-					$(OGCDIR)/network_wii.c \
-					$(OGCDIR)/wiisd.c \
-					$(OGCDIR)/conf.c \
-					$(OGCDIR)/usbstorage.c \
-					$(OGCDIR)/texconv.c \
-					$(OGCDIR)/wiilaunch.c
-
-SOURCES_OGC_ASM := $(OGCDIR)/cache_asm.S \
-						 $(OGCDIR)/decrementer_handler.S \
-						 $(OGCDIR)/depackrnc.S \
-						 $(OGCDIR)/exception_handler.S \
-						 $(OGCDIR)/gu_psasm.S \
-						 $(OGCDIR)/irq_handler.S \
-						 $(OGCDIR)/lwp_handler.S \
-						 $(OGCDIR)/ogc_crt0.S \
-						 $(OGCDIR)/system_asm.S \
-						 $(OGCDIR)/video_asm.S
-
-ifneq ($(BUILD_LITE), 1)
-SOURCES_OGC += $(OGCDIR)/dvd.c
-endif
-
-OGCOBJ := $(SOURCES_OGC:.c=.o) $(SOURCES_OGC_ASM:.S=.o)
-
-#---------------------------------------------------------------------------------
-SOURCES_DB		:=	\
-				$(DBDIR)/uIP/uip_ip.c \
-				$(DBDIR)/uIP/uip_tcp.c \
-				$(DBDIR)/uIP/uip_pbuf.c \
-				$(DBDIR)/uIP/uip_netif.c \
-				$(DBDIR)/uIP/uip_arp.c \
-				$(DBDIR)/uIP/uip_arch.c \
-				$(DBDIR)/uIP/uip_icmp.c \
-				$(DBDIR)/uIP/memb.c \
-				$(DBDIR)/uIP/memr.c \
-				$(DBDIR)/uIP/bba.c \
-				$(DBDIR)/tcpip.c \
-				$(DBDIR)/debug.c \
-				$(DBDIR)/debug_handler.c \
-				$(DBDIR)/debug_supp.c \
-				$(DBDIR)/geckousb.c
-
-DBOBJ      := $(SOURCES_DB:.c=.o)
-
-#---------------------------------------------------------------------------------
-SOURCES_BTE		:=	\
-					$(BTEDIR)/bte.c \
-					$(BTEDIR)/hci.c \
-					$(BTEDIR)/l2cap.c \
-					$(BTEDIR)/btmemb.c \
-					$(BTEDIR)/btmemr.c \
-					$(BTEDIR)/btpbuf.c \
-					$(BTEDIR)/physbusif.c
-
-BTEOBJ      := $(SOURCES_BTE:.c=.o)
-
-#---------------------------------------------------------------------------------
-SOURCES_WIIUSE	:=	\
-					$(WIIUSEDIR)/classic.c \
-					$(WIIUSEDIR)/dynamics.c \
-					$(WIIUSEDIR)/events.c \
-					$(WIIUSEDIR)/io.c \
-					$(WIIUSEDIR)/io_wii.c \
-					$(WIIUSEDIR)/ir.c \
-					$(WIIUSEDIR)/nunchuk.c \
-					$(WIIUSEDIR)/wiiuse.c \
-					$(WIIUSEDIR)/speaker.c \
-					$(WIIUSEDIR)/wpad.c \
-					$(WIIUSEDIR)/motion_plus.c
-
-WIIUSEOBJ   := $(SOURCES_WIIUSE:.c=.o)
-
-#---------------------------------------------------------------------------------
-SOURCES_WIIKEYB = $(LIBWIIKEYB)/usbkeyboard.c \
-						$(LIBWIIKEYB)/keyboard.c \
-						$(LIBWIIKEYB)/ukbdmap.c \
-						$(LIBWIIKEYB)/wskbdutil.c
-
-WIIKEYBLIBOBJ	:=	$(SOURCES_WIIKEYB:.c=.o)
-
-LIBRARIES	:=	$(OGCLIB).a  $(DBLIB).a
-
-ifeq ($(PLATFORM),cube)
-LIBRARIES	+=	$(BBALIB).a
-endif
-ifeq ($(PLATFORM),wii)
-LIBRARIES	+=	$(BTELIB).a $(WIIUSELIB).a $(WIIKEYBLIB).a
-endif
-
-all: $(LIBRARIES)
-#---------------------------------------------------------------------------------
-$(BBALIB).a: $(LWIPOBJ)
-#---------------------------------------------------------------------------------
-$(OGCLIB).a: $(OGCOBJ)
-#---------------------------------------------------------------------------------
-$(DBLIB).a: $(DBOBJ)
-#---------------------------------------------------------------------------------
-$(WIIKEYBLIB).a: $(WIIKEYBLIBOBJ)
-#---------------------------------------------------------------------------------
-$(BTELIB).a: $(BTEOBJ)
-#---------------------------------------------------------------------------------
-$(WIIUSELIB).a: $(WIIUSEOBJ)
-#---------------------------------------------------------------------------------
-
-#---------------------------------------------------------------------------------
-clean:
-#---------------------------------------------------------------------------------
-	rm -fr $(LWIPOBJ) $(OGCOBJ) $(DBOBJ) $(BTEOBJ) $(WIIUSEOBJ) $(WIIKEYBLIBOBJ)
-	rm -f *.map
@@ -1,264 +0,0 @@
-TARGET		    := retroarch.exe
-DEBUG           = 0
-GRIFFIN_BUILD   = 0
-OS              = Win32
-ARCH            = amd64
-#TARGET_ARCH     = x86
-BUILD_DIR       = objs/msvc
-CXX_BUILD       = 0
-
-WindowsSdkDir = C:\Program Files (x86)\Windows Kits\10\$(NOTHING)
-WindowsSDKVersion := 10.0.14393.0\$(NOTHING)
-VCINSTALLDIR := C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\$(NOTHING)
-
-HAVE_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_WINMM               := 1
-
-HAVE_RPNG                := 1
-HAVE_ZLIB                := 1
-WANT_ZLIB                := 1
-HAVE_MENU                := 1
-HAVE_RGUI                := 1
-HAVE_XMB                 := 1
-HAVE_MATERIALUI          := 1
-HAVE_STB_FONT            := 1
-HAVE_THREADS             := 1
-HAVE_LIBRETRODB          := 1
-HAVE_COMMAND             := 1
-HAVE_STDIN_CMD           := 1
-HAVE_CMD                 := 1
-HAVE_DYLIB               := 1
-HAVE_DYNAMIC             := 1
-HAVE_DINPUT              := 1
-HAVE_MENU_COMMON         := 1
-HAVE_BUILTINZLIB         := 1
-
-HAVE_RJPEG               := 1
-HAVE_RBMP                := 1
-HAVE_RTGA                := 1
-HAVE_7ZIP                := 1
-HAVE_NETWORKING          := 1
-HAVE_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,$(DEF_FLAGS))
-CXXFLAGS     := $(filter-out  -fpermissive -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -Wno-parentheses,$(CXXFLAGS))
-LIBS         := $(filter-out  -lstdc++,$(LIBS))
-
-ifeq ($(ARCH),x64)
-   ARCH := amd64
-endif
-
-ARCH2 := $(ARCH)
-ifeq ($(ARCH),amd64)
-   ARCH2 := x64
-endif
-
-ifeq ($(TARGET_ARCH),)
-   TARGET_ARCH = $(ARCH)
-endif
-
-ifeq ($(TARGET_ARCH),x64)
-   TARGET_ARCH = amd64
-endif
-
-TARGET_ARCH2 = $(TARGET_ARCH)
-ifeq ($(TARGET_ARCH2),amd64)
-   TARGET_ARCH2 = x64
-endif
-
-CROSS = $(ARCH)
-ifeq ($(ARCH),x86)
-CROSS =
-endif
-
-INCLUDE := $(VCINSTALLDIR)include;$(VCINSTALLDIR)atlmfc\include;$(WindowsSdkDir)include\$(WindowsSDKVersion)ucrt;$(WindowsSdkDir)include\$(WindowsSDKVersion)shared;$(WindowsSdkDir)include\$(WindowsSDKVersion)um;
-LIB     := $(VCINSTALLDIR)LIB\$(CROSS);$(VCINSTALLDIR)atlmfc\lib\$(CROSS);$(WindowsSdkDir)lib\$(WindowsSDKVersion)ucrt\$(TARGET_ARCH2);$(WindowsSdkDir)lib\$(WindowsSDKVersion)um\$(TARGET_ARCH2);C:\Program Files (x86)\NVIDIA Corporation\Cg\lib.$(TARGET_ARCH2);C:\Program Files (x86)\Microsoft DirectX SDK (February 2010)\Lib\$(TARGET_ARCH2);
-LIBPATH := $(VCINSTALLDIR)LIB\$(CROSS);$(VCINSTALLDIR)atlmfc\lib\$(CROSS);
-
-PATH := $(shell IFS=$$'\n'; cygpath "$(VCINSTALLDIR)bin\\$(CROSS)"):$(shell IFS=$$'\n'; cygpath "$(WindowsSdkDir)\bin\\$(ARCH2)"):$(PATH)
-
-export INCLUDE := $(INCLUDE)
-export LIB     := $(LIB)
-export LIBPATH := $(LIBPATH)
-export PATH    := $(PATH)
-
-#$(info WindowsSdkDir : $(WindowsSdkDir))
-#$(info WindowsSDKVersion : $(WindowsSDKVersion))
-#$(info VCINSTALLDIR : $(VCINSTALLDIR))
-#$(info INCLUDE : $(INCLUDE))
-#$(info LIB : $(LIB))
-#$(info LIBPATH : $(LIBPATH))
-#$(info PATH : $(PATH))
-#$(error end)
-
-DEFINES += -D__SSE__ -D__SSE2__
-ifeq ($(TARGET_ARCH2),x64)
-DEFINES += -D__x86_64__
-else
-#DEFINES += -D__i686__
-endif
-
-FLAGS  += -nologo -MP
-FLAGS  += -Gm- -Zc:inline -fp:precise -Zc:forScope -GR- -Gd -Oi -volatile:iso
-#FLAGS  += -Zc:wchar_t -Zp16 -Z7
-#FLAGS += -utf-8
-#FLAGS += -source-charset:utf-8
-
-CXXFLAGS += $(CFLAGS) -TP -EHsc
-ifeq ($(CXX_BUILD),1)
-   CFLAGS  := $(CXXFLAGS)
-   DEFINES += -DCXX_BUILD
-else
-   CFLAGS  += -TC
-endif
-
-WARNINGS += -WX -W3
-WARNINGS += -wd4101 -wd4996 -wd4244 -wd4267 -wd4090 -wd4305 -wd4146 -wd4334 -wd4018 -wd4800 -wd4838
-
-CC = cl.exe
-CXX = cl.exe
-LD = link.exe
-RC = rc.exe
-
-LIBS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib
-LDFLAGS  += -nologo -wx -nxcompat -machine:$(TARGET_ARCH2)
-
-ifeq ($(DEBUG),1)
-   FLAGS += -GS -Gy -Od -RTC1 -D_SECURE_SCL=1 -Zi
-   FLAGS += -MDd
-   LDFLAGS += -DEBUG
-   DEFINES += -DDEBUG -D_DEBUG
-else
-   FLAGS += -GS- -Gy- -O2 -Ob2 -GF -GT -Oy -Ot -D_SECURE_SCL=0
-   FLAGS += -MD
-endif
-
-ifeq ($(DEBUG),1)
-   BUILD_DIR := $(BUILD_DIR)-debug
-endif
-
-ifeq ($(GRIFFIN_BUILD),1)
-   BUILD_DIR := $(BUILD_DIR)-griffin
-endif
-
-BUILD_DIR := $(BUILD_DIR)-$(TARGET_ARCH2)
-
-ifneq ($(V), 1)
-   Q := @
-endif
-
-ifeq ($(GRIFFIN_BUILD), 1)
-   OBJ       := griffin/griffin.o griffin/griffin_cpp.o
-   DEFINES   += -DHAVE_GRIFFIN -DUSE_MATH_DEFINES
-else
-   BLACKLIST :=
-   OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-endif
-
-DEFINES += -DRARCH_INTERNAL -DHAVE_DYNAMIC -DJSON_STATIC
-INCLUDE_DIRS += -I. -Igfx/include
-
-#OBJ := version_git.o
-
-OBJ := $(patsubst %rarch.o,%rarch.res,$(OBJ))
-OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))
-OBJ := $(OBJ:.o=.obj)
-
-LDFLAGS += -WX -SUBSYSTEM:WINDOWS -ENTRY:mainCRTStartup
-
-DEFINES := $(patsubst -f%,,$(DEFINES))
-LDFLAGS := $(patsubst -l%,%.lib,$(LDFLAGS))
-LIBS := $(filter-out -lm,$(LIBS))
-LIBS := $(patsubst -l%,%.lib,$(LIBS))
-
-#$(info INCLUDE_DIRS : $(INCLUDE_DIRS))
-#$(info DEFINES : $(DEFINES))
-#$(info CFLAGS : $(CFLAGS))
-#$(info CXXFLAGS : $(CXXFLAGS))
-#$(info LDFLAGS : $(LDFLAGS))
-#$(info LIBS : $(LIBS))
-#$(info OBJ : $(OBJ))
-#$(info target : $(TARGET))
-#$(info flags : $(FLAGS))
-#$(info INCLUDE : $(INCLUDE))
-#$(info LIB : $(LIB))
-#$(info LIBPATH : $(LIBPATH))
-#$(error end)
-
-$(info os     : $(OS))
-$(info host   : $(ARCH))
-$(info target : $(TARGET_ARCH))
-
-all: $(TARGET)
-
-%: $(BUILD_DIR)/%
-	cp $< $@
-
-ifeq ($(DEBUG),1)
-%.exe: $(BUILD_DIR)/%.exe
-	cp $< $@
-	cp $(BUILD_DIR)/$*.pdb $*.pbd
-endif
-
-SHELL:=$(SHELL) -o pipefail
-
-DEPFLAGS = -showIncludes | tee $(BUILD_DIR)/$*.dtemp | sed /'Note: including file:'/d
-MAKEDEPS = echo $@: $< \\ > $(BUILD_DIR)/$*.depend && \
-           grep 'Note: including file:' $(BUILD_DIR)/$*.dtemp \
-           | sed '/$(subst \,\\,$(WindowsSdkDir))/Id; /$(subst \,\\,$(VCINSTALLDIR))/Id; s/Note: including file:[ ]*//g; s/\\/\//g; s/ /\\ /g; s/.*/   & \\/g' \
-           >> $(BUILD_DIR)/$*.depend && \
-           rm -f $(BUILD_DIR)/$*.dtemp
-
-#DEPFLAGS :=
-#MAKEDEPS :=
-
-$(BUILD_DIR)/%.obj: %.cpp
-	@mkdir -p $(dir $@)
-	$(Q)$(CXX) -c -Fo:$@ $< $(FLAGS) $(CXXFLAGS) $(DEFINES) $(INCLUDE_DIRS) $(WARNINGS) $(DEPFLAGS)
-	@$(MAKEDEPS)
-
-$(BUILD_DIR)/%.obj: %.c
-	@mkdir -p $(dir $@)
-	$(Q)$(CC) -c -Fo:$@ $< $(FLAGS) $(CFLAGS) $(DEFINES) $(INCLUDE_DIRS) $(WARNINGS) $(DEPFLAGS)
-	@$(MAKEDEPS)
-
-$(BUILD_DIR)/%.res: %.rc
-	@mkdir -p $(dir $@)
-	$(Q)$(RC) $<
-	$(Q)mv $*.res $@
-
-$(BUILD_DIR)/$(TARGET): $(OBJ) .$(TARGET).last
-	@touch .$(TARGET).last
-	$(Q)$(LD) $(OBJ) $(LDFLAGS) $(LIBS) -out:$(BUILD_DIR)/$(TARGET)
-
-%.h %.hpp %.depend %.last: ;
-
-clean:
-	rm -f $(OBJ) $(TARGET)
-	rm -f $(BUILD_DIR)/$(TARGET)
-	rm -f .$(TARGET).last
-	rm -f $(OBJ:.obj=.depend)
-
-.PHONY: clean all
-.PRECIOUS: %.depend %.last
-
-include $(patsubst %.obj,%.depend,$(filter %.obj,$(OBJ)))
@@ -1,4 +1,4 @@
-include version.all
+RARCH_VERSION		= "0.9.9.3"

 DEBUG = 0

@@ -10,12 +10,12 @@ TARGET := retroarch-pandora
 LDDIRS = -L. -L$(PNDSDK)/usr/lib
 INCDIRS = -I. -I$(PNDSDK)/usr/include

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

 LIBS = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound
 DEFINES = -std=gnu99 -DHAVE_THREADS -DHAVE_GETOPT_LONG=1 -DHAVE_GRIFFIN -DRARCH_INTERNAL
-DEFINES += -D__ARM_ARCH_6__ -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_OVERLAY -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
+DEFINES += -D__ARM_ARCH_6__ -DSINC_LOWER_QUALITY -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DWANT_RPNG -DWANT_ZLIB -DHAVE_OVERLAY -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
 DEFINES += $(INCDIRS)
 DEFINES += -D__OPENPANDORA__ -DPANDORA
 DEFINES += -marm -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -ftree-vectorize
@@ -1,166 +0,0 @@
-TARGET		    := retroarch_orbis
-DEBUG               ?= 0
-GRIFFIN_BUILD        = 0
-WHOLE_ARCHIVE_LINK   = 0
-
-PS4_TITLE_ID	:= RETROARCH
-PS4_TITLE_NAME	:= RetroArch
-
-PC_DEVELOPMENT_IP_ADDRESS  =
-PC_DEVELOPMENT_UDP_PORT	   =
-
-OBJ :=
-
-DEFINES :=
-
-ifeq ($(GRIFFIN_BUILD), 1)
-	OBJ += griffin/griffin.o
-	DEFINES += -DHAVE_GRIFFIN=1
-	DEFINES += -DHAVE_MENU -DHAVE_LIBRETRODB
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
-	ifeq ($(DEBUG), 1)
-		DEFINES += -DHAVE_NETLOGGER
-	endif
-else
-
-	HAVE_FILTERS_BUILTIN	:= 1
-	HAVE_LANGEXTRA		:= 0
-	HAVE_RPNG		:= 1
-	HAVE_RJPEG		:= 1
-	HAVE_RBMP		:= 1
-	HAVE_RTGA		:= 1
-	HAVE_ZLIB		:= 1
-	HAVE_OVERLAY		:= 1
-	HAVE_7ZIP		:= 1
-	HAVE_EGL 		:= 1
-	HAVE_OPENGLES  		:= 1
-	HAVE_NETWORKING		:= 0
-	HAVE_SOCKET_LEGACY	:= 0
-	HAVE_MENU		:= 1
-	HAVE_MENU_COMMON	:= 1
-	HAVE_RGUI		:= 0
-	HAVE_MATERIALUI 	:= 0
-	HAVE_XMB		:= 1
-	HAVE_THREADS		:= 1
-	HAVE_LIBRETRODB		:= 1
-	HAVE_CC_RESAMPLER	:= 1
-	HAVE_CHEEVOS		:= 1
-	RARCH_CONSOLE		:= 1
-	HAVE_STATIC_VIDEO_FILTERS = 1
-	HAVE_STATIC_AUDIO_FILTERS = 1
-
-	ifeq ($(DEBUG), 1)
-		HAVE_NETLOGGER = 1
-	endif
-
-	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
-	BLACKLIST :=
-	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-
-	OBJ += input/drivers/ps4_input.o
-	OBJ += input/drivers_joypad/ps4_joypad.o
-	OBJ += audio/drivers/psp_audio.o
-	#OBJ += frontend/drivers/platform_orbis.o
-endif
-
-ifeq ($(strip $(PS4SDK)),)
-$(error "Please set PS4SDK in your environment. export PS4SDK=<path to>ps4sdk")
-endif
-
-export PATH := $(PATH):$(PS4SDK)/bin
-
-PREFIX :=
-
-CC      := $(PREFIX)clang
-CXX     := $(PREFIX)clang
-AS      := $(PREFIX)clang
-AR      := $(PREFIX)ar
-OBJCOPY := $(PREFIX)objcopy
-STRIP   := $(PREFIX)strip
-NM      := $(PREFIX)nm
-LD      := $(CXX)
-
-INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Ideps/stb
-LIBDIRS := -L.
-
-ARCHFLAGS := -m64 -DORBIS
-CFLAGS    += $(ARCHFLAGS) -std=c11 -mcmodel=large -ffreestanding -nostdlib -nostdinc -fno-builtin -fno-stack-protector
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O2 -g
-else
-   CFLAGS += -O3
-endif
-
-ASFLAGS := $(ARCHFLAGS) -I$(PS4SDK)/include -target x86_64-scei-ps4-elf -fPIE
-LDFLAGS := -O3 -Wall -m64 -nostartfiles -nostdlib -L$(PS4SDK)/lib -pie
-ARFLAGS := rcs
-
-CRTFILE ?= $(PS4SDK)/crt0.s
-
-CFLAGS += -Wall -pedantic -Wno-zero-length-array -Wno-format-pedantic
-CFLAGS += -D__PS4__ -I$(PS4SDK)/include -I $(PS4SDK)/include/sce
-CFLAGS += -target x86_64-scei-ps4-elf -fPIE
-CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
-CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
-
-ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
-   CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
-endif
-
-ifneq ($(PC_DEVELOPMENT_UDP_PORT),)
-   CFLAGS += -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-endif
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-CXXFLAGS := $(CFLAGS) 
-
-PS4_LIBS := -lps4link -ldebugnet -lorbisFile -lelfloader -lorbisKeyboard -lorbis2d -lpng -lz -lorbisGl -lorbisPad -lorbisAudio -lmod -lorbisFileBrowser -lorbisXbmFont -lSceNet_stub -lScePigletv2VSH_stub -lSceSystemService_stub -lSceUserService_stub -lScePad_stub -lSceAudioOut_stub -lSceIme_stub -lSceSysmodule_stub \
-	-lPs4_extension_kernel_call_standard -lPs4_extension_kernel_execute_dynlib_prepare_dlclose -lPs4_common_kernel -lPs4_common_user -lPs4_common_generic -lPs4LibCInternalAdaptive_stub -lPs4LibKernelAdaptive_stub -lSceLibcInternal_stub -lkernel_stub -lps4Kernel_stub -lPs4_base_stub_resolve_minimal -lPs4_base_kernel_dlsym_standard -lPs4_base_kernel_seek_elf_address_standard -lPs4_base_assembler_register_parameter_standard -lPs4_base_assembler_system_call_standard
-
-LIBS	:= $(WHOLE_START) -lretro_orbis $(WHOLE_END) $(PS4_LIBS) 
-
-TARGETS := $(TARGET).elf
-
-DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
-POSTCOMPILE = mv -f $*.Tdepend $*.depend
-
-all: $(TARGETS)
-
-%.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)
-
-%.depend: ;
-
-$(TARGET).elf: $(OBJ) libretro_orbis.a
-	$(LD) $(CRTFILE) $(OBJ) $(LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
-
-clean:
-	rm -f $(OBJ) $(TARGET).elf 
-	rm -f $(OBJ:.o=.depend)
-
-.PHONY: clean all 
-.PRECIOUS: %.depend
-
-include $(OBJ:.o=.depend)
@@ -2,7 +2,7 @@
 # $ source /usr/local/angstrom/arm/environment-setup
 # $ setprj retroarch

-PNDDIR=./pkg/pandora
+PNDDIR=./pandora
 BINDIR=$(PNDDIR)/bin

 all: $(BINDIR)/retroarch
@@ -52,3 +52,4 @@ clean:
 	rm -f $(BINDIR)/retroarch-joyconfig
 	rm -f $(PNDDIR)/readme.html
 	rm -f retroarch
+
@@ -1,114 +0,0 @@
-BUILD_PRX          = 0
-DEBUG              = 0
-HAVE_KERNEL_PRX    = 0
-HAVE_LOGGER        = 0
-HAVE_FILE_LOGGER   = 0
-HAVE_THREADS       = 0
-BIG_STACK          = 0
-MUTE_WARNINGS      = 0
-PS2_IP = 192.168.1.150
-
-#Configuration for IRX
-EE_BIN2O = bin2o
-IRX_DIR = $(PS2SDK)/iop/irx
-
-TARGET = retroarchps2.elf
-TARGET_RELEASE = retroarchps2-release.elf
-
-ifeq ($(DEBUG), 1)
-   OPTIMIZE_LV	:= -O0 -g
-	RARCH_DEFINES += -DDEBUG
-else
-   OPTIMIZE_LV	:= -O2
-	LDFLAGS :=  -s
-endif
-
-ifeq ($(MUTE_WARNINGS), 1)
-   DISABLE_WARNINGS := -Wno-sign-compare -Wno-unused -Wno-parentheses
-endif
-
-INCDIR = -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/ports/include
-INCDIR += -Ips2 -Ips2/include -Ilibretro-common/include
-INCDIR += -Ideps -Ideps/stb -Ideps/libz -Ideps/7zip -Ideps/pthreads -Ideps/pthreads/platform/ps2 -Ideps/pthreads/platform/helper
-GPVAL = -G0
-CFLAGS = $(OPTIMIZE_LV) $(DISABLE_WARNINGS) -ffast-math -fsingle-precision-constant
-ASFLAGS = $(CFLAGS)
-
-RARCH_DEFINES += -DPS2 -DUSE_IOP_CTYPE_MACRO -D_MIPS_ARCH_R5900 -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB
-RARCH_DEFINES += -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
-
-LIBDIR =
-LDFLAGS += -L$(PS2SDK)/ports/lib -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ee/lib -L.
-LIBS += -lretro_ps2 -lgskit -ldmakit -lgskit_toolkit -laudsrv -lpad -lmc -lhdd -lsdl -lfileXio -lpatches -lpoweroff
-
-#IRX modules
-# IRX modules - modules have to be in IRX_DIR
-IRX = iomanX.irx fileXio.irx mcman.irx mcserv.irx usbd.irx usbhdfsd.irx freesd.irx audsrv.irx poweroff.irx ps2dev9.irx ps2atad.irx ps2hdd.irx ps2fs.irx
-IRX_OBJ = $(IRX:.irx=.o)
-EE_OBJS += $(IRX_OBJ)
-
-ifeq ($(HAVE_THREADS), 1)
-RARCH_DEFINES += -DHAVE_THREADS
-endif
-
-ifeq ($(HAVE_FILE_LOGGER), 1)
-CFLAGS += -DHAVE_FILE_LOGGER
-endif
-
-ifeq ($(HAVE_KERNEL_PRX), 1)
-CFLAGS += -DHAVE_KERNEL_PRX
-endif
-
-ifeq ($(BIG_STACK), 1)
-CFLAGS += -DBIG_STACK
-endif
-
-CFLAGS += $(RARCH_DEFINES)
-
-# Missing objecst on the PS2SDK
-EE_OBJS += ps2/compat_files/compat_ctype.o ps2/compat_files/time.o
-
-#EE_OBJS = griffin/griffin.o bootstrap/ps2/kernel_functions.o
-EE_OBJS += griffin/griffin.o
-
-EE_CFLAGS = $(CFLAGS)
-EE_CXXFLAGS = $(CFLAGS)
-EE_LDFLAGS = $(LDFLAGS)
-EE_LIBS = $(LIBS)
-EE_ASFLAGS = $(ASFLAGS)
-EE_INCS = $(INCDIR)
-EE_IRX_OBJ = $(IRX_OBJ) 
-EE_BIN = $(TARGET)
-EE_GPVAL = $(GPVAL)
-
-all: $(EE_IRX_OBJ) $(EE_BIN)
-
-clean:
-	rm -f $(EE_BIN) $(EE_OBJS)
-
-prepare:
-	ps2client -h $(PS2_IP) reset
-	ps2client -h $(PS2_IP) netdump
-
-run:
-	ps2client -h $(PS2_IP) execee host:$(EE_BIN)
-
-debug: clean prepare all run
-
-package:
-	ps2-packer $(EE_BIN) $(TARGET_RELEASE)
-
-release: clean all package
-
-#Specific file name and output per IRX Module
-$(EE_IRX_OBJ):
-	$(EE_BIN2O) $(EE_GPVAL) $(IRX_DIR)/$(@:.o=.irx) $@ $(@:.o=_irx)
-
-#Include preferences
-include $(PS2SDK)/samples/Makefile.pref 
-include $(PS2SDK)/samples/Makefile.eeglobal
-
-#Linking with C++
-$(EE_BIN): $(EE_OBJS) $(PS2SDK)/ee/startup/crt0.o
-	$(EE_CXX) $(EE_NO_CRT) -T$(PS2SDK)/ee/startup/linkfile $(EE_CXXFLAGS) \
-		-o $(EE_BIN) $(PS2SDK)/ee/startup/crt0.o $(CRTI_OBJ) $(CRTBEGIN_OBJ) $(EE_OBJS) $(CRTEND_OBJ) $(CRTN_OBJ) $(EE_LDFLAGS) $(EE_LIBS)
@@ -1,12 +1,12 @@
-include version.all
+RARCH_VERSION		= "0.9.9.3"

 #which compiler to build  with - GCC or SNC
 #set to GCC for debug builds for use with debugger
 CELL_BUILD_TOOLS	= SNC
 CELL_GPU_TYPE	   	= RSX
-CELL_PSGL_VERSION	= opt
+CELL_PSGL_VERSION	= ultra-opt

-ASSETS_DIR  := media/assets
+RMENU_IMG_DIR  := media/rmenu

 # options
 DOWNLOAD_SHADERS	= 1
@@ -15,6 +15,7 @@ DEBUG			      = 0
 HAVE_GCMGL	      = 0
 HAVE_LOGGER		   = 0
 HAVE_FREETYPE	   = 0
+HAVE_RLAUNCH      = 0
 WHOLE_ARCHIVE_LINK = 0

 CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001
@@ -29,11 +30,11 @@ include $(CELL_MK_DIR)/sdk.makedef.mk
 PPU_TARGET		= retroarch_ps3.elf
 SALAMANDER_TARGET	= retroarch-salamander_ps3.elf

-EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
-CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF
+EBOOT_PATH		= ps3/pkg/USRDIR/EBOOT.BIN
+CORE_PATH		= ps3/pkg/USRDIR/cores/CORE.SELF

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

 # system platform
 system_platform = unix
@@ -46,7 +47,7 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
   system_platform = win
 endif

-PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
+PKG_SCRIPT		= ps3/ps3py/pkg.py
 ifeq ($(shell uname), Linux)
 PKG_FINALIZE         	= package_finalize
 MAKE_SELF_WC		= make_self_wc
@@ -63,19 +64,11 @@ endif

 PPU_SRCS		= griffin/griffin.c

-DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD -DHAVE_DR_MP3 -DHAVE_DR_FLAC
-
-ifeq ($(DEX_BUILD), 1)
-DEFINES += -DDEX_BUILD
+ifeq ($(HAVE_RLAUNCH), 1)
+	DEFINES += -DHAVE_RLAUNCH
 endif

-ifeq ($(CEX_BUILD), 1)
-DEFINES += -DCEX_BUILD
-endif
-
-ifeq ($(ODE_BUILD), 1)
-DEFINES += -DODE_BUILD
-endif
+DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_GLUI -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_STB_FONT

 ifeq ($(HAVE_GCMGL), 1)
 DEFINES			+= -DHAVE_GCMGL
@@ -96,7 +89,8 @@ 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
@@ -112,18 +106,17 @@ 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 -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_CHEEVOS -DRC_DISABLE_LUA
-
-#DEFINES += -DHAVE_IMAGEVIEWER
+DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LIBRETRODB -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_7Z -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_BUILTIN_AUTOCONFIG

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

 ifeq ($(HAVE_LOGGER), 1)
 DEFINES			+= -DHAVE_LOGGER
+INCDIRS        +=  -Ilogger/netlogger
 endif

 PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
@@ -164,30 +157,29 @@ create-salamander:
 	$(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL)

 copy-media-files:
-	@cp -r $(ASSETS_DIR)/glui pkg/ps3/USRDIR/cores/assets
-	@cp -r $(ASSETS_DIR)/xmb  pkg/ps3/USRDIR/cores/assets
+	@cp -r $(RMENU_IMG_DIR)/*.png ps3/pkg/USRDIR/cores/borders/Menu/

 create-shaders:
-	make -f Makefile.griffin platform=ps3 shaders-deploy
+	make -f Makefile.shaders deploy-ps3

 pkg: $(PPU_TARGET)  create-shaders copy-media-files create-npdrm-salamander create-npdrm-core
-	$(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf pkg/ps3
+	$(MAKE_PACKAGE_NPDRM) ps3/pkg/package.conf ps3/pkg

 pkg-signed: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg

 pkg-signed-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
 	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg

 pkg-signed-cfw: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
-	$(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
+	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg

 pkg-signed-cfw-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
 	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
-	$(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg

 clean-selfs:
 ifeq ($(EBOOT_EXISTS),1)
@@ -1,11 +1,13 @@
-include version.all
+RARCH_VERSION		= "0.9.9.3"

 #which compiler to build  with - GCC or SNC
 #set to GCC for debug builds for use with debugger
-CELL_BUILD_TOOLS	= GCC
+CELL_BUILD_TOOLS	= SNC
 CELL_GPU_TYPE	   	= RSX
 CELL_PSGL_VERSION	= ultra-opt

+RMENU_IMG_DIR  := media/rmenu
+
 # options
 DOWNLOAD_SHADERS	= 1
 STRIPPING_ENABLE	= 0
@@ -13,6 +15,7 @@ DEBUG			      = 0
 HAVE_GCMGL	      = 1
 HAVE_LOGGER		   = 0
 HAVE_FREETYPE	   = 0
+HAVE_RLAUNCH      = 0
 WHOLE_ARCHIVE_LINK = 0

 CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001
@@ -27,11 +30,11 @@ include $(CELL_MK_DIR)/sdk.makedef.mk
 PPU_TARGET		= retroarch_ps3.elf
 SALAMANDER_TARGET	= retroarch-salamander_ps3.elf

-EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
-CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF
+EBOOT_PATH		= ps3/pkg/USRDIR/EBOOT.BIN
+CORE_PATH		= ps3/pkg/USRDIR/cores/CORE.SELF

 LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
-INCDIRS = -I. -Idefines -Ideps -Ideps/stb
+INCDIRS = -I. -Ips3 -Icommon

 # system platform
 system_platform = unix
@@ -44,7 +47,7 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
   system_platform = win
 endif

-PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
+PKG_SCRIPT		= ps3/ps3py/pkg.py
 ifeq ($(shell uname), Linux)
 PKG_FINALIZE         	= package_finalize
 MAKE_SELF_WC		= make_self_wc
@@ -61,19 +64,11 @@ endif

 PPU_SRCS		= griffin/griffin.c

-DEFINES += -DHAVE_RGUI -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_MENU -DRARCH_INTERNAL
-
-ifeq ($(DEX_BUILD), 1)
-DEFINES += -DDEX_BUILD
+ifeq ($(HAVE_RLAUNCH), 1)
+	DEFINES += -DHAVE_RLAUNCH
 endif

-ifeq ($(CEX_BUILD), 1)
-DEFINES += -DCEX_BUILD
-endif
-
-ifeq ($(ODE_BUILD), 1)
-DEFINES += -DODE_BUILD
-endif
+DEFINES += -DHAVE_RMENU -DHAVE_MENU -DRARCH_INTERNAL

 ifeq ($(HAVE_GCMGL), 1)
 DEFINES			+= -DHAVE_GCMGL
@@ -94,7 +89,8 @@ 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
@@ -110,7 +106,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 -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_FBO -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)

 ifeq ($(DEBUG), 1)
   PPU_OPTIMIZE_LV	:= -O0 -g
@@ -120,6 +116,7 @@ endif

 ifeq ($(HAVE_LOGGER), 1)
 DEFINES			+= -DHAVE_LOGGER
+INCDIRS        +=  -Ilogger/netlogger
 endif

 PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
@@ -160,30 +157,29 @@ create-salamander:
 	$(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL)

 copy-media-files:
-	@cp -r $(ASSETS_DIR)/glui pkg/ps3/USRDIR/cores/assets
-	@cp -r $(ASSETS_DIR)/xmb  pkg/ps3/USRDIR/cores/assets
+	@cp -r $(RMENU_IMG_DIR)/*.png ps3/pkg/USRDIR/cores/borders/Menu/

 create-shaders:
 	make -f Makefile.shaders deploy-ps3

 pkg: $(PPU_TARGET)  create-shaders copy-media-files create-npdrm-salamander create-npdrm-core
-	$(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf pkg/ps3
+	$(MAKE_PACKAGE_NPDRM) ps3/pkg/package.conf ps3/pkg

 pkg-signed: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg

 pkg-signed-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
 	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg

 pkg-signed-cfw: $(PPU_TARGET)  create-shaders copy-media-files create-salamander create-core
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
-	$(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
+	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg

 pkg-signed-cfw-standalone: $(PPU_TARGET)  create-shaders copy-media-files create-core
 	$(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID)
-	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg
-	$(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg

 clean-selfs:
 ifeq ($(EBOOT_EXISTS),1)
@@ -1,4 +1,4 @@
-CELL_BUILD_TOOLS	= GCC
+CELL_BUILD_TOOLS	= SNC
 CELL_SDK		?= /usr/local/cell
 HAVE_LOGGER		= 0
 CELL_MK_DIR ?= $(CELL_SDK)/samples/mk
@@ -16,57 +16,23 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
   system_platform = win
 endif

-ifeq ($(DEBUG), 1)
-	PPU_OPTIMIZE_LV := -O0 -g
-else
-	PPU_OPTIMIZE_LV := -O2 -DNDEBUG
-endif
-
 STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe

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

 ifeq ($(HAVE_LOGGER), 1)
-PPU_CFLAGS		+= -DHAVE_LOGGER 
-PPU_SRCS		   += network/net_logger.c \
-						libretro-common/net/net_compat.c \
-						libretro-common/net/net_socket.c
+PPU_CFLAGS		+= -DHAVE_LOGGER -Ilogger/netlogger
+PPU_SRCS		+= logger/netlogger/logger.c
 endif

 PPU_TARGET		= retroarch-salamander_ps3.elf
@@ -86,6 +52,8 @@ endif

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

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

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

 DEBUG			= 0
 HAVE_LOGGER		= 0
@@ -14,10 +14,10 @@ LD = $(PS3DEV)/ppu/bin/ppu-ld
 CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001

 ELF_TARGET := retroarch_psl1ght.elf
-EBOOT_PATH		= pkg/ps3/USRDIR/EBOOT.BIN
-CORE_PATH		= pkg/ps3/USRDIR/cores/CORE.SELF
+EBOOT_PATH		= ps3/pkg/USRDIR/EBOOT.BIN
+CORE_PATH		= ps3/pkg/USRDIR/cores/CORE.SELF

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

 MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__
@@ -36,7 +36,7 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
   system_platform = win
 endif

-PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
+PKG_SCRIPT		= ps3/ps3py/pkg.py
 ifeq ($(shell uname), Linux)
 PKG_FINALIZE         	= package_finalize
 MAKE_SELF_WC		= make_self_wc
@@ -61,7 +61,7 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
   system_platform = win
 endif

-PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
+PKG_SCRIPT		= ps3/ps3py/pkg.py
 ifeq ($(shell uname), Linux)
 PKG_FINALIZE         	= package_finalize
 MAKE_SELF_WC		= make_self_wc
@@ -83,13 +83,14 @@ OBJ = griffin/griffin.o

 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
+CFLAGS		+= -Ilogger/netlogger
 endif

 ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
 endif

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

@@ -118,13 +119,14 @@ create-core:
 	$(MAKE_SELF_WC) $(ELF_TARGET) $(CORE_PATH)

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

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

 clean:
 	rm -f $(ELF_TARGET)
 	rm -f $(OBJ)

 .PHONY: clean
+
@@ -1,10 +1,8 @@
-BUILD_PRX          = 0
-PSP_LARGE_MEMORY   = 1
+BUILD_PRX          = 1
 DEBUG              = 0
 HAVE_KERNEL_PRX    = 1
-HAVE_LOGGER        = 0
 HAVE_FILE_LOGGER   = 0
-HAVE_THREADS       = 1
+HAVE_THREADS       = 0
 BIG_STACK          = 0
 WHOLE_ARCHIVE_LINK = 0

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

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

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

-RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_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
+RARCH_DEFINES = -DPSP -D_MIPS_ARCH_ALLEGREX -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DWANT_RPNG -DSINC_LOWEST_QUALITY -DHAVE_BUILTIN_AUTOCONFIG -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP

 LIBDIR =
 LDFLAGS =
@@ -49,10 +47,11 @@ endif

 CFLAGS += $(RARCH_DEFINES)

+
 EXTRA_TARGETS = EBOOT.PBP
 PSP_EBOOT_TITLE = RetroArch PSP1

-PSP_OBJECTS = griffin/griffin.o bootstrap/psp1/kernel_functions.o
+PSP_OBJECTS = griffin/griffin.o psp1/kernel_functions.o

 OBJS = $(PSP_OBJECTS)

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

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

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

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

-EXTRA_TARGETS   = EBOOT.PBP
+EXTRA_TARGETS = EBOOT.PBP
 PSP_EBOOT_TITLE = RetroArch
-PSP_EBOOT_ICON  = pkg/psp1/ICON0.PNG
-PSP_EBOOT_PIC1  = pkg/psp1/PIC1.PNG
+PSP_EBOOT_ICON = psp1/ICON0.PNG
+PSP_EBOOT_PIC1 = psp1/PIC1.PNG

 OBJS = frontend/frontend_salamander.o \
 		 frontend/frontend_driver.o \
 		 frontend/drivers/platform_psp.o \
 		 frontend/drivers/platform_null.o \
 		 libretro-common/file/file_path.o \
-		 libretro-common/string/stdstring.o \
-		 libretro-common/lists/string_list.o \
-		 libretro-common/lists/dir_list.o \
-		 libretro-common/file/retro_dirent.o \
-		 libretro-common/encodings/encoding_utf.o \
-		 libretro-common/compat/fopen_utf8.o \
-		 libretro-common/compat/compat_strl.o \
-		 libretro-common/compat/compat_strcasestr.o \
+		 libretro-common/string/string_list.o \
+		 libretro-common/file/dir_list.o \
+		 libretro-common/compat/compat.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 \
-		 bootstrap/psp1/kernel_functions.o 
+		 psp1/kernel_functions.o 

 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak
@@ -1,70 +0,0 @@
-TARGET := retroarch_switch
-
-DEBUG                  ?= 0
-GRIFFIN_BUILD           = 0
-WHOLE_ARCHIVE_LINK      = 0
-
-OBJ :=
-
-DEFINES := -DSWITCH=1 -U__linux__ -U__linux -DRARCH_INTERNAL -DHAVE_DYNAMIC
-
-ifeq ($(GRIFFIN_BUILD), 1)
-	OBJ += griffin/griffin.o
-	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_NEON -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB
-	DEFINES += -DHAVE_RUNAHEAD -DHAVE_DYNAMIC
-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_MATERIALUI = 0 # enable later?
-	HAVE_XMB = 0
-	HAVE_STATIC_VIDEO_FILTERS = 1
-	HAVE_STATIC_AUDIO_FILTERS = 1
-	HAVE_MENU = 1
-	HAVE_RUNAHEAD = 1
-	HAVE_DYNAMIC = 1
-
-	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
-	BLACKLIST :=
-	BLACKLIST += input/input_overlay.o
-	BLACKLIST += tasks/task_overlay.o
-	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-endif
-
-ifeq ($(strip $(LIBTRANSISTOR_HOME)),)
-$(error "Please set LIBTRANSISTOR_HOME in your environment. export LIBTRANSISTOR_HOME=<path/to/libtransistor/dist/>")
-endif
-
-include $(LIBTRANSISTOR_HOME)/libtransistor.mk
-
-INCDIRS := -I. -Ideps -Ideps/libz -Ilibretro-common/include -Ideps/stb -I$(LIBTRANSISTOR_HOME)/build/sdl2_install/include/SDL2/
-LIBDIRS := -L.
-
-TARGETS := $(TARGET).nro
-
-CFLAGS += $(INCDIRS) $(DEFINES) -Wno-unused-command-line-argument -Werror-implicit-function-declaration
-
-all: $(TARGETS)
-
-$(TARGET).nro.so: $(OBJ) libretro_switch.a fs.squashfs.o $(LIBTRANSISTOR_NRO_LIB) $(LIBTRANSISTOR_COMMON_LIBS)
-	$(LD) $(LD_FLAGS) --allow-multiple-definition -o $@ $(OBJ) libretro_switch.a fs.squashfs.o $(LIBTRANSISTOR_NRO_LDFLAGS) -lm
-
-%.squashfs.o: %.squashfs
-	$(LD) -s -r -b binary -m aarch64elf -T $(LIBTRANSISTOR_HOME)/fs.T -o $@ $<
-
-fs.squashfs: fs/*
-	mksquashfs $^ $@ -comp lz4 -nopad -noappend
-
-clean:
-	rm -f $(OBJ) $(TARGET).nro.so $(TARGET).nro
-
-.PHONY: clean all
@@ -1,181 +0,0 @@
-TARGET		    := retroarch_vita
-DEBUG               ?= 0
-GRIFFIN_BUILD        = 0
-WHOLE_ARCHIVE_LINK   = 0
-
-VITA_TITLE_ID	:= RETROARCH
-VITA_TITLE_NAME	:= RetroArch
-
-PC_DEVELOPMENT_IP_ADDRESS  =
-PC_DEVELOPMENT_UDP_PORT	   =
-
-OBJ :=
-
-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_KEYMAPPER
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
-	ifeq ($(DEBUG), 1)
-		DEFINES += -DHAVE_NETLOGGER
-	endif
-else
-
-	HAVE_NEON		:= 1
-	HAVE_FILTERS_BUILTIN	:= 1
-	HAVE_LANGEXTRA		:= 1
-	HAVE_RPNG		:= 1
-	HAVE_RJPEG		:= 1
-	HAVE_RBMP		:= 1
-	HAVE_RTGA		:= 1
-	HAVE_ZLIB		:= 1
-	HAVE_7ZIP		:= 1
-	HAVE_VITA2D		:= 1
-	HAVE_NETWORKING		:= 1
-	HAVE_SOCKET_LEGACY	:= 1
-	HAVE_MENU		:= 1
-	HAVE_MENU_COMMON	:= 1
-	HAVE_OVERLAY		:= 1
-	HAVE_MATERIALUI		:= 1
-	HAVE_XMB		:= 1
-	HAVE_RGUI		:= 1
-	HAVE_STB_FONT		:= 1
-	HAVE_THREADS		:= 1
-	HAVE_LIBRETRODB		:= 1
-	HAVE_CC_RESAMPLER	:= 1
-	HAVE_CHEEVOS		:= 1
-	RARCH_CONSOLE		:= 1
-	HAVE_STATIC_VIDEO_FILTERS = 1
-	HAVE_STATIC_AUDIO_FILTERS = 1
-
-	ifeq ($(DEBUG), 1)
-		HAVE_NETLOGGER = 1
-	endif
-
-	include Makefile.common
-	CFLAGS += $(DEF_FLAGS)
-	BLACKLIST :=
-	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-
-	OBJ += input/drivers/psp_input.o
-	OBJ += input/drivers_joypad/psp_joypad.o
-	OBJ += audio/drivers/psp_audio.o
-	OBJ += frontend/drivers/platform_psp.o
-endif
-
-ifeq ($(strip $(VITASDK)),)
-$(error "Please set VITASDK in your environment. export VITASDK=<path to>vitasdk")
-endif
-
-export PATH := $(PATH):$(VITASDK)/bin
-
-PREFIX := arm-vita-eabi-
-
-CC      := $(PREFIX)gcc
-CXX     := $(PREFIX)g++
-AS      := $(PREFIX)as
-AR      := $(PREFIX)ar
-OBJCOPY := $(PREFIX)objcopy
-STRIP   := $(PREFIX)strip
-NM      := $(PREFIX)nm
-LD      := $(CXX)
-
-INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Ideps/stb
-LIBDIRS := -L.
-
-ARCHFLAGS := -march=armv7-a -mfpu=neon -mfloat-abi=hard -DVITA
-CFLAGS    += $(ARCHFLAGS) -mword-relocations -fno-optimize-sibling-calls
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O2 -g
-else
-   CFLAGS += -O3
-endif
-
-ASFLAGS := $(CFLAGS)
-LDFLAGS := -Wl,-q
-
-CFLAGS += -Wall -ffast-math
-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_UDP_PORT),)
-   CFLAGS += -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-endif
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
-
-VITA_LIBS := -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub \
-	-lSceSysmodule_stub -lSceCtrl_stub -lSceTouch_stub -lSceAudio_stub \
-	-lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
-	-lSceFiber_stub -lSceMotion_stub -lSceAppMgr_stub -lpthread -lpng -lz
-
-LIBS	:= $(WHOLE_START) -lretro_vita $(WHOLE_END) $(VITA_LIBS) -lm -lc
-
-TARGETS := $(TARGET).vpk
-
-DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
-POSTCOMPILE = mv -f $*.Tdepend $*.depend
-
-all: $(TARGETS)
-
-%.o: %.cpp
-%.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)
-
-%.depend: ;
-
-$(TARGET).elf: $(OBJ) libretro_vita.a
-	$(LD) $(OBJ) $(LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
-
-%.velf: %.elf
-	vita-elf-create $< $@
-
-%.self: %.velf
-	vita-make-fself -c -s $< $@
-
-%.vpk: %.self
-	vita-mksfoex -s TITLE_ID=$(VITA_TITLE_ID) "$(VITA_TITLE_NAME)" param.sfo
-	vita-pack-vpk -s param.sfo -b $< $@
-
-clean:
-	rm -f $(OBJ) $(TARGET).elf $(TARGET).velf $(TARGET).self param.sfo $(TARGET).vpk
-	rm -f $(OBJ:.o=.depend)
-
-# Useful for developers
-vpksend: $(TARGET).vpk
-	curl -T $< ftp://$(PSVITAIP):1337/ux0:/
-
-send: $(TARGET).self
-	curl -T $< ftp://$(PSVITAIP):1337/ux0:/app/$(VITA_TITLE_ID)/eboot.bin
-
-.PHONY: clean all send vpksend
-.PRECIOUS: %.depend
-
-include $(OBJ:.o=.depend)
@@ -1,85 +0,0 @@
-HAVE_FILE_LOGGER  = 0
-DEBUG             = 0
-
-TARGET = retroarchvita_salamander
-TITLE_ID = RETROVITA
-
-ifeq ($(DEBUG), 1)
-   OPTIMIZE_LV	:= -O0 -g
-else
-   OPTIMIZE_LV	:= -O2
-endif
-
-PREFIX  = arm-vita-eabi
-CC      = $(PREFIX)-gcc
-
-INCDIR = libretro-common/include
-CFLAGS = -Wl,-q $(OPTIMIZE_LV) -I$(INCDIR) -std=gnu99 -mfloat-abi=hard -ffast-math -fsingle-precision-constant -mword-relocations
-ASFLAGS = $(CFLAGS)
-
-RARCH_DEFINES = -DVITA -DIS_SALAMANDER -DRARCH_CONSOLE
-
-LIBDIR =
-LDFLAGS =
-LIBS = -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
-     -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub -lSceFiber_stub\
-     -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
-     -lSceMotion_stub -lSceAppMgr_stub -lfreetype -lpng -lm -lc
-
-ifeq ($(HAVE_FILE_LOGGER), 1)
-CFLAGS		+= -DHAVE_FILE_LOGGER
-endif
-
-CFLAGS += $(RARCH_DEFINES)
-
-OBJS = frontend/frontend_salamander.o \
-		 frontend/frontend_driver.o \
-		 frontend/drivers/platform_psp.o \
-		 frontend/drivers/platform_null.o \
-		 libretro-common/file/file_path.o \
-		 libretro-common/string/stdstring.o \
-		 libretro-common/lists/string_list.o \
-		 libretro-common/lists/dir_list.o \
-		 libretro-common/file/retro_dirent.o \
-		 libretro-common/encodings/encoding_utf.o \
-		 libretro-common/compat/compat_strl.o \
-		 libretro-common/compat/compat_strcasestr.o \
-		 libretro-common/compat/fopen_utf8.o \
-		 libretro-common/file/config_file.o \
-		 libretro-common/streams/file_stream.o \
-		 libretro-common/vfs/vfs_implementation.o \
-		 libretro-common/hash/rhash.o \
-		 file_path_str.o \
-		 verbosity.o
-
-all: $(TARGET).vpk
-
-%.vpk: eboot.bin
-	vita-mksfoex -s TITLE_ID=$(TITLE_ID) "$(TARGET)" param.sfo
-	vita-pack-vpk -s param.sfo -b eboot.bin $@
-
-eboot.bin: $(TARGET).velf
-	vita-make-fself $< $@
-
-%.velf: %.elf
-	vita-elf-create $< $@
-
-$(TARGET).elf: $(OBJS)
-	$(CC) $(CFLAGS) $^ $(LIBS) -o $@
-
-%.o: %.png
-	$(PREFIX)-ld -r -b binary -o $@ $^
-
-clean:
-	@rm -rf $(TARGET).vpk $(TARGET).velf $(TARGET).elf $(OBJS) \
-		eboot.bin param.sfo
-
-vpksend: $(TARGET).vpk
-	curl -T $(TARGET).vpk ftp://$(PSVITAIP):1337/ux0:/
-	@echo "Sent."
-
-PSVITAIP = 192.168.1.15
-
-send: eboot.bin
-	curl -T eboot.bin ftp://$(PSVITAIP):1337/ux0:/app/$(TITLE_ID)/
-	@echo "Sent."
@@ -6,7 +6,6 @@
 DEBUG			= 0
 HAVE_LOGGER		= 0
 HAVE_FILE_LOGGER	= 0
-EXTERNAL_LIBOGC = 0

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

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

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

 APP_BOOTER_DIR = wii/app_booter

-OBJ = frontend/frontend_salamander.o \
-		frontend/frontend_driver.o \
-		frontend/drivers/platform_gx.o \
-		frontend/drivers/platform_wii.o \
-		frontend/drivers/platform_null.o \
-		libretro-common/file/file_path.o \
-		libretro-common/hash/rhash.o \
-		libretro-common/string/stdstring.o \
-		libretro-common/lists/string_list.o \
-		libretro-common/lists/dir_list.o \
-		libretro-common/streams/file_stream.o \
-		libretro-common/vfs/vfs_implementation.o \
-		libretro-common/file/retro_dirent.o \
-		libretro-common/encodings/encoding_utf.o \
-		libretro-common/compat/compat_strl.o \
-		libretro-common/compat/compat_strcasestr.o \
-		libretro-common/compat/fopen_utf8.o \
-		libretro-common/file/config_file.o \
-		file_path_str.o \
-		verbosity.o \
-		$(APP_BOOTER_DIR)/app_booter.binobj
-
-ifeq ($(EXTERNAL_LIBOGC), 1)
-else
-OBJ += wii/libogc/libfat/cache.o \
-		wii/libogc/libfat/directory.o \
-		wii/libogc/libfat/disc.o \
-		wii/libogc/libfat/fatdir.o \
-		wii/libogc/libfat/fatfile.o \
-		wii/libogc/libfat/file_allocation_table.o \
-		wii/libogc/libfat/filetime.o \
-		wii/libogc/libfat/libfat.o \
-		wii/libogc/libfat/lock.o \
-		wii/libogc/libfat/partition.o
-endif
+OBJ = frontend/frontend_salamander.o frontend/frontend_driver.o frontend/drivers/platform_gx.o frontend/drivers/platform_wii.o frontend/drivers/platform_null.o libretro-common/file/file_path.o libretro-common/hash/rhash.o libretro-common/string/string_list.o libretro-common/file/dir_list.o libretro-common/compat/compat.o libretro-common/file/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj

 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-OBJ             += network/net_logger.o \
-						 libretro-common/net/net_compat.o \
-						 libretro-common/net/net_socket.o
+CFLAGS          += -Ilogger/netlogger
+OBJ             += logger/netlogger/logger.o
 endif

 ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
+CFLAGS          += -Ilogger/netlogger
 endif

-CFLAGS += -std=gnu99 -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_RARCH_EXEC -DGEKKO -Wno-char-subscripts
+CFLAGS += -std=gnu99 -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_RARCH_EXEC -DGEKKO -Wno-char-subscripts 

 ifeq ($(DEBUG), 1)
   CFLAGS += -O0 -g
@@ -107,11 +61,6 @@ else
   CFLAGS += -O3
 endif

-ifeq ($(USBGECKO), 1)
-LIBS += -ldb
-CFLAGS += -DUSBGECKO
-endif
-
 all: $(DOL_TARGET)

 %.dol: %.elf
@@ -130,7 +79,7 @@ $(APP_BOOTER_DIR)/app_booter.bin:
 	$(MAKE) -C $(APP_BOOTER_DIR)

 pkg: all
-	cp -r $(DOL_TARGET) pkg/wii/boot.dol
+	cp -r $(DOL_TARGET) wii/pkg/boot.dol

 clean:
 	rm -f $(DOL_TARGET)
@@ -139,3 +88,4 @@ clean:
 	$(MAKE) -C $(APP_BOOTER_DIR) clean

 .PHONY: clean
+
@@ -1,325 +0,0 @@
-TARGET		    := retroarch_wiiu
-
-BUILD_HBL_ELF              = 1
-BUILD_RPX                  = 1
-DEBUG                      = 0
-GRIFFIN_BUILD              = 0
-SALAMANDER_BUILD           = 0
-WHOLE_ARCHIVE_LINK         = 0
-WIIU_HID                   = 1
-HAVE_RUNAHEAD              = 1
-WIIU_LOG_RPX               = 0
-BUILD_DIR                  = objs/wiiu
-PC_DEVELOPMENT_TCP_PORT	   ?=
-
-ifeq ($(SALAMANDER_BUILD),1)
-   BUILD_DIR := $(BUILD_DIR)-salamander
-   TARGET    := $(TARGET)_salamander
-else ifeq ($(GRIFFIN_BUILD),1)
-   BUILD_DIR := $(BUILD_DIR)-griffin
-endif
-
-ifeq ($(DEBUG),1)
-   BUILD_DIR := $(BUILD_DIR)-debug
-endif
-
-ifneq ($(V), 1)
-   Q := @
-endif
-
-OBJ :=
-OBJ += wiiu/main.o
-OBJ += wiiu/system/memory.o
-OBJ += wiiu/system/atomic.o
-OBJ += wiiu/system/exception_handler.o
-OBJ += wiiu/system/missing_libc_functions.o
-OBJ += wiiu/fs/sd_fat_devoptab.o
-OBJ += wiiu/fs/fs_utils.o
-OBJ += wiiu/hbl.o
-
-DEFINES :=
-
-ifeq ($(WIIU_LOG_RPX),1)
-   defines += -DWIIU_LOG_RPX
-endif
-
-ifeq ($(WIIU_HID),1)
-   DEFINES += -DWIIU_HID
-   OBJ += input/drivers_joypad/wiiu/hidpad_driver.o
-   OBJ += input/drivers_hid/wiiu_hid.o
-   OBJ += input/connect/joypad_connection.o \
-          input/common/hid/hid_device_driver.o \
-          input/common/hid/device_wiiu_gca.o \
-          input/common/hid/device_ds3.o \
-          input/common/hid/device_ds4.o \
-          input/common/hid/device_null.o
-endif
-
-ifeq ($(SALAMANDER_BUILD),1)
-   DEFINES += -DRARCH_CONSOLE -DIS_SALAMANDER
-
-   OBJ += frontend/frontend_salamander.o
-   OBJ += frontend/frontend_driver.o
-   OBJ += frontend/drivers/platform_wiiu.o
-   OBJ += frontend/drivers/platform_null.o
-   OBJ += libretro-common/encodings/encoding_utf.o
-   OBJ += libretro-common/compat/compat_strcasestr.o
-   OBJ += libretro-common/compat/fopen_utf8.o
-   OBJ += libretro-common/file/file_path.o
-   OBJ += libretro-common/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/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 -DHAVE_NETPLAYDISCOVERY
-   #	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_MENU = 1
-   	HAVE_RGUI = 1
-   	HAVE_ZLIB = 1
-   	HAVE_7ZIP = 1
-	HAVE_BUILTINZLIB = 0
-   	HAVE_LIBRETRODB = 1
-   	HAVE_MATERIALUI = 1
-   	HAVE_XMB = 1
-   	HAVE_STB_FONT = 1
-   #	HAVE_FREETYPE = 1
-   	HAVE_LANGEXTRA = 1
-   	HAVE_LIBRETRODB = 1
-   	HAVE_NETWORKING = 1
-		HAVE_NETPLAYDISCOVERY = 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
-
-   	OBJ += gfx/drivers/gx2_gfx.o
-   	OBJ += gfx/drivers_font/wiiu_font.o
-   	OBJ += menu/drivers_display/menu_display_wiiu.o
-   	OBJ += input/drivers/wiiu_input.o
-   	OBJ += input/drivers_joypad/wiiu_joypad.o
-        OBJ += input/drivers_joypad/wiiu/wpad_driver.o
-        OBJ += input/drivers_joypad/wiiu/kpad_driver.o
-        OBJ += input/drivers_joypad/wiiu/pad_functions.o
-
-   	OBJ += audio/drivers/wiiu_audio.o
-   	OBJ += frontend/drivers/platform_wiiu.o
-   endif
-endif
-
-OBJ := $(addprefix $(BUILD_DIR)/,$(OBJ))
-
-#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_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")
-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.
-INCDIRS += -Ideps
-INCDIRS += -Ideps/stb
-INCDIRS += -Ideps/libz
-INCDIRS += -Ideps/7zip
-INCDIRS += -Ilibretro-common/include
-INCDIRS += -Iinput/include
-INCDIRS += -Iwiiu
-INCDIRS += -Iwiiu/include
-INCDIRS += -I$(DEVKITPRO)/portlibs/ppc/include
-LIBDIRS := -L. -L$(DEVKITPRO)/portlibs/ppc/lib
-
-CFLAGS  := -mwup -mcpu=750 -meabi -mhard-float
-LDFLAGS :=
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -g
-else
-   CFLAGS += -O3
-endif
-
-LDFLAGS := $(CFLAGS)
-
-ASFLAGS := $(CFLAGS) -mregnames
-
-CFLAGS +=  -ffast-math -Werror=implicit-function-declaration
-#CFLAGS += -fomit-frame-pointer -mword-relocations
-#CFLAGS	+= -Wall
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-
-CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions
-
-LDFLAGS  += -Wl,--gc-sections
-
-LIBS	:= $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm -lpng -lz
-
-ifneq ($(WANT_LIBFAT), 1)
-LIBS += -lfat
-endif
-
-ifneq ($(WANT_IOSUHAX), 1)
-LIBS += -liosuhax
-endif
-
-RPX_OBJ           = $(BUILD_DIR)/wiiu/system/stubs_rpl.o
-HBL_ELF_OBJ       = $(BUILD_DIR)/wiiu/system/dynamic.o $(BUILD_DIR)/wiiu/system/stubs_elf.o
-
-RPX_LDFLAGS      := -pie -fPIE
-RPX_LDFLAGS      += -z common-page-size=64 -z max-page-size=64
-RPX_LDFLAGS      += -T wiiu/link_rpl.ld
-RPX_LDFLAGS      += -nostartfiles
-
-HBL_ELF_LDFLAGS  := -T wiiu/link_elf.ld
-
-TARGETS :=
-ifeq ($(BUILD_RPX), 1)
-TARGETS += $(TARGET).rpx
-endif
-
-ifeq ($(BUILD_HBL_ELF), 1)
-TARGETS += $(TARGET).elf
-endif
-
-DEPFLAGS    = -MT $@ -MMD -MP -MF $(BUILD_DIR)/$*.depend
-
-all: $(TARGETS)
-
-%: $(BUILD_DIR)/%
-	cp $< $@
-
-$(BUILD_DIR)/%.o: %.cpp %.depend
-	@$(if $(Q), echo CXX $<,)
-	@mkdir -p $(dir $@)
-	$(Q)$(CXX) -c -o $@ $< $(CXXFLAGS) $(DEFINES) $(INCDIRS) $(DEPFLAGS)
-
-$(BUILD_DIR)/%.o: %.c %.depend
-	@$(if $(Q), echo CC $<,)
-	@mkdir -p $(dir $@)
-	$(Q)$(CC) -c -o $@ $< $(CFLAGS) $(DEFINES) $(INCDIRS) $(DEPFLAGS)
-
-$(BUILD_DIR)/%.o: %.S %.depend
-	@$(if $(Q), echo AS $<,)
-	@mkdir -p $(dir $@)
-	$(Q)$(CC) -c -o $@ $< $(ASFLAGS) $(DEFINES) $(INCDIRS) $(DEPFLAGS)
-
-$(BUILD_DIR)/%.o: %.s %.depend
-	@$(if $(Q), echo AS $<,)
-	@mkdir -p $(dir $@)
-	$(Q)$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-%.a:
-	@$(if $(Q), echo AR $<,)
-	@mkdir -p $(dir $@)
-	$(Q)$(AR) -rc $@ $^
-
-%.depend: ;
-%.last: ;
-
-$(ELF2RPL):
-	@$(if $(Q), echo MAKE $@,)
-	$(Q)$(MAKE) -C wiiu/wut/elf2rpl/
-
-$(BUILD_DIR)/$(TARGET).elf: $(OBJ) $(HBL_ELF_OBJ) libretro_wiiu.a wiiu/link_elf.ld .$(TARGET).elf.last
-	@$(if $(Q), echo LD $@,)
-	@touch .$(TARGET).elf.last
-	$(Q)$(LD) $(OBJ) $(HBL_ELF_OBJ) $(LDFLAGS) $(HBL_ELF_LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
-
-$(BUILD_DIR)/$(TARGET).rpx.elf: $(OBJ) $(RPX_OBJ) libretro_wiiu.a wiiu/link_elf.ld
-	@$(if $(Q), echo LD $@,)
-	$(Q)$(LD) $(OBJ) $(RPX_OBJ) $(LDFLAGS) $(RPX_LDFLAGS) $(LIBDIRS)  $(LIBS) -o $@
-
-$(BUILD_DIR)/$(TARGET).rpx: $(BUILD_DIR)/$(TARGET).rpx.elf $(ELF2RPL) .$(TARGET).rpx.last
-	@$(if $(Q), echo ELF2RPL $@,)
-	@touch .$(TARGET).rpx.last
-	$(Q)-$(ELF2RPL) $< $@
-
-clean:
-	rm -f $(OBJ) $(RPX_OBJ) $(HBL_ELF_OBJ) $(TARGET).elf $(TARGET).rpx.elf $(TARGET).rpx
-	rm -f $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).rpx.elf $(BUILD_DIR)/$(TARGET).rpx
-	rm -f .$(TARGET).elf.last .$(TARGET).rpx.elf.last .$(TARGET).rpx.last
-	rm -f $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
-
-.PHONY: clean all
-.PRECIOUS: %.depend %.last
-
-include $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
@@ -1,26 +1,26 @@
 TARGET = retroarch.exe
+JTARGET = tools/retroarch-joyconfig.exe

 HAVE_DINPUT = 1
 HAVE_XAUDIO = 1
 HAVE_DSOUND = 1
-HAVE_WASAPI = 1
 HAVE_OPENGL = 1
+HAVE_FBO = 1
 HAVE_DYLIB = 1
 HAVE_D3D9 = 1
+HAVE_NETPLAY = 1
 HAVE_NETWORKING = 1
-HAVE_NETPLAYDISCOVERY = 1
 HAVE_STDIN_CMD = 1
 HAVE_COMMAND = 1
 HAVE_THREADS = 1
-HAVE_MENU = 1
 HAVE_RGUI = 1
-HAVE_MATERIALUI = 1
+HAVE_GLUI = 1
 HAVE_7ZIP = 1
+HAVE_ZLIB_DEFLATE = 1
 HAVE_PYTHON = 0
 DYNAMIC = 1

 HAVE_XINPUT = 1
-HAVE_WINMM = 1

 HAVE_SDL      := 0
 HAVE_SDL2     := 0
@@ -35,7 +35,6 @@ HAVE_CG       := 1
 HAVE_LIBXML2  := 0
 HAVE_ZLIB     := 1
 WANT_ZLIB     := 1
-HAVE_CC_RESAMPLER := 1

 ifeq ($(HAVE_CG), 1)
 CG_LIBS          := -lcg -lcgGL
@@ -85,7 +84,9 @@ OBJDIR           := obj-w32

 OS               := Win32
 OBJ              :=
+JOYCONFIG_OBJ    :=
 LIBS             := -lm
+JOYCONFIG_LIBS   :=
 DEFINES          := -I. -Ilibretro-common/include -DRARCH_INTERNAL -DHAVE_OVERLAY
 LDFLAGS          := -L. -static-libgcc

@@ -103,6 +104,7 @@ else
   WINDRES = windres
 endif

+
 libretro ?= -lretro

 ifeq ($(DYNAMIC), 1)
@@ -121,12 +123,13 @@ ifeq ($(DEBUG), 1)
 else
   CFLAGS += -O3 -ffast-math
   CXXFLAGS += -O3 -ffast-math
+   LDCXXFLAGS += -s
 endif

-CFLAGS += $(DEF_FLAGS) -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps
-CXXFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps -std=c++98 -D__STDC_CONSTANT_MACROS
+CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I.
+CXXFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -std=c++0x -D__STDC_CONSTANT_MACROS
 ifeq ($(CXX_BUILD), 1)
-   CFLAGS += -std=c++98 -xc++ -D__STDC_CONSTANT_MACROS
+   CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS
 else
   ifneq ($(GNU90_BUILD), 1)
      CFLAGS += -std=gnu99
@@ -134,41 +137,69 @@ else
 endif

 RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
+RARCH_JOYCONFIG_OBJ := $(addprefix $(OBJDIR)/,$(JOYCONFIG_OBJ))

-all: $(TARGET)
+all: $(TARGET) $(JTARGET)

-include $(RARCH_OBJ:.o=.d)
+-include $(RARCH_OBJ:.o=.d) $(RARCH_JOYCONFIG_OBJ:.o=.d)

 $(TARGET): $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
 	$(Q)$(CXX) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LDCXXFLAGS)

-#those mkdir shenanigans are really ugly, but I can't find any better solution
 $(OBJDIR)/%.o: %.c
-	@-mkdir -p $(dir $@) || mkdir $(subst /,\,$(dir $@)) || echo .
+	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo CC $<),)
 	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<

 .FORCE:

 $(OBJDIR)/git_version.o: git_version.c .FORCE
-	@-mkdir -p $(dir $@) || mkdir $(subst /,\,$(dir $@)) || echo .
+	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo CC $<),)
 	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<

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

 $(OBJDIR)/%.o: %.rc $(HEADERS)
-	@-mkdir -p $(dir $@) || mkdir $(subst /,\,$(dir $@)) || echo .
+	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo WINDRES $<),)
 	$(Q)$(WINDRES) -o $@ $<

+$(JTARGET): $(RARCH_JOYCONFIG_OBJ)
+	@$(if $(Q), $(shell echo echo LD $@),)
+ifeq ($(CXX_BUILD), 1)
+	$(Q)$(CXX) -o $@ $(RARCH_JOYCONFIG_OBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JOYCONFIG_LIBS)
+else
+	$(Q)$(CC) -o $@ $(RARCH_JOYCONFIG_OBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JOYCONFIG_LIBS)
+endif
+
 clean:
 	rm -rf $(OBJDIR)
 	rm -f $(TARGET)
 	rm -f *.d
+	rm -f tools/retroarch-joyconfig.exe
+
+dist_x86: all
+	zip -r retroarch-win32-1.0.zip $(TARGET) $(JTARGET) retroarch.cfg
+
+dist_x86_64: all
+	zip -r retroarch-win64-1.0.zip $(TARGET) $(JTARGET) retroarch.cfg
+
+libs_x86:
+	wget http://themaister.net/retroarch-dl/RetroArch-win32-libs.zip
+	unzip RetroArch-win32-libs.zip
+	wget http://themaister.net/retroarch-dl/RetroArch-win32-headers.zip
+	unzip RetroArch-win32-headers.zip
+
+libs_x86_64:
+	wget http://themaister.net/retroarch-dl/RetroArch-win64-libs.zip
+	unzip RetroArch-win64-libs.zip
+	wget http://themaister.net/retroarch-dl/RetroArch-win64-headers.zip
+	unzip RetroArch-win64-headers.zip
+
+.PHONY: all install uninstall clean dist_x86 dist_x86_64 libs_x86 libs_x86_64

-.PHONY: all install uninstall clean
@@ -0,0 +1,49 @@
+RARCH_VERSION		= "0.9.9.3"
+
+DEBUG = 0
+
+CC = xenon-gcc
+CXX = xenon-g++
+OBJCOPY = xenon-objcopy
+STRIP = xenon-strip
+
+PPU_TARGET := retroarch-libxenon.elf
+PPU_TARGET_ADJUSTED := retroarch-libxenon.elf32
+
+LDDIRS = -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32
+INCDIRS = -I. -I$(DEVKITXENON)/usr/include
+
+OBJ = griffin/griffin.o
+
+LIBS = -lretro_xenon360 -lxenon -lm -lc
+DEFINES = -std=gnu99 -DRARCH_CONSOLE -DHAVE_THREADS -DHAVE_GETOPT_LONG=1 -DHAVE_GRIFFIN -DRARCH_INTERNAL
+DEFINES += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DXENON $(INCDIRS) -Wno-char-subscripts
+DEFINES += -u read -u _start -u exc_base
+
+ifeq ($(DEBUG), 1)
+   OPTIMIZE_LV	:= -O0 -g
+else
+   OPTIMIZE_LV	:= -O3
+endif
+
+all: $(PPU_TARGET_ADJUSTED)
+
+CFLAGS := $(OPTIMIZE_LV) $(DEFINES)
+
+LDFLAGS := -m32 -n -T $(DEVKITXENON)/app.lds
+
+$(PPU_TARGET_ADJUSTED): $(PPU_TARGET)
+	$(OBJCOPY) -O elf32-powerpc --adjust-vma 0x80000000 $< $@
+	$(STRIP) $@
+
+$(PPU_TARGET): $(OBJ)
+	$(CXX) -o $@ $(OBJ) $(LDFLAGS) $(LDDIRS) $(LIBS)
+
+%.o: %.c config.h
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	rm -f $(PPU_TARGET)
+	rm -f $(OBJ)
+
+.PHONY: clean
@@ -18,7 +18,7 @@ So we will use
 First we will clone and build the kernel:
 git clone https://github.com/mireq/linux-sunxi.git -b sunxi-3.4 --depth 1

-Now we edit drivers/video/sunxi/disp/dev_fb.c, and uncomment the line 1074:
+Now we edit drivers/video/sunxi/disp/dev_fb.c, and uncoment the line 1074:
 // Fb_wait_for_vsync(info); 

 It is assumed you have a cross-compiler installed, so we configure and build the kernel and modules:
@@ -1,88 +1,60 @@
-[![Build Status](https://travis-ci.org/libretro/RetroArch.svg?branch=master)](https://travis-ci.org/libretro/RetroArch)
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/8936/badge.svg)](https://scan.coverity.com/projects/retroarch)
-
 # RetroArch

 RetroArch is the reference frontend for the libretro API.
-Popular examples of implementations for this API includes video game system emulators and game engines as well as
+Popular examples of implementations for this API includes videogame system emulators and game engines, but also
 more generalized 3D programs.
 These programs are instantiated as dynamic libraries. We refer to these as "libretro cores".

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

 [libretro](http://libretro.com) is an API that exposes generic audio/video/input callbacks.
 A frontend for libretro (such as RetroArch) handles video output, audio output, input and application lifecycle.
-A libretro core written in portable C or C++ can run seamlessly on many platforms with very little to no porting effort.
+A libretro core written in portable C or C++ can run seamlessly on many platforms with very little/no porting effort.

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

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

 ## Binaries

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

 ## Support

-To reach developers, either make an issue here on GitHub, make a thread on the [forum](http://www.libretro.com/forums/), chat on [Discord](https://discord.gg/C4amCeV), or visit our IRC channel: #retroarch @ irc.freenode.org.
+To reach developers, either make an issue here on Github, make a thread on the [forum](http://www.libretro.com/forums/),
+or visit our IRC channel: #retroarch @ irc.freenode.org.

 ## Documentation

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

 ## Related projects

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

 ## Philosophy

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

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

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

 ## Platforms

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

-   - DOS
-   - Windows
-   - Linux
-   - Emscripten (WebAssembly and JavaScript)
-   - FreeBSD
-   - NetBSD
-   - OpenBSD
-   - Haiku
-   - Solaris
-   - macOS (PPC, x86-32 and x86-64)
-   - PlayStation 3
-   - PlayStation Portable
-   - PlayStation Vita
-   - Original Microsoft Xbox
-   - Microsoft Xbox 360 (Libxenon/XeXDK)
-   - Nintendo GameCube
-   - Nintendo Wii
-   - Nintendo Wii U
-   - Nintendo 3DS
-   - Nintendo Switch
-   - Nintendo NES/SNES Classic Edition
+   - PlayStation3
+   - Xbox 360 (Libxenon/XeXDK)
+   - Xbox 1
+   - Wii, Gamecube (Libogc)
   - Raspberry Pi
   - Android
   - iOS
@@ -90,14 +62,9 @@ RetroArch has been ported to the following platforms:

 ## Dependencies (PC)

-There are no true hard dependencies per se.
+On Windows, RetroArch can run with only Win32 as dependency. On Linux, you need:

-On Windows, RetroArch can run with only Win32 as dependency.
-
-On Linux, there are no true dependencies. For optimal usage, the
-following dependencies come as recommended:
-
-   - GL headers / Vulkan headers
+   - GL headers
   - X11 headers and libs, or EGL/KMS/GBM

 OSX port of RetroArch requires latest versions of XCode to build.
@@ -122,7 +89,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)
@@ -132,128 +99,110 @@ 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 it does not exist.
+RetroArch will on startup create a config file in $XDG\_CONFIG\_HOME/retroarch/retroarch.cfg if doesn't exist.
 Users only need to configure a certain option if the desired value deviates from the value defined in config.def.h.

-To configure joypads, use the built-in menu or the `retroarch-joyconfig` command-line tool.
+To configure joypads, use the built-in menu or the <tt>retroarch-joyconfig</tt> command-line tool.

 ## Compiling and installing
+<b>Linux</b><br/>
+- Prerequisites:
+```bash
+sudo apt-get install -y make git-core curl g++ pkg-config libglu1-mesa-dev freeglut3-dev mesa-common-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev
+```
+- Compiling:
+```bash
+./configure
+make
+```

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

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

-CRT SwitchRes will turn on, on the fly. However, you will need to restart RetroArch to disable it. With CRT SwitchRes enable RetroArch will start in 2560 x 480 @ 60.  
+<b>PlayStation3</b><br/>

-If you are running Windows, before enabling the CRT SwitchRes options please make sure you have installed CRTEmudriver and installed some modelines. The minimum modelines for all games to switch correctly are:
+RetroArch PS3 needs to be compiled in the following order:

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

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

- 2560 x 192 @ 50.000000
- 2560 x 200 @ 50.000000
- 2560 x 240 @ 50.000000
- 2560 x 224 @ 50.000000
- 2560 x 288 @ 50.000000
- 2560 x 237 @ 50.000000
- 2560 x 254 @ 55.000000
- 2560 x 448 @ 50.000000
- 2560 x 480 @ 50.000000
+2) Compile the RGL video driver

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

- 2560 x 512 @ 50.000000
- 2560 x 576 @ 50.000000
+3) Compile RetroArch as a library

-Ideally install all these modelines and everything will work great.
+<tt>make -f Makefile.ps3.retroarch</tt>

-## Super Resolutions
+4) Finally, compile RetroArch packed together with the GUI:

-The default super resolution is 2560. It is displayed just under the CRT switch option, which can be found in video settings. This can be changed within the retroarch.cfg. The only compatible resolutions are 1920, 2560 and 3840. Any other resolutions will be ignored and native switching will be activated.
+<tt>make -f Makefile.ps3</tt>

-## Native Resolutions
+<b>PlayStation3 - Creating a PKG installable file</b><br />

-If native resolutions are activated you will need a whole new set of modelines:
+You can add `pkg` as a parameter in order to make a PKG file - for example:

- 256 x 240 @ 50.006977 SNESpal
- 256 x 448 @ 50.006977 SNESpal
- 512 x 224 @ 50.006977 SNESpal
- 512 x 240 @ 50.006977 SNESpal
- 512 x 448 @ 50.006977 SNESpal
- 256 x 240 @ 60.098812 SNESntsc
- 256 x 448 @ 60.098812 SNESntsc
- 512 x 240 @ 60.098812 SNESntsc
- 512 x 224 @ 60.098812 SNESntsc
- 512 x 448 @ 60.098812 SNESntsc
- 256 x 192 @ 59.922745 MDntsc
- 256 x 224 @ 59.922745 MDntsc
- 320 x 224 @ 59.922745 MDntsc
- 320 x 240 @ 59.922745 MDntsc
- 320 x 448 @ 59.922745 MDntsc
- 320 x 480 @ 59.922745 MDntsc
- 256 x 192 @ 49.701458 MDpal
- 256 x 224 @ 49.701458 MDpal
- 320 x 224 @ 49.701458 MDpal
- 320 x 240 @ 49.701458 MDpal
- 320 x 288 @ 49.701458 MDpal
- 320 x 448 @ 49.701458 MDpal
- 320 x 480 @ 49.701458 MDpal
- 320 x 576 @ 49.701458 MDpal
- 256 x 288 @ 49.701458 MSYSpal
- 256 x 240 @ 60.098812 NESntsc
- 256 x 240 @ 50.006977 NESpal
+<tt>make -f Makefile.ps3 pkg</tt>

- 640 x 237 @ 60.130001 N64ntsc
- 640 x 240 @ 60.130001 N64ntsc
- 640 x 480 @ 60.130001 N64ntsc
- 640 x 288 @ 50.000000 N64pal
- 640 x 480 @ 50.000000 N64pal
- 640 x 576 @ 50.000000 N64pal
+This creates an NPDRM package. This can be installed on debug PS3s.

- 256 x 252 @ 49.759998 PSXpal
- 320 x 252 @ 49.759998 PSXpal
- 384 x 252 @ 49.759998 PSXpal
- 640 x 252 @ 49.759998 PSXpal
- 640 x 540 @ 49.759998 PSXpal
+To make a non-NPDRM package that can be installed on a jailbroken/CFW PS3 (such as PSGroove or PS3 CFWs and other 3.55 CFW derivatives), do:

- 384 x 240 @ 59.941002 PSXntsc
- 256 x 480 @ 59.941002 PSXntsc
+<tt>make -f Makefile.ps3 pkg-signed</tt>

- 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
+If you're using Kmeaw 3.55 firmware, the package needs to be signed:

- 240 x 160 @ 59.730000 GBA
- 320 x 200 @ 60.000000 Doom
+<tt>make -f Makefile.ps3 pkg-signed-cfw</tt>

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

- 400 x 254 @ 54.706841 MK
- 384 x 224 @ 59.637405 CPS1
+<b> Xbox 360 (XeXDK)</b><br />

-These modelines are more accurate giving exact hz. However, some games may have unwanted results. This is due to mid-scanline resolution changes on the original hardware. For the best results super resolutions are the way to go.
+You will need Microsoft Visual Studio 2010 installed (or higher) in order to compile RetroArch 360.

-## CRT resolution switching & MAME
+The solution file can be found at the following location:

-Some arcade resolutions can be very different from consumer CRTs. There is resolution detection to ensure MAME games will be displayed in the closest available resolution but drawn at their native resolution within this resolution. Meaning that the MAME game will look just like the original hardware.
+<tt>msvc-360/RetroArch-360.sln</tt>

-MAME ROMs that run in a vertical aspect like DoDonPachi need to be rotated within MAME before resolution switching and aspect correction will work. Do this before enabling CRT SwitchRes so that RetroArch will run in your desktop resolution. Once you have rotated any games that may need it turn CRT SwitchRes on.
+NOTE: A pre-existing libretro library needs to be present in the `msvc-360/RetroArch-360/Release` directory in order to link RetroArch 360. This file needs to be
+called <em><b>`libretro_xdk360.lib`</b></em>.
+
+<b> Xbox 360 (Libxenon)</b><br />
+
+You will need to have the libxenon libraries and a working Devkit Xenon toolchain installed in order to compile RetroArch 360 Libxenon.
+
+<tt>make -f Makefile.xenon</tt>
+
+NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch 360 Libxenon. This file needs to be called <em><b>`libretro_xenon360.a`</b></em>.
+
+<b> Wii</b><br >
+
+You will need to have the libogc libraries and a working Devkit PPC toolchain installed in order to compile RetroArch Wii.
+
+<tt>make -f Makefile.wii</tt>
+
+NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch Wii. This file needs to be called <em><b>`libretro_wii.a`</b></em>.
@@ -0,0 +1,20 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "ubuntu/trusty64"
+  config.vm.provision :shell, :inline => $BOOTSTRAP_SCRIPT # see below
+end
+
+$BOOTSTRAP_SCRIPT = <<EOF
+  set -e # Stop on any error
+
+  export DEBIAN_FRONTEND=noninteractive
+
+  echo VAGRANT SETUP: DOING APT-GET STUFF...
+  # Install prereqs
+  sudo apt-get update
+  sudo apt-get install -y make git-core curl g++ pkg-config libglu1-mesa-dev freeglut3-dev mesa-common-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev
+
+  # Make vagrant automatically go to /vagrant when we ssh in.
+  echo "cd /vagrant" | sudo tee -a ~vagrant/.profile
+
+  echo VAGRANT IS READY.
+EOF
@@ -0,0 +1,45 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.retroarch"
+    android:versionCode="42"
+    android:versionName="1.2.2"
+    android:installLocation="preferExternal">
+    <uses-feature android:glEsVersion="0x00020000" />
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-feature android:name="android.software.leanback" android:required="false" />
+    <uses-feature android:name="android.hardware.gamepad" android:required="false"/>
+    <uses-sdk
+        android:minSdkVersion="9"
+        android:targetSdkVersion="21" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:hasCode="true"
+        android:banner="@drawable/banner"
+    	android:debuggable="false">
+        <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
+        <activity android:name="com.retroarch.browser.mainmenu.MainMenuActivity" android:exported="true" android:launchMode="singleInstance">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+                <category android:name="tv.ouya.intent.category.GAME" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.retroarch.browser.retroactivity.RetroActivityFuture" android:exported="true" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleInstance">
+            <meta-data android:name="android.app.lib_name" android:value="retroarch-activity" />
+            <meta-data android:name="android.app.func_name" android:value="ANativeActivity_onCreate" />
+        </activity>
+        <activity android:name="com.retroarch.browser.retroactivity.RetroActivityPast" android:exported="true" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleInstance">
+            <meta-data android:name="android.app.lib_name" android:value="retroarch-activity" />
+            <meta-data android:name="android.app.func_name" android:value="ANativeActivity_onCreate" />
+        </activity>
+    </application>
+</manifest>
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="retroarch" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <condition property="ndk.dir" value="${env.ANDROID_NDK}">
+       <isset property="env.ANDROID_NDK" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!-- Name of ndk-build executable. -->
+    <condition property="ndk.cmd" value="ndk-build.cmd" else="ndk-build">
+        <os family="windows"/>
+    </condition>
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+    <target name="-pre-build">
+       <exec executable="${ndk.dir}/${ndk.cmd}" failonerror="true">
+          <arg value="-j4"/>
+       </exec>
+    </target>
+
+    <target name="clean" depends="android_rules.clean">
+       <exec executable="${ndk.dir}/${ndk.cmd}" failonerror="true">
+          <arg value="clean"/>
+       </exec>
+    </target>
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
@@ -0,0 +1,77 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := retroarch-jni
+RARCH_DIR := ../../..
+LOCAL_CFLAGS += -std=gnu99 -Wall -DHAVE_LOGGER -DRARCH_DUMMY_LOG -DHAVE_ZLIB -DHAVE_MMAP -DRARCH_INTERNAL
+LOCAL_LDLIBS := -llog -lz
+LOCAL_SRC_FILES := apk-extract/apk-extract.c $(RARCH_DIR)/libretro-common/file/file_extract.c $(RARCH_DIR)/libretro-common/file/file_path.c $(RARCH_DIR)/file_ops.c $(RARCH_DIR)/libretro-common/string/string_list.c $(RARCH_DIR)/libretro-common/compat/compat.c
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/
+
+include $(BUILD_SHARED_LIBRARY)
+
+HAVE_NEON := 1
+HAVE_LOGGER := 1
+
+include $(CLEAR_VARS)
+ifeq ($(TARGET_ARCH),arm)
+   LOCAL_CFLAGS += -DANDROID_ARM -marm
+   LOCAL_ARM_MODE := arm
+endif
+
+ifeq ($(TARGET_ARCH),x86)
+   LOCAL_CFLAGS += -DANDROID_X86 -DHAVE_SSSE3
+endif
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+
+ifeq ($(HAVE_NEON),1)
+	LOCAL_CFLAGS += -D__ARM_NEON__
+   LOCAL_SRC_FILES += $(RARCH_DIR)/audio/audio_utils_neon.S.neon
+   LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/sinc_neon.S.neon
+   LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/cc_resampler_neon.S.neon
+endif
+LOCAL_CFLAGS += -DSINC_LOWER_QUALITY 
+
+LOCAL_CFLAGS += -DANDROID_ARM_V7
+endif
+
+ifeq ($(TARGET_ARCH),mips)
+   LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__
+endif
+
+LOCAL_MODULE := retroarch-activity
+
+LOCAL_SRC_FILES  +=	$(RARCH_DIR)/griffin/griffin.c
+
+ifeq ($(HAVE_LOGGER), 1)
+   LOCAL_CFLAGS += -DHAVE_LOGGER
+   LOGGER_LDLIBS := -llog
+endif
+
+ifeq ($(GLES),3)
+   GLES_LIB := -lGLESv3
+   LOCAL_CFLAGS += -DHAVE_OPENGLES3
+else
+   GLES_LIB := -lGLESv2
+endif
+
+
+LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_GLUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT
+LOCAL_CFLAGS += -DHAVE_7ZIP
+
+ifeq ($(NDK_DEBUG),1)
+LOCAL_CFLAGS += -O0 -g
+else
+LOCAL_CFLAGS += -O2 -DNDEBUG
+endif
+
+LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/
+
+LOCAL_CFLAGS += -DHAVE_SL
+LOCAL_LDLIBS += -lOpenSLES -lz
+
+include $(BUILD_SHARED_LIBRARY)
+
@@ -0,0 +1,19 @@
+ifeq ($(GLES),3)
+   ifndef NDK_GL_HEADER_VER
+      APP_PLATFORM := android-18
+   else
+      APP_PLATFORM := $(NDK_GL_HEADER_VER)
+   endif
+else
+   ifndef NDK_NO_GL_HEADER_VER
+      APP_PLATFORM := android-9
+   else
+      APP_PLATFORM := $(NDK_NO_GL_HEADER_VER)
+   endif
+endif
+
+ifndef TARGET_ABIS
+   APP_ABI := armeabi-v7a mips x86
+else
+   APP_ABI := $(TARGET_ABIS)
+endif
@@ -0,0 +1,91 @@
+#include <file/file_extract.h>
+#include <file/file_path.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <retro_miscellaneous.h>
+#include "../native/com_retroarch_browser_NativeInterface.h"
+
+//#define VERBOSE_LOG
+
+#ifndef VERBOSE_LOG
+#undef RARCH_LOG
+#define RARCH_LOG(...)
+#endif
+
+struct userdata
+{
+   const char *subdir;
+   const char *dest;
+};
+
+static int zlib_cb(const char *name, const char *valid_exts,
+      const uint8_t *cdata,
+      unsigned cmode, uint32_t csize, uint32_t size,
+      uint32_t crc32, void *userdata)
+{
+   char path[PATH_MAX];
+   char path_dir[PATH_MAX];
+   struct userdata *user = userdata;
+   const char *subdir = user->subdir;
+   const char *dest   = user->dest;
+
+   if (strstr(name, subdir) != name)
+      return 1;
+
+   name += strlen(subdir) + 1;
+
+   fill_pathname_join(path, dest, name, sizeof(path));
+   fill_pathname_basedir(path_dir, path, sizeof(path_dir));
+
+   if (!path_mkdir(path_dir))
+   {
+      RARCH_ERR("Failed to create dir: %s.\n", path_dir);
+      return 0;
+   }
+
+   RARCH_LOG("Extracting %s -> %s ...\n", name, path);
+
+   if (!zlib_perform_mode(path, valid_exts,
+            cdata, cmode, csize, size, crc32, userdata))
+   {
+      if (cmode == 0)
+      {
+         RARCH_ERR("Failed to write file: %s.\n", path);
+         return 0;
+      }
+      goto error;
+   }
+
+   return 1;
+
+error:
+   RARCH_ERR("Failed to deflate to: %s.\n", path);
+   return 0;
+}
+
+JNIEXPORT jboolean JNICALL Java_com_retroarch_browser_NativeInterface_extractArchiveTo(
+      JNIEnv *env, jclass cls, jstring archive, jstring subdir, jstring dest)
+{
+   const char *archive_c = (*env)->GetStringUTFChars(env, archive, NULL);
+   const char *subdir_c  = (*env)->GetStringUTFChars(env, subdir, NULL);
+   const char *dest_c    = (*env)->GetStringUTFChars(env, dest, NULL);
+
+   jboolean ret = JNI_TRUE;
+
+   struct userdata data = {
+      .subdir = subdir_c,
+      .dest = dest_c,
+   };
+
+   if (!zlib_parse_file(archive_c, NULL, zlib_cb, &data))
+   {
+      RARCH_ERR("Failed to parse APK: %s.\n", archive_c);
+      ret = JNI_FALSE;
+   }
+
+   (*env)->ReleaseStringUTFChars(env, archive, archive_c);
+   (*env)->ReleaseStringUTFChars(env, subdir, subdir_c);
+   (*env)->ReleaseStringUTFChars(env, dest, dest_c);
+   return ret;
+}
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_retroarch_browser_NativeInterface */
+
+#ifndef _Included_com_retroarch_browser_NativeInterface
+#define _Included_com_retroarch_browser_NativeInterface
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_retroarch_browser_NativeInterface
+ * Method:    extractArchiveTo
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_retroarch_browser_NativeInterface_extractArchiveTo
+  (JNIEnv *, jclass, jstring, jstring, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry exported="true" kind="lib" path="libs/android-support-v4.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/android-support-v7-appcompat.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android-support-v7-appcompat</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.support.v7.appcompat">
+    <uses-sdk android:minSdkVersion="7"/>
+</manifest>
@@ -0,0 +1,10 @@
+Library Project including compatibility ActionBar.
+
+This can be used by an Android project to provide
+access to ActionBar on applications running on API 7+.
+
+There is technically no source, but the src folder is necessary
+to ensure that the build system works.  The content is actually
+located in libs/android-support-v7-appcompat.jar.
+The accompanying resources must also be included in the application.
+
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+       android:interpolator="@android:anim/decelerate_interpolator"
+       android:fromAlpha="0.0" android:toAlpha="1.0"
+       android:duration="@android:integer/config_mediumAnimTime" />
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+       android:interpolator="@android:anim/decelerate_interpolator"
+       android:fromAlpha="1.0" android:toAlpha="0.0"
+       android:duration="@android:integer/config_mediumAnimTime" />
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+           android:interpolator="@android:anim/decelerate_interpolator"
+           android:fromYDelta="50%p" android:toYDelta="0"
+           android:duration="@android:integer/config_mediumAnimTime"/>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+           android:interpolator="@android:anim/decelerate_interpolator"
+           android:fromYDelta="-50%p" android:toYDelta="0"
+           android:duration="@android:integer/config_mediumAnimTime"/>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+           android:interpolator="@android:anim/accelerate_interpolator"
+           android:fromYDelta="0" android:toYDelta="50%p"
+           android:duration="@android:integer/config_mediumAnimTime"/>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+           android:interpolator="@android:anim/accelerate_interpolator"
+           android:fromYDelta="0" android:toYDelta="-50%p"
+           android:duration="@android:integer/config_mediumAnimTime"/>
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:color="@color/abc_search_url_text_pressed"/>
+    <item android:state_selected="true" android:color="@color/abc_search_url_text_selected"/>
+    <item android:color="@color/abc_search_url_text_normal"/> <!-- not selected -->
+</selector>
Author	SHA1	Message	Date
twinaphex	589b92cc99	(Wii) Bump up to version 1.2.2	2015-07-19 11:50:27 +02:00
twinaphex	e223821c22	(Android) Bump up APK version code; bump up version	2015-07-19 11:50:00 +02:00
Twinaphex	f073739970	(OSX) Bump up to version 1.2.2	2015-07-19 00:14:31 +02:00
twinaphex	0bbb0d6913	(Darwin) Cleanups	2015-07-18 23:49:58 +02:00
twinaphex	c56f1403e5	(Darwin) Setup default shader dir	2015-07-18 23:41:42 +02:00
twinaphex	1fab41ad63	Cleanup	2015-07-18 23:32:23 +02:00
twinaphex	f3f238381f	Take out -Wno-invalid-encoding - GCC doesn't support this, and too much of a pain to selectively take it out	2015-07-18 22:48:45 +02:00
radius	49931f4df7	build fix	2015-07-18 15:45:58 -05:00
Twinaphex	d06bd1870e	Move Quick Menu to the top	2015-07-18 22:11:59 +02:00
twinaphex	2f36994f67	Finally linked openCore	2015-07-18 21:02:31 +02:00
twinaphex	5cd9fb1da2	(es) Buildfix	2015-07-18 20:59:42 +02:00
twinaphex	99e1a9b297	Get rid of builtin_bswap16/bswap32 - breaks on OSX 10.8	2015-07-18 20:56:47 +02:00
Twinaphex	60f681f5f8	Merge pull request #1991 from sergiobenrocha2/master Fix portuguese string.	2015-07-18 20:41:40 +02:00
Twinaphex	b886f7ab96	Merge pull request #1990 from IlDucci/patch-3 Update menu_hash_es.c	2015-07-18 20:40:58 +02:00
Twinaphex	727e71d206	Merge pull request #1992 from vanfanel/master VIDEO/SUNXI: fixed compilation because of a couple of small errors co…	2015-07-18 20:40:27 +02:00
vanfanel	824c647377	VIDEO/SUNXI: fixed compilation because of a couple of small errors coming from cleanups.	2015-07-18 20:33:07 +02:00
twinaphex	5c258a52f5	Revert "(MainMenu.xib) Try to add IBConnectionRecord" This reverts commit `0bc2a86fb5`.	2015-07-18 20:32:14 +02:00
twinaphex	0bc2a86fb5	(MainMenu.xib) Try to add IBConnectionRecord	2015-07-18 20:31:50 +02:00
sergiobenrocha2	8ee4fd9c15	Fix portuguese string.	2015-07-18 15:15:54 -03:00
twinaphex	cb9deedbf2	Remove showCores dialog	2015-07-18 20:06:31 +02:00
Twinaphex	8bf42618d9	(OSX) Fix IBAction openCores	2015-07-18 19:24:14 +02:00
IlDucci	cf915d6524	Update menu_hash_es.c Started with help screens. Spanish translation incomplete.	2015-07-18 19:07:17 +02:00
Twinaphex	0961446b19	Merge pull request #1988 from IlDucci/patch-2 Update msg_hash_es.c	2015-07-18 18:38:25 +02:00
IlDucci	09b9683e26	Update msg_hash_es.c Starting a Spanish translation.	2015-07-18 18:34:59 +02:00
twinaphex	88caa51a5e	(ES) Fix some labels	2015-07-18 18:32:24 +02:00
Twinaphex	eba3506b55	Merge pull request #1987 from IlDucci/patch-1 Update menu_hash_es.c	2015-07-18 18:30:12 +02:00
IlDucci	5a324c1dac	Update menu_hash_es.c Starting a Spanish translation.	2015-07-18 18:21:49 +02:00
Twinaphex	6cb42bde29	Set all paths to bundle dirs when RELEASE_BUILD is defined	2015-07-18 17:36:30 +02:00
twinaphex	d9a72d9b5c	(OSX) Set XMB driver as menu default driver from OSX 10.6 and up	2015-07-18 16:15:54 +02:00
twinaphex	fd33f2153a	Update openCore	2015-07-18 16:01:39 +02:00
twinaphex	e35fab5dc8	(OSX) Add HAVE_CORETEXT	2015-07-18 15:55:35 +02:00
twinaphex	f02f1ebc8f	(OSX) setWantsBestResolutionOpenGLSurface - OSX 10.7 and up	2015-07-18 15:46:48 +02:00
twinaphex	5bc03fb3a8	backingScaleFactor OSX 10.7 and up	2015-07-18 15:41:14 +02:00
twinaphex	edac6e0afc	Remove no-invalid-source-encoding - GCC on OSX can't handle this	2015-07-18 15:39:26 +02:00
twinaphex	7ad1beeb81	Some robustness checks	2015-07-18 15:26:31 +02:00
Twinaphex	a54a4d6cbe	(Menu) Cleanup unused variable	2015-07-18 15:25:42 +02:00
twinaphex	ffc075166e	(OSX) Add 'openCore'	2015-07-18 15:24:45 +02:00
Twinaphex	34c2791fa4	Revert "(OSX) Add default dirs for Pictures and Downloads" This reverts commit `b9831cdc14`.	2015-07-18 15:16:56 +02:00
twinaphex	b9831cdc14	(OSX) Add default dirs for Pictures and Downloads	2015-07-18 15:14:40 +02:00
Twinaphex	09ee27337c	(OSX) Fix crash at exit	2015-07-18 15:07:16 +02:00
twinaphex	67c5d14900	(OSX) Fix some paths	2015-07-18 15:05:22 +02:00
twinaphex	31e76e4329	Fix 'What Is A core' entry	2015-07-18 15:00:38 +02:00
twinaphex	b3bb7def66	Small nit	2015-07-18 14:58:14 +02:00
twinaphex	a86e4304b4	Add 'Scanning For Content' help	2015-07-18 14:57:20 +02:00
twinaphex	a919c26b81	Add 'Change Virtual Gamepad' help	2015-07-18 14:01:37 +02:00
Alcaro	b45c8bf916	Fix saying 'several ways' and only listing one way if net is off.	2015-07-18 11:34:50 +02:00
twinaphex	280fab6cab	Cleanup	2015-07-18 11:31:54 +02:00
twinaphex	ef1b066b64	Add 'What Is A Core?' to Help	2015-07-18 11:29:37 +02:00
twinaphex	d3b1eef196	Add MENU_LABEL_VALUE_MENU_CONTROLS_PROLOG	2015-07-18 08:39:52 +02:00
twinaphex	34be1b9c9c	Cleanup	2015-07-18 07:27:22 +02:00
twinaphex	6636fbaf15	(Help) Add 'Loading Content'	2015-07-17 22:11:24 +02:00
twinaphex	f48c31cf68	Update 'Basic Menu Controls'	2015-07-17 21:50:51 +02:00
twinaphex	ac9d54032f	Start creating Menu Help list	2015-07-17 20:33:09 +02:00
Twinaphex	d725ff9738	Merge pull request #1983 from heuripedes/master (stb.c) Fix growth conditional and limit growth to 2048x2048	2015-07-17 18:53:01 +02:00
Higor Eurípedes	ab55ed7908	(stb.c) Fix growth conditional and limit growth to 2048x2048	2015-07-17 13:38:24 -03:00
twinaphex	7f3424ab15	(Menu) More translatable strings	2015-07-17 18:22:59 +02:00
twinaphex	40541d60c9	Add more translatable strings	2015-07-17 15:53:02 +02:00
twinaphex	673e2ba57d	Add "Welcome to RetroArch" to translatable strings	2015-07-17 15:25:58 +02:00
twinaphex	4e64eac514	Add welcome start screen and make it have a 3-second timeout	2015-07-17 15:03:17 +02:00