(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-10 03:21:30 -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
4566 changed files with 155808 additions and 988665 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]
@@ -11,7 +11,6 @@ config.log
 /retroarch
 /retroarch.cfg
 /retroarch.exe
-/retroarch_debug.exe
 /config.h
 /config.mk
 /tools/retroarch-joyconfig
@@ -24,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/
@@ -47,7 +46,6 @@ DerivedData
 apple/tmp
 apple/*.mobileprovision
 apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
-menu/driverspzarch.c
 /Cg/
 /GL/
 /SDL/
@@ -63,24 +61,13 @@ menu/driverspzarch.c
 /media/shaders_glsl/
 /obj-w32/

-# Wii U
-*.depend
-*.rpx
-wiiu/wut/elf2rpl/elf2rpl
-
-# 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/
@@ -89,26 +76,8 @@ wiiu/wut/elf2rpl/elf2rpl
 /media/shaders_cg/
 /media/libretrodb/

-pkg/apple/iOS/build/
-pkg/apple/iOS/modules/
+apple/iOS/build/
+apple/iOS/modules/

 obj-unix/
 .vagrant/
-
-.MAKEFILE_DEFINES
-.CONFIG_DEFINES
-/pkg/msvc/Release Cg/*.exe
-/pkg/msvc/Release Cg/*.iobj
-/pkg/msvc/Release Cg/*.ipdb
-/pkg/msvc/Release Cg/*.pdb
-/pkg/msvc/Release Cg/*.lpl
-/pkg/msvc/Release Cg/*.cfg
-/pkg/msvc/*.db
-/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
@@ -1,65 +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:
-        - CROSS_COMPILE=i686-w64-mingw32- ./configure --disable-d3d9 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
-    - compiler: mingw-x64
-      addons:
-        apt:
-          packages:
-            - g++-mingw-w64-x86-64
-            - mingw-w64-x86-64-dev
-      script:
-        - CROSS_COMPILE=x86_64-w64-mingw32- ./configure --disable-d3d9 && make HAVE_ZLIB=1 HAVE_BUILTINZLIB=1 HAVE_RPNG=1
-    - compiler: gcc
-    - compiler: clang
-      addons:
-        # Install a more recent clang than the default
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.8
-          packages:
-            - clang-3.8
-      env: COMPILER_NAME=clang-3.8 CXX=clang++-3.8 CC=clang-3.8
-    - os: osx
-      osx_image: xcode7.3
-      script:
-          - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
-
-script:
-  - ./configure
-  - make
-
-env:
-  global:
-   - MAKEFLAGS="-j2"
-   - secure: "qc91ReC3OlzSh2gFaSH6TYzC2qIQvgA2AZff6J13eaH8xijAhuMzttZ0rMQJ0DWCIhPeUb0kIzVyaGoe4MwPALzpw1C1AznIWiZJ53HN+hWCOcS/af7YVPk6HPySnwqrS+Wv3AIIvIKFV2mxv21F/JbT/N+pArlRrp904Xj+KPo="
-addons:
-  apt:
-    packages:
-      - curl
-      - 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
-  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
@@ -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,216 +0,0 @@
-# 1.7.0 (future)
-
-# 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,55 +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

 TARGET = retroarch
+JTARGET = tools/retroarch-joyconfig 

 OBJDIR := obj-unix

-OBJ :=
+ifeq ($(GLOBAL_CONFIG_DIR),)
+   GLOBAL_CONFIG_DIR = /etc
+endif
+
+OBJ := 
+JOYCONFIG_OBJ :=
 LIBS :=
 DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'

-ifneq ($(findstring BSD,$(OS)),)
-   CFLAGS += -DBSD
-   LDFLAGS += -L/usr/local/lib
-endif
-
-ifneq ($(findstring DOS,$(OS)),)
-   CFLAGS += -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
-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
@@ -70,25 +45,15 @@ else
   OPTIMIZE_FLAG = -O3 -ffast-math
 endif

-ifneq ($(findstring Win32,$(OS)),)
-   LDFLAGS += -mwindows
-endif
-
-CFLAGS   += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) $(DEBUG_FLAG) -I. -Ideps -Ideps/stb
-
-APPEND_CFLAGS := $(CFLAGS)
-CXXFLAGS += $(APPEND_CFLAGS) -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 ($(CXX_BUILD), 1)
   LINK = $(CXX)
-   CFLAGS   := $(CXXFLAGS) -xc++
-   CFLAGS   += -DCXX_BUILD
-   CXXFLAGS += -DCXX_BUILD
+   CFLAGS := $(CXXFLAGS) -xc++
 else
-   ifeq ($(NEED_CXX_LINKER),1)
-      LINK = $(CXX)
-   else ifeq ($(findstring Win32,$(OS)),)
+   ifeq ($(findstring Win32,$(OS)),)
      LINK = $(CC)
   else
      # directx-related code is c++
@@ -103,8 +68,9 @@ else
      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

@@ -118,44 +84,38 @@ ifeq ($(NOUNUSED_VARIABLE), yes)
 endif

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

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

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

-all: $(TARGET) config.mk
-
-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 $@)
@@ -169,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 $<),)
@@ -181,47 +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)$(PREFIX)/share/applications 2>/dev/null || /bin/true
-	mkdir -p $(DESTDIR)$(MAN_DIR)/man6 2>/dev/null || /bin/true
+	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)$(BIN_DIR)
-	install -m755 tools/cg2glsl.py $(DESTDIR)$(BIN_DIR)/retroarch-cg2glsl
+	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 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
-	install -m644 docs/retroarch.6 $(DESTDIR)$(MAN_DIR)/man6
-	install -m644 docs/retroarch-cg2glsl.6 $(DESTDIR)$(MAN_DIR)/man6
+	install -m644 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
-	@if test -d media/assets; then \
-		echo "Installing media assets..."; \
-		mkdir -p $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb; \
-		mkdir -p $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/glui; \
-		cp -r media/assets/xmb/  $(DESTDIR)$(ASSETS_DIR)/retroarch/assets; \
-		cp -r media/assets/glui/ $(DESTDIR)$(ASSETS_DIR)/retroarch/assets; \
-		echo "Removing unneeded source image files.."; \
-		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/flatui/src; \
-		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/monochrome/src; \
-		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/retroactive/src; \
-		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/neoactive/src; \
-		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/retrosystem/src; \
-		rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch/assets/xmb/dot-art/src; \
-		echo "Asset copying done."; \
-	fi

 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)$(PREFIX)/share/applications/retroarch.desktop
-	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch.6
-	rm -f $(DESTDIR)$(MAN_DIR)/man6/retroarch-cg2glsl.6
+	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
-	rm -rf $(DESTDIR)$(ASSETS_DIR)/retroarch

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

 .PHONY: all install uninstall clean
@@ -1,127 +1,30 @@
 TARGET := retroarch_3ds
-LIBRETRO =
-
-DEBUG                   = 0
-GRIFFIN_BUILD           = 1
-WHOLE_ARCHIVE_LINK      = 0
-BUILD_3DSX              = 1
-BUILD_3DS               = 1
-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             = ctr/assets/default.png
-APP_BANNER           = ctr/assets/libretro_banner.png
-APP_AUDIO            = ctr/assets/silent.wav
-APP_RSF              = ctr/tools/template.rsf
-APP_SYSTEM_MODE      = 64MB
-APP_SYSTEM_MODE_EXT  = 124MB
-APP_BIG_TEXT_SECTION = 0
-APP_USE_SVCHAX       = 0
-
-include 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
-
-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
-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_7ZIP = 1
-	HAVE_BUILTINZLIB = 1
-	HAVE_LIBRETRODB = 1
-	HAVE_ZARCH = 0
-	HAVE_MATERIALUI = 1
-	HAVE_XMB = 1
-
-	include Makefile.common
-	BLACKLIST :=
-	BLACKLIST += input/input_overlay.o
-	BLACKLIST += tasks/task_overlay.o
-	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-
-	OBJ += gfx/drivers/ctr_gfx.o
-	OBJ += gfx/drivers_font/ctr_font.o
-	OBJ += menu/drivers_display/menu_display_ctr.o
-	OBJ += input/drivers/ctr_input.o
-	OBJ += input/drivers_joypad/ctr_joypad.o
-	OBJ += audio/drivers/ctr_csnd_audio.o
-	OBJ += audio/drivers/ctr_dsp_audio.o
-	OBJ += frontend/drivers/platform_ctr.o
-	OBJ += gfx/video_filters/2xsai.o
-	OBJ += gfx/video_filters/super2xsai.o
-	OBJ += gfx/video_filters/supereagle.o
-	OBJ += gfx/video_filters/2xbr.o
-	OBJ += gfx/video_filters/darken.o
-	OBJ += gfx/video_filters/epx.o
-	OBJ += gfx/video_filters/scale2x.o
-	OBJ += gfx/video_filters/blargg_ntsc_snes.o
-	OBJ += gfx/video_filters/lq2x.o
-	OBJ += gfx/video_filters/phosphor2x.o
-	OBJ += libretro-common/audio/dsp_filters/echo.o
-	OBJ += libretro-common/audio/dsp_filters/eq.o
-	OBJ += libretro-common/audio/dsp_filters/chorus.o
-	OBJ += libretro-common/audio/dsp_filters/iir.o
-	OBJ += libretro-common/audio/dsp_filters/panning.o
-	OBJ += libretro-common/audio/dsp_filters/phaser.o
-	OBJ += libretro-common/audio/dsp_filters/reverb.o
-	OBJ += libretro-common/audio/dsp_filters/wahwah.o
-endif
+OBJS :=
+OBJS += gfx/drivers/ctr_sprite.o griffin/griffin.o
+#NO_SMDH = 1
+DEBUG = 0


-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
@@ -132,53 +35,57 @@ ifeq ($(DEBUG), 1)
 else
   CFLAGS	+= -O3
 endif
-
-ifeq ($(LIBCTRU_NO_DEPRECATION), 1)
-   CFLAGS	+= -DLIBCTRU_NO_DEPRECATION
-endif
-
-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 += -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include

 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE -DSINC_LOWEST_QUALITY
-CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
+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
+

 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) -lctru -lm
+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).core
-$(TARGET).3dsx: $(TARGET).elf
-$(TARGET).elf: $(OBJ) libretro_ctr.a
+clean:
+	rm -f $(OBJS)
+	rm -f $(TARGET).3dsx
+	rm -f $(TARGET).elf

-PREFIX		:=	$(DEVKITPRO)/devkitARM/bin/arm-none-eabi-
+
+$(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-

 CC      := $(PREFIX)gcc
 CXX     := $(PREFIX)g++
@@ -189,26 +96,17 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)

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

-%.o: %.vsh %.gsh
-	$(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
-	$(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
-	rm $*.shbin
+%.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
-	$(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
-	$(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
-	rm $*.shbin

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

 %.vsh:

-$(TARGET).smdh: $(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 ctr/big_text_section.xml $(TARGET).xml
-else
-	rm -f $(TARGET).xml
-endif
-	-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 $@
-
-$(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
-
-$(TARGET).core: $(TARGET).elf
-	echo $(APP_UNIQUE_ID) > $(TARGET).core
-
-
-clean:
-	rm -f $(OBJ)
-	rm -f $(TARGET).3dsx
-	rm -f $(TARGET).elf
-	rm -f $(TARGET).3ds
-	rm -f $(TARGET).cia
-	rm -f $(TARGET).core
-	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

+.PHONY: .FORCE

@@ -1,203 +0,0 @@
-TARGET := retroarch_3ds_salamander
-LIBRETRO =
-
-DEBUG                   = 0
-BUILD_3DSX              = 0
-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             = ctr/assets/default.png
-APP_BANNER           = ctr/assets/libretro_banner.png
-APP_AUDIO            = ctr/assets/silent.wav
-APP_RSF              = ctr/tools/template.rsf
-APP_SYSTEM_MODE      = 64MB
-APP_SYSTEM_MODE_EXT  = 124MB
-
-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/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/hash/rhash.o \
-		 file_path_str.o \
-		 verbosity.o
-
-ifeq ($(strip $(DEVKITPRO)),)
-	$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitpro")
-endif
-
-ifeq ($(strip $(CTRULIB)),)
-	CTRULIB = $(DEVKITPRO)/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)
-
-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		:=	$(DEVKITPRO)/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)
-
-ifneq ($(findstring Linux,$(shell uname -a)),)
-	MAKEROM    = ctr/tools/makerom-linux
-	BANNERTOOL = ctr/tools/bannertool-linux
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-	MAKEROM    = ctr/tools/makerom-mac
-	BANNERTOOL = ctr/tools/bannertool-mac
-else
-	MAKEROM    = ctr/tools/makerom.exe
-	BANNERTOOL = ctr/tools/bannertool.exe
-endif
-
-%.o: %.vsh %.gsh
-	$(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
-	$(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
-	rm $*.shbin
-
-%.o: %.vsh
-	$(DEVKITPRO)/devkitARM/bin/picasso $^ -o $*.shbin
-	$(DEVKITPRO)/devkitARM/bin/bin2s $*.shbin | $(PREFIX)as -o $@
-	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)
-	smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
-
-$(TARGET).3dsx: $(TARGET).elf
-ifeq ($(APP_BIG_TEXT_SECTION), 1)
-	cp ctr/big_text_section.xml $(TARGET).xml
-else
-	rm -f $(TARGET).xml
-endif
-	-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,27 +1,20 @@
-TARGET := retroarch.js
+TARGET = retroarch.js

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

-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_RGUI = 1
 HAVE_SDL = 0
-HAVE_SDL2 = 1
 HAVE_ZLIB = 1
+HAVE_FBO = 1
 WANT_ZLIB = 1
-MEMORY = 536870912
-
+MEMORY = 268435456
+LTO = 0
 # XXX: setting this to 1/2 currently crashes Firefox nightly
 PRECISE_F32 = 2

@@ -29,25 +22,8 @@ ifneq ($(NATIVE_ZLIB),)
   WANT_ZLIB = 0
 endif

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

@@ -62,16 +38,16 @@ OBJ += gfx/video_filters/blargg_ntsc_snes.o
 OBJ += gfx/video_filters/lq2x.o
 OBJ += gfx/video_filters/phosphor2x.o

-OBJ += libretro-common/audio/dsp_filters/echo.o
-OBJ += libretro-common/audio/dsp_filters/eq.o
-OBJ += libretro-common/audio/dsp_filters/chorus.o
-OBJ += libretro-common/audio/dsp_filters/iir.o
-OBJ += libretro-common/audio/dsp_filters/panning.o
-OBJ += libretro-common/audio/dsp_filters/phaser.o
-OBJ += libretro-common/audio/dsp_filters/reverb.o
-OBJ += libretro-common/audio/dsp_filters/wahwah.o
+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/libz -Ideps -Ideps/stb
+CFLAGS += -Ideps/zlib/
 libretro = libretro_emscripten.bc

 ifneq ($(V), 1)
@@ -91,8 +67,7 @@ else
   CFLAGS += -O2
 endif

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

 all: $(TARGET)

@@ -102,15 +77,15 @@ $(TARGET): $(OBJ)

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

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

 clean:
 	rm -f *.o
-	rm -f deps/libz/*.o
+	rm -f deps/zlib/*.o
 	rm -f frontend/*.o
 	rm -f menu/*.o
 	rm -f menu/disp/*.o
@@ -136,3 +111,4 @@ clean:
 	rm -f *.d

 .PHONY: all clean
+
@@ -1,358 +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,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__ -DSINC_LOWER_QUALITY -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_DYNAMIC -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB -DHAVE_OVERLAY -DHAVE_ALSA -DHAVE_ZLIB -D__linux__
+DEFINES += -D__ARM_ARCH_6__ -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
@@ -2,7 +2,7 @@
 # $ source /usr/local/angstrom/arm/environment-setup
 # $ setprj retroarch

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

 all: $(BINDIR)/retroarch
@@ -1,4 +1,4 @@
-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
@@ -6,7 +6,7 @@ CELL_BUILD_TOOLS	= SNC
 CELL_GPU_TYPE	   	= RSX
 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,7 +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
+ifeq ($(HAVE_RLAUNCH), 1)
+	DEFINES += -DHAVE_RLAUNCH
+endif
+
+DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_GLUI -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_STB_FONT

 ifeq ($(HAVE_GCMGL), 1)
 DEFINES			+= -DHAVE_GCMGL
@@ -101,9 +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_HEADSET -DHAVE_LANGEXTRA -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -DWANT_ZLIB -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN
-
-#DEFINES += -DHAVE_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
@@ -113,6 +116,7 @@ endif

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

 PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
@@ -153,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,4 +1,4 @@
-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
@@ -6,6 +6,8 @@ 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,7 +64,11 @@ endif

 PPU_SRCS		= griffin/griffin.c

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

 ifeq ($(HAVE_GCMGL), 1)
 DEFINES			+= -DHAVE_GCMGL
@@ -99,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 -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_STB_VORBIS
+DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_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
@@ -109,6 +116,7 @@ endif

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

 PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
@@ -149,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)
@@ -16,43 +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
-
-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/streams/file_stream.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
@@ -72,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,10 +119,10 @@ 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)
@@ -19,11 +19,11 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
   WHOLE_END := -Wl,--no-whole-archive
 endif

-INCDIR = deps deps/stb deps/libz deps/7zip libretro-common/include
+INCDIR = deps/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 -DSINC_LOWEST_QUALITY -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 =
@@ -51,7 +51,7 @@ 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)

@@ -26,29 +26,22 @@ endif

 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/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/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,199 +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_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
-
-	ifeq ($(DEBUG), 1)
-		HAVE_NETLOGGER = 1
-	endif
-
-	include Makefile.common
-	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
-	OBJ += gfx/video_filters/2xsai.o
-	OBJ += gfx/video_filters/super2xsai.o
-	OBJ += gfx/video_filters/supereagle.o
-	OBJ += gfx/video_filters/2xbr.o
-	OBJ += gfx/video_filters/darken.o
-	OBJ += gfx/video_filters/epx.o
-	OBJ += gfx/video_filters/scale2x.o
-	OBJ += gfx/video_filters/blargg_ntsc_snes.o
-	OBJ += gfx/video_filters/lq2x.o
-	OBJ += gfx/video_filters/phosphor2x.o
-	OBJ += libretro-common/audio/dsp_filters/echo.o
-	OBJ += libretro-common/audio/dsp_filters/eq.o
-	OBJ += libretro-common/audio/dsp_filters/chorus.o
-	OBJ += libretro-common/audio/dsp_filters/iir.o
-	OBJ += libretro-common/audio/dsp_filters/panning.o
-	OBJ += libretro-common/audio/dsp_filters/phaser.o
-	OBJ += libretro-common/audio/dsp_filters/reverb.o
-	OBJ += libretro-common/audio/dsp_filters/wahwah.o
-endif
-
-
-ifeq ($(strip $(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,83 +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/file/config_file.o \
-		 libretro-common/streams/file_stream.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,73 +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
-LIBS := -lwiiuse -logc -lbte
-
-ifeq ($(EXTERNAL_LIBOGC), 1)
-LIBS += -lfat
-endif
+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/file/retro_dirent.o \
-		libretro-common/encodings/encoding_utf.o \
-		libretro-common/compat/compat_strl.o \
-		libretro-common/compat/compat_strcasestr.o \
-		libretro-common/file/config_file.o \
-		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
@@ -104,11 +61,6 @@ else
   CFLAGS += -O3
 endif

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

 %.dol: %.elf
@@ -127,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)
@@ -136,3 +88,4 @@ clean:
 	$(MAKE) -C $(APP_BOOTER_DIR) clean

 .PHONY: clean
+
@@ -1,261 +0,0 @@
-TARGET		    := retroarch_wiiu
-BUILD_HBL_ELF	     = 1
-BUILD_RPX	         = 1
-DEBUG                = 0
-GRIFFIN_BUILD        = 0
-WHOLE_ARCHIVE_LINK   = 0
-
-ifneq ($(V), 1)
-   Q := @
-endif
-
-PC_DEVELOPMENT_IP_ADDRESS  ?=
-PC_DEVELOPMENT_TCP_PORT	   ?=
-
-OBJ :=
-OBJ += wiiu/system/memory.o
-OBJ += wiiu/system/exception_handler.o
-OBJ += wiiu/system/missing_libc_functions.o
-OBJ += wiiu/fs/sd_fat_devoptab.o
-OBJ += wiiu/fs/fs_utils.o
-OBJ += wiiu/controller_patcher/ControllerPatcher.o
-OBJ += wiiu/controller_patcher/ControllerPatcherWrapper.o
-OBJ += wiiu/controller_patcher/ConfigReader.o
-OBJ += wiiu/controller_patcher/config/ConfigParser.o
-OBJ += wiiu/controller_patcher/config/ConfigValues.o
-OBJ += wiiu/controller_patcher/network/ControllerPatcherNet.o
-OBJ += wiiu/controller_patcher/network/TCPServer.o
-OBJ += wiiu/controller_patcher/network/UDPClient.o
-OBJ += wiiu/controller_patcher/network/UDPServer.o
-OBJ += wiiu/controller_patcher/patcher/ControllerPatcherUtils.o
-OBJ += wiiu/controller_patcher/patcher/ControllerPatcherHID.o
-OBJ += wiiu/controller_patcher/utils/CPRetainVars.o
-OBJ += wiiu/controller_patcher/utils/CPStringTools.o
-OBJ += wiiu/controller_patcher/utils/PadConst.o
-OBJ += wiiu/controller_patcher/utils/FSHelper.o
-OBJ += wiiu/tex_shader.o
-OBJ += wiiu/hbl.o
-
-DEFINES :=
-
-ifeq ($(GRIFFIN_BUILD), 1)
-	OBJ += griffin/griffin.o
-	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_LIBRETRODB
-	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
-	DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING
-#	DEFINES += -DWANT_IFADDRS
-#	DEFINES += -DHAVE_FREETYPE
-	DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
-else
-	HAVE_MENU_COMMON = 1
-	HAVE_RTGA = 1
-	HAVE_RPNG = 1
-	HAVE_RJPEG = 1
-	HAVE_RBMP = 1
-	HAVE_RGUI = 1
-	HAVE_ZLIB = 1
-	HAVE_7ZIP = 1
-	HAVE_BUILTINZLIB = 1
-	HAVE_KEYMAPPER = 1
-	HAVE_LIBRETRODB = 1
-	HAVE_ZARCH = 0
-	HAVE_MATERIALUI = 1
-	HAVE_XMB = 1
-	HAVE_STB_FONT = 1
-#	HAVE_FREETYPE = 1
-	HAVE_LANGEXTRA = 1
-	HAVE_LIBRETRODB = 1
-	HAVE_NETWORKING = 1
-	HAVE_CHEEVOS = 1
-#	WANT_IFADDRS = 1
-
-	include Makefile.common
-	BLACKLIST :=
-	BLACKLIST += input/input_overlay.o
-	BLACKLIST += tasks/task_overlay.o
-	BLACKLIST += $(LIBRETRO_COMM_DIR)/net/net_ifinfo.o
-	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
-
-	OBJ += gfx/drivers/wiiu_gfx.o
-	OBJ += gfx/drivers_font/wiiu_font.o
-	OBJ += menu/drivers_display/menu_display_wiiu.o
-	OBJ += input/drivers/wiiu_input.o
-	OBJ += input/drivers_joypad/wiiu_joypad.o
-	OBJ += audio/drivers/wiiu_audio.o
-	OBJ += frontend/drivers/platform_wiiu.o
-	OBJ += gfx/video_filters/2xsai.o
-	OBJ += gfx/video_filters/super2xsai.o
-	OBJ += gfx/video_filters/supereagle.o
-	OBJ += gfx/video_filters/2xbr.o
-	OBJ += gfx/video_filters/darken.o
-	OBJ += gfx/video_filters/epx.o
-	OBJ += gfx/video_filters/scale2x.o
-	OBJ += gfx/video_filters/blargg_ntsc_snes.o
-	OBJ += gfx/video_filters/lq2x.o
-	OBJ += gfx/video_filters/phosphor2x.o
-	OBJ += libretro-common/audio/dsp_filters/echo.o
-	OBJ += libretro-common/audio/dsp_filters/eq.o
-	OBJ += libretro-common/audio/dsp_filters/chorus.o
-	OBJ += libretro-common/audio/dsp_filters/iir.o
-	OBJ += libretro-common/audio/dsp_filters/panning.o
-	OBJ += libretro-common/audio/dsp_filters/phaser.o
-	OBJ += libretro-common/audio/dsp_filters/reverb.o
-	OBJ += libretro-common/audio/dsp_filters/wahwah.o
-endif
-
-DEFINES += -DHAVE_KEYMAPPER
-
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPRO")
-endif
-
-export PATH	  := $(PATH):$(DEVKITPPC)/bin
-
-PREFIX := powerpc-eabi-
-
-CC      := $(PREFIX)gcc
-CXX     := $(PREFIX)g++
-AS      := $(PREFIX)as
-AR      := $(PREFIX)ar
-OBJCOPY := $(PREFIX)objcopy
-STRIP   := $(PREFIX)strip
-NM      := $(PREFIX)nm
-LD      := $(CXX)
-
-ELF2RPL   := wiiu/wut/elf2rpl/elf2rpl
-
-ifneq ($(findstring Linux,$(shell uname -a)),)
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-else
-   ELF2RPL   := $(ELF2RPL).exe
-endif
-
-
-INCDIRS := -I. -Ideps -Ideps/stb -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Iwiiu -Iwiiu/include -I$(DEVKITPRO)/portlibs/ppc/include
-LIBDIRS := -L. -L$(DEVKITPRO)/portlibs/ppc/lib
-
-CFLAGS  := -mwup -mcpu=750 -meabi -mhard-float
-LDFLAGS :=
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -g
-else
-   CFLAGS += -O3
-endif
-LDFLAGS := $(CFLAGS)
-
-ASFLAGS := $(CFLAGS) -mregnames
-
-CFLAGS +=  -ffast-math -Werror=implicit-function-declaration
-#CFLAGS += -fomit-frame-pointer -mword-relocations
-#CFLAGS	+= -Wall
-
-#todo: remove -DWIIU and use the built-in macros instead (HW_WUP or __wiiu__).
-CFLAGS += -DWIIU -DMSB_FIRST
-CFLAGS += -DHAVE_MAIN
-CFLAGS += -DHAVE_UPDATE_ASSETS
-CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
-CFLAGS += -DHAVE_FILTERS_BUILTIN $(DEFINES)
-
-ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
-   CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
-endif
-
-ifneq ($(PC_DEVELOPMENT_TCP_PORT),)
-   CFLAGS += -DPC_DEVELOPMENT_TCP_PORT=$(PC_DEVELOPMENT_TCP_PORT)
-endif
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -D_GNU_SOURCE
-
-LDFLAGS  += -Wl,--gc-sections
-
-LIBS	:= $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm -lfat -liosuhax
-
-
-RPX_OBJ           = wiiu/system/stubs_rpl.o
-HBL_ELF_OBJ       = wiiu/system/dynamic.o wiiu/system/stubs_elf.o
-
-RPX_LDFLAGS      := -pie -fPIE
-RPX_LDFLAGS      += -z common-page-size=64 -z max-page-size=64
-RPX_LDFLAGS      += -T wiiu/link_rpl.ld
-RPX_LDFLAGS      += -nostartfiles
-
-HBL_ELF_LDFLAGS  := -T wiiu/link_elf.ld
-
-TARGETS :=
-ifeq ($(BUILD_RPX), 1)
-TARGETS += $(TARGET).rpx
-endif
-
-ifeq ($(BUILD_HBL_ELF), 1)
-TARGETS += $(TARGET).elf
-endif
-
-DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
-POSTCOMPILE = mv -f $*.Tdepend $*.depend
-
-
-all: $(TARGETS)
-
-%.o: %.cpp
-%.o: %.cpp %.depend
-	@$(if $(Q), echo CXX $<,)
-	$(Q)$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(Q)$(POSTCOMPILE)
-
-%.o: %.c
-%.o: %.c %.depend
-	@$(if $(Q), echo CC $<,)
-	$(Q)$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(Q)$(POSTCOMPILE)
-
-
-%.o: %.S
-%.o: %.S %.depend
-	@$(if $(Q), echo AS $<,)
-	$(Q)$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(Q)$(POSTCOMPILE)
-
-%.o: %.s
-%.o: %.s %.depend
-	@$(if $(Q), echo AS $<,)
-	$(Q)$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(Q)$(POSTCOMPILE)
-%.a:
-	@$(if $(Q), echo AR $<,)
-	$(Q)$(AR) -rc $@ $^
-
-%.depend: ;
-
-
-$(ELF2RPL):
-	@$(if $(Q), echo MAKE $@,)
-	$(Q)$(MAKE) -C wiiu/wut/elf2rpl/
-
-$(TARGET).elf: $(OBJ) $(HBL_ELF_OBJ) libretro_wiiu.a wiiu/link_elf.ld
-	@$(if $(Q), echo LD $@,)
-	$(Q)$(LD) $(OBJ) $(HBL_ELF_OBJ) $(LDFLAGS) $(HBL_ELF_LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
-
-$(TARGET).rpx.elf: $(OBJ) $(RPX_OBJ) libretro_wiiu.a wiiu/link_elf.ld
-	@$(if $(Q), echo LD $@,)
-	$(Q)$(LD) $(OBJ) $(RPX_OBJ) $(LDFLAGS) $(RPX_LDFLAGS) $(LIBDIRS)  $(LIBS) -o $@
-
-$(TARGET).rpx: $(TARGET).rpx.elf $(ELF2RPL)
-	@$(if $(Q), echo ELF2RPL $@,)
-	$(Q)-$(ELF2RPL) $(TARGET).rpx.elf $@
-
-clean:
-	rm -f $(OBJ) $(RPX_OBJ) $(HBL_ELF_OBJ) $(TARGET).elf $(TARGET).rpx.elf $(TARGET).rpx
-	rm -f $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
-
-.PHONY: clean all
-.PRECIOUS: %.depend
-
-include $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
@@ -1,176 +0,0 @@
-TARGET		    := retroarch_wiiu_salamander
-BUILD_HBL_ELF	     = 1
-BUILD_RPX	     = 1
-DEBUG                = 0
-
-PC_DEVELOPMENT_IP_ADDRESS  =
-PC_DEVELOPMENT_TCP_PORT	   =
-
-OBJ :=
-OBJ += wiiu/system/memory.o
-OBJ += wiiu/system/exception_handler.o
-OBJ += wiiu/fs/sd_fat_devoptab.o
-OBJ += wiiu/fs/fs_utils.o
-OBJ += wiiu/hbl.o
-OBJ += frontend/frontend_salamander.o
-OBJ += frontend/frontend_driver.o
-OBJ += frontend/drivers/platform_wiiu.o
-OBJ += frontend/drivers/platform_null.o
-OBJ += libretro-common/encodings/encoding_utf.o
-OBJ += libretro-common/compat/compat_strcasestr.o
-OBJ += libretro-common/file/file_path.o
-OBJ += libretro-common/string/stdstring.o
-OBJ += libretro-common/lists/string_list.o
-OBJ += libretro-common/lists/dir_list.o
-OBJ += libretro-common/file/retro_dirent.o
-OBJ += libretro-common/compat/compat_strl.o
-OBJ += libretro-common/file/config_file.o
-OBJ += libretro-common/streams/file_stream.o
-OBJ += libretro-common/hash/rhash.o
-OBJ += file_path_str.o
-OBJ += verbosity.o
-
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
-endif
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPRO")
-endif
-
-export PATH	  := $(PATH):$(DEVKITPPC)/bin
-
-PREFIX := powerpc-eabi-
-
-CC      := $(PREFIX)gcc
-CXX     := $(PREFIX)g++
-AS      := $(PREFIX)as
-AR      := $(PREFIX)ar
-OBJCOPY := $(PREFIX)objcopy
-STRIP   := $(PREFIX)strip
-NM      := $(PREFIX)nm
-LD      := $(CXX)
-
-ELF2RPL   := wiiu/wut/elf2rpl/elf2rpl
-
-ifneq ($(findstring Linux,$(shell uname -a)),)
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-else
-   ELF2RPL   := $(ELF2RPL).exe
-endif
-
-
-INCDIRS := -I. -Ideps/libz -Ideps/7zip -Ilibretro-common/include -Iwiiu -Iwiiu/include -I$(DEVKITPRO)/portlibs/ppc/include
-LIBDIRS := -L. -L$(DEVKITPRO)/portlibs/ppc/lib
-
-CFLAGS  := -mwup -mcpu=750 -meabi -mhard-float
-LDFLAGS :=
-
-ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -g
-else
-   CFLAGS += -O3
-endif
-LDFLAGS := $(CFLAGS)
-
-ASFLAGS := $(CFLAGS) -mregnames
-
-CFLAGS +=  -ffast-math -Werror=implicit-function-declaration
-#CFLAGS += -fomit-frame-pointer -mword-relocations
-#CFLAGS	+= -Wall
-
-#todo: remove -DWIIU and use the built-in macros instead (HW_WUP or __wiiu__).
-CFLAGS += -DWIIU -DMSB_FIRST
-CFLAGS += -DHAVE_MAIN
-CFLAGS += -DRARCH_CONSOLE -DIS_SALAMANDER
-
-ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
-   CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
-endif
-
-ifneq ($(PC_DEVELOPMENT_TCP_PORT),)
-   CFLAGS += -DPC_DEVELOPMENT_TCP_PORT=$(PC_DEVELOPMENT_TCP_PORT)
-endif
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions
-
-LDFLAGS  += -Wl,--gc-sections
-
-LIBS	:= $(WHOLE_START) -lretro_wiiu $(WHOLE_END) -lm -lfat -liosuhax
-
-
-RPX_OBJ           = wiiu/system/stubs_rpl.o
-HBL_ELF_OBJ       = wiiu/system/dynamic.o wiiu/system/stubs_elf.o
-
-RPX_LDFLAGS      := -pie -fPIE
-RPX_LDFLAGS      += -z common-page-size=64 -z max-page-size=64
-RPX_LDFLAGS      += -T wiiu/link_rpl.ld
-RPX_LDFLAGS      += -nostartfiles
-
-HBL_ELF_LDFLAGS  := -T wiiu/link_elf.ld
-
-TARGETS :=
-ifeq ($(BUILD_RPX), 1)
-TARGETS += $(TARGET).rpx
-endif
-
-ifeq ($(BUILD_HBL_ELF), 1)
-TARGETS += $(TARGET).elf
-endif
-
-DEPFLAGS    = -MT $@ -MMD -MP -MF $*.Tdepend
-POSTCOMPILE = mv -f $*.Tdepend $*.depend
-
-
-all: $(TARGETS)
-
-%.o: %.cpp
-%.o: %.cpp %.depend
-	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
-
-%.o: %.c
-%.o: %.c %.depend
-	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
-
-
-%.o: %.S
-%.o: %.S %.depend
-	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
-
-%.o: %.s
-%.o: %.s %.depend
-	$(CC) -c -o $@ $< $(ASFLAGS) $(INCDIRS) $(DEPFLAGS)
-	$(POSTCOMPILE)
-%.a:
-	$(AR) -rc $@ $^
-
-%.depend: ;
-
-
-$(ELF2RPL):
-	$(MAKE) -C wiiu/wut/elf2rpl/
-
-$(TARGET).elf: $(OBJ) $(HBL_ELF_OBJ) libretro_wiiu.a wiiu/link_elf.ld
-	$(LD) $(OBJ) $(HBL_ELF_OBJ) $(LDFLAGS) $(HBL_ELF_LDFLAGS) $(LIBDIRS) $(LIBS) -o $@
-
-$(TARGET).rpx.elf: $(OBJ) $(RPX_OBJ) libretro_wiiu.a wiiu/link_elf.ld
-	$(LD) $(OBJ) $(RPX_OBJ) $(LDFLAGS) $(RPX_LDFLAGS) $(LIBDIRS)  $(LIBS) -o $@
-
-$(TARGET).rpx: $(TARGET).rpx.elf $(ELF2RPL)
-	-$(ELF2RPL) $(TARGET).rpx.elf $@
-
-clean:
-	rm -f $(OBJ) $(RPX_OBJ) $(HBL_ELF_OBJ) $(TARGET).elf $(TARGET).rpx.elf $(TARGET).rpx
-	rm -f $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
-
-.PHONY: clean all
-.PRECIOUS: %.depend
-
-include $(OBJ:.o=.depend) $(RPX_OBJ:.o=.depend) $(HBL_ELF_OBJ:.o=.depend)
-
@@ -1,19 +1,22 @@
 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_STDIN_CMD = 1
 HAVE_COMMAND = 1
 HAVE_THREADS = 1
 HAVE_RGUI = 1
-HAVE_MATERIALUI = 1
+HAVE_GLUI = 1
 HAVE_7ZIP = 1
+HAVE_ZLIB_DEFLATE = 1
 HAVE_PYTHON = 0
 DYNAMIC = 1

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

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

-CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps 
-CXXFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ideps -std=c++98 -D__STDC_CONSTANT_MACROS
+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
@@ -132,42 +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

-.PHONY: all install uninstall clean
+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

@@ -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,6 +1,3 @@
-[![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.
@@ -8,12 +5,6 @@ Popular examples of implementations for this API includes videogame system emula
 more generalized 3D programs.
 These programs are instantiated as dynamic libraries. We refer to these as "libretro cores".

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

 [libretro](http://libretro.com) is an API that exposes generic audio/video/input callbacks.
@@ -23,29 +14,26 @@ A libretro core written in portable C or C++ can run seamlessly on many platform
 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 Windows 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/),
+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

@@ -61,20 +49,12 @@ RetroArch also emphasizes on being easy to integrate into various launcher front

 ## Platforms

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

-   - Windows
-   - Linux
-   - FreeBSD
-   - NetBSD
-   - MacOS
-   - PlayStation 3
-   - PlayStation Portable
-   - Original Xbox
+   - PlayStation3
   - Xbox 360 (Libxenon/XeXDK)
-   - Wii, GameCube (Libogc)
-   - WiiU
-   - Nintendo 3DS
+   - Xbox 1
+   - Wii, Gamecube (Libogc)
   - Raspberry Pi
   - Android
   - iOS
@@ -82,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.
@@ -132,8 +107,102 @@ A sample configuration file is installed to /etc/retroarch.cfg. This is the syst
 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/
+```
+
+<b>PC</b><br/>
+Instructions for compiling on PC can be found in the [wiki](https://github.com/Themaister/RetroArch/wiki).
+
+<b>PlayStation3</b><br/>
+
+RetroArch PS3 needs to be compiled in the following order:
+
+1) Compile RetroArch Salamander
+
+<tt>make -f Makefile.ps3.salamander</tt>
+
+2) Compile the RGL video driver
+
+<tt>make -f Makefile.ps3.rgl</tt>
+
+3) Compile RetroArch as a library
+
+<tt>make -f Makefile.ps3.retroarch</tt>
+
+4) Finally, compile RetroArch packed together with the GUI:
+
+<tt>make -f Makefile.ps3</tt>
+
+<b>PlayStation3 - Creating a PKG installable file</b><br />
+
+You can add `pkg` as a parameter in order to make a PKG file - for example:
+
+<tt>make -f Makefile.ps3 pkg</tt>
+
+This creates an NPDRM package. This can be installed on debug PS3s.
+
+To make a non-NPDRM package that can be installed on a jailbroken/CFW PS3 (such as PSGroove or PS3 CFWs and other 3.55 CFW derivatives), do:
+
+<tt>make -f Makefile.ps3 pkg-signed</tt>
+
+If you're using Kmeaw 3.55 firmware, the package needs to be signed:
+
+<tt>make -f Makefile.ps3 pkg-signed-cfw</tt>
+
+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>.
+
+<b> Xbox 360 (XeXDK)</b><br />
+
+You will need Microsoft Visual Studio 2010 installed (or higher) in order to compile RetroArch 360.
+
+The solution file can be found at the following location:
+
+<tt>msvc-360/RetroArch-360.sln</tt>
+
+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,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