(Android/iOS/Blackberry) Add default shader dir for Blackberry/iOS/Android

(iOS/GLSL) Shouldn't have been added to repo
(iOS) Add reference to shaders_glsl - building/compiling will require
2026-11-08 17:28:49 -10:00 · 2013-05-29 13:29:48 +02:00 · 2013-05-29 13:18:16 +02:00 · 2013-05-29 13:17:27 +02:00 · 2013-05-29 12:57:20 +02:00 · 2013-05-29 12:55:24 +02:00
761 changed files with 163836 additions and 10613 deletions
@@ -1,5 +1,51 @@
 *.o
-ssnes
+*.bmpobj
+*.binobj
+*.so
+*.dll
+*.a
+*.elf
+*.dol
+*.map
+config.log
+/retroarch
+/retroarch.*
 /config.h
 /config.mk
-/tools/ssnes-joyconfig
+/tools/retroarch-joyconfig
+/tools/retroarch-joyconfig.*
+/tools/retrolaunch/retrolaunch
+*.ncb
+*.sdf
+*.opensdf
+*.suo
+Debug
+Release
+ipch
+*.user
+/wii/app_booter/app_booter.bin
+*.zip
+RetroArch-w32/
+RetroArch-w64/
+android/native/obj/
+android/phoenix/bin/
+android/phoenix/gen/
+.DS_Store
+*/build/*
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+profile
+*.moved-aside
+DerivedData
+.idea/
+*.hmap
+ios/tmp
+ios/modules/*.dylib
+ios/*.mobileprovision
@@ -1,5 +1,54 @@
 Hans-Kristian Arntzen - <[email protected]>
   - Main code, maintainer
+   - Initial Gamecube/Wii libogc port

 Devin J. Pohly - <[email protected]>
   - Joypad axis support
+
+Chris Moeller - <[email protected]> 
+   - CoreAudio audio driver
+
+Daniel De Matteis - <[email protected]>
+   - PlayStation 3 port
+   - XBox 360 XDK port
+   - Libxenon port
+   - XBox 1 port
+   - Android port
+   - OpenSL ES audio driver
+   - Gamecube/Wii libogc port
+   - Blackberry 10/Playbook port
+   - iOS port patches
+
+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
+
+Darren Alton -
+   - OpenPandora port
+
+Fabian Knopf -
+   - WGL multi-monitor support
+   - D3D9 overlay, multi-monitor and RGUI support
+
+Gražvydas Ignotas -
+   - ARM Linux patches
+
+Saggi Mizrahi - 
+   - RetroLaunch utility
@@ -0,0 +1,58 @@
+# Contributing to RetroArch
+
+If you are a developer and want to contribute to the development of RetroArch, please read this.
+If you have found a bug and want to submit a minor patch or a bug report, please read this as well.
+
+# Submitting a bug report
+When submitting a bug report, make sure that the bug is local to RetroArch.
+A bug in a libretro core or something deemed to be external is likely to be closed very fast.
+If you still suspect a bug in RetroArch, make sure to test with several cores to make sure.
+
+If you have troubles building RetroArch on Linux/BSD/OSX, make sure to paste shell output of ./configure,
+as well as config.log and shell output of make. If building on Windows, just paste shell output of make.
+
+If the issue occurs during runtime, make sure to paste RetroArch's verbose log.
+If using Phoenix frontend, you can find log in (File -> Show Log) after running.
+In console, make sure to run with verbose (-v) flag.
+
+# Pull Requests
+Outside contributions are generally only accepted in the form of a pull request. The process is very simple.
+Fork RetroArch, make your changes, and issue a pull request on GitHub. This can all be done within the browser.
+The changes are reviewed, and might be merged in. If the pull request isn't acceptable at the time,
+note that it's possible to continue pushing up commits to your branch.
+
+If you want to develop a larger feature,
+we'd like to discuss this first (ideally on IRC) so that you don't risk developing something
+that won't be merged. A pull request with a proof-of-concept is fine, but please indicate so.
+
+## libretro API
+If you wish to add functionality to libretro's API, it can take some time to merge in, because changes
+to libretro API will affect other projects as well, and we highly value API/ABI stability.
+Features will only be added when deemed *necessary* for a concrete libretro core to function properly.
+Features will not be added on basis of hypothetical libretro implementations.
+
+# Coding style
+Having a consistent code style throughout the code base is highly valued.
+Please look through the code to get a feel for the coding style.
+A pull request may be asked to fix the coding style before submission.
+In other cases, a pull request may be followed up with a "style nit commit".
+
+## Non-obvious things:
+  - Code should be both ISO C99 and ISO C++ compatible. This dual requirement is for XBox360 and MSVC in general. Think of it as a C++ compatible subset of C99.
+  - Warnings are not allowed (-Wall). Make sure your code is warning-free. Note that warning sensitivity differs a bit across compiler versions.
+  - Using deprecated APIs is discouraged.
+
+# Copyright Headers and AUTHORS
+If you have contributed to a part of a source file (a chunk of code that's written by you),
+you should add yourself to the copyright header in that file.
+If you have contributed significantly
+(a feature, a contribution you can "name", e.g. "Added audio driver foo"), you should add yourself to AUTHORS file.
+We'd like your full name and email, and which features you have been part of.
+
+# IRC
+Active development happens on IRC. (#retroarch @ irc.freenode.org)
+We value discussing things in "real-time".
+
+# Commit Access
+Contributors who show a track record of making good pull requests over time will eventually get commit access to the repo.
+This typically happens when the "overhead" of looking through pull requests over time becomes a burden.
@@ -1,119 +1,354 @@
 include config.mk

-TARGET = ssnes tools/ssnes-joyconfig
+TARGET = retroarch tools/retroarch-joyconfig tools/retrolaunch/retrolaunch
+
+OBJ = frontend/frontend.o \
+		retroarch.o \
+		file.o \
+		file_path.o \
+		hash.o \
+		driver.o \
+		settings.o \
+		dynamic.o \
+		dynamic_dummy.o \
+		message.o \
+		rewind.o \
+		gfx/gfx_common.o \
+		input/input_common.o \
+		input/overlay.o \
+		patch.o \
+		fifo_buffer.o \
+		core_options.o \
+		compat/compat.o \
+		cheats.o \
+		conf/config_file.o \
+		screenshot.o \
+		gfx/scaler/scaler.o \
+		gfx/shader_parse.o \
+		gfx/scaler/pixconv.o \
+		gfx/scaler/scaler_int.o \
+		gfx/scaler/filter.o \
+		gfx/image.o \
+		gfx/fonts/fonts.o \
+		gfx/fonts/bitmapfont.o \
+		audio/resampler.o \
+		audio/sinc.o \
+		performance.o
+
+JOYCONFIG_OBJ = tools/retroarch-joyconfig.o \
+	conf/config_file.o \
+	file_path.o \
+	compat/compat.o \
+	tools/input_common_joyconfig.o
+
+RETROLAUNCH_OBJ = tools/retrolaunch/main.o \
+	tools/retrolaunch/sha1.o \
+	tools/retrolaunch/parser.o \
+	tools/retrolaunch/cd_detect.o \
+	tools/retrolaunch/rl_fnmatch.o \
+	tools/input_common_launch.o \
+	file_path.o \
+	compat/compat.o \
+	conf/config_file.o \
+	settings.o

-OBJ = ssnes.o file.o driver.o settings.o dynamic.o message.o rewind.o movie.o
-JOYCONFIG_OBJ = tools/ssnes-joyconfig.o conf/config_file.o
 HEADERS = $(wildcard */*.h) $(wildcard *.h)

-LIBS =
-DEFINES = -DHAVE_CONFIG_H
+ifeq ($(findstring Haiku,$(OS)),)
+	LIBS = -lm
+endif

-ifneq ($(findstring Darwin,$(shell uname -a)),)
+DEFINES = -DHAVE_CONFIG_H -DHAVE_SCREENSHOTS
+
+ifeq ($(GLOBAL_CONFIG_DIR),)
+   GLOBAL_CONFIG_DIR = /etc
+endif
+DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
+
+ifeq ($(REENTRANT_TEST), 1)
+   DEFINES += -Dmain=retroarch_main
+   OBJ += console/test.o
+endif
+
+ifneq ($(findstring Darwin,$(OS)),)
   OSX := 1
   LIBS += -framework AppKit
 else
   OSX := 0
 endif

-ifeq ($(HAVE_SRC), 1)
-   LIBS += $(SRC_LIBS)
-   DEFINES += $(SRC_CFLAGS)
-else
-   OBJ += audio/hermite.o
+ifneq ($(findstring BSD,$(OS)),)
+   BSD_LOCAL_INC = -I/usr/local/include
 endif

-ifeq ($(HAVE_CONFIGFILE), 1)
-   OBJ += conf/config_file.o
+ifneq ($(findstring Linux,$(OS)),)
+   LIBS += -lrt
+   OBJ += input/linuxraw_input.o input/linuxraw_joypad.o
+   JOYCONFIG_OBJ += tools/linuxraw_joypad.o
+endif
+
+ifeq ($(HAVE_RGUI), 1)
+   OBJ += frontend/menu/menu_common.o frontend/menu/rgui.o frontend/menu/history.o
+endif
+
+ifeq ($(HAVE_THREADS), 1)
+   OBJ += autosave.o thread.o gfx/thread_wrapper.o
+   ifeq ($(findstring Haiku,$(OS)),)
+      LIBS += -lpthread
+   endif
+endif
+
+ifeq ($(HAVE_BSV_MOVIE), 1)
+   OBJ += movie.o
+endif
+
+ifeq ($(HAVE_NETPLAY), 1)
+   OBJ += netplay.o
+endif
+
+ifeq ($(HAVE_COMMAND), 1)
+   OBJ += command.o
 endif

 ifeq ($(HAVE_RSOUND), 1)
   OBJ += audio/rsound.o
-   LIBS += -lrsound
+   LIBS += $(RSOUND_LIBS)
+   DEFINES += $(RSOUND_CFLAGS)
 endif

 ifeq ($(HAVE_OSS), 1)
   OBJ += audio/oss.o
 endif
-ifeq ($(HAVE_ALSA), 1)
-   OBJ += audio/alsa.o
-   LIBS += -lasound
+
+ifeq ($(HAVE_OSS_BSD), 1)
+   OBJ += audio/oss.o
 endif
+
+ifeq ($(HAVE_OSS_LIB), 1)
+   LIBS += -lossaudio
+endif
+
+ifeq ($(HAVE_ALSA), 1)
+   OBJ += audio/alsa.o audio/alsathread.o
+   LIBS += $(ALSA_LIBS)
+   DEFINES += $(ALSA_CFLAGS)
+endif
+
 ifeq ($(HAVE_ROAR), 1)
   OBJ += audio/roar.o
-   LIBS += -lroar
+   LIBS += $(ROAR_LIBS)
+   DEFINES += $(ROAR_CFLAGS)
 endif
+
 ifeq ($(HAVE_AL), 1)
   OBJ += audio/openal.o
-ifeq ($(OSX),1)
-   LIBS += -framework OpenAL
-else
-   LIBS += -lopenal
-endif
+   ifeq ($(OSX),1)
+      LIBS += -framework OpenAL
+   else
+      LIBS += -lopenal
+   endif
 endif
+
 ifeq ($(HAVE_JACK),1)
   OBJ += audio/jack.o
-   LIBS += -ljack
+   LIBS += $(JACK_LIBS)
+   DEFINES += $(JACK_CFLAGS)
 endif
+
 ifeq ($(HAVE_PULSE), 1)
   OBJ += audio/pulse.o
   LIBS += $(PULSE_LIBS)
   DEFINES += $(PULSE_CFLAGS)
 endif

-ifeq ($(HAVE_SDL), 1)
-   OBJ += gfx/gl.o input/sdl.o audio/sdl.o audio/buffer.o
-   DEFINES += $(SDL_CFLAGS)
-   LIBS += $(SDL_LIBS)
-ifeq ($(OSX),1)
-   LIBS += -framework OpenGL
-else
-   LIBS += -lGL
+ifeq ($(HAVE_COREAUDIO), 1)
+   OBJ += audio/coreaudio.o
+   LIBS += -framework CoreServices -framework CoreAudio -framework AudioUnit
 endif
+
+ifeq ($(SCALER_NO_SIMD), 1)
+   DEFINES += -DSCALER_NO_SIMD
+endif
+
+ifeq ($(PERF_TEST), 1)
+   DEFINES += -DPERF_TEST
+endif
+
+ifeq ($(HAVE_SDL), 1)
+   OBJ += gfx/sdl_gfx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o
+   JOYCONFIG_OBJ += input/sdl_joypad.o
+   DEFINES += $(SDL_CFLAGS) $(BSD_LOCAL_INC)
+   LIBS += $(SDL_LIBS)
+
+   ifeq ($(HAVE_OPENGL), 1)
+      OBJ += gfx/context/sdl_ctx.o
+   endif
+endif
+
+ifeq ($(HAVE_OPENGL), 1)
+   OBJ += gfx/gl.o \
+			 gfx/gfx_context.o \
+			 gfx/fonts/gl_font.o \
+			 gfx/fonts/gl_raster_font.o \
+			 gfx/math/matrix.o \
+			 gfx/state_tracker.o
+
+   ifeq ($(HAVE_KMS), 1)
+      OBJ += gfx/context/drm_egl_ctx.o
+      DEFINES += $(GBM_CFLAGS) $(DRM_CFLAGS) $(EGL_CFLAGS)
+      LIBS += $(GBM_LIBS) $(DRM_LIBS) $(EGL_LIBS)
+   endif
+
+   ifeq ($(HAVE_VIDEOCORE), 1)
+      OBJ += gfx/context/vc_egl_ctx.o
+		# videocore's libs set later
+   endif
+
+   ifeq ($(HAVE_X11), 1)
+      ifeq ($(HAVE_GLES), 0)
+         OBJ += gfx/context/glx_ctx.o
+      endif
+      ifeq ($(HAVE_EGL), 1)
+         OBJ += gfx/context/xegl_ctx.o
+         DEFINES += $(EGL_CFLAGS)
+         LIBS += $(EGL_LIBS)
+      endif
+   endif
+	
+   ifeq ($(HAVE_GLES), 1)
+      LIBS += -lGLESv2
+      DEFINES += -DHAVE_OPENGLES -DHAVE_OPENGLES2
+   else
+      ifeq ($(OSX), 1)
+         LIBS += -framework OpenGL
+      else
+         LIBS += -lGL
+         DEFINES += -DHAVE_GL_SYNC
+      endif
+   endif
+
+   OBJ += gfx/shader_glsl.o 
+   DEFINES += -DHAVE_GLSL -DHAVE_OVERLAY
+endif
+
+ifeq ($(HAVE_VG), 1)
+   OBJ += gfx/vg.o gfx/math/matrix_3x3.o
+   DEFINES += $(VG_CFLAGS)
+   LIBS += $(VG_LIBS)
+endif
+
+ifeq ($(HAVE_VIDEOCORE), 1)
+   LIBS += -lbcm_host -lvcos -lvchiq_arm -lEGL
+endif
+
+ifeq ($(HAVE_XVIDEO), 1)
+   OBJ += gfx/xvideo.o
+   LIBS += $(XVIDEO_LIBS) 
+   DEFINES += $(XVIDEO_CFLAGS)
+endif
+
+ifeq ($(HAVE_X11), 1)
+   OBJ += input/x11_input.o gfx/context/x11_common.o
+   LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
+   DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
 endif

 ifeq ($(HAVE_CG), 1)
   OBJ += gfx/shader_cg.o
-   LIBS += -lCg -lCgGL
+   ifeq ($(OSX), 1)
+      LIBS += -framework Cg
+   else
+      LIBS += -lCg -lCgGL
+   endif
 endif

-ifeq ($(HAVE_XML), 1)
-   OBJ += gfx/shader_glsl.o
-   LIBS += $(XML_LIBS)
-   DEFINES += $(XML_CFLAGS)
+ifeq ($(HAVE_LIBXML2), 1)
+   LIBS += $(LIBXML2_LIBS)
+   DEFINES += $(LIBXML2_CFLAGS)
+else
+   OBJ += compat/rxml/rxml.o
 endif

-ifeq ($(HAVE_FILTER), 1)
-   OBJ += hqflt/hq.o
-   OBJ += hqflt/grayscale.o
-   OBJ += hqflt/bleed.o
-   OBJ += hqflt/ntsc.o
-   OBJ += hqflt/snes_ntsc/snes_ntsc.o
+ifeq ($(HAVE_DYLIB), 1)
+   LIBS += $(DYLIB_LIB)
 endif

 ifeq ($(HAVE_FREETYPE), 1)
-   OBJ += gfx/fonts.o
+   OBJ += gfx/fonts/freetype.o
   LIBS += $(FREETYPE_LIBS)
   DEFINES += $(FREETYPE_CFLAGS)
 endif

+ifeq ($(HAVE_SDL_IMAGE), 1)
+   LIBS += $(SDL_IMAGE_LIBS)
+   DEFINES += $(SDL_IMAGE_CFLAGS)
+endif
+
+ifeq ($(HAVE_ZLIB), 1)
+   OBJ += gfx/rpng/rpng.o file_extract.o
+   LIBS += $(ZLIB_LIBS)
+   DEFINES += $(ZLIB_CFLAGS) -DHAVE_ZLIB_DEFLATE
+endif
+
 ifeq ($(HAVE_FFMPEG), 1)
   OBJ += record/ffemu.o
-   LIBS += $(AVCODEC_LIBS) $(AVCORE_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS)
-   DEFINES += $(AVCODEC_CFLAGS) $(AVCORE_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS)
+   LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS)
+   DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS)
 endif

 ifeq ($(HAVE_DYNAMIC), 1)
-   LIBS += -ldl
+   LIBS += $(DYLIB_LIB)
 else
-   LIBS += $(libsnes)
+   LIBS += $(libretro)
+endif
+
+ifeq ($(HAVE_PYTHON), 1)
+   DEFINES += $(PYTHON_CFLAGS) -Wno-unused-parameter
+   LIBS += $(PYTHON_LIBS)
+   OBJ += gfx/py_state/py_state.o
+endif
+
+ifeq ($(HAVE_NEON),1)
+	OBJ += audio/sinc_neon.o
+	# When compiled without this, tries to attempt to compile sinc lerp,
+	# which will error out
+	DEFINES += -DSINC_LOWER_QUALITY
+endif
+
+OBJ += audio/utils.o
+ifeq ($(HAVE_NEON),1)
+   OBJ += audio/utils_neon.o
 endif

 ifneq ($(V),1)
   Q := @
 endif

-CFLAGS = -Wall -O3 -g -std=gnu99 -I.
+OPTIMIZE_FLAG = -O3 -ffast-math
+ifeq ($(DEBUG), 1)
+   OPTIMIZE_FLAG = -O0
+endif
+
+CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -g -I.
+ifeq ($(CXX_BUILD), 1)
+   LD = $(CXX)
+   CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS
+else
+   LD = $(CC)
+   ifneq ($(findstring icc,$(CC)),)
+      CFLAGS += -std=c99 -D_GNU_SOURCE
+   else
+      CFLAGS += -std=gnu99
+   endif
+endif
+
+ifeq ($(NOUNUSED), yes)
+   CFLAGS += -Wno-unused-result
+endif
+ifeq ($(NOUNUSED_VARIABLE), yes)
+   CFLAGS += -Wno-unused-variable
+endif
+

 all: $(TARGET) config.mk

@@ -121,42 +356,83 @@ config.mk: configure qb/*
 	@echo "config.mk is outdated or non-existing. Run ./configure again."
 	@exit 1

-ssnes: $(OBJ)
-	$(Q)$(CXX) -o $@ $(OBJ) $(LIBS) $(LDFLAGS)
+retroarch: $(OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
+	$(Q)$(LD) -o $@ $(OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)

-tools/ssnes-joyconfig: $(JOYCONFIG_OBJ)
-	$(Q)$(CC) -o $@ $(JOYCONFIG_OBJ) $(SDL_LIBS) $(LDFLAGS)
+tools/retroarch-joyconfig: $(JOYCONFIG_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
+ifeq ($(CXX_BUILD), 1)
+	$(Q)$(CXX) -o $@ $(JOYCONFIG_OBJ) $(SDL_LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
+else
+	$(Q)$(CC) -o $@ $(JOYCONFIG_OBJ) $(SDL_LIBS) $(LDFLAGS) $(LIBRARY_DIRS)
+endif
+
+tools/retrolaunch/retrolaunch: $(RETROLAUNCH_OBJ)
+	@$(if $(Q), $(shell echo echo LD $@),)
+	$(Q)$(LD) -o $@ $(RETROLAUNCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)

 %.o: %.c config.h config.mk $(HEADERS)
-	$(Q)$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
 	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
+
+tools/linuxraw_joypad.o: input/linuxraw_joypad.c
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -DIS_JOYCONFIG -c -o $@ $<
+
+tools/input_common_launch.o: input/input_common.c
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -DIS_RETROLAUNCH -c -o $@ $<
+
+tools/input_common_joyconfig.o: input/input_common.c
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -DIS_JOYCONFIG -c -o $@ $<
+
+%.o: %.S config.h config.mk $(HEADERS)
+	@$(if $(Q), $(shell echo echo AS $<),)
+	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<

 install: $(TARGET)
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	mkdir -p $(DESTDIR)/etc
-	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
+	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/man/man1 2>/dev/null || /bin/true
+	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps 2>/dev/null || /bin/true
 	install -m755 $(TARGET) $(DESTDIR)$(PREFIX)/bin 
-	install -m644 ssnes.cfg $(DESTDIR)/etc/ssnes.cfg
-	install -m644 docs/ssnes.1 $(DESTDIR)$(PREFIX)/share/man/man1
-	install -m644 docs/ssnes-joyconfig.1 $(DESTDIR)$(PREFIX)/share/man/man1
+	install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
+	install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR)
+	install -m644 docs/retroarch-joyconfig.1 $(DESTDIR)$(MAN_DIR)
+	install -m755 retroarch-zip $(DESTDIR)$(PREFIX)/bin
+	install -m644 media/retroarch.png $(DESTDIR)$(PREFIX)/share/pixmaps

 uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/bin/{ssnes,ssnes-joyconfig}
-	rm -f $(DESTDIR)/etc/ssnes.cfg
-	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/{ssnes,ssnes-joyconfig}.1
+	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch
+	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-joyconfig
+	rm -f $(DESTDIR)$(PREFIX)/bin/retrolaunch
+	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-zip
+	rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
+	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch.1
+	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-joyconfig.1
+	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.png

 clean:
 	rm -f *.o 
+	rm -f frontend/menu/*.o
+	rm -f frontend/*.o
 	rm -f audio/*.o
 	rm -f conf/*.o
 	rm -f gfx/*.o
+	rm -f gfx/rpng/*.o
+	rm -f gfx/fonts/*.o
+	rm -f gfx/math/*.o
+	rm -f gfx/context/*.o
+	rm -f gfx/py_state/*.o
+	rm -f gfx/scaler/*.o
+	rm -f compat/*.o
+	rm -f compat/rxml/*.o
 	rm -f record/*.o
-	rm -f hqflt/*.o
-	rm -f hqflt/snes_ntsc/*.o
 	rm -f input/*.o
 	rm -f tools/*.o
+	rm -f tools/retrolaunch/*.o
 	rm -f $(TARGET)

 .PHONY: all install uninstall clean
@@ -0,0 +1,99 @@
+RARCH_VERSION		= "0.9.9"
+
+DEBUG			= 0
+HAVE_LOGGER		= 1
+HAVE_FILE_LOGGER	= 0
+PERF_TEST		= 0
+WHOLE_ARCHIVE_LINK	= 0
+BIG_STACK		= 0
+
+PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
+PC_DEVELOPMENT_UDP_PORT		= 3490
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
+LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
+ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
+
+DOL_TARGET := retroarch_ngc.dol
+ELF_TARGET := retroarch_ngc.elf
+
+INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
+LIBDIRS := -L$(DEVKITPRO)/libogc/lib/cube -L.
+
+MACHDEP := -DGEKKO -DHW_DOL -mogc -mcpu=750 -meabi -mhard-float
+CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
+ifeq ($(BIG_STACK), 1)
+   LDFLAGS += -T gx/ld/ogc.ld
+endif
+LIBS := -lfat $(WHOLE_START) -lretro_ngc $(WHOLE_END) -logc
+
+OBJ = griffin/griffin.o
+
+ifeq ($(PERF_TEST), 1)
+   CFLAGS += -DPERF_TEST
+endif
+
+ifeq ($(HAVE_LOGGER), 1)
+CFLAGS		+= -DHAVE_LOGGER
+CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+CFLAGS          += -Iconsole/logger
+LIBS += -lbba
+endif
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS		+= -DHAVE_FILE_LOGGER
+CFLAGS          += -Iconsole/logger
+endif
+
+CFLAGS += -std=gnu99 -DHAVE_RGUI -DRARCH_CONSOLE -DGEKKO -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Wno-char-subscripts 
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+else
+   CFLAGS += -O3
+endif
+
+all: $(DOL_TARGET)
+
+%.dol: %.elf
+	$(ELF2DOL) $< $@
+
+$(ELF_TARGET): $(OBJ)
+	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+%.binobj: %.bin
+	$(LD) -r -b binary -o $@ $<
+
+%.bmpobj: %.bmp
+	$(LD) -r -b binary -o $@ $<
+
+pkg: all
+	cp -r $(DOL_TARGET) ngc/pkg/CORE.dol
+
+clean:
+	rm -f $(DOL_TARGET)
+	rm -f $(ELF_TARGET)
+	rm -f $(OBJ)
+
+.PHONY: clean
+
@@ -0,0 +1,54 @@
+# Before using this Makefile, be sure to do:
+# $ source /usr/local/angstrom/arm/environment-setup
+# $ setprj retroarch
+
+PNDDIR=./pandora
+BINDIR=$(PNDDIR)/bin
+
+all: $(BINDIR)/retroarch
+	mkdir -p $(PNDDIR)/lib
+	@echo "Put libretro-*.so files in $(PNDDIR)/lib/ before making pnd!"
+
+pnd: retroarch.pnd
+
+install: all $(BINDIR)/retroarch-joyconfig $(BINDIR)/retroarch-zip $(PNDDIR)/readme.html
+
+retroarch:
+	./configure --prefix=$PND_BASEDIR/$PRJ --disable-ffmpeg --disable-cg --disable-python --disable-libpng --disable-pulse --disable-jack --enable-gles --enable-xml
+	make -f Makefile
+
+$(BINDIR)/retroarch: retroarch
+	mkdir -p $(BINDIR)
+	cp retroarch $(BINDIR)/retroarch
+
+$(BINDIR)/retroarch-joyconfig: tools/retroarch-joyconfig
+	mkdir -p $(BINDIR)
+	cp tools/retroarch-joyconfig $(BINDIR)/retroarch-joyconfig
+
+$(BINDIR)/retroarch-zip: retroarch-zip
+	mkdir -p $(BINDIR)
+	cp retroarch-zip $(BINDIR)/retroarch-zip
+
+$(PNDDIR)/readme.html: README.md
+	markdown README.md > $(PNDDIR)/readme.html
+
+retroarch.pnd: install
+	pnd_make -c -p retroarch.pnd -d $(PNDDIR)/ -x $(PNDDIR)/PXML.xml -i $(PNDDIR)/icon.png
+
+clean:
+	rm -f *.o 
+	rm -f audio/*.o
+	rm -f conf/*.o
+	rm -f gfx/*.o
+	rm -f gfx/fonts/*.o
+	rm -f gfx/context/*.o
+	rm -f gfx/py_state/*.o
+	rm -f compat/*.o
+	rm -f record/*.o
+	rm -f input/*.o
+	rm -f tools/*.o
+	rm -f $(BINDIR)/retroarch
+	rm -f $(BINDIR)/retroarch-joyconfig
+	rm -f $(PNDDIR)/readme.html
+	rm -f retroarch
+
@@ -0,0 +1,204 @@
+RARCH_VERSION		= "0.9.9"
+
+#which compiler to build  with - GCC or SNC
+#set to GCC for debug builds for use with debugger
+CELL_BUILD_TOOLS	= SNC
+CELL_GPU_TYPE	   	= RSX
+CELL_PSGL_VERSION	= ultra-opt
+
+RMENU_IMG_DIR  := media/rmenu
+
+# options
+DOWNLOAD_SHADERS	= 1
+STRIPPING_ENABLE	= 0
+DEBUG			      = 0
+HAVE_RGL		      = 1
+HAVE_LOGGER		   = 0
+HAVE_FREETYPE	   = 0
+HAVE_RLAUNCH      = 0
+HAVE_RGUI         = 0
+PERF_TEST		   = 0
+WHOLE_ARCHIVE_LINK = 0
+
+CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001
+CONTENT_ID		= SSNE10000
+
+PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
+PC_DEVELOPMENT_UDP_PORT		= 3490
+
+CELL_MK_DIR		?= $(CELL_SDK)/samples/mk
+include $(CELL_MK_DIR)/sdk.makedef.mk
+
+PPU_TARGET		= retroarch_ps3.elf
+SALAMANDER_TARGET	= retroarch-salamander_ps3.elf
+
+EBOOT_PATH		= 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. -Ips3 -Icommon
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+PKG_SCRIPT		= ps3/ps3py/pkg.py
+ifeq ($(shell uname), Linux)
+PKG_FINALIZE         	= package_finalize
+MAKE_SELF_WC		= make_self_wc
+MAKE_SELF		= make_self_npdrm
+PYTHON2			= python2
+GIT			= git
+else
+PKG_FINALIZE         	= package_finalize.exe
+MAKE_SELF_WC		= make_self_wc.exe
+MAKE_SELF		= make_self_npdrm.exe
+PYTHON2			= python2.exe
+GIT			= git.exe
+endif
+
+PPU_SRCS		= griffin/griffin.c
+
+ifeq ($(PERF_TEST), 1)
+   DEFINES += -DPERF_TEST
+endif
+
+ifeq ($(HAVE_RLAUNCH), 1)
+	DEFINES += -DHAVE_RLAUNCH
+endif
+
+ifeq ($(HAVE_RGUI), 1)
+	DEFINES += -DHAVE_RGUI
+else
+	DEFINES += -DHAVE_RMENU -DHAVE_RMENU_GUI
+endif
+
+ifeq ($(HAVE_RGL), 1)
+DEFINES			+= -DHAVE_RGL
+GL_LIBS			:= -L. -lrgl_ps3
+else
+GL_LIBS			:= -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc
+endif
+
+ifeq ($(HAVE_FREETYPE), 1)
+DEFINES			+= -DHAVE_FREETYPE
+FONT_LIBS		:= -lfontFT_stub -lfreetype_stub
+else
+DEFINES			+= -DHAVE_LIBDBGFONT
+FONT_LIBS		:= -ldbgfont
+endif
+
+ifeq ($(CELL_BUILD_TOOLS), SNC)
+	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
+	PPU_CXX	= $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
+	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
+else
+ifneq($(system_platform), win)
+	PPU_CXX	= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
+	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
+	PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
+	PPU_CCLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
+endif
+
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+WHOLE_START := -Wl, --whole-archive
+WHOLE_END := -Wl, --no-whole-archive
+endif
+
+PPU_LDLIBS =  $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -lcgc -lgcm_cmdasm -lgcm_sys_stub -lresc_stub -lm -lio_stub -lfs_stub -lsysutil_stub -lsysutil_game_stub -lsysutil_screenshot_stub -lsysutil_np_stub -lpngdec_stub -ljpgdec_stub -lsysmodule_stub -laudio_stub -lnet_stub -lnetctl_stub -lpthread
+
+PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe
+
+DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FILEBROWSER -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -DWANT_MINIZ -DSINC_LOWER_QUALITY -D__CELLOS_LV2__ -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+
+ifeq ($(DEBUG), 1)
+   PPU_OPTIMIZE_LV	:= -O0 -g
+else
+   PPU_OPTIMIZE_LV	:= -O3 -g
+endif
+
+ifeq ($(HAVE_LOGGER), 1)
+DEFINES			+= -DHAVE_LOGGER
+INCDIRS        +=  -Iconsole/logger
+endif
+
+PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
+PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
+
+EXIST_EBOOT_WILDCARD := $(wildcard $(EBOOT_PATH))
+EXIST_CORE_WILDCARD := $(wildcard $(CORE_PATH))
+
+EBOOT_EXISTS		= 1
+CORE_EXISTS		= 1
+
+ifneq ($(strip $(EXIST_EBOOT_WILDCARD)),)
+EBOOT_EXISTS		= 0
+endif
+
+ifneq ($(strip $(EXIST_CORE_WILDCARD)),)
+CORE_EXISTS		= 0
+endif
+
+include $(CELL_MK_DIR)/sdk.target.mk
+
+MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe
+MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe
+MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe
+
+.PHONY: create-npdrm-core create-core create-npdrm-salamander create-shaders clean-selfs create-salamander
+
+create-npdrm-core:
+	$(MAKE_FSELF_NPDRM) $(PPU_TARGET) $(CORE_PATH)
+
+create-core:
+	$(MAKE_SELF_WC) $(PPU_TARGET) $(CORE_PATH)
+
+create-npdrm-salamander:
+	$(MAKE_FSELF_NPDRM) $(SALAMANDER_TARGET) $(EBOOT_PATH)
+	
+create-salamander:
+	$(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL)
+
+copy-media-files:
+	@cp -r $(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) 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) 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) 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) 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) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+	$(PKG_FINALIZE) retroarch-ps3-cfw-$(RARCH_VERSION)-kmeaw.pkg
+
+clean-selfs:
+ifeq ($(EBOOT_EXISTS),1)
+	@echo "WARNING: Couldn't find file to delete: [$(EBOOT_PATH)], skipping this step."
+else
+	rm $(EBOOT_PATH)
+endif
+ifeq ($(CORE_EXISTS),1)
+	@echo "WARNING: Couldn't find file to delete: [$(CORE_PATH)], skipping this step."
+else
+	rm $(CORE_PATH)
+endif
@@ -0,0 +1,60 @@
+#which compiler to build  with - GCC or SNC
+#set to GCC for debug builds for use with debugger
+CELL_BUILD_TOOLS	= GCC
+CELL_GPU_TYPE	   	= RSX
+
+DEBUG			= 0
+STRIPPING_ENABLE	=  1
+RGL_2D      = 1
+
+PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
+PC_DEVELOPMENT_UDP_PORT		= 3490
+
+CELL_MK_DIR		?= $(CELL_SDK)/samples/mk
+include $(CELL_MK_DIR)/sdk.makedef.mk
+
+PPU_LIB_TARGET		= librgl_ps3.a
+
+LDDIRS = -L.
+INCDIRS = -I. -Ips3/rgl/include
+
+RGL_DIR = ps3/rgl/src
+
+PPU_SRCS		=  $(RGL_DIR)/libelf/readelf.cpp \
+			  $(RGL_DIR)/ps3/rgl_ps3_raster.cpp \
+			  $(RGL_DIR)/ps3/rgl_ps3.cpp
+
+
+ifeq ($(CELL_BUILD_TOOLS), SNC)
+	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
+	PPU_CXX	= $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
+	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
+	SNC_PPU_AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
+else
+	PPU_CXX	= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
+	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
+	PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
+	PPU_AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
+endif
+
+PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe
+
+
+PPU_LDLIBS = -lio_stub 
+
+DEFINES += -D__CELLOS_LV2__
+
+ifeq ($(DEBUG), 1)
+   PPU_OPTIMIZE_LV	:= -O0 -g
+else
+   PPU_OPTIMIZE_LV	:= -O3
+endif
+
+ifeq ($(RGL_2D), 1)
+	PPU_OPTIMIZE_LV += -DHAVE_RGL_2D
+endif
+
+PPU_CFLAGS = $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
+PPU_CXXFLAGS = $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES)
+
+include $(CELL_MK_DIR)/sdk.target.mk
@@ -0,0 +1,50 @@
+CELL_BUILD_TOOLS	= SNC
+CELL_SDK		?= /usr/local/cell
+HAVE_LOGGER		= 0
+CELL_MK_DIR ?= $(CELL_SDK)/samples/mk
+
+include $(CELL_MK_DIR)/sdk.makedef.mk
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
+
+PPU_CFLAGS		+= -I. -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
+PPU_SRCS		= frontend/frontend_salamander.c file_path.c compat/compat.c conf/config_file.c
+
+ifeq ($(HAVE_LOGGER), 1)
+PPU_CFLAGS		+= -DHAVE_LOGGER -Iconsole/logger
+PPU_SRCS		+= console/logger/logger.c
+endif
+
+PPU_TARGET		= retroarch-salamander_ps3.elf
+
+ifeq ($(CELL_BUILD_TOOLS),SNC)
+	PPU_CFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1 
+	PPU_CXXFLAGS		+= -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1
+	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
+	PPU_CLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
+	PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
+else
+	PPU_CFLAGS += -std=gnu99
+	PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
+	PPU_CLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
+	PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe
+endif
+
+PPU_LDLIBS		+= -lm -lnet_stub -lnetctl_stub -lio_stub -lsysmodule_stub -lsysutil_stub -lsysutil_game_stub -lfs_stub -lsysutil_np_stub
+
+PPU_OPTIMIZE_LV		:= -O2
+
+MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe
+
+include $(CELL_MK_DIR)/sdk.target.mk
@@ -0,0 +1,134 @@
+RARCH_VERSION		= "0.9.8.3"
+
+DEBUG			= 0
+HAVE_LOGGER		= 0
+HAVE_FILE_LOGGER	= 0
+
+PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
+PC_DEVELOPMENT_UDP_PORT		= 3490
+
+CC = $(PS3DEV)/ppu/bin/ppu-gcc
+CXX = $(PS3DEV)/ppu/bin/ppu-g++
+LD = $(PS3DEV)/ppu/bin/ppu-ld
+
+CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001
+
+ELF_TARGET := retroarch_psl1ght.elf
+EBOOT_PATH		= ps3/pkg/USRDIR/EBOOT.BIN
+CORE_PATH		= ps3/pkg/USRDIR/cores/CORE.SELF
+
+INCLUDE := -I. -I$(PS3DEV)/ppu/include
+LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.
+
+MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__
+CFLAGS += -Wall $(MACHDEP) $(INCLUDE)
+LDFLAGS := $(MACHDEP)
+LIBS := -lretro_psl1ght -laudio -lGL -lEGL -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule  -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+PKG_SCRIPT		= ps3/ps3py/pkg.py
+ifeq ($(shell uname), Linux)
+PKG_FINALIZE         	= package_finalize
+MAKE_SELF_WC		= make_self_wc
+MAKE_SELF		= make_self_npdrm
+PYTHON2			= python2
+GIT			= git
+else
+PKG_FINALIZE         	= package_finalize.exe
+MAKE_SELF_WC		= make_self_wc.exe
+MAKE_SELF		= make_self_npdrm.exe
+PYTHON2			= python2.exe
+GIT			= git.exe
+endif
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+PKG_SCRIPT		= ps3/ps3py/pkg.py
+ifeq ($(shell uname), Linux)
+PKG_FINALIZE         	= package_finalize
+MAKE_SELF_WC		= make_self_wc
+MAKE_SELF		= make_self_npdrm
+PYTHON2			= python2
+GIT			= git
+else
+PKG_FINALIZE         	= package_finalize.exe
+MAKE_SELF_WC		= make_self_wc.exe
+MAKE_SELF		= make_self_npdrm.exe
+PYTHON2			= python2.exe
+GIT			= git.exe
+endif
+
+MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe
+MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe
+
+OBJ = griffin/griffin.o
+
+ifeq ($(HAVE_LOGGER), 1)
+CFLAGS		+= -DHAVE_LOGGER
+CFLAGS		+= -Iconsole/logger
+endif
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS		+= -DHAVE_FILE_LOGGER
+endif
+
+RSXGL_DEFINES = -D__RSX__ -DGL3_PROTOTYPES
+
+SHARED_FLAGS := -DHAVE_FILEBROWSER $(RSXGL_DEFINES) -DHAVE_OPENGL -DHAVE_EGL -DHAVE_OPENGL_MODERN -DHAVE_GLSL -DHAVE_VID_CONTEXT -DHAVE_FBO -DHAVE_MOUSE -DRARCH_CONSOLE -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_GRIFFIN=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPACKAGE_VERSION=\"0.9.8\" -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)
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+else
+   CFLAGS += -O3 -g 
+   CXXFLAGS += -03 -g
+endif
+
+all: $(ELF_TARGET)
+
+$(ELF_TARGET): $(OBJ)
+	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+%.o: %.cpp
+	$(CXX) $(CFLAGS) -c -o $@ $<
+
+create-npdrm-core:
+	$(MAKE_FSELF_NPDRM) $(ELF_TARGET) $(CORE_PATH)
+
+create-core:
+	$(MAKE_SELF_WC) $(ELF_TARGET) $(CORE_PATH)
+
+pkg: $(ELF_TARGET) create-npdrm-core
+	$(MAKE_PACKAGE_NPDRM) ps3/pkg/package.conf ps3/pkg
+
+pkg-signed: $(ELF_TARGET) create-core
+	$(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) ps3/pkg/ retroarch-ps3-cfw-$(RARCH_VERSION).pkg
+
+clean:
+	rm -f $(ELF_TARGET)
+	rm -f $(OBJ)
+
+.PHONY: clean
+
@@ -0,0 +1,31 @@
+RARCH_VERSION		= "0.9.9"
+
+HAVE_FILE_LOGGER	= 1
+
+TARGET = retroarchpsp
+
+INCDIR = 
+CFLAGS = -O2 -G0 -g -std=gnu99 -ffast-math
+ASFLAGS = $(CFLAGS)
+
+RARCH_DEFINES = -DPSP -DHAVE_FILEBROWSER -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -DHAVE_NULLVIDEO -DHAVE_NULLAUDIO
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS		+= -DHAVE_FILE_LOGGER
+endif
+
+CFLAGS += $(RARCH_DEFINES)
+
+LIBDIR =
+LDFLAGS =
+LIBS = -lretro_psp1 -lstdc++ -lpspgu -lpspgum -lm
+
+EXTRA_TARGETS = EBOOT.PBP
+PSP_EBOOT_TITLE = RetroArch PSP1
+
+PSP_OBJECTS = griffin/griffin.o
+
+OBJS = $(PSP_OBJECTS)
+
+PSPSDK=$(shell psp-config --pspsdk-path)
+include $(PSPSDK)/lib/build.mak
@@ -0,0 +1,55 @@
+DOWNLOAD_SHADERS	= 1
+SHADER_DIR     := media/shaders
+SHADER_GLSL_DIR := media/shaders_glsl
+
+SHADER_DEST_PS3_DIR := ps3/pkg/USRDIR/cores/shaders
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+ifeq ($(shell uname), Linux)
+PYTHON2		= python2
+PYTHON3		= python
+GIT			= git
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+PYTHON2		= python2
+PYTHON3		= python
+GIT			= git
+else
+PYTHON2		= python2.exe
+PYTHON3		= python.exe
+GIT			= git.exe
+endif
+
+checkout-shaders:
+ifeq ($(DOWNLOAD_SHADERS),1)
+	@if test -d $(SHADER_DIR); then \
+		echo "[SHADER CHECKOUT::] Git pulling common-shaders..."; \
+      cd $(SHADER_DIR); \
+		$(GIT) pull; \
+		cd ../../../../..; \
+	else \
+	echo "[SHADER CHECKOUT::] Git cloning common-shaders first..."; \
+      $(GIT) clone git://github.com/libretro/common-shaders.git $(SHADER_DIR); \
+	fi
+endif
+
+convert-xml:
+	$(PYTHON) tools/cg2glsl.py $(SHADER_DIR) $(SHADER_GLSL_DIR)
+
+deploy-ps3: checkout-shaders
+	@if test -d $(SHADER_DEST_PS3_DIR); then \
+		cp -r $(SHADER_DIR)/* $(SHADER_DEST_PS3_DIR); \
+	else \
+	echo "[DEPLOY PS3::] Creating PS3 shader directory first..."; \
+		mkdir -p $(SHADER_DEST_PS3_DIR) || bin/true; \
+	fi
+	@echo "[DEPLOY PS3::] Copied shaders to PS3 shaders directory."
@@ -0,0 +1,109 @@
+RARCH_VERSION		= "0.9.9"
+
+DEBUG			= 0
+HAVE_LOGGER		= 0
+HAVE_FILE_LOGGER	= 0
+PERF_TEST		= 0
+WHOLE_ARCHIVE_LINK	= 0
+BIG_STACK		= 0
+CUSTOM_LIBOGC  = 0
+
+PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.6"
+PC_DEVELOPMENT_UDP_PORT		= 3490
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
+LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
+ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
+
+DOL_TARGET := retroarch_wii.dol
+ELF_TARGET := retroarch_wii.elf
+
+INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/ogc
+LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
+
+ifeq ($(CUSTOM_LIBOGC), 1)
+CFLAGS += -DHAVE_MINIOGC
+endif
+
+MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
+CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,strdup,-wrap,strndup,-wrap,malloc_usable_size
+ifeq ($(BIG_STACK), 1)
+   LDFLAGS += -T gx/ld/rvl.ld
+endif
+LIBS := -lfat $(WHOLE_START) -lretro_wii $(WHOLE_END) -logc -lwiiuse -lbte 
+APP_BOOTER_DIR = wii/app_booter
+
+OBJ = griffin/griffin.o $(APP_BOOTER_DIR)/app_booter.binobj
+
+ifeq ($(PERF_TEST), 1)
+   CFLAGS += -DPERF_TEST
+endif
+
+ifeq ($(HAVE_LOGGER), 1)
+CFLAGS		+= -DHAVE_LOGGER
+CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
+CFLAGS          += -Iconsole/logger
+endif
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS		+= -DHAVE_FILE_LOGGER
+CFLAGS          += -Iconsole/logger
+endif
+
+
+CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DGEKKO -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Wno-char-subscripts 
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g -DDEBUG
+else
+   CFLAGS += -O3
+endif
+
+all: $(DOL_TARGET)
+
+%.dol: %.elf
+	$(ELF2DOL) $< $@
+
+$(ELF_TARGET): $(OBJ)
+	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+%.bmpobj: %.bmp
+	$(LD) -r -b binary -o $@ $<
+
+%.binobj: %.bin
+	$(LD) -r -b binary -o $@ $<
+
+$(APP_BOOTER_DIR)/app_booter.bin:
+	$(MAKE) -C $(APP_BOOTER_DIR)
+
+pkg: all
+	cp -r $(DOL_TARGET) wii/pkg/CORE.dol
+
+clean:
+	rm -f $(DOL_TARGET)
+	rm -f $(ELF_TARGET)
+	rm -f $(OBJ)
+	$(MAKE) -C $(APP_BOOTER_DIR) clean
+
+.PHONY: clean
+
@@ -0,0 +1,91 @@
+###
+##
+# Makefile for RetroArch Wii.
+##
+
+DEBUG			= 0
+HAVE_LOGGER		= 0
+HAVE_FILE_LOGGER	= 0
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+EXE_EXT = .exe
+   system_platform = win
+else ifneq ($(findstring Darwin,$(shell uname -a)),)
+   system_platform = osx
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+   system_platform = win
+endif
+
+PC_DEVELOPMENT_IP_ADDRESS	= "192.168.1.7"
+PC_DEVELOPMENT_UDP_PORT		= 3490
+
+CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
+LD = $(DEVKITPPC)/bin/powerpc-eabi-ld$(EXE_EXT)
+ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
+
+DOL_TARGET := retroarch-salamander_wii.dol
+ELF_TARGET := retroarch-salamander_wii.elf
+
+INCLUDE := -I. -I$(DEVKITPRO)/libogc/include
+LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
+
+MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
+CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
+LDFLAGS := $(MACHDEP) -Wl,-Map,$(notdir $(ELF_TARGET)).map
+LIBS := -lfat -lwiiuse -logc -lbte
+
+APP_BOOTER_DIR = wii/app_booter
+
+OBJ = frontend/frontend_salamander.o file_path.o compat/compat.o conf/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)
+CFLAGS          += -Iconsole/logger
+OBJ             += console/logger/logger.o
+endif
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS		+= -DHAVE_FILE_LOGGER
+CFLAGS          += -Iconsole/logger
+endif
+
+CFLAGS += -std=gnu99 -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_RARCH_EXEC -DGEKKO -DPACKAGE_VERSION=\"0.9.8\" -Wno-char-subscripts 
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+else
+   CFLAGS += -O3
+endif
+
+all: $(DOL_TARGET)
+
+%.dol: %.elf
+	$(ELF2DOL) $< $@
+
+$(ELF_TARGET): $(OBJ)
+	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+%.binobj: %.bin
+	$(LD) -r -b binary -o $@ $<
+
+$(APP_BOOTER_DIR)/app_booter.bin:
+	$(MAKE) -C $(APP_BOOTER_DIR)
+
+pkg: all
+	cp -r $(DOL_TARGET) wii/pkg/boot.dol
+
+clean:
+	rm -f $(DOL_TARGET)
+	rm -f $(ELF_TARGET)
+	rm -f $(OBJ)
+	$(MAKE) -C $(APP_BOOTER_DIR) clean
+
+.PHONY: clean
+
@@ -0,0 +1,320 @@
+TARGET = retroarch.exe
+JTARGET = tools/retroarch-joyconfig.exe
+
+OBJ = frontend/frontend.o \
+		retroarch.o \
+		file.o \
+		file_path.o \
+		driver.o \
+		conf/config_file.o \
+		settings.o \
+		hash.o \
+		dynamic.o \
+		dynamic_dummy.o \
+		message.o \
+		rewind.o \
+		movie.o \
+		gfx/gfx_common.o \
+		input/input_common.o \
+		core_options.o \
+		patch.o \
+		compat/compat.o \
+		screenshot.o \
+		cheats.o \
+		audio/utils.o \
+		input/overlay.o \
+		fifo_buffer.o \
+		media/rarch.o \
+		gfx/scaler/scaler.o \
+		gfx/scaler/pixconv.o \
+		gfx/scaler/scaler_int.o \
+		gfx/scaler/filter.o \
+		gfx/state_tracker.o \
+		gfx/shader_parse.o \
+		gfx/fonts/fonts.o \
+		gfx/fonts/bitmapfont.o \
+		gfx/image.o \
+		audio/resampler.o \
+		audio/sinc.o \
+		performance.o
+
+JOBJ := conf/config_file.o \
+	tools/retroarch-joyconfig.o \
+	compat/compat.o \
+	file_path.o \
+	tools/input_common_joyconfig.o \
+	input/dinput.o
+
+CC = gcc
+CXX = g++
+WINDRES = windres
+
+HAVE_DINPUT = 1
+HAVE_XAUDIO = 1
+HAVE_DSOUND = 1
+HAVE_OPENGL = 1
+HAVE_DYLIB = 1
+HAVE_D3D9 = 1
+HAVE_NETPLAY = 1
+HAVE_STDIN_CMD = 1
+HAVE_THREADS = 1
+HAVE_RGUI = 1
+DYNAMIC = 1
+
+ifeq ($(SLIM),)
+   HAVE_SDL = 1
+   HAVE_SDL_IMAGE = 1
+   HAVE_LIBXML2 = 1
+   HAVE_FREETYPE = 1
+   HAVE_ZLIB = 1
+   HAVE_RSOUND = 1
+   HAVE_FBO = 1
+   HAVE_CG = 1
+   HAVE_PYTHON = 1
+   HAVE_FFMPEG = 1
+endif
+
+libretro ?= -lretro
+
+LIBS = -lm
+DEFINES = -I. -DHAVE_SCREENSHOTS -DHAVE_BSV_MOVIE -DPACKAGE_VERSION=\"0.9.9\"
+LDFLAGS = -L. -static-libgcc
+
+ifeq ($(TDM_GCC),)
+   LDCXXFLAGS += -static-libstdc++
+endif
+
+ifeq ($(SCALER_NO_SIMD), 1)
+   DEFINES += -DSCALER_NO_SIMD
+endif
+
+ifeq ($(PERF_TEST), 1)
+   DEFINES += -DPERF_TEST
+endif
+
+JLIBS =
+
+ifeq ($(HAVE_RGUI), 1)
+   DEFINES += -DHAVE_RGUI
+   OBJ += frontend/menu/menu_common.o frontend/menu/rgui.o frontend/menu/history.o
+endif
+
+ifeq ($(HAVE_SDL), 1)
+   OBJ += gfx/sdl_gfx.o gfx/context/sdl_ctx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o
+   JOBJ += input/sdl_joypad.o
+   LIBS += -lSDL
+   JLIBS += -lSDL
+   DEFINES += -ISDL -DHAVE_SDL
+endif
+
+ifeq ($(HAVE_THREADS), 1)
+   OBJ += autosave.o thread.o gfx/thread_wrapper.o
+   DEFINES += -DHAVE_THREADS
+endif
+
+ifeq ($(HAVE_OPENGL), 1)
+   OBJ += gfx/gl.o gfx/math/matrix.o gfx/fonts/gl_font.o gfx/fonts/gl_raster_font.o gfx/gfx_context.o gfx/context/wgl_ctx.o gfx/shader_glsl.o 
+   DEFINES += -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_GLSL -DHAVE_GL_SYNC
+   LIBS += -lopengl32 -lgdi32
+endif
+
+ifeq ($(HAVE_SDL_IMAGE), 1)
+   LIBS += -lSDL_image
+   DEFINES += -DHAVE_SDL_IMAGE
+endif
+
+ifeq ($(HAVE_CG), 1)
+   OBJ += gfx/shader_cg.o
+   LIBS += -lcg -lcgGL
+   DEFINES += -DHAVE_CG
+else
+   HAVE_D3D9 = 0
+endif
+
+ifeq ($(HAVE_D3D9), 1)
+   OBJ += gfx/d3d9/d3d9.o gfx/d3d9/render_chain.o
+   DEFINES += -DHAVE_WIN32_D3D9
+   LIBS += -ld3d9 -lcg -lcgD3D9 -ld3dx9 -ldxguid
+endif
+
+ifeq ($(HAVE_XAUDIO), 1)
+   OBJ += audio/xaudio.o audio/xaudio-c/xaudio-c.o
+   DEFINES += -DHAVE_XAUDIO
+   LIBS += -lole32
+endif
+
+ifeq ($(HAVE_DSOUND), 1)
+   OBJ += audio/dsound.o
+   DEFINES += -DHAVE_DSOUND
+   LIBS += -ldxguid -ldsound
+endif
+
+ifeq ($(HAVE_RSOUND), 1)
+   OBJ += audio/rsound.o
+   DEFINES += -DHAVE_RSOUND
+   LIBS += -lrsound
+endif
+
+ifeq ($(HAVE_ZLIB), 1)
+   OBJ += gfx/rpng/rpng.o file_extract.o
+   DEFINES += -DHAVE_ZLIB
+   ifeq ($(WANT_MINIZ), 1)
+      OBJ += deps/miniz/miniz.o
+      DEFINES += -DWANT_MINIZ
+   else
+      LIBS += -lz
+      DEFINES += -DHAVE_ZLIB_DEFLATE
+   endif
+endif
+
+ifeq ($(HAVE_LIBXML2), 1)
+   DEFINES += -Ilibxml2 -DHAVE_LIBXML2 -DHAVE_GLSL
+   LIBS += -lxml2 -liconv
+else
+   OBJ += compat/rxml/rxml.o
+endif
+
+ifeq ($(HAVE_DYLIB), 1)
+   DEFINES += -DHAVE_DYLIB
+endif
+
+ifeq ($(HAVE_STDIN_CMD), 1)
+   DEFINES += -DHAVE_COMMAND -DHAVE_STDIN_CMD
+   OBJ += command.o
+endif
+
+ifeq ($(HAVE_NETPLAY), 1)
+   DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD
+   OBJ += netplay.o
+   LIBS += -lws2_32
+endif
+
+ifeq ($(HAVE_FREETYPE), 1)
+   OBJ += gfx/fonts/freetype.o
+   DEFINES += -DHAVE_FREETYPE -Ifreetype2
+   LIBS += -lfreetype -lz
+endif
+
+ifeq ($(DYNAMIC), 1)
+   DEFINES += -DHAVE_DYNAMIC
+else
+   LIBS += $(libretro)
+endif
+
+ifeq ($(HAVE_FBO), 1)
+   DEFINES += -DHAVE_FBO
+endif
+
+ifeq ($(HAVE_PYTHON), 1)
+   LIBS += -lpython32
+   DEFINES += -DHAVE_PYTHON -Ipython
+   OBJ += gfx/py_state/py_state.o
+endif
+
+ifeq ($(HAVE_DINPUT), 1)
+   LIBS += -ldinput8 -ldxguid -lole32
+   DEFINES += -DHAVE_DINPUT
+   OBJ += input/dinput.o
+endif
+
+ifeq ($(HAVE_FFMPEG), 1)
+   LIBS += -lavformat -lavcodec -lavutil -lswscale -lws2_32 -lz
+   DEFINES += -DHAVE_FFMPEG -Iffmpeg
+   OBJ += record/ffemu.o
+endif
+
+ifneq ($(V), 1)
+   Q := @
+endif
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+   CXXFLAGS += -O0 -g
+else
+   CFLAGS += -O3 -ffast-math
+   CXXFLAGS += -O3 -ffast-math
+   LDCXXFLAGS += -s
+endif
+
+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++0x -xc++ -D__STDC_CONSTANT_MACROS
+else
+   CFLAGS += -std=gnu99
+endif
+
+all: $(TARGET) $(JTARGET)
+
+$(TARGET): $(OBJ)
+	@$(if $(Q), $(shell echo echo LD $@),)
+	$(Q)$(CXX) -o $@ $(OBJ) $(LIBS) $(LDFLAGS) $(LDCXXFLAGS)
+
+%.o: %.c
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
+
+tools/input_common_joyconfig.o: input/input_common.c
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -DIS_JOYCONFIG -c -o $@ $<
+
+%.o: %.cpp
+	@$(if $(Q), $(shell echo echo CXX $<),)
+	$(Q)$(CXX) $(CXXFLAGS) $(DEFINES) -c -o $@ $<
+
+%.o: %.rc
+	@$(if $(Q), $(shell echo echo WINDRES $<),)
+	$(Q)$(WINDRES) -o $@ $<
+
+$(JTARGET): $(JOBJ)
+	@$(if $(Q), $(shell echo echo LD $@),)
+ifeq ($(CXX_BUILD), 1)
+	$(Q)$(CXX) -o $@ $(JOBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JLIBS)
+else
+	$(Q)$(CC) -o $@ $(JOBJ) -ldxguid -ldinput8 -lole32 $(LDFLAGS) $(JLIBS)
+endif
+
+clean:
+	rm -f *.o
+	rm -f deps/miniz/*.o
+	rm -f frontend/*.o
+	rm -f frontend/menu/*.o
+	rm -f audio/*.o
+	rm -f audio/xaudio-c/*.o
+	rm -f compat/*.o
+	rm -f compat/rxml/*.o
+	rm -f conf/*.o
+	rm -f gfx/scaler/*.o
+	rm -f gfx/*.o
+	rm -f gfx/d3d9/*.o
+	rm -f gfx/context/*.o
+	rm -f gfx/math/*.o
+	rm -f gfx/fonts/*.o
+	rm -f gfx/py_state/*.o
+	rm -f gfx/rpng/*.o
+	rm -f record/*.o
+	rm -f input/*.o
+	rm -f $(TARGET)
+	rm -f retroarch-joyconfig.exe
+	rm -f tools/*.o
+
+dist_x86: all
+	zip -r retroarch-win32-0.9.9.zip $(TARGET) $(JTARGET) retroarch.cfg
+
+dist_x86_64: all
+	zip -r retroarch-win64-0.9.9.zip $(TARGET) $(JTARGET) retroarch.cfg
+
+libs_x86:
+	wget https://github.com/downloads/Themaister/RetroArch/RetroArch-win32-libs.zip --no-check-certificate
+	unzip RetroArch-win32-libs.zip
+	wget https://github.com/downloads/Themaister/RetroArch/RetroArch-win32-headers.zip --no-check-certificate
+	unzip RetroArch-win32-headers.zip
+
+libs_x86_64:
+	wget https://github.com/downloads/Themaister/RetroArch/RetroArch-win64-libs.zip --no-check-certificate
+	unzip RetroArch-win64-libs.zip
+	wget https://github.com/downloads/Themaister/RetroArch/RetroArch-win64-headers.zip --no-check-certificate
+	unzip RetroArch-win64-headers.zip
+
+.PHONY: all install uninstall clean dist_x86 dist_x86_64 libs_x86 libs_x86_64
+
@@ -1,108 +0,0 @@
-TARGET = ssnes.exe
-JTARGET = ssnes-joyconfig.exe
-OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o dynamic.o message.o rewind.o movie.o
-JOBJ = conf/config_file.o tools/main-stub.o tools/ssnes-joyconfig.o
-
-CC = gcc
-CXX = g++
-
-HAVE_SRC = 0
-HAVE_SDL = 1
-HAVE_XML = 1
-HAVE_FREETYPE = 1
-HAVE_XAUDIO = 1
-HAVE_RSOUND = 1
-libsnes ?= -lsnes
-
-LIBS =
-DEFINES = -I. -DHAVE_CONFIGFILE
-LDFLAGS = -L. -static-libgcc -s
-
-SRC_LIBS = -lsamplerate-0
-SDL_LIBS = -lSDL
-SDL_CFLAGS = -ISDL
-
-ifeq ($(HAVE_SRC), 1)
-   LIBS += $(SRC_LIBS)
-   DEFINES += $(SRC_CFLAGS) -DHAVE_SRC
-else
-   OBJ += audio/hermite.o
-endif
-
-ifeq ($(HAVE_SDL), 1)
-   OBJ += gfx/gl.o input/sdl.o audio/sdl.o audio/buffer.o
-   LIBS += $(SDL_LIBS) -lopengl32
-   DEFINES += $(SDL_CFLAGS) -DHAVE_SDL
-endif
-
-ifeq ($(HAVE_XAUDIO), 1)
-   OBJ += audio/xaudio.o
-   DEFINES += -DHAVE_XAUDIO
-endif
-
-ifeq ($(HAVE_RSOUND), 1)
-   OBJ += audio/rsound.o
-   DEFINES += -DHAVE_RSOUND
-   LIBS += -lrsound
-endif
-
-ifeq ($(HAVE_XML), 1)
-   OBJ += gfx/shader_glsl.o
-   DEFINES += $(XML_CFLAGS) -DHAVE_XML
-   LIBS += -lxml2
-endif
-
-ifeq ($(HAVE_FREETYPE), 1)
-   OBJ += gfx/fonts.o
-   DEFINES += -DHAVE_FREETYPE -Ifreetype2
-   LIBS += -lz -lfreetype6
-endif
-
-ifeq ($(DYNAMIC), 1)
-   DEFINES += -DHAVE_DYNAMIC
-else
-   LIBS += $(libsnes)
-endif
-
-ifneq ($(V),1)
-   Q := @
-endif
-
-
-CFLAGS = -Wall -O3 -std=gnu99 -I.
-
-all: $(TARGET) $(JTARGET)
-
-$(TARGET): $(OBJ)
-	$(Q)$(CXX) -o $@ $(OBJ) $(LIBS) $(LDFLAGS)
-	@$(if $(Q), $(shell echo echo LD $@),)
-
-%.o: %.c
-	$(Q)$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
-	@$(if $(Q), $(shell echo echo CC $<),)
-
-$(JTARGET): $(JOBJ)
-	$(Q)$(CC) -o $@ $(JOBJ) $(SDL_LIBS) $(LDFLAGS)
-	@$(if $(Q), $(shell echo echo LD $@),)
-
-clean:
-	rm -f *.o 
-	rm -f audio/*.o
-	rm -f conf/*.o
-	rm -f gfx/*.o
-	rm -f record/*.o
-	rm -f hqflt/*.o
-	rm -f input/*.o
-	rm -f hqflt/snes_ntsc/*.o
-	rm -f $(TARGET)
-	rm -f ssnes-joyconfig.exe
-	rm -f tools/*.o
-
-dist: all
-	zip -r ssnes-win32-0.2.2.zip $(TARGET) ssnes.cfg snes.dll libxml2.dll iconv.dll zlib1.dll SDL.dll libsamplerate-0.dll freetype6.dll xaudio-c.dll rsound.dll pthreadGC2.dll README.win32.txt $(JTARGET)
-
-libs:
-	wget https://github.com/downloads/Themaister/SSNES/SSNES-win32-libs.zip --no-check-certificate
-	unzip SSNES-win32-libs.zip
-
-.PHONY: all install uninstall clean dist libs
@@ -0,0 +1,49 @@
+RARCH_VERSION		= "0.9.9"
+
+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 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -DRARCH_CONSOLE -DHAVE_THREADS -DHAVE_GETOPT_LONG=1 -DHAVE_GRIFFIN
+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
@@ -1,32 +1,63 @@
-# SSNES
+# RetroArch

-SSNES is a simple frontend for the libsnes library.
+RetroArch (formerly known as SSNES) is a simple frontend for the libretro API. An API that attempts to generalize
+a retro gaming system, such as SNES, NES, GameBoy, Arcade machines, etc.
+Emulator/game cores are instantiated as loadable plugins.

-# libsnes
+# libretro

-libsnes is the emulator core of [bSNES](http://www.byuu.org), the most accurate SNES emulator to date, in library form. The libsnes API has been implemented by SNES9x as well, allowing multiple different cores to be used for an emulator that supports libsnes.
-This enables the possibility of custom front-ends for the emulator.
+libretro is an API that exposes the core of a retro gaming system.
+A frontend for libretro handles video output, audio output and input.
+A libretro core written in portable C or C++ can run seamlessly on many platforms.
+
+[libretro API header](https://github.com/Themaister/RetroArch/blob/master/libretro.h)
+
+# Binaries
+
+Latest Windows binaries are currently hosted on my [homepage](http://themaister.net/retroarch.html).
+
+# Related projects
+
+   - GUI frontend for PC: [RetroArch-Phoenix](https://github.com/Themaister/RetroArch-Phoenix)
+   - Cg/HLSL shaders: [common-shaders](https://github.com/twinaphex/common-shaders)
+   - More Cg shaders: [Emulator-Shader-Pack](https://github.com/Themaister/Emulator-Shader-Pack)
+   - Helper scripts to build libretro implementations: [libretro-super](https://github.com/libretro/libretro-super)

 # Philosophy

-SSNES attempts to be very small and lean, while still having all the useful core features expected from an emulator. 
-It is used through command-line.
+RetroArch attempts to be very small and lean,
+while still having all the useful core features expected from an emulator. 
+It is used through command-line. It is also designed to be portable.

-# Dependencies
+# Platforms

-SSNES requires these libraries to build:
+RetroArch has been ported to the following platforms outside PC:

-   - [libsnes](http://byuu.org/bsnes/)
-   - SDL
+   - PlayStation3
+   - Xbox 360 (Libxenon/XeXDK)
+   - Xbox 1
+   - Wii, Gamecube (Libogc)
+   - Raspberry Pi
+   - Android
+   - iOS
+   - Blackberry

-SSNES can utilize these libraries if enabled:
+# Dependencies (PC)
+
+On Windows, RetroArch can run with only Win32 as dependency. On Linux, you need:
+
+   - GL headers
+   - X11 headers and libs, or EGL/KMS/GBM
+
+OSX port of RetroArch still requires SDL 1.2 libraries.
+
+RetroArch can utilize these libraries if enabled:

   - nvidia-cg-toolkit
-   - libxml2 (bSNES XML shaders)
+   - libxml2 (GLSL XML shaders)
   - libfreetype2 (TTF font rendering on screen)
-   - libsamplerate

-SSNES needs at least one of these audio driver libraries:
+RetroArch needs at least one of these audio driver libraries:

   - ALSA
   - OSS
@@ -35,63 +66,98 @@ SSNES needs at least one of these audio driver libraries:
   - OpenAL
   - JACK
   - SDL
-   - XAudio2 (Win32)
   - PulseAudio
+   - XAudio2 (Win32, Xbox 360)
+   - DirectSound (Win32, Xbox 1)
+   - CoreAudio (OSX, iOS)

-# Building libsnes
+To run properly, RetroArch requires a libretro implementation present, however, as it's typically loaded
+dynamically, it's not required at build time.

-   - Download bSNES source (link over).
-   - Add -fPIC to flags in Makefile.
-   - <tt>$ make library profile=performance</tt> (accuracy, compatibility are the other profiles. compatibility is a great choice for decent PCs. :D)
-   - <tt># make prefix=/usr library-install</tt>
-   - <tt># cp snes/libsnes/libsnes.hpp /usr/include/</tt>
-   - ?!?!
-   - Profit!
+# Dependencies (Console ports, mobile)
+
+Console ports have their own dependencies, but generally do not require
+anything other than what the respective SDKs provide.

 # Configuring

 The default configuration is defined in config.def.h. 
-These can later be tweaked by using the ssnes config file. 
-A sample configuration file is installed to /etc/ssnes.cfg. 
+These can later be tweaked by using a config file. 
+A sample configuration file is installed to /etc/retroarch.cfg. 
 This is the system-wide config file. 
-Each user should create a config file in $XDG\_CONFIG\_HOME/ssnes/ssnes.cfg.
+Each user should create a config file in $XDG\_CONFIG\_HOME/retroarch/retroarch.cfg.
 The users only need to configure a certain option if the desired value deviates from the value defined in config.def.h.

-To configure joypads, start up <tt>jstest /dev/input/js0</tt> to determine which joypad buttons (and axis) to use. It is also possible to use the <tt>ssnes-joyconfig</tt> tool as well for simple configuration.
+To configure joypads, use the <tt>retroarch-joyconfig</tt> tool.
+It is also possible to configure joypads using the RetroArch-Phoenix GUI frontend.

 # Compiling and installing

-<b>Linux/Unix</b><br/>
-As most packages, SSNES is built using the standard <tt>./configure && make && make install</tt>
-Do note that the build system is not autotools based, but resembles it.
+<b>PC</b><br/>
+Instructions for compiling on PC can be found in the [wiki](https://github.com/Themaister/RetroArch/wiki).

-Notable options for ./configure: 
--with-libsnes=: Normally libsnes is located with -lsnes, however, this can be overridden.
--enable-dynamic: Do not link to libsnes at compile time, but load libsnes dynamically at runtime. libsnes\_path in config file defines which library to load. Useful for development.
+<b>PlayStation3</b><br/>

-Do note that these two options are mutually exclusive.
+RetroArch PS3 needs to be compiled in the following order:

-<b>Win32</b><br/>
-It is possible with MinGW to compile for Windows in either msys or Linux/Unix based systems. Do note that Windows build uses a static Makefile since configuration scripts create more harm than good on this platform. Libraries, headers, etc, needed to compile and run SSNES can be fetched with a Makefile target.
+1) Compile RetroArch Salamander

-In Linux/Unix:<br/>
-<tt>make -f Makefile.win32 libs</tt></br>
-<tt>make -f Makefile.win32 CC=i486-mingw32-gcc CXX=i486-mingw32-g++</tt></br>
+<tt>make -f Makefile.ps3.salamander</tt>

-In MSYS:
-<tt>mingw32-make -f Makefile.win32 libs</tt>. # You will need to have wget in your patch for this command! MSYS should provide this.</br>
-<tt>mingw32-make -f Makefile.win32</tt>
+2) Compile the RGL video driver

+<tt>make -f Makefile.ps3.rgl</tt>

+3) Compile RetroArch as a library

-# Filters, bSNES XML shaders and Cg shader support
+<tt>make -f Makefile.ps3.retroarch</tt>

-This is not strictly not necessary for an emulator, but it can be enabled if desired. 
-For best performance, Cg shaders or bSNES XML shaders are recommended as they do not eat up valuable CPU time (assuming your GPU can handle the shaders). 
-Cg shaders and XML shaders (GLSL) are compiled at run-time.
-All shaders share a common interface to pass some essential arguments such as texture size and viewport size. (Common for pixel art scalers)
-Some Cg shaders are included in hqflt/cg/ and could be used as an example.
-bSNES XML shaders can be found on various places on the net. Best place to start looking are the bSNES forums.
+4) Finally, compile RetroArch packed together with the GUI:

-The Cg shaders closely resemble the GLSL shaders found in bSNES shader pack, so porting them is trivial if desired.
+<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>.

@@ -1,39 +0,0 @@
-===================================================
-   SSNES - Simple Super Nintendo Emulator System
-===================================================
-
-SSNES is a simplistic emulator frontend designed for use without any GUI. 
-It is used from command line, but is designed to play well with eventual GUI frontends, 
-as the configuration file format is very simple.
-
-This allows for great portability and focus on what matters in a frontend, such as video and audio performance.
-Its core libraries for video and input are OpenGL and SDL, with many different audio library supported.
-
-On first use you should get accustomed to how SSNES works.
-
-  SSNES emphasizes simplicity. It has no graphical user interface, and is primarily used through the command line.
-   It is recommended for experienced users.
-   It is possible though to create a GUI which can use SSNES.
-
-  SSNES isn't dependant on any emulator core, such as bSNES, SNES9x or ZSNES. 
-   SSNES only talks to the libsnes interface, 
-   which was created initially by bSNES but it has an implementation available for SNES9x as well.
-
-  SSNES is configured through a config file. In the Win32 distribution, there should be a ssnes.cfg included.
-   This config file serves as a base for your custom configuration file.
-   It is recommended that you go through the config file and alter any configurations you might use.
-   This is a good way to learn about the features SSNES have.
-   It is possible to pick which configuration file you want with the '-c' flag. 
-   E.g.: ssnes.exe -c myconfig.cfg rom.sfc.
-   
-  When unsure which command line flags to use, use the command: ssnes.exe --help.
-
-  When something is not working as expected, try using verbose logging first to see what is happening: 
-   E.g.: ssnes.exe -v romfile.sfc
-   If something is not working, and you want to file a bug report, 
-   please include console output with the -v flag turned on.
-
-  SSNES does not support zipped roms directly. It only supports roms with extentions .sfc and .smc.
-   However, SSNES can read roms from stdin, 
-   which makes it possible to create wrapper programs that can support every zip format under the sun.
-   This can also be performed by a GUI frontend.
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<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.app.NativeActivity</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,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BEGIN_INCLUDE(manifest) -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.retroarch.retroarch"
+        android:versionCode="1"
+        android:versionName="1.0">
+
+    <!-- This is the platform API where NativeActivity was introduced. -->
+    <uses-sdk android:minSdkVersion="9" />
+
+    <!-- This .apk has no Java code itself, so set hasCode to false. -->
+    <application android:label="@string/app_name" android:hasCode="false">
+
+        <!-- Our activity is the built-in NativeActivity framework class.
+             This will take care of integrating with our NDK code. -->
+        <activity android:name="android.app.NativeActivity"
+                android:label="@string/app_name"
+                android:configChanges="orientation|keyboardHidden">
+            <!-- Tell NativeActivity the name of or .so -->
+            <meta-data android:name="android.app.lib_name"
+                    android:value="retroarch" />
+            <meta-data android:name="android.app.func_name"
+                    android:value="ANativeActivity_onCreate" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest> 
+<!-- END_INCLUDE(manifest) -->
@@ -0,0 +1,58 @@
+RARCH_VERSION		= "0.9.9"
+LOCAL_PATH := $(call my-dir)
+PERF_TEST := 0
+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 += -DHAVE_NEON
+LOCAL_SRC_FILES += ../../../audio/utils_neon.S.neon
+endif
+
+ifeq ($(HAVE_NEON),1)
+LOCAL_SRC_FILES += ../../../audio/sinc_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
+
+RARCH_PATH  := ../../..
+LOCAL_SRC_FILES  +=	$(RARCH_PATH)/griffin/griffin.c
+
+ifeq ($(HAVE_LOGGER), 1)
+LOCAL_CFLAGS += -DHAVE_LOGGER
+LOGGER_LDLIBS := -llog
+endif
+
+ifeq ($(PERF_TEST), 1)
+LOCAL_CFLAGS += -DPERF_TEST
+endif
+
+LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_RGUI -DHAVE_SCREENSHOTS -DWANT_MINIZ -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 -I../../../deps/miniz
+
+LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 $(LOGGER_LDLIBS) -ldl
+
+LOCAL_CFLAGS += -DHAVE_SL
+LOCAL_LDLIBS += -lOpenSLES
+
+include $(BUILD_SHARED_LIBRARY)
@@ -0,0 +1,2 @@
+APP_PLATFORM := android-9
+APP_ABI := all
@@ -0,0 +1,510 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/* ChangeLog for this library:
+ *
+ * NDK r7c: Fix CPU count computation. The old method only reported the
+ *           number of _active_ CPUs when the library was initialized,
+ *           which could be less than the real total.
+ *
+ * NDK r5: Handle buggy kernels which report a CPU Architecture number of 7
+ *         for an ARMv6 CPU (see below).
+ *
+ *         Handle kernels that only report 'neon', and not 'vfpv3'
+ *         (VFPv3 is mandated by the ARM architecture is Neon is implemented)
+ *
+ *         Handle kernels that only report 'vfpv3d16', and not 'vfpv3'
+ *
+ *         Fix x86 compilation. Report ANDROID_CPU_FAMILY_X86 in
+ *         android_getCpuFamily().
+ *
+ * NDK r4: Initial release
+ */
+#include <sys/system_properties.h>
+#ifdef __arm__
+#include <machine/cpu-features.h>
+#endif
+#include <pthread.h>
+#include "cpufeatures.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <errno.h>
+
+static  pthread_once_t     g_once;
+static  AndroidCpuFamily   g_cpuFamily;
+static  uint64_t           g_cpuFeatures;
+static  int                g_cpuCount;
+
+#ifdef __arm__
+#  define DEFAULT_CPU_FAMILY  ANDROID_CPU_FAMILY_ARM
+#elif defined __i386__
+#  define DEFAULT_CPU_FAMILY  ANDROID_CPU_FAMILY_X86
+#else
+#  define DEFAULT_CPU_FAMILY  ANDROID_CPU_FAMILY_UNKNOWN
+#endif
+
+#ifdef __i386__
+static __inline__ void cpu_x86_cpuid(int func, int values[4])
+{
+    int a, b, c, d;
+    /* We need to preserve ebx since we're compiling PIC code */
+    /* this means we can't use "=b" for the second output register */
+    __asm__ __volatile__ ( \
+      "push %%ebx\n"
+      "cpuid\n" \
+      "mov %1, %%ebx\n"
+      "pop %%ebx\n"
+      : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
+      : "a" (func) \
+    );
+    values[0] = a;
+    values[1] = b;
+    values[2] = c;
+    values[3] = d;
+}
+#endif
+
+/* Read the content of /proc/cpuinfo into a user-provided buffer.
+ * Return the length of the data, or -1 on error. Does *not*
+ * zero-terminate the content. Will not read more
+ * than 'buffsize' bytes.
+ */
+static int
+cpu_read_file(const char*  pathname, char*  buffer, size_t  buffsize)
+{
+    int  fd, len;
+
+    fd = open(pathname, O_RDONLY);
+    if (fd < 0)
+        return -1;
+
+    do {
+        len = read(fd, buffer, buffsize);
+    } while (len < 0 && errno == EINTR);
+
+    close(fd);
+
+    return len;
+}
+
+/* Extract the content of a the first occurence of a given field in
+ * the content of /proc/cpuinfo and return it as a heap-allocated
+ * string that must be freed by the caller.
+ *
+ * Return NULL if not found
+ */
+static char*
+extract_cpuinfo_field(char* buffer, int buflen, const char* field)
+{
+   int  fieldlen = strlen(field);
+   char* bufend = buffer + buflen;
+   char* result = NULL;
+   int len;
+   const char *p, *q;
+
+   /* Look for first field occurence, and ensures it starts the line.
+   */
+   p = buffer;
+   bufend = buffer + buflen;
+   for (;;)
+   {
+      p = memmem(p, bufend-p, field, fieldlen);
+      if (p == NULL)
+         goto EXIT;
+
+      if (p == buffer || p[-1] == '\n')
+         break;
+
+      p += fieldlen;
+   }
+
+   /* Skip to the first column followed by a space */
+   p += fieldlen;
+   p  = memchr(p, ':', bufend-p);
+   if (p == NULL || p[1] != ' ')
+      goto EXIT;
+
+   /* Find the end of the line */
+   p += 2;
+   q = memchr(p, '\n', bufend-p);
+   if (q == NULL)
+      q = bufend;
+
+   /* Copy the line into a heap-allocated buffer */
+   len = q-p;
+   result = malloc(len+1);
+   if (result == NULL)
+      goto EXIT;
+
+   memcpy(result, p, len);
+   result[len] = '\0';
+
+EXIT:
+   return result;
+}
+
+/* Checks that a space-separated list of items contains one given 'item'.
+ * Returns 1 if found, 0 otherwise.
+ */
+static int
+has_list_item(const char* list, const char* item)
+{
+    const char*  p = list;
+    int itemlen = strlen(item);
+
+    if (list == NULL)
+        return 0;
+
+    while (*p)
+    {
+        const char*  q;
+
+        /* skip spaces */
+        while (*p == ' ' || *p == '\t')
+            p++;
+
+        /* find end of current list item */
+        q = p;
+        while (*q && *q != ' ' && *q != '\t')
+            q++;
+
+        if (itemlen == q-p && !memcmp(p, item, itemlen))
+            return 1;
+
+        /* skip to next item */
+        p = q;
+    }
+    return 0;
+}
+
+/* Parse an decimal integer starting from 'input', but not going further
+ * than 'limit'. Return the value into '*result'.
+ *
+ * NOTE: Does not skip over leading spaces, or deal with sign characters.
+ * NOTE: Ignores overflows.
+ *
+ * The function returns NULL in case of error (bad format), or the new
+ * position after the decimal number in case of success (which will always
+ * be <= 'limit').
+ */
+static const char*
+parse_decimal(const char* input, const char* limit, int* result)
+{
+    const char* p = input;
+    int val = 0;
+    while (p < limit)
+    {
+        int d = (*p - '0');
+        if ((unsigned)d >= 10U)
+            break;
+        val = val*10 + d;
+        p++;
+    }
+    if (p == input)
+        return NULL;
+
+    *result = val;
+    return p;
+}
+
+/* This small data type is used to represent a CPU list / mask, as read
+ * from sysfs on Linux. See http://www.kernel.org/doc/Documentation/cputopology.txt
+ *
+ * For now, we don't expect more than 32 cores on mobile devices, so keep
+ * everything simple.
+ */
+typedef struct {
+    uint32_t mask;
+} CpuList;
+
+/* Parse a textual list of cpus and store the result inside a CpuList object.
+ * Input format is the following:
+ * - comma-separated list of items (no spaces)
+ * - each item is either a single decimal number (cpu index), or a range made
+ *   of two numbers separated by a single dash (-). Ranges are inclusive.
+ *
+ * Examples:   0
+ *             2,4-127,128-143
+ *             0-1
+ */
+static void cpulist_parse(CpuList* list, const char* line, int line_len)
+{
+   const char* p = line;
+   const char* end = p + line_len;
+   const char* q;
+
+   /* NOTE: the input line coming from sysfs typically contains a
+    * trailing newline, so take care of it in the code below
+    */
+   while (p < end && *p != '\n')
+   {
+      int val, start_value, end_value;
+
+      /* Find the end of current item, and put it into 'q' */
+      q = memchr(p, ',', end-p);
+      if (q == NULL)
+         q = end;
+
+      /* Get first value */
+      p = parse_decimal(p, q, &start_value);
+      if (p == NULL)
+         goto BAD_FORMAT;
+
+      end_value = start_value;
+
+      /* If we're not at the end of the item, expect a dash and
+       * and integer; extract end value.
+       */
+      if (p < q && *p == '-')
+      {
+         p = parse_decimal(p+1, q, &end_value);
+         if (p == NULL)
+            goto BAD_FORMAT;
+      }
+
+      /* Set bits CPU list bits */
+      for (val = start_value; val <= end_value; val++)
+      {
+         if ((unsigned)val < 32)
+            list->mask |= (uint32_t)(1U << val);
+      }
+
+      /* Jump to next item */
+      p = q;
+      if (p < end)
+         p++;
+   }
+
+BAD_FORMAT:
+   ;
+}
+
+/* Read a CPU list from one sysfs file */
+static void
+cpulist_read_from(CpuList* list, const char* filename)
+{
+   char   file[64];
+   int    filelen;
+
+   list->mask = 0;
+
+   filelen = cpu_read_file(filename, file, sizeof file);
+
+   if (filelen < 0)
+   {
+      RARCH_ERR("Could not read %s: %s\n", filename, strerror(errno));
+      return;
+   }
+
+   cpulist_parse(list, file, filelen);
+}
+
+/* Return the number of cpus present on a given device.
+ *
+ * To handle all weird kernel configurations, we need to compute the
+ * intersection of the 'present' and 'possible' CPU lists and count
+ * the result.
+ */
+static int get_cpu_count(void)
+{
+   CpuList cpus_present[1];
+   CpuList cpus_possible[1];
+
+   cpulist_read_from(cpus_present, "/sys/devices/system/cpu/present");
+   cpulist_read_from(cpus_possible, "/sys/devices/system/cpu/possible");
+
+   /* Compute the intersection of both sets to get the actual number of
+    * CPU cores that can be used on this device by the kernel.
+    */
+   cpus_present->mask &= cpus_possible->mask;
+
+   return __builtin_popcount(cpus_present->mask);
+}
+
+static void android_cpuInit(void)
+{
+   char cpuinfo[4096];
+   int  cpuinfo_len;
+
+   g_cpuFamily   = DEFAULT_CPU_FAMILY;
+   g_cpuFeatures = 0;
+   g_cpuCount    = 1;
+
+   cpuinfo_len = cpu_read_file("/proc/cpuinfo", cpuinfo, sizeof cpuinfo);
+   RARCH_LOG("cpuinfo_len is (%d):\n%.*s\n", cpuinfo_len,
+         cpuinfo_len >= 0 ? cpuinfo_len : 0, cpuinfo);
+
+   if (cpuinfo_len < 0)
+      return;
+
+   /* Count the CPU cores, the value may be 0 for single-core CPUs */
+   g_cpuCount = get_cpu_count();
+   if (g_cpuCount == 0)
+      g_cpuCount = 1;
+
+   RARCH_LOG("found cpuCount = %d\n", g_cpuCount);
+
+#ifdef __ARM_ARCH__
+   /* Extract architecture from the "CPU Architecture" field.
+    * The list is well-known, unlike the the output of
+    * the 'Processor' field which can vary greatly.
+    *
+    * See the definition of the 'proc_arch' array in
+    * $KERNEL/arch/arm/kernel/setup.c and the 'c_show' function in
+    * same file.
+    */
+   char* cpuArch = extract_cpuinfo_field(cpuinfo, cpuinfo_len, "CPU architecture");
+
+   if (cpuArch != NULL)
+   {
+      char*  end;
+      long   archNumber;
+      int    hasARMv7 = 0;
+
+      RARCH_LOG("found cpuArch = '%s'\n", cpuArch);
+
+      /* read the initial decimal number, ignore the rest */
+      archNumber = strtol(cpuArch, &end, 10);
+
+      /* Here we assume that ARMv8 will be upwards compatible with v7
+       * in the future. Unfortunately, there is no 'Features' field to
+       * indicate that Thumb-2 is supported.
+       */
+      if (end > cpuArch && archNumber >= 7)
+         hasARMv7 = 1;
+
+      /* Unfortunately, it seems that certain ARMv6-based CPUs
+       * report an incorrect architecture number of 7!
+       *
+       * See http://code.google.com/p/android/issues/detail?id=10812
+       *
+       * We try to correct this by looking at the 'elf_format'
+       * field reported by the 'Processor' field, which is of the
+       * form of "(v7l)" for an ARMv7-based CPU, and "(v6l)" for
+       * an ARMv6-one.
+       */
+      if (hasARMv7)
+      {
+         char* cpuProc = extract_cpuinfo_field(cpuinfo, cpuinfo_len,
+               "Processor");
+         if (cpuProc != NULL)
+         {
+            RARCH_LOG("found cpuProc = '%s'\n", cpuProc);
+            if (has_list_item(cpuProc, "(v6l)"))
+            {
+               RARCH_ERR("CPU processor and architecture mismatch!!\n");
+               hasARMv7 = 0;
+            }
+            free(cpuProc);
+         }
+      }
+
+      if (hasARMv7)
+         g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_ARMv7;
+
+      /* The LDREX / STREX instructions are available from ARMv6 */
+      if (archNumber >= 6)
+         g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_LDREX_STREX;
+
+      free(cpuArch);
+   }
+
+   /* Extract the list of CPU features from 'Features' field */
+   char* cpuFeatures = extract_cpuinfo_field(cpuinfo, cpuinfo_len, "Features");
+
+   if (cpuFeatures != NULL)
+   {
+      RARCH_LOG("found cpuFeatures = '%s'\n", cpuFeatures);
+
+      if (has_list_item(cpuFeatures, "vfpv3"))
+         g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_VFPv3;
+
+      else if (has_list_item(cpuFeatures, "vfpv3d16"))
+         g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_VFPv3;
+
+      if (has_list_item(cpuFeatures, "neon"))
+      {
+         /* Note: Certain kernels only report neon but not vfpv3
+          *       in their features list. However, ARM mandates
+          *       that if Neon is implemented, so must be VFPv3
+          *       so always set the flag.
+          */
+         g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_NEON |
+            ANDROID_CPU_ARM_FEATURE_VFPv3;
+      }
+      free(cpuFeatures);
+   }
+#endif /* __ARM_ARCH__ */
+
+#ifdef __i386__
+   g_cpuFamily = ANDROID_CPU_FAMILY_X86;
+
+   int regs[4];
+
+   /* According to http://en.wikipedia.org/wiki/CPUID */
+#define VENDOR_INTEL_b  0x756e6547
+#define VENDOR_INTEL_c  0x6c65746e
+#define VENDOR_INTEL_d  0x49656e69
+
+   cpu_x86_cpuid(0, regs);
+   int vendorIsIntel = (regs[1] == VENDOR_INTEL_b &&
+         regs[2] == VENDOR_INTEL_c &&
+         regs[3] == VENDOR_INTEL_d);
+
+   cpu_x86_cpuid(1, regs);
+   if ((regs[2] & (1 << 9)) != 0)
+      g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_SSSE3;
+   if ((regs[2] & (1 << 23)) != 0)
+      g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_POPCNT;
+   if (vendorIsIntel && (regs[2] & (1 << 22)) != 0)
+      g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_MOVBE;
+#endif
+
+#ifdef _MIPS_ARCH
+   g_cpuFamily = ANDROID_CPU_FAMILY_MIPS;
+#endif /* _MIPS_ARCH */
+}
+
+AndroidCpuFamily android_getCpuFamily(void)
+{
+    pthread_once(&g_once, android_cpuInit);
+    return g_cpuFamily;
+}
+
+uint64_t android_getCpuFeatures(void)
+{
+    pthread_once(&g_once, android_cpuInit);
+    return g_cpuFeatures;
+}
+
+int android_getCpuCount(void)
+{
+    pthread_once(&g_once, android_cpuInit);
+    return g_cpuCount;
+}
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#ifndef CPU_FEATURES_H
+#define CPU_FEATURES_H
+
+#include <sys/cdefs.h>
+#include <stdint.h>
+
+typedef enum {
+    ANDROID_CPU_FAMILY_UNKNOWN = 0,
+    ANDROID_CPU_FAMILY_ARM,
+    ANDROID_CPU_FAMILY_X86,
+    ANDROID_CPU_FAMILY_MIPS,
+
+    ANDROID_CPU_FAMILY_MAX  /* do not remove */
+
+} AndroidCpuFamily;
+
+/* Return family of the device's CPU */
+extern AndroidCpuFamily   android_getCpuFamily(void);
+
+enum {
+    ANDROID_CPU_ARM_FEATURE_ARMv7       = (1 << 0),
+    ANDROID_CPU_ARM_FEATURE_VFPv3       = (1 << 1),
+    ANDROID_CPU_ARM_FEATURE_NEON        = (1 << 2),
+    ANDROID_CPU_ARM_FEATURE_LDREX_STREX = (1 << 3),
+};
+
+enum {
+    ANDROID_CPU_X86_FEATURE_SSSE3  = (1 << 0),
+    ANDROID_CPU_X86_FEATURE_POPCNT = (1 << 1),
+    ANDROID_CPU_X86_FEATURE_MOVBE  = (1 << 2),
+};
+
+extern uint64_t    android_getCpuFeatures(void);
+
+/* Return the number of CPU cores detected on this device. */
+extern int         android_getCpuCount(void);
+
+#endif /* CPU_FEATURES_H */
@@ -0,0 +1,220 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2013 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2013 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../../../frontend/frontend_android.h"
+#include "jni_macros.h"
+#include "input_autodetect.h"
+
+static void input_autodetect_get_device_name(void *data, char *buf, size_t size, int id)
+{
+   struct android_app *android_app = (struct android_app*)data;
+   buf[0] = '\0';
+
+   JavaVM *vm = android_app->activity->vm;
+   JNIEnv *env = NULL;
+   (*vm)->AttachCurrentThread(vm, &env, 0);
+
+   jclass input_device_class = NULL;
+   FIND_CLASS(env, input_device_class, "android/view/InputDevice");
+   if (!input_device_class)
+      goto end;
+
+   jmethodID method = NULL;
+   GET_STATIC_METHOD_ID(env, method, input_device_class, "getDevice", "(I)Landroid/view/InputDevice;");
+   if (!method)
+      goto end;
+
+   jobject device = NULL;
+   CALL_OBJ_STATIC_METHOD_PARAM(env, device, input_device_class, method, (jint)id);
+   if (!device)
+   {
+      RARCH_ERR("Failed to find device for ID: %d\n", id);
+      goto end;
+   }
+
+   jmethodID getName = NULL;
+   GET_METHOD_ID(env, getName, input_device_class, "getName", "()Ljava/lang/String;");
+   if (!getName)
+      goto end;
+
+   jobject name = NULL;
+   CALL_OBJ_METHOD(env, name, device, getName);
+   if (!name)
+   {
+      RARCH_ERR("Failed to find name for device ID: %d\n", id);
+      goto end;
+   }
+
+   const char *str = (*env)->GetStringUTFChars(env, name, 0);
+   if (str)
+      strlcpy(buf, str, size);
+   (*env)->ReleaseStringUTFChars(env, name, str);
+
+end:
+   (*vm)->DetachCurrentThread(vm);
+}
+
+void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned port, unsigned id, int source)
+{
+   struct android_app *android_app = (struct android_app*)data;
+ 
+   unsigned device;
+   char name_buf[256];
+   name_buf[0] = 0;
+
+   if (port > MAX_PADS)
+   {
+      snprintf(msg, sizeof_msg, "Max number of pads reached.\n");
+      return;
+   }
+
+   char *current_ime = android_app->current_ime;
+   input_autodetect_get_device_name(android_app, name_buf, sizeof(name_buf), id);
+   RARCH_LOG("device name: %s\n", name_buf);
+
+   if (g_settings.input.autodetect_enable)
+   {
+      device = 0;
+
+      if (strstr(name_buf,"Logitech") && strstr(name_buf, "RumblePad 2"))
+         device = DEVICE_LOGITECH_RUMBLEPAD2;
+      else if (strstr(name_buf, "Logitech") && strstr(name_buf, "Dual Action"))
+         device = DEVICE_LOGITECH_DUAL_ACTION;
+      else if (strstr(name_buf, "shooter-keypad"))
+         device = DEVICE_ICONTROLPAD_BLUEZ_IME;
+      else if (strstr(name_buf, "SEGA VIRTUA STICK High Grade"))
+         device = DEVICE_SEGA_VIRTUA_STICK_HIGH_GRADE;
+      else if (strstr(name_buf, "TTT THT Arcade console 2P USB Play"))
+         device = DEVICE_TTT_THT_ARCADE;
+      else if (strstr(name_buf, "TOMMO NEOGEOX Arcade Stick"))
+         device = DEVICE_TOMMO_NEOGEOX_ARCADE;
+      else if (strstr(name_buf, "MadCatz") && strstr(name_buf, "PC USB Wired Stick"))
+         device = DEVICE_MADCATZ_PC_USB_STICK;
+      else if (strstr(name_buf, "Logicool") && strstr(name_buf, "RumblePad 2"))
+         device = DEVICE_LOGICOOL_RUMBLEPAD2;
+      else if (strstr(name_buf, "Sun4i-keypad"))
+         device = DEVICE_IDROID_X360;
+      else if (strstr(name_buf, "Zeemote") && strstr(name_buf, "Steelseries free"))
+         device = DEVICE_ZEEMOTE_STEELSERIES;
+      else if (strstr(name_buf, "HuiJia  USB GamePad"))
+         device = DEVICE_HUIJIA_USB_SNES;
+      else if (strstr(name_buf, "Smartjoy Family Super Smartjoy 2"))
+         device = DEVICE_SUPER_SMARTJOY;
+      else if (strstr(name_buf, "Jess Tech Dual Analog Rumble Pad"))
+         device = DEVICE_SAITEK_RUMBLE_P480;
+      else if (strstr(name_buf, "Microsoft"))
+      {
+         if (strstr(name_buf, "Dual Strike"))
+            device = DEVICE_MS_SIDEWINDER_DUAL_STRIKE;
+         else if (strstr(name_buf, "SideWinder"))
+            device = DEVICE_MS_SIDEWINDER;
+         else if (strstr(name_buf, "X-Box 360") || strstr(name_buf, "X-Box")
+               || strstr(name_buf, "Xbox 360 Wireless Receiver"))
+            device = DEVICE_MS_XBOX;
+      }
+      else if (strstr(name_buf, "WiseGroup"))
+      {
+         if (strstr(name_buf, "TigerGame") || strstr(name_buf, "Game Controller Adapter")
+               || strstr(name_buf, "JC-PS102U") || strstr(name_buf, "Dual USB Joypad"))
+         {
+            if (strstr(name_buf, "WiseGroup"))
+               device = DEVICE_WISEGROUP_PLAYSTATION2;
+            else if (strstr(name_buf, "JC-PS102U"))
+               device = DEVICE_JCPS102_PLAYSTATION2;
+            else
+               device = DEVICE_GENERIC_PLAYSTATION2_CONVERTER;
+         }
+      }
+      else if (strstr(name_buf, "PLAYSTATION(R)3") || strstr(name_buf, "Dualshock3")
+            || strstr(name_buf,"Sixaxis") ||
+            (strstr(name_buf, "Gamepad 0") || strstr(name_buf, "Gamepad 1") || 
+               strstr(name_buf, "Gamepad 2") || strstr(name_buf, "Gamepad 3")))
+      {
+         if (strstr(name_buf, "Gamepad 0") || strstr(name_buf, "Gamepad 1") || 
+               strstr(name_buf, "Gamepad 2") || strstr(name_buf, "Gamepad 3"))
+            device = DEVICE_PLAYSTATION3_VERSION1;
+         else
+            device = DEVICE_PLAYSTATION3_VERSION2;
+      }
+      else if (strstr(name_buf, "MOGA"))
+         device = DEVICE_MOGA;
+      else if (strstr(name_buf, "Sony Navigation Controller"))
+         device = DEVICE_PSMOVE_NAVI;
+      else if (strstr(name_buf, "OUYA Game Controller"))
+         device = DEVICE_OUYA;
+      else if (strstr(name_buf, "adc joystick"))
+         device = DEVICE_JXD_S7300B;
+      else if (strstr(name_buf, "idroid:con"))
+         device = DEVICE_IDROID_CON;
+      else if (strstr(name_buf, "NYKO PLAYPAD PRO"))
+         device = DEVICE_NYKO_PLAYPAD_PRO;
+      else if (strstr(name_buf, "2-Axis, 8-Button"))
+         device = DEVICE_GENIUS_MAXFIRE_G08XU;
+      else if (strstr(name_buf, "USB,2-axis 8-button gamepad"))
+         device = DEVICE_USB_2_AXIS_8_BUTTON_GAMEPAD;
+      else if (strstr(name_buf, "BUFFALO BGC-FC801"))
+         device = DEVICE_BUFFALO_BGC_FC801;
+      else if (strstr(name_buf, "RetroUSB.com RetroPad"))
+         device = DEVICE_RETROUSB_RETROPAD;
+      else if (strstr(name_buf, "RetroUSB.com SNES RetroPort"))
+         device = DEVICE_RETROUSB_SNES_RETROPORT;
+      else if (strstr(name_buf, "CYPRESS USB"))
+         device = DEVICE_CYPRESS_USB;
+      else if (strstr(name_buf, "Mayflash Wii Classic"))
+         device = DEVICE_MAYFLASH_WII_CLASSIC;
+      else if (strstr(name_buf, "SZMy-power LTD CO.  Dual Box WII"))
+         device = DEVICE_SZMY_POWER_DUAL_BOX_WII;
+      else if (strstr(name_buf, "Toodles 2008 ChImp"))
+         device = DEVICE_TOODLES_2008_CHIMP;
+      else if (strstr(name_buf, "joy_key"))
+         device = DEVICE_ARCHOS_GAMEPAD;
+      else if (strstr(name_buf, "matrix_keyboard"))
+         device = DEVICE_JXD_S5110;
+      else if (strstr(name_buf, "keypad-zeus") || (strstr(name_buf, "keypad-game-zeus")))
+         device = DEVICE_XPERIA_PLAY;
+      else if (strstr(name_buf, "Broadcom Bluetooth HID"))
+         device = DEVICE_BROADCOM_BLUETOOTH_HID;
+      else if (strstr(name_buf, "USB Gamepad"))
+         device = DEVICE_THRUST_PREDATOR;
+      else if (strstr(name_buf, "DragonRise"))
+         device = DEVICE_DRAGONRISE;
+      else if (strstr(name_buf, "Thrustmaster T Mini"))
+         device = DEVICE_THRUSTMASTER_T_MINI;
+      else if (strstr(name_buf, "2Axes 11Keys Game  Pad"))
+         device = DEVICE_TOMEE_NES_USB;
+
+      if (strstr(current_ime, "net.obsidianx.android.mogaime"))
+      {
+         device = DEVICE_MOGA_IME;
+         snprintf(name_buf, sizeof(name_buf), "MOGA IME");
+      }
+      else if (strstr(current_ime, "com.ccpcreations.android.WiiUseAndroid"))
+      {
+         device = DEVICE_CCPCREATIONS_WIIUSE_IME;
+         snprintf(name_buf, sizeof(name_buf), "ccpcreations WiiUse");
+      }
+
+      if (source == AINPUT_SOURCE_KEYBOARD)
+         device = DEVICE_KEYBOARD_RETROPAD;
+
+      if (driver.input->set_keybinds)
+         driver.input->set_keybinds(driver.input_data, device, port, id,
+               (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
+   }
+
+   if (name_buf[0] != 0)
+      snprintf(msg, sizeof_msg, "Port %d: %s.\n", port, name_buf);
+}
@@ -0,0 +1,86 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2013 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2013 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _ANDROID_INPUT_AUTODETECT_H
+#define _ANDROID_INPUT_AUTODETECT_H
+
+#define MAX_PADS 8
+
+#define AKEY_EVENT_NO_ACTION 255
+
+enum {
+   ICADE_PROFILE_RED_SAMURAI = 0,
+   ICADE_PROFILE_IPEGA_PG9017,
+   ICADE_PROFILE_GAMESTOP_WIRELESS,
+} icade_profile_enums;
+
+enum {
+   AKEYCODE_META_FUNCTION_ON = 8,
+   AKEYCODE_ESCAPE          = 111,
+   AKEYCODE_FORWARD_DEL     = 112,
+   AKEYCODE_CTRL_LEFT       = 113,
+   AKEYCODE_CTRL_RIGHT      = 114,
+   AKEYCODE_CAPS_LOCK       = 115,
+   AKEYCODE_SCROLL_LOCK     = 116,
+   AKEYCODE_SYSRQ           = 120, AKEYCODE_BREAK           = 121,
+   AKEYCODE_MOVE_HOME       = 122,
+   AKEYCODE_MOVE_END        = 123,
+   AKEYCODE_INSERT          = 124,
+   AKEYCODE_FORWARD         = 125,
+   AKEYCODE_MEDIA_PLAY      = 126,
+   AKEYCODE_MEDIA_PAUSE     = 127,
+   AKEYCODE_F1              = 131,
+   AKEYCODE_F2              = 132,
+   AKEYCODE_F3              = 133,
+   AKEYCODE_F4              = 134,
+   AKEYCODE_F5              = 135,
+   AKEYCODE_F6              = 136,
+   AKEYCODE_F7              = 137,
+   AKEYCODE_F8              = 138,
+   AKEYCODE_F9              = 139,
+   AKEYCODE_NUMPAD_1        = 145,
+   AKEYCODE_NUMPAD_2        = 146,
+   AKEYCODE_NUMPAD_3        = 147,
+   AKEYCODE_NUMPAD_4        = 148,
+   AKEYCODE_NUMPAD_5        = 149,
+   AKEYCODE_NUMPAD_6        = 150,
+   AKEYCODE_NUMPAD_7        = 151,
+   AKEYCODE_NUMPAD_8        = 152,
+   AKEYCODE_NUMPAD_9        = 153,
+   AKEYCODE_BUTTON_1        = 188,
+   AKEYCODE_BUTTON_2        = 189,
+   AKEYCODE_BUTTON_3        = 190,
+   AKEYCODE_BUTTON_4        = 191,
+   AKEYCODE_BUTTON_5        = 192,
+   AKEYCODE_BUTTON_6        = 193,
+   AKEYCODE_BUTTON_7        = 194,
+   AKEYCODE_BUTTON_8        = 195,
+   AKEYCODE_BUTTON_9        = 196,
+   AKEYCODE_BUTTON_10       = 197,
+   AKEYCODE_BUTTON_11       = 198,
+   AKEYCODE_BUTTON_12       = 199,
+   AKEYCODE_BUTTON_13       = 200,
+   AKEYCODE_BUTTON_14       = 201,
+   AKEYCODE_BUTTON_15       = 202,
+   AKEYCODE_BUTTON_16       = 203,
+   AKEYCODE_ASSIST          = 219,
+};
+
+#define LAST_KEYCODE AKEYCODE_ASSIST
+
+void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned port, unsigned id, int source);
+
+#endif
@@ -0,0 +1,82 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2013 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2013 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _JNI_MACROS_H
+#define _JNI_MACROS_H
+
+#include <jni.h>
+
+struct jni_params
+{
+   JavaVM *java_vm;
+   JNIEnv *env;
+   jobject class_obj;
+   char class_name[128];
+   char method_name[128];
+   char method_signature[128];
+};
+
+struct jni_out_params_char
+{
+   char *out;
+   size_t out_sizeof;
+   char in[128];
+};
+
+#define JNI_EXCEPTION(env) \
+   if ((*env)->ExceptionOccurred(env)) \
+   { \
+      (*env)->ExceptionDescribe(env); \
+      (*env)->ExceptionClear(env); \
+   }
+
+#define FIND_CLASS(env, var, classname) \
+   var = (*env)->FindClass(env, classname); \
+   JNI_EXCEPTION(env)
+
+#define GET_OBJECT_CLASS(env, var, clazz_obj) \
+   var = (*env)->GetObjectClass(env, clazz_obj); \
+   JNI_EXCEPTION(env)
+
+#define GET_FIELD_ID(env, var, clazz, fieldName, fieldDescriptor) \
+   var = (*env)->GetFieldID(env, clazz, fieldName, fieldDescriptor); \
+   JNI_EXCEPTION(env)
+
+#define GET_METHOD_ID(env, var, clazz, methodName, fieldDescriptor) \
+   var = (*env)->GetMethodID(env, clazz, methodName, fieldDescriptor); \
+   JNI_EXCEPTION(env)
+
+#define GET_STATIC_METHOD_ID(env, var, clazz, methodName, fieldDescriptor) \
+   var = (*env)->GetStaticMethodID(env, clazz, methodName, fieldDescriptor); \
+   JNI_EXCEPTION(env)
+
+#define CALL_OBJ_METHOD(env, var, clazz_obj, methodId) \
+   var = (*env)->CallObjectMethod(env, clazz_obj, methodId); \
+   JNI_EXCEPTION(env)
+
+#define CALL_OBJ_STATIC_METHOD(env, var, clazz, methodId) \
+   var = (*env)->CallStaticObjectMethod(env, clazz, methodId); \
+   JNI_EXCEPTION(env)
+
+#define CALL_OBJ_STATIC_METHOD_PARAM(env, var, clazz, methodId, ...) \
+   var = (*env)->CallStaticObjectMethod(env, clazz, methodId, __VA_ARGS__); \
+   JNI_EXCEPTION(env)
+
+#define CALL_OBJ_METHOD_PARAM(env, var, clazz_obj, methodId, ...) \
+   var = (*env)->CallObjectMethod(env, clazz_obj, methodId, __VA_ARGS__); \
+   JNI_EXCEPTION(env)
+
+#endif
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">NativeActivity</string>
+</resources>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
@@ -0,0 +1,5 @@
+/gen
+/bin
+/libs/*/*
+/obj
+/jni/modules/*.so
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>RetroArch</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,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
@@ -0,0 +1,43 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.retroarch"
+    android:versionCode="14"
+    android:versionName="0.9.9" >
+	<uses-feature android:glEsVersion="0x00020000" />
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-sdk
+        android:minSdkVersion="9"
+        android:targetSdkVersion="17" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <activity android:name="org.retroarch.browser.RetroArch">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name="org.retroarch.browser.DisplayRefreshRateTest"></activity>
+        <activity android:name="org.retroarch.browser.RefreshRateSetOS"></activity>
+        <activity android:name="org.retroarch.browser.SettingsActivity"></activity>
+        <activity android:name="org.retroarch.browser.HelpActivity"></activity>
+        <activity android:name="org.retroarch.browser.DirectoryActivity"></activity>
+        <activity android:name="org.retroarch.browser.ROMActivity"></activity>
+        
+        <activity android:name="org.retroarch.browser.ShaderActivity"></activity>
+        <activity android:name="org.retroarch.browser.OverlayActivity"></activity>
+        <activity android:name="org.retroarch.browser.ROMDirActivity"></activity>
+        <activity android:name="org.retroarch.browser.SRMDirActivity"></activity>
+        <activity android:name="org.retroarch.browser.StateDirActivity"></activity>
+        <activity android:name="org.retroarch.browser.SystemDirActivity"></activity>
+        
+        <activity android:name="android.app.NativeActivity" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale">
+        	<meta-data android:name="android.app.lib_name" android:value="retroarch-activity" />
+         	<meta-data android:name="android.app.func_name" android:value="ANativeActivity_onCreate" />
+        </activity>
+    </application>
+</manifest>
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
@@ -0,0 +1,19 @@
+libretro_mednafen_pce_fast = "Mednafen PCE-fast (PC Engine/PC Engine CD)"
+libretro_mednafen_wswan = "Mednafen WSwan (Wonderswan)"
+libretro_fceumm = "FCEUmm (Nintendo NES)"
+libretro_mednafen_vb = "Mednafen VB (Virtual Boy)"
+libretro_fba = "Final Burn Alpha (Arcade)"
+libretro_mednafen_ngp = "Mednafen NGP (Neo-Geo Pocket)"
+libretro_gambatte = "Gambatte (GameBoy/GameBoy Color)"
+libretro_genesis_plus_gx = "Genesis Plus GX (Sega Genesis/Sega CD/Master System)"
+libretro_vba_next = "VBA Next (GameBoy Advance)"
+libretro_prboom = "PrBoom (DOOM)"
+libretro_snes9x_next = "Snes9x-Next (Nintendo SNES)"
+libretro_nestopia = "Nestopia (Nintendo NES)"
+libretro_pcsx_rearmed-neon = "PCSX-reARMed (PlayStation1) [NEON]"
+libretro_pcsx_rearmed = "PCSX-reARMed (PlayStation1)"
+libretro_nxengine = "NXEngine (Cave Story/Doukutsu Monogatari)"
+libretro_quicknes = "QuickNES (Nintendo NES)"
+libretro_tyrquake = "TyrQuake (Quake 1)"
+libretro_scenewalker = "SceneWalker (Objects)"
+libretro_modelviewer = "ModelViewer (Objects)"
@@ -0,0 +1,92 @@
+<?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>
+
+    <!-- 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"
+    />
+
+    <!--
+        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" />
+
+    <!-- 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,12 @@
+LOCAL_PATH := $(call my-dir)
+include $(LOCAL_PATH)/../../native/jni/Android.mk
+
+# Include all present sub-modules
+FOCAL_PATH := $(LOCAL_PATH)
+
+define function
+$(eval RETRO_MODULE_OBJECT := $(1))
+$(eval include $(FOCAL_PATH)/modules/Android.mk)
+endef
+
+$(foreach m,$(wildcard $(FOCAL_PATH)/modules/*.so),$(eval $(call function,$(m))))
@@ -0,0 +1,2 @@
+APP_PLATFORM := android-9
+APP_ABI := all
@@ -0,0 +1,6 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := $(notdir $(RETRO_MODULE_OBJECT))
+LOCAL_SRC_FILES := $(notdir $(RETRO_MODULE_OBJECT))
+include $(PREBUILT_SHARED_LIBRARY)
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-16
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+android:text="Enabling rewind will double the system requirements of a core (conservative ballpark figure here). It is NOT recommended that you turn on rewind with any core unless you know your device is capable of running said core at twice (or more) its full (realtime) speed.\n\n " />
+</LinearLayout>
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="NOTE: The original version of Cave Story/Doukutsu Monogatari was released as freeware back in 2004.\n\nGo to this repository: https://github.com/libretro/nxengine-libretro\n\nDownload the entire 'datafiles' directory there and copy it to your device. Select 'NXEngine (Cave Story)' from the 'Select a Libretro Core' screen and select 'doukutsu.exe' (this file should be in the root of the datafiles directory that you just copied over). On first boot-up it will extract needed files from the EXE file to disk - this will be a one-time procedure and will take slightly longer than all subsequent boots. After this is done you can play." />
+</LinearLayout>
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="NOTE: To run Prboom, you need to load a Doom WAD file. However, to run any Doom WAD file with Prboom, you'll also need a special WAD file in that folder called prboom.wad\n\nGo to this repository: https://github.com/libretro/libretro-prboom\n\nCopy the prboom.wad file to your device and put it in the same directory as the Doom WAD you're trying to play." />
+</LinearLayout>
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+android:text="Neo Geo games should be played with the Final Burn Alpha core. To run any Neo Geo games, you will need a BIOS file placed in the same directory as the game you want to play. The name of the BIOS file is 'neogeo.zip'. If it still doesn't work even with this BIOS file placed in the same directory, then either your ROM files are outdated or your Neo-Geo BIOS file is." />
+</LinearLayout>
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+android:text="If Neo Geo games start up with a 'VIDEO RAM ERROR', then this indicates that rewind is enabled. Neo Geo games with the Final Burn Alpha core can't currently be played with rewind enabled. If you have the Rewinding option enabled, disable it in the Settings menu and then try the game again." />
+</LinearLayout>
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="NOTE: To play PC Engine CD games, you will need a BIOS file called 'syscard3.pce' placed in the same directory as the game you want to play."/>
+</LinearLayout>
@@ -0,0 +1,14 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="Tegra 2 CPUs don't have NEON SIMD capabilities. Because of that, PCSX ReARMed will use an 'inferior' graphics plugin that doesn't look as good as the NEON GPU plugin. Nothing can be done about this other than get yourself a newer device so that you can enjoy the NEON version of PCSX ReARMed. Note - the NEON version of PCSX ReARMed is only shown in the list on devices that have a CPU with NEON support."
+        />
+</LinearLayout>
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+android:text="If a game doesn't work with the PS1 emulator (PCSX ReARMed), you should be aware that there are two modes of operation -\n\n* HLE BIOS - If you do NOT have any BIOS files placed in the same directory as the game you're trying to load, then PCSX ReARMed will be in this mode. In this mode, you don't need a BIOS but game compatibility will be lower and some games will simply not play.\n\n* REAL BIOS - If you have BIOS files placed in the same directory as the game you're trying to load, then PCSX ReARMed will be in this mode. With a real BIOS, most games that previously didn't work before or had problems should work properly.\n\nNOTE: The BIOS files that it looks for are:\n\nscph1001.bin\n\nscph5500.bin\n\nscph5501.bin\n\nscph5502.bin\n\nscph7502.bin" />
+</LinearLayout>
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="NOTE: To play Sega CD/Mega CD games, you will need to have BIOS files placed in the same directory as the game you want to play. They should be named as follows:\n\n* bios_CD_E.bin\n\n* bios_CD_U.bin\n\n* bios_CD_J.bin\n\nIn case it needs any explaining, bios_CD_E.bin is the Mega CD EU BIOS, bios_CD_U.bin is the Sega CD US BIOS, and bios_CD_J.bin is the Mega CD Japanese BIOS."/>
+</LinearLayout>
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="There can be two reasons for this:\n\na) Either your device is not powerful enough to run the core you've selected at fullspeed.\n\nb) The refresh rate of the screen that your device reports is wrong. More on b) below.\n\n== REFRESH RATES AND RETROARCH ==\n\nUnlike other emulators, RetroArch does not use frameskipping. To get smooth gameplay and sound that are remotely close to the original hardware, RetroArch Android uses static synchronization. If you notice any skipping music or 'jerkiness' - rest assured it's not our code - it's likely that your device reports a wrong refreshrate to the OS (Android in this case). For instance, certain devices like the Note 2 have refresh rates below 60Hz.\n\nTo get any decent audio and video out of any application, you will have to synchronize the game's refresh rate with that of your screen - if the refresh rate cannot be properly synchronized, you will get bad audio pops and video glitchiness.\n\nThe problem is that a good many Android devices 'report' the wrong refresh rate to Android. The Samsung Galaxy S3 is known for doing this - it reports a 60Hz refresh rate when it isn't (the Note 2 for instance has a 58Hz screen but at least reports it correctly). So, because it 'reports' a wrong refresh rate, RetroArch will not yield good results.\n\nIf you experience any audio pops on cores that should be running fullspeed on your device, you should go with manual synchronization. To do this, you can start by calcuating your screens refresh rate with the 'Calibrate refresh rate' setting. This option can give a good guess, but for best results you should edit the value it returns in the 'Forced refresh rate (Hz)' option and set it manually - start at the value it returns and if it still audio pops/crackles, raise or lower the value (0.01 intervals is a good place to start) until you hit a sweet spot.\n\nIf you think  your device reports the correct value, you can use that instead by selecting the 'Set OS-reported refresh rate' option instead.\n\nWith a bit of experimentation you can get this right easily - I am running games on a single-core Cortex A8 device (1.2GHz - Allwinner A10) and I get no sound pops or any video glitchiness at all in most cores. So this is entirely a refresh rate issue that you can overcome easily on most devices by doing what I state above." />
+</LinearLayout>
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="The following pads have been added to the autodetection list:\n\n* Logitech/Logicool Rumblepad 2\n* Microsoft Sidewinder USB (ISSUE - diagonals not working).\n* Microsoft Xbox 360 Wired/Wireless (ISSUE - diagonals not working).\n* PS3 Sixaxis/DualShock 3 (using either USB or Dancingpixelstudios' IME app)\n* MOGA (using either 'root' gamepad mode or official IME app)\n* JXD S5110\n* Snakebyte idroid\n* Logitech Dual Action\n* Mayflash Super Joy Box 3 Pro\n*RetroUSB SNES RetroPort\n*RetroUSB NES RetroPad\n*Buffalo SNES Pad\n* Elecom PS1/PS2 to USB\n* Archos gamepad\n* Xbox 1 (Titanium X-Joy Converter) (ISSUE - diagonals not working).\n* Red Samurai (IME app Bluetooth or gamepad mode\n* Xperia Play\n* Trust Raptor\n* Logitech F710\n* DragonRise USB\n* Madcatz PS3 fighting stick\n* iControlPad (needs to be tested)\n* iPega (iCade profile)\n* PC2JAMMA-USB (TODO - TEST)\n* Genius MaxFire G-08XU\n* Zeemote Steelseries\n* Saitek Rumblepad\n* Super Smart Joy\n* Groupwise PS2 to USB converter\n* Toodles 2008 Chimp\n* Sega Saturn USB pad\n*Mayflash Wii Classic\n* Mayflash PS2 to USB\n* Nintendo Wii (using ccpcreations.WiiUse IME app)\n* Nyko Playpad Pro" />
+</LinearLayout>
@@ -0,0 +1,29 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="The system requirements differ per Libretro core. The recommended system requirements mentioned below are for reaching fullspeed in most games (if you get any audio pops/crackles, then please read 'Why do games sound choppy on my device?'): \n
+        * SNES9X Next [Super Nintendo] : Dual-core ARM Cortex A9 CPU or higher. Yoshi's Island and other SuperFX games might need higher system requirements.\n
+        * VBA Next [Game Boy Advance] : At least a dual-core ARM Cortex A9 CPU or higher.\n
+        * FCEUmm [Nintendo NES] : Has been tested to run at fullspeed on an ARM Cortex A8 single-core CPU.\n
+        * NEStopia [Nintendo NES] : Has been tested to run at fullspeed on an ARM Cortex A8 single-core CPU.\n
+        * Gambatte [GameBoy/Game Boy Color] : Has been tested to run at fullspeed on an ARM Cortex A8 single-core CPU.\n
+        * Final Burn Alpha [Arcade] : Performance varies based on the game you want to play. Systems like CPS2 and Neogeo have been tested to run at fullspeed on an ARM Cotex A8 single-core CPU. CPS3 games need a dual-core ARM Cortex A9-based CPU. Your mileage with other games may vary.\n
+        * Genesis Plus GX [Sega Genesis/Sega CD/Master System/SG-1000] : Has been tested o run at fullspeed on an ARM Cortex A8 single-core CPU for most games. Virtua Racing will need a dual-core ARM Cortex A9-based CPU.\n
+        * NX Engine [Cave Story] : Has been tested to run at fullspeed on an ARM Cortex A8 single-core CPU. Note - sound is currently imperfect in this core.\n
+        * PCSX ReARMed [PlayStation1] : Most games will run fullspeed on an ARM Cortex A8 single-core CPU. Higher-resolution interlaced games (such as Tekken 3, Tobal 2, Dead or Alive 1) will need at least a dual-core ARM Cortex A9 CPU and up.\n
+        * Prboom [DOOM] : Has been tested to run at fullspeed on an ARM Cortex A8 single-core CPU.\n
+        * Mednafen NGP [NeoGeo Pocket Color] : Has been tested to run at fullspeed on an ARM Cortex A8 single-core CPU.\n
+        * Mednafen WonderSwan [WonderSwan] : Has been tested to run at fullspeed on an ARM Cortex A8 single-core CPU.\n
+        * Mednafen Virtual Boy [Virtual Boy] : Dual-core ARM Cortex A9 CPU or higher.\n
+        * Mednafen PC Engine [PC Engine] : Has been tested to run at fullspeed on an ARM Cortex A8 single-core CPU.\n
+        * TyrQuake [Quake 1] : Has been tested to run around give or take 55-60fps at 320x240 resolution on an ARM Cortex A8 single-core CPU.\n
+        " />
+</LinearLayout>
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="In layman's terms, a 'Libretro core' is something you use to either:\n\na) Play games meant for a specific 'simulated' system (i.e. an emulator)\n\nb) Play games meant for a specific game engine (ie. Doom [Prboom], Cave Story [NXEngine]).\n\nLibretro cores will not play any games by themselves - just like how a games console needs a DVD or a cartridge to play a game, so too does a Libretro core either need 'ROM files' or a 'CD ISO' image in order to play games with it." />
+</LinearLayout>
@@ -0,0 +1,190 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="
+        r13 (May 26, 2013)\n\n
+        * Threaded video option. Mainly for Android users but works for OpenGL driver in general.\n
+        * (Android) Add iControlPad support.\n
+        * (Android) Add the following gamepads / etc to autodetection list:\n
+        - Tommo NeoGeoX Arcade Stick\n
+        - Xperia Play (fixes ANR issues after 30 seconds)\n
+        - TTT THT pad\n
+        - JXD S7300B\n
+        - Sega Virtua Stick\n
+        - Ouya pad (untested)\n
+        - Gamestop Wireless\n
+        - Tomee NES USB\n
+        - Thrustmaster T Mini Wireless\n
+        * (Android) Add back key behavior - can either 'toggle' RGUI' on/off or exit the app.\n
+        * (RGUI) RGUI now works on PC, Android, iOS and Blackberry - and is no longer Wii-exclusive.\n
+        * (RGUI) RGUI is an ingame menu that can be toggled from within the game. It looks and functions a bit like MAME's OSD system. It is possible now to configure most of RetroArch's settings from this builtin menu instead of having to exit the game and go to an 'external' settings menu.\n
+        * (RGUI) Added a 'Game History' list.\n
+        * (RGUI) Added sophisticated shader stacking - for Cg shaders.\n
+        * (RGUI/Libretro) Add disk image swapping - supported by Mednafen PSX and PCSX ReARMed\n
+        * (Libretro) Add libretro GL capability to libretro API. Supported currently by PC, Android,
+        iOS, Blackberry, Raspberry Pi, and Pandora. Targets either GL 2.0 or GL ES 2.0. Targeting
+        GL ES 2.0 is encouraged for maximum portability to mobile platforms.\n
+        * (Libretro/RGUI) Add Core Options. This makes it possible to 'expose' options for a libretro
+        core to the frontend.\n
+        * (Libretro) Add SET_SUPPORT_NO_GAME to API.\n
+        * (RGUI) Change menu layout options.\n
+        * (Menus) Standardize RGUI, RMenu and RMenu XUI to look and work the same.\n
+        * (Overlays/RGUI) Overlays can now be scaled and their opacity changed from RGUI).\n
+        * (RMenu/RGUI) Add text scrolling when a text string is too large to fit onscreen.\n
+        * (ZIP support) Switch from builtin zlib to miniz - less codebloat.\n
+        * [SNES9x Next] No longer disable high resolution for SA-1 games for Xbox 1 / Wii / Gamecube\n
+        * [SNES9x Next] Seiken Densetsu 3/Romancing Saga 3 no longer downsample to low-resolution for high-resolution modes on Xbox 1/Gamecube/Wii\n
+        * [SNES9x Next] Add Core Option - 'SuperFX Overclock'.\n
+        * [SNES9x Next] [Gamecube/Wii] Use sthbrx/stwbrx for READ_WORD/WRITE_WORD macros - speedup.\n
+        * [Gambatte] Fixed serious input reporting bug on libretro side that could drastically slow down gameplay speed - found an edge case in a Japanese Pokemon Blue version that triggered this.\n
+        * [Gambatte] Make colorization optional and not enforced through use of a Core Option.\n
+        * [FCEUmm] Should load UNIF ROM format now.\n
+        * [NEStopia] Fixes Famicom Disk System support.\n
+        * [NEStopia] L/R now inserts coins on Vs. System games.\n
+        * [NEStopia] Add Core Option 'Sprite Limit'.\n
+        * [Mednafen] Add several Core Options for Mednafen PSX, Mednafen PCE Fast, Mednafen Neo Geo Pocket Color, etc.\n
+        * [Mednafen PSX] Add disk swap mechanisms - exposed through RGUI\n
+        * [PCSX ReARMed] Latest update to r19 from notaz (main author)\n
+        * [PCSX ReARMed] Totally rewritten ARM code by notaz in order to support outdated version of Apple's GAS (for iOS support).\n
+        * [PCSX ReARMed] Add disk swap mechanisms - exposed through RGUI\n
+        * [PCSX ReARMed] Add m3u Mednafen-style cuesheet support\n
+        * [PCSX ReARMed] Add core option 'Frameskip' - users with bad performance on Android should try out if setting this higher than 0 fixes their problems.\n
+        * [PCSX ReARMed] Add core options 'NEON enhanced resolution' and 'NEON enhanced resolution speedhack' - this is for systems with ARM NEON CPUs. Note that this will easily triple or even quadruple CPU requirements. If you have an underpowered CPU, you might want to try this out in combination with the 'Frameskip' option (setting it higher than 0) to make things somewhat playable.\n
+        * [Genesis Plus GX] Latest compatibility updates from ekeeke (main author)\n
+        * [Genesis Plus GX] Add Core Options for blargg NTSC, Overscan and Game Gear Extend Screen\n
+        * [Final Burn Alpha] Add several Core Options for going tO Service Mode, Resetting game, etc.\n
+        * (LIBRETRO) Added Tyrquake.\n
+        * (LIBRETRO) Added ModelViewer and SceneWalker (for platforms which support libretro GL).\n
+        * (LIBRETRO) NXEngine / Cave Story is now completely playable on consoles\n
+        (Wii/PlayStation3/Xbox 1/Xbox 360) thanks to many code alterations. Performance is also much improved on the platforms which could already play them, such as Android and PC.\n
+        * (Shaders) New shaders- mdapt, new xBR versions, new Harlequin Gameboy/LCD shaders, etc.\n
+\n
+        r12 (Feb 16, 2013)\n\n
+* [NEStopia] Famicom Disk System support. For Android users - put disksys.rom
+into the same folder as the FDS ROM you're trying to load. For everyone else -
+put disksys.rom into your system directory.\n
+  - Y Button will switch sides of a disk.\n
+  - If you get any problems of the sort DISK A / B ERR 07' - pressing Y button again or letting it run its course should do it.\n
+  - NOTE - Famicom Disk System loading is slow, so you might be tempted to fast forward through most of it. However, I'd advise caution when doing so and to savestate regularly in case 'fast forwarding' can negatively affect disk loading.\n
+* [FBA core] Various changes/fixes\n
+- Hook up Eco Fighters controls (Turn 1/Turn 2 bound to L and R buttons)\n
+- Hook up Pnickie controls (Turn 1/Turn 2 bound to L and R buttons - press
+one of the buttons to progress beyond start screen)\n
+- Hook up Continental Circus controls - Brake 2/Brake 3 (L1/L2 buttons)
+and Accelerate 2/Accelerate 3 (R1/R2 buttons)\n
+- Hook up Gun Smoke controls - Start button (needed to progress beyond
+title screen)\n
+- Hook up Mighty Pang controls (P1 Shot1/P1 Shot2/P2 Shot1/P2 Shot2)\n
+- Fixed Varia Metal palette\n
+- Fixed Fairyland Story palette\n
+- Fixed Return of the Invaders palette\n
+- Fixed Act-Fancer palette issue\n
+- Fixes pitch issue in Gals Hustle (will possibly fix more games as well)\n
+* [Android] Fixed regression where a button bound to AKEYCODE_BACK would 'exit out'
+of RetroArch.\n
+* [Android] Fixes Madcatz fighting stick being autodetected properly.\n
+* [Android] Input autodetection expanded -\n
+  - iControlpad (needs to be tested)\n
+* [Unzipping [All consoles/Android]] Moved from rzlib to miniz/minizip -should increase compatibility
+with ZIP archives.\n
+\n
+        r11 (Feb 11, 2013)\n\n
+        * [FBA core] Various changes/fixes\n
+        - Hook up Armed Police Batrider controls\n
+        - Afterburner - make fire buttons work\n
+        - Hook up Bad Dudes controls\n
+        - Hook up Cyberbots controls\n
+        - Hook up 1942 controls\n
+        - Add missing Chase HQ controls\n
+        - Add missing WWF Wrestlefest controls\n
+        - EEPROM save should now work (tested with EEPROM-based system such as Capcom CPS2)\n
+        - Samples are now looked for - should be in 'samples' subdirectory\n
+        - Hiscore files should now be read from/written to.\n
+        * [SNES9x Next] Added big speed hack for Star Fox 1 - makes it fast enough for it to run at fullspeed on the Wii.\n
+        * New 'Calibrate Refresh Rate' option - use this to get an accurate estimation of your screen refresh rate. NOTE: Touch the screen at all times during calibration for more accurate measurements. You might have to slightly tweak the value later on for the best results.\n
+        * Added a 'Set OS-reported refresh rate' which should do the same as what 'Sync refreshrate to Screen' previously did. Note 2 users might get better results with this than they will with 'Calibrate refresh rate'.\n
+        * Added a built-in help system that should answer a lot of the frequently asked questions.\n
+        * Add iCade profiles - two added for now - iPega and Red Samurai\n
+        * [Android] Audio resampler now faster\n
+        * Input autodetection expanded -\n
+        - PC2JAMMA-USB (needs to be tested)\n
+        - Genius MaxFire G-08XU\n
+        - Zeemote Steelseries\n
+        - Saitek Rumblepad\n
+        - Super Smart Joy\n
+        \n
+        r10 (Feb 5, 2013)\n\n
+        * [NXEngine / Cave Story] Fixed bug where moving blocks would not move in Labyrinth levels\n
+        * Add new psx and GBA overlays by user boxs.\n
+        * Should fix some touchscreen control issues.\n
+        \n
+        r9 (Feb 4, 2013)\n\n
+        * Better multi-touch controls.\n
+        * Ability to set opacity of overlays.\n
+        * Shaders bundled (NOTE: need Tegra 4/Exynos5-class GPU for good results).\n
+        * Input autodetection expanded -\n
+        - Xperia Play (now properly tested on an r800i)\n
+        - Madcatz PS3 fighting stick\n
+        - Moga IME app (previously would work only on rooted devices with gamepad mode)\n
+        * Doesn't extract the assets everytime you go to the menu but only when you first install the new APK - was causing lots of  garbage collector overhead.\n
+        * FBA core - fixed a serious bug causing graphic glitches.\n
+        * Nestopia core - use mono sound like the real NES.\n
+        * Genesis Plus GX - Lunar Eternal Blue (JP) works again.\n
+        \n
+        r8 (Jan 30, 2013) - VERSION 0.9.8.1\n\n
+        * Is now compatible with Android version 2.3 and up.\n
+        * Back button issues with certain gamepads should now be fixed.\n
+        * Wonderswan core was broken (Mednafen Wonderswan) - is now fixed.\n
+        * 'Detect' button for manual input binding for touchless devices.\n
+        * Old overlays are back and put into a directory called 'Low-resolution' for devices with slower CPUs - the higher-resolution ones are somewhat more demanding than the original 256x256 ones.\n
+        * Input autodetection expanded -\n
+        - DragonRise USB Gamepad\n
+        \n
+        r6 (Jan 29, 2013)\n\n
+        * PlayStation1 [PCSX ReARMed] core fixes (from notaz)\n
+        - Fixes 50Hz PAL games (were running with sound being too fast and other irregularities before)\n
+        - Should fix emu crashing on some devices due to memory mapping issues.\n
+        * New system-specific overlays added - on new installs only these new ones will be there and the old bad ones will no longer be there. On pre-existing installs - just use the new ones - they should be much better. If you're still unsatisfied, nothing is stopping you from editing these files yourself with a text editor and an image editor - it's really simple to do.\n
+        * New 'custom binding' when you turn off 'Configuration Autodetect Enable' - allows you to manually put in button mapping in case we don't support your pad. Note - it's probably more reliable right now to select the 'keycode' from the dropdown list instead of pressing the button on the pad.\n
+        - Input autodetection expanded -\n
+        - Trust Raptor\n
+        - Should fix Logitech F710/Elecom/RetroUSB NES/etc\n
+        \n
+        r5 (Jan 28, 2013)\n\n
+        * Input autodetection expanded\n
+        - Archos gamepad\n
+        - Xperia Play\n
+        - Xbox 1 (Titanium X-JoyConverter)\n
+        - Xbox 360 (wired)\n
+        - Red Samurai Bluetooth\n
+        - Another variant of Mayflash Wii Classic\n
+        - RetroUSB SNES RetroPort\n
+        - RetroUSB NES RetroPad\n
+        - Buffalo SNES Pad\n
+        - Logicool F710 (Japanese Logitech F710)\n
+        - Elecom PS1/PS2 to USB\n
+        \n
+        r4 (Jan 27, 2013)\n\n
+        * Input autodetection expanded\n
+        - Nyko Playpad Pro\n
+        * Fixed bug where device name would not be onscreen for long enough - useful for reporting input name\n
+        \n
+        r3 (Jan 26, 2013)\n\n
+        * More user-friendly core selection names\n
+        * Input autodetection expanded\n
+        - Added Mayflash Super Joy Box 3 Pro\n
+        - Added JXD S5110\n
+        - Added Logitech Dual Action\n
+        - Added Snakebyte idroid\n
+        \n
+        r2\n\n
+        * Initial release." />
+</LinearLayout>
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="RetroArch Android is not a 'game'. What it is, however, is an 'engine' that allows you to run emulators and game engines.\n\nEmulators can play games that were made for the systems the emulator tries to simulate. For example, a SNES emulator can play SNES games in the form of files that are commonly referred to as 'ROM images'.\n\nDue to legalese, RetroArch Android does NOT come with ROMs or copyrighted material of any kind. Said material must be provided by yourself. DO NOT REQUEST WHERE TO GET ROMS. ANY E-MAILS RE: ROM REQUESTS WILL BE IGNORED.\n\nGame engine ports allow you to play specific games - for instance, prBoom is a game engine for the DOOM games, while NX-Engine is a game engine that can play Cave Story. To play these games, you must often provide the original datafiles of the game or else they will not work. The instructions as to how to play these 'game engines' differ per core." />
+</LinearLayout>
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="All these shaders came from the RetroArch versions on PlayStation3, Xbox 360 and PC. Compared to those systems, the GPUs in Android devices are very, very weak.\n\nThis problem will solve itself as Android devices will start getting more powerful GPUs. An example of a SoC that might handle most shaders at fullspeed would be the Tegra 4 with its 72-core GPU."/>
+</LinearLayout>
@@ -0,0 +1,57 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="NOTE: Prboom only supports MP3 soundtracks right now. To have the game use MP3 files, the files must be correctly named and should be placed in the same directry as the WAD file.\n\nHere is a listing of the files that are looked for by Prboom when trying to playback music in-game.\n\n== FOR DOOM 1/ULTIMATE DOOM ==\n\ne1m1.mp3\n\ne1m2.mp3\n\ne1m3.mp3\n\ne1m4.mp3\n\ne1m5.mp3\n\ne1m6.mp3\n\ne1m7.mp3\n\ne1m8.mp3\n\ne1m9.mp3\n\n
+e2m1.mp3\n\n
+e2m2.mp3\n\n
+e2m3.mp3\n\n
+e2m4.mp3\n\n
+e2m5.mp3\n\n
+e2m6.mp3\n\n
+e2m7.mp3\n\n
+e2m8.mp3\n\n
+e2m9.mp3\n\n
+e3m1.mp3\n\n
+e3m2.mp3\n\n
+e3m3.mp3\n\n
+e3m4.mp3\n\n
+e3m5.mp3\n\n
+e3m6.mp3\n\n
+e3m7.mp3\n\n
+e3m8.mp3\n\n
+intermid1.mp3\n\n
+intro.mp3\n\n
+bunny.mp3\n\n
+victor.mp3\n\n
+\n\n
+== FOR DOOM 2 ==\n\n
+stalks.mp3\n\n
+runnin.mp3\n\n
+countd.mp3\n\n
+betwee.mp3
+doom.mp3\n\n
+the_da.mp3\n\n
+shawn.mp3\n\n
+ddtblu.mp3\n\n
+in_cit.mp3\n\n
+dead.mp3\n\n
+romero.mp3\n\n
+messag.mp3\n\n
+ampie.mp3\n\n
+tense.mp3\n\n
+openin.mp3\n\n
+evil.mp3\n\n
+ultima.mp3\n\n
+read_m.mp3\n\n
+dm2ttl.mp3\n\n
+dm2int.mp3"
+/>
+</LinearLayout>
@@ -0,0 +1,21 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="Most likely reason is that it hasn't been added yet to the autodetection list. You can help us out with this by doing the following steps:\n\n
+        1. Go back to the main menu, bring up the popup menu. Select 'Settings' and go to 'Input Settings'.\n\n
+        2. Make sure that 'Debug Input Reporting Enable' is disabled.\n\n
+        3. After that, start up a game with any emu (doesn't matter which). The first thing I need to know exactly is the message that appears when you first press a button on the pad. It should say something like -\n\n'HID %somename here%'\n\n
+        3b. IF 3 FAILS - Another way you can give us the name of the pad is to do 'adb logcat' on the commandline from your PC (or for developers, use Eclipse). Connect a USB/BT/whatever device and it should show something like this (example here with a Rumblepad 2:\n\nI/EventHub( 175): New device: id=6, fd=106, path='/dev/input/event2', name='Logitech Logitech RumblePad 2 USB', classes=0x80000141, configuration='', keyLayout='/system/usr/keylayout/Generic.kl', keyCharacterMap='/system/usr/keychars/Generic.kcm', builtinKeyboard=false\n\nI/InputReader( 175): Device added: id=6, name='Logitech Logitech RumblePad 2 USB', sources=0x01000511\n\n
+        4. (EXTRA STEP IN CASE YOU ARE USING A BLUETOOTH PAD) - Go to the main menu, bring up the Popup menu and click on 'Report IME'. Write down what it says in the dialog box. We will be needing this information from you.\n\n
+        4. Enable 'Debug Input Reporting Enable'.\n\n
+        5. The next few things I need to know is the keycode that each button on your pad will now report 'onscreen'. Every time you press a button, it will show you a message onscreen with the keycode for each button.\n\n
+        6. Send your results to [email protected]. MAKE SURE THAT YOU HAVE FOLLOWED ALL PREVIOUS STEPS. If you have provided all the information we need, somebody can then add it to the autodetection list.\n\nIn the meantime, in case your pad is not added yet to the autodetection list, you could try manually setting up controls. To do this, you will need to disable 'Configuration Autodetect' in Settings -> Input Settings." />
+</LinearLayout>
@@ -0,0 +1,14 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="If the PS1 emulator [PCSX ReARMed] does not show up in the Main Menu, then chances are that your Android device has an MIPS or x86-based CPU. PCSX ReARMed is exclusive to ARM-based Android devices (which happens to be the vast majority of all devices out)."
+        />
+</LinearLayout>
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="40px"
+        android:text="VBA Next is an emulator that is based on VBA-M. This is a more accurate emulator than most, but it's also much slower. Unfortunately, while VBA Next seems to run very well even on a Nintendo Wii, it seems that as of this minute even medium heavyweight Android devices can't compete with a Nintendo Wii in terms of runtime performance.\n\nThere will be another Game Boy Advance core added shortly that will be a lot faster than VBA Next and will compete directly with Gameboid and other emus of this ilk. NOTE - Gameboid and those 'other emus' are based on the open-source emulator gpSP - which is also the emulator we will be basing this new faster core on." />
+</LinearLayout>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="192dp"
+        android:layout_height="192dp"
+        android:layout_gravity="center"
+        android:contentDescription="@string/file_type_icon"
+        android:padding="8dp" />
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_gravity="center"
+        android:layout_weight="0.5"
+        android:textSize="18sp" />
+
+</LinearLayout>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<GridView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:numColumns="2" >
+
+</GridView>
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/key_bind_dialog"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <TextView
+        android:id="@+id/key_bind_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="20dp"
+        android:text="@string/key_bind_title"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <EditText
+        android:id="@+id/key_bind_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/key_bind_title"
+        android:layout_below="@+id/key_bind_title"
+        android:ems="10"
+        android:inputType="text" >
+
+        <requestFocus />
+    </EditText>
+
+    <ListView
+        android:id="@+id/key_bind_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/key_bind_clear"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/key_bind_value"
+        android:entries="@array/key_bind_values"
+        android:fastScrollEnabled="true" >
+
+    </ListView>
+
+    <Button
+        android:id="@+id/key_bind_clear"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_toLeftOf="@+id/key_bind_detect"
+        android:text="@string/key_bind_clear" />
+
+    <Button
+        android:id="@+id/key_bind_detect"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/key_bind_list"
+        android:layout_marginRight="72dp"
+        android:text="@string/key_bind_detect" />
+
+</RelativeLayout>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/list"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:fastScrollEnabled="true" >
+
+</ListView>
+
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="48dp">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:contentDescription="@string/file_type_icon"
+        android:padding="8dp" />
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_weight="0.5"
+        android:textSize="18sp" />
+
+</LinearLayout>
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/seekbar_dialog"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <SeekBar
+        android:id="@+id/seekbar_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:max="100" />
+
+    <TextView
+        android:id="@+id/seekbar_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_gravity="center" />
+
+</LinearLayout>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/rarch_settings" android:title="@string/rarch_settings" android:showAsAction="ifRoom" />
+    <item android:id="@+id/help" android:title="@string/help"></item>
+    <item android:id="@+id/input_method_select" android:title="@string/input_method" android:showAsAction="ifRoom" />
+    <item android:id="@+id/report_ime" android:title="@string/report_ime"></item>
+    <item android:id="@+id/report_refreshrate" android:title="@string/report_refreshrate"></item>
+    <item android:id="@+id/retroarch_guide" android:title="@string/retroarch_guide"></item>
+    <item android:id="@+id/cores_guide" android:title="@string/cores_guide"></item>
+    <item android:id="@+id/overlay_guide" android:title="@string/overlay_guide"></item>
+</menu>
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/settings"
+        android:title="@string/settings"
+        android:icon="@drawable/ic_file"
+        android:showAsAction="ifRoom" />
+</menu>
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="back_options">
+        <item>Quit</item>
+        <item>Menu toggle</item>
+    </string-array>
+
+    <string-array name="back_options_values">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+    <string-array name="aspect_ratios">
+        <item>Full screen</item>
+        <item>Auto</item>
+        <item>Square pixel</item>
+        <item>4:3</item>
+        <item>16:9</item>
+        <item>16:10</item>
+        <item>8:7</item>
+    </string-array>
+    
+    <string-array name="aspect_values">
+        <item>full</item>
+        <item>auto</item>
+        <item>square</item>
+        <item>1.33333</item>
+        <item>1.77777</item>
+        <item>1.60000</item>
+        <item>1.14286</item>
+    </string-array>
+
+    <string-array name="icade_profiles">
+        <item>Red Samurai</item>
+        <item>iPega PG-9017</item>
+        <item>Gamestop Wireless</item>
+    </string-array>
+
+    <string-array name="icade_profiles_values">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+    
+    <string-array name="key_bind_values">
+        <item>UNBOUND</item>
+        <item>SOFT LEFT</item>
+        <item>SOFT RIGHT</item>
+        <item>HOME</item>
+        <item>BACK</item>
+        <item>CALL</item>
+        <item>ENDCALL</item>
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>STAR</item>
+        <item>POUND</item>
+        <item>DPAD UP</item>
+        <item>DPAD DOWN</item>
+        <item>DPAD LEFT</item>
+        <item>DPAD RIGHT</item>
+        <item>DPAD CENTER</item>
+        <item>VOLUME UP</item>
+        <item>VOLUME DOWN</item>
+        <item>POWER</item>
+        <item>CAMERA</item>
+        <item>CLEAR</item>
+        <item>A</item>
+        <item>B</item>
+        <item>C</item>
+        <item>D</item>
+        <item>E</item>
+        <item>F</item>
+        <item>G</item>
+        <item>H</item>
+        <item>I</item>
+        <item>J</item>
+        <item>K</item>
+        <item>L</item>
+        <item>M</item>
+        <item>N</item>
+        <item>O</item>
+        <item>P</item>
+        <item>Q</item>
+        <item>R</item>
+        <item>S</item>
+        <item>T</item>
+        <item>U</item>
+        <item>V</item>
+        <item>W</item>
+        <item>X</item>
+        <item>Y</item>
+        <item>Z</item>
+        <item>COMMA</item>
+        <item>PERIOD</item>
+        <item>ALT LEFT</item>
+        <item>ALT RIGHT</item>
+        <item>SHIFT LEFT</item>
+        <item>SHIFT RIGHT</item>
+        <item>TAB</item>
+        <item>SPACE</item>
+        <item>SYM</item>
+        <item>EXPLORER</item>
+        <item>ENVELOPE</item>
+        <item>ENTER</item>
+        <item>DEL</item>
+        <item>GRAVE</item>
+        <item>MINUS</item>
+        <item>EQUALS</item>
+        <item>LEFT BRACKET</item>
+        <item>RIGHT BRACKET</item>
+        <item>BACKSLASH</item>
+        <item>SEMICOLON</item>
+        <item>APOSTROPHE</item>
+        <item>SLASH</item>
+        <item>AT</item>
+        <item>NUM</item>
+        <item>HEADSETHOOK</item>
+        <item>FOCUS</item>
+        <item>PLUS</item>
+        <item>MENU</item>
+        <item>NOTIFICATION</item>
+        <item>SEARCH</item>
+        <item>MEDIA PLAY PAUSE=</item>
+        <item>MEDIA STOP</item>
+        <item>MEDIA NEXT</item>
+        <item>MEDIA PREVIOUS</item>
+        <item>MEDIA REWIND</item>
+        <item>MEDIA FAST FORWARD</item>
+        <item>MUTE</item>
+        <item>PAGE UP</item>
+        <item>PAGE DOWN</item>
+        <item>PICTSYMBOLS</item>
+        <item>SWITCH CHARSET</item>
+        <item>BUTTON A</item>
+        <item>BUTTON B</item>
+        <item>BUTTON C</item>
+        <item>BUTTON X</item>
+        <item>BUTTON Y</item>
+        <item>BUTTON Z</item>
+        <item>BUTTON L1</item>
+        <item>BUTTON R1</item>
+        <item>BUTTON L2</item>
+        <item>BUTTON R2</item>
+        <item>BUTTON THUMBL</item>
+        <item>BUTTON THUMBR</item>
+        <item>BUTTON START</item>
+        <item>BUTTON SELECT</item>
+        <item>BUTTON MODE</item>
+        <item>ESCAPE</item>
+        <item>FORWARD DEL</item>
+        <item>CTRL LEFT</item>
+        <item>CTRL RIGHT</item>
+        <item>CAPS LOCK</item>
+        <item>SCROLL LOCK</item>
+        <item>META LEFT</item>
+        <item>META RIGHT</item>
+        <item>FUNCTION</item>
+        <item>SYSRQ</item>
+        <item>BREAK</item>
+        <item>MOVE HOME</item>
+        <item>MOVE END</item>
+        <item>INSERT</item>
+        <item>FORWARD</item>
+        <item>MEDIA PLAY</item>
+        <item>MEDIA PAUSE</item>
+        <item>MEDIA CLOSE</item>
+        <item>MEDIA EJECT</item>
+        <item>MEDIA RECORD</item>
+        <item>F1</item>
+        <item>F2</item>
+        <item>F3</item>
+        <item>F4</item>
+        <item>F5</item>
+        <item>F6</item>
+        <item>F7</item>
+        <item>F8</item>
+        <item>F9</item>
+        <item>F10</item>
+        <item>F11</item>
+        <item>F12</item>
+        <item>NUM LOCK</item>
+        <item>NUMPAD 0</item>
+        <item>NUMPAD 1</item>
+        <item>NUMPAD 2</item>
+        <item>NUMPAD 3</item>
+        <item>NUMPAD 4</item>
+        <item>NUMPAD 5</item>
+        <item>NUMPAD 6</item>
+        <item>NUMPAD 7</item>
+        <item>NUMPAD 8</item>
+        <item>NUMPAD 9</item>
+        <item>NUMPAD DIVIDE</item>
+        <item>NUMPAD MULTIPLY</item>
+        <item>NUMPAD SUBTRACT</item>
+        <item>NUMPAD ADD</item>
+        <item>NUMPAD DOT</item>
+        <item>NUMPAD COMMA</item>
+        <item>NUMPAD ENTER</item>
+        <item>NUMPAD EQUALS</item>
+        <item>NUMPAD LEFT PAREN</item>
+        <item>NUMPAD RIGHT PAREN</item>
+        <item>VOLUME MUTE</item>
+        <item>INFO</item>
+        <item>CHANNEL UP</item>
+        <item>CHANNEL DOWN</item>
+        <item>ZOOM IN</item>
+        <item>ZOOM OUT</item>
+        <item>TV</item>
+        <item>WINDOW</item>
+        <item>GUIDE</item>
+        <item>DVR</item>
+        <item>BOOKMARK</item>
+        <item>CAPTIONS</item>
+        <item>SETTINGS</item>
+        <item>TV POWER</item>
+        <item>TV INPUT</item>
+        <item>STB POWER</item>
+        <item>STB INPUT</item>
+        <item>AVR POWER</item>
+        <item>AVR INPUT</item>
+        <item>PROG RED</item>
+        <item>PROG GREEN</item>
+        <item>PROG YELLOW</item>
+        <item>PROG BLUE</item>
+        <item>APP SWITCH</item>
+        <item>BUTTON 1</item>
+        <item>BUTTON 2</item>
+        <item>BUTTON 3</item>
+        <item>BUTTON 4</item>
+        <item>BUTTON 5</item>
+        <item>BUTTON 6</item>
+        <item>BUTTON 7</item>
+        <item>BUTTON 8</item>
+        <item>BUTTON 9</item>
+        <item>BUTTON 10</item>
+        <item>BUTTON 11</item>
+        <item>BUTTON 12</item>
+        <item>BUTTON 13</item>
+        <item>BUTTON 14</item>
+        <item>BUTTON 15</item>
+        <item>BUTTON 16</item>
+        <item>LANGUAGE SWITCH</item>
+        <item>MANNER MODE</item>
+        <item>3D MODE</item>
+        <item>CONTACTS</item>
+        <item>CALENDAR</item>
+        <item>MUSIC</item>
+        <item>CALCULATOR</item>
+    </string-array>
+</resources>
@@ -0,0 +1,22 @@
+<resources>
+
+    <string name="app_name">RetroArch</string>
+    <string name="input_method">Input Method</string>
+    <string name="file_type_icon">File type icon</string>
+    <string name="video_settings">Video Settings</string>
+    <string name="rarch_settings">Settings</string>
+    <string name="audio_settings">Audio Settings</string>
+    <string name="input_settings">Input Settings</string>
+    <string name="general_settings">General Settings</string>
+    <string name="settings">Settings</string>
+    <string name="retroarch_guide">RetroArch Guide</string>
+    <string name="cores_guide">Cores Guide</string>
+    <string name="overlay_guide">Overlay How-to Guide</string>
+    <string name="key_bind_title">Select the button to use</string>
+    <string name="key_bind_clear">Unbind</string>
+    <string name="help">Help</string>
+    <string name="report_ime">Report IME</string>
+    <string name="report_refreshrate">Report Refresh Rate</string>
+    <string name="key_bind_detect">Detect</string>
+
+</resources>
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="Help" >
+    <PreferenceScreen android:title="What's New?" >
+       <PreferenceCategory android:title="What's New?" android:layout="@layout/faq_whats_new" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Where are the games?" >
+       <PreferenceCategory android:title="Where are the games?" android:layout="@layout/faq_where_are_the_games" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="What is a 'Libretro core'?" >
+       <PreferenceCategory android:title="What is a 'Libretro core'?" android:layout="@layout/faq_what_is_a_libretro_core" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Libretro core system requirements" >
+       <PreferenceCategory android:title="Libretro core system requirements" android:layout="@layout/faq_system_requirements" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Why do games sound choppy on my device?" >
+       <PreferenceCategory android:title="Games sound choppy on my device?" android:layout="@layout/faq_sound_choppy" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Why are the shaders so slow on my device?" >
+       <PreferenceCategory android:title="Why are the shader so slow on my device?" android:layout="@layout/faq_why_are_the_shaders_so_slow" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Games are slow with rewind. Why?" >
+       <PreferenceCategory android:title="With rewind enabled, games are slow. Why?" android:layout="@layout/faq_games_are_slow_with_rewind_why" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Why doesn't it autodetect my gamepad?" >
+       <PreferenceCategory android:title="Why doesn't it autodetect my gamepad?" android:layout="@layout/faq_why_doesnt_it_autodetect_my_gamepad" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="How do I run Prboom/DOOM?" >
+       <PreferenceCategory android:title="How do I run Prboom/DOOM?" android:layout="@layout/faq_how_do_i_run_prboom" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="How do I run NXEngine/Cave Story?" >
+       <PreferenceCategory android:title="How do I run NXEngine/Cave Story?" android:layout="@layout/faq_how_do_i_run_cave_story" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Why does DOOM have no music?" >
+       <PreferenceCategory android:title="Why does DOOM have no music?" android:layout="@layout/faq_why_does_prboom_have_no_music" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Why doesn't my Neo Geo game work in Final Burn Alpha?" >
+       <PreferenceCategory android:title="Why doesn't my PS1 game work?" android:layout="@layout/faq_neo_geo_game_doesnt_work" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Neo Geo game in FBA shows Video RAM error. Why?" >
+       <PreferenceCategory android:title="Neo Geo game in FBA shows Video RAM error. Why?" android:layout="@layout/faq_neo_geo_game_in_fba_shows_video_ram_err_why" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Why doesn't the PS1 core [PCSX ReARMed] show up in the list?" >
+       <PreferenceCategory android:title="Why doesn't the PS1 core [PCSX ReARMed] show up in the list?" android:layout="@layout/faq_why_doesnt_the_ps1_core_show_up_in_the_list" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="PS1 core looks bad on my Tegra 2, why?" >
+       <PreferenceCategory android:title="PS1 core looks bad on my Tegra 2, why?" android:layout="@layout/faq_ps1_core_looks_bad_on_my_tegra_2_why" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Why doesn't my PS1 game work?" >
+       <PreferenceCategory android:title="Why doesn't my PS1 game work?" android:layout="@layout/faq_ps1_game_doesnt_work" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Why doesn't my Sega CD game work?" >
+       <PreferenceCategory android:title="Why doesn't my Sega CD game work?" android:layout="@layout/faq_sega_cd_game_doesnt_work" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Why is VBA Next/Game Boy Advance so slow compared to other emus ?" >
+       <PreferenceCategory android:title="Why is VBA Next/Game Boy Advance so slow compared to other emus?" android:layout="@layout/faq_why_is_gba_so_slow" >
+        </PreferenceCategory>
+    </PreferenceScreen>
+</PreferenceScreen>
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="RetroArch Settings" >
+
+    <PreferenceScreen android:title="Path Settings">
+        <PreferenceCategory android:title="ROM paths">
+            <Preference android:title="ROM directory"
+                android:summary="Sets directory where ROM browser will first browse for ROM files.">
+                <intent
+                    android:targetClass="org.retroarch.browser.ROMDirActivity"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
+        </PreferenceCategory>
+        
+        <PreferenceCategory android:title="Save files">
+            <CheckBoxPreference android:title="Enable custom directory"
+                android:summary="Enables use of custom save file folder. (.srm) save files will be saved and loaded to configured directory. If not enabled, save files will reside in ROM folder."
+                android:key="savefile_directory_enable"
+                android:defaultValue="false"/>
+            <Preference android:title="Savefile directory"
+                android:summary="Sets directory where to save and load game save files."
+                android:dependency="savefile_directory_enable">
+                <intent
+                    android:targetClass="org.retroarch.browser.SRMDirActivity"
+                    android:targetPackage="org.retroarch" />
+            </Preference>            
+        </PreferenceCategory>
+        <PreferenceCategory android:title="Save states">
+            <CheckBoxPreference android:title="Enable custom directory"
+                android:summary="Enables use of custom save state folder. (.state) save states will be saved and loaded to configured directory. If not enabled, save states will reside in ROM folder."
+                android:key="savestate_directory_enable"
+                android:defaultValue="false"/>
+            <Preference android:title="Save state directory"
+                android:summary="Sets directory where to save and load game save states."
+                android:dependency="savestate_directory_enable">
+                <intent
+                    android:targetClass="org.retroarch.browser.StateDirActivity"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
+        </PreferenceCategory>
+        <PreferenceCategory android:title="System">
+            <CheckBoxPreference android:title="Enable custom directory"
+                android:summary="Enables use of custom system folder. Cores will look for system specific files, like BIOSes, in this folder. If not enabled, it will look in the ROM folder."
+                android:key="system_directory_enable"
+                android:defaultValue="false"/>
+            <Preference android:title="System directory"
+                android:summary="Sets directory where system files are loaded from."
+                android:dependency="system_directory_enable">
+                <intent
+                    android:targetClass="org.retroarch.browser.SystemDirActivity"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="System Settings" >
+        <PreferenceCategory android:title="General" >
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="savestate_auto_load"
+                android:summary="Loads an automatically created savestate (*.state.auto) at startup."
+                android:title="Auto load state" />
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="savestate_auto_save"
+                android:summary="Automatically saves state (*.state.auto) when exiting game."
+                android:title="Auto save state" />
+        </PreferenceCategory>
+        <PreferenceCategory android:title="Rewinding" >
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="rewind_enable"
+                android:summary="Enable real-time rewinding of gameplay. (WARNING: Very CPU intensive - will decrease ingame performance by a lot - only use this option on a powerful device)."
+                android:title="Enable" />
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Video Settings" >
+        <PreferenceCategory android:title="General" >
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="video_vsync"
+                android:summary="When set to enabled, prevents screen tearing."
+                android:title="VSync" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="video_allow_rotate"
+                android:summary="Will auto-rotate the screen for vertically oriented games."
+                android:title="Auto-rotate" />
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="video_scale_integer"
+                android:summary="Scales video only in whole steps of game resolution. Useful when playing without bilinear filtering."
+                android:title="Scale integer" />
+
+            <ListPreference
+                android:entries="@array/aspect_ratios"
+                android:entryValues="@array/aspect_values"
+                android:key="video_aspect_ratio"
+                android:summary="Aspect ratio to enforce."
+                android:title="Aspect ratio" />
+        </PreferenceCategory>
+        <PreferenceCategory android:title="Synchronization" >
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="video_threaded"
+                android:summary="Uses a multi-threaded video driver. Is likely to improve performance at the expense of slightly more latency and jitter. Use this if you have troubles getting good video and audio."
+                android:title="Threaded video driver" />
+            <EditTextPreference
+                android:key="video_refresh_rate"
+                android:numeric="decimal"
+                android:summary="Force a specific refresh rate to be detected. Only set manually if calibration reports wrong refresh rate."
+                android:title="Forced refresh rate (Hz)" />
+            <Preference
+                android:summary="Attempts to find the true refresh rate of monitor. Updates value in &apos;Force refresh rate (Hz)&apos; option. To help ensure accuracy, make sure no intense background services are running, and avoid triggering screensaver."
+                android:title="Calibrate refresh rate" >
+                <intent
+                    android:targetClass="org.retroarch.browser.DisplayRefreshRateTest"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
+            <Preference
+                android:summary="Sets refresh rate equal to OS-reported value. This might not be accurate for your phone."
+                android:title="Set OS-reported refresh rate" >
+                <intent
+                    android:targetClass="org.retroarch.browser.RefreshRateSetOS"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
+        </PreferenceCategory>
+        <PreferenceCategory android:title="Shaders (1st pass)" >
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="video_smooth"
+                android:summary="Applies Bilinear filtering, smooths out edges (settings still apply even if no shader is selected)."
+                android:title="Bilinear filter" />
+            <CheckBoxPreference
+                android:summary="Enable first pass shader (WARNING: recommended system requirements for these shaders is a Tegra 4/Exynos5 class GPU and/or higher)."
+                android:defaultValue="false"
+                android:key="video_shader_enable"
+                android:title="Enable" />
+
+            <Preference
+                android:summary="Sets GLES2 style XML shader."
+                android:title="XML shader"
+                android:dependency="video_shader_enable" >
+                <intent
+                    android:targetClass="org.retroarch.browser.ShaderActivity"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
+        </PreferenceCategory>
+        <PreferenceCategory android:title="Fonts">
+            <CheckBoxPreference android:title="Enable on-screen fonts"
+                android:summary="Enable rendering of on-screen fonts for messages."
+                android:key="video_font_enable"
+                android:defaultValue="true"/>
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Audio Settings" >
+        <PreferenceCategory android:title="Audio" >
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="audio_enable"
+                android:title="Enable" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="audio_rate_control"
+                android:summary="Enable dynamic rate control (recommended)."
+                android:title="Dynamic Rate Control"
+                android:dependency="audio_enable" />
+        </PreferenceCategory>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="Input Settings" >
+       <PreferenceCategory android:title="General" >
+            <ListPreference
+                android:entries="@array/back_options"
+                android:entryValues="@array/back_options_values"
+                android:key="input_back_behavior"
+                android:summary="Select how you want the Back button to behave."
+                android:title="Back behavior" />
+       </PreferenceCategory>
+        <PreferenceCategory android:title="Configuration Autodetect" >
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="input_autodetect_enable"
+                android:summary="This will attempt to preconfigure various gamepads and/or IME apps that you connect."
+                android:title="Enable"
+                android:disableDependentsState="true" />
+        <PreferenceScreen android:title="List of autodetected devices" >
+       <PreferenceCategory android:title="Configuration Autodetect - Supported Pads" android:layout="@layout/faq_supported_pads" >
+        </PreferenceCategory>
+     </PreferenceScreen>
+            <ListPreference
+                android:entries="@array/icade_profiles"
+                android:entryValues="@array/icade_profiles_values"
+                android:key="input_autodetect_icade_profile_pad0"
+                android:summary="Select the iCade profile to use for controller 1."
+                android:title="iCade profile Pad 1" />
+            <ListPreference
+                android:entries="@array/icade_profiles"
+                android:entryValues="@array/icade_profiles_values"
+                android:key="input_autodetect_icade_profile_pad1"
+                android:summary="Select the iCade profile to use for controller 2."
+                android:title="iCade profile Pad 2" />
+            <ListPreference
+                android:entries="@array/icade_profiles"
+                android:entryValues="@array/icade_profiles_values"
+                android:key="input_autodetect_icade_profile_pad2"
+                android:summary="Select the iCade profile to use for controller 3."
+                android:title="iCade profile Pad 3" />
+            <ListPreference
+                android:entries="@array/icade_profiles"
+                android:entryValues="@array/icade_profiles_values"
+                android:key="input_autodetect_icade_profile_pad3"
+                android:summary="Select the iCade profile to use for controller 4."
+                android:title="iCade profile Pad 4" />
+        </PreferenceCategory>
+        <PreferenceCategory android:title="Debug input reporting" >
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="input_debug_enable"
+                android:summary="This will report keycodes on-screen generated by your input device(s). Useful for debugging."
+                android:title="Enable" />
+        </PreferenceCategory>
+        <PreferenceCategory android:title="Touchscreen Overlay" >
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="input_overlay_enable"
+                android:summary="Enable touchscreen overlays (WARNING: Lower-resolution overlays might be more suitable for less powerful devices)."
+                android:title="Enable" />
+
+            <Preference
+                android:summary="Sets touchscreen overlay config."
+                android:title="Input overlay"
+                android:dependency="input_overlay_enable" >
+                <intent
+                    android:targetClass="org.retroarch.browser.OverlayActivity"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
+            <org.retroarch.browser.SeekbarPreference
+                android:summary="Set the opacity of the touch overlay."
+                android:title="Overlay opacity"
+                android:key="input_overlay_opacity"
+                android:dependency="input_overlay_enable" />
+        </PreferenceCategory>
+        <PreferenceCategory android:title="Custom Binds">
+	        <PreferenceScreen
+	            android:title="Player 1 Custom Binds"
+	            android:dependency="input_autodetect_enable" >
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_up_btn"
+	                android:title="Up Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_down_btn"
+	                android:title="Down Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_left_btn"
+	                android:title="Left Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_right_btn"
+	                android:title="Right Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_a_btn"
+	                android:title="A Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_b_btn"
+	                android:title="B Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_x_btn"
+	                android:title="X Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_y_btn"
+	                android:title="Y Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_start_btn"
+	                android:title="Start Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_select_btn"
+	                android:title="Select Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_l_btn"
+	                android:title="L1 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_r_btn"
+	                android:title="R1 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_l2_btn"
+	                android:title="L2 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_r2_btn"
+	                android:title="R2 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_l3_btn"
+	                android:title="L3 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player1_r3_btn"
+	                android:title="R3 Button" />
+	        </PreferenceScreen>
+	        <PreferenceScreen
+	            android:title="Player 2 Custom Binds"
+	            android:dependency="input_autodetect_enable" >
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_up_btn"
+	                android:title="Up Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_down_btn"
+	                android:title="Down Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_left_btn"
+	                android:title="Left Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_right_btn"
+	                android:title="Right Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_a_btn"
+	                android:title="A Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_b_btn"
+	                android:title="B Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_x_btn"
+	                android:title="X Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_y_btn"
+	                android:title="Y Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_start_btn"
+	                android:title="Start Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_select_btn"
+	                android:title="Select Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_l_btn"
+	                android:title="L1 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_r_btn"
+	                android:title="R1 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_l2_btn"
+	                android:title="L2 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_r2_btn"
+	                android:title="R2 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_l3_btn"
+	                android:title="L3 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player2_r3_btn"
+	                android:title="R3 Button" />
+	        </PreferenceScreen>
+	        <PreferenceScreen
+	            android:title="Player 3 Custom Binds"
+	            android:dependency="input_autodetect_enable" >
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_up_btn"
+	                android:title="Up Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_down_btn"
+	                android:title="Down Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_left_btn"
+	                android:title="Left Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_right_btn"
+	                android:title="Right Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_a_btn"
+	                android:title="A Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_b_btn"
+	                android:title="B Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_x_btn"
+	                android:title="X Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_y_btn"
+	                android:title="Y Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_start_btn"
+	                android:title="Start Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_select_btn"
+	                android:title="Select Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_l_btn"
+	                android:title="L1 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_r_btn"
+	                android:title="R1 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_l2_btn"
+	                android:title="L2 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_r2_btn"
+	                android:title="R2 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_l3_btn"
+	                android:title="L3 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player3_r3_btn"
+	                android:title="R3 Button" />
+	        </PreferenceScreen>
+	        <PreferenceScreen
+	            android:title="Player 4 Custom Binds"
+	            android:dependency="input_autodetect_enable" >
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_up_btn"
+	                android:title="Up Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_down_btn"
+	                android:title="Down Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_left_btn"
+	                android:title="Left Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_right_btn"
+	                android:title="Right Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_a_btn"
+	                android:title="A Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_b_btn"
+	                android:title="B Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_x_btn"
+	                android:title="X Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_y_btn"
+	                android:title="Y Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_start_btn"
+	                android:title="Start Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_select_btn"
+	                android:title="Select Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_l_btn"
+	                android:title="L1 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_r_btn"
+	                android:title="R1 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_l2_btn"
+	                android:title="L2 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_r2_btn"
+	                android:title="R2 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_l3_btn"
+	                android:title="L3 Button" />
+	            <org.retroarch.browser.KeyBindPreference
+	                android:key="input_player4_r3_btn"
+	                android:title="R3 Button" />
+	        </PreferenceScreen>
+        </PreferenceCategory>
+    </PreferenceScreen>
+</PreferenceScreen>
@@ -0,0 +1,116 @@
+package org.retroarch.browser;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.FileInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ConfigFile {
+	private HashMap<String, String> map = new HashMap<String, String>();
+
+	public void append(InputStream stream) throws IOException {
+		BufferedReader br = new BufferedReader(new InputStreamReader(stream));
+
+		String line;
+		while ((line = br.readLine()) != null)
+			parseLine(line);
+
+		br.close();
+	}
+
+	public void open(File file) throws IOException {
+		clear();
+		append(new FileInputStream(file));
+	}
+	
+	public ConfigFile(File file) throws IOException {
+		open(file);
+	}
+	
+	public ConfigFile() {}
+
+	private void parseLine(String line) {
+		String[] tokens = line.split("=", 2);
+		if (tokens.length < 2)
+			return;
+
+		for (int i = 0; i < tokens.length; i++)
+			tokens[i] = tokens[i].trim();
+
+		String key = tokens[0];
+		String value = tokens[1];
+
+		if (value.startsWith("\""))
+			value = value.substring(1, value.lastIndexOf('\"'));
+		else
+			value = value.split(" ")[0];
+
+		if (value.length() > 0)
+			map.put(key, value);
+	}
+
+	public void clear() {
+		map.clear();
+	}
+
+	public void write(File file) throws IOException {
+		PrintWriter writer = new PrintWriter(file.getAbsolutePath());
+		for (Map.Entry<String, String> entry : map.entrySet())
+			writer.println(entry.getKey() + " = \"" + entry.getValue() + "\"");
+		writer.close();
+	}
+
+	public void setString(String key, String value) {
+		map.put(key, value);
+	}
+
+	public void setBoolean(String key, boolean value) {
+		map.put(key, Boolean.toString(value));
+	}
+
+	public void setInt(String key, int value) {
+		map.put(key, Integer.toString(value));
+	}
+
+	public void setDouble(String key, double value) {
+		map.put(key, Double.toString(value));
+	}
+
+	public boolean keyExists(String key) {
+		return map.containsKey(key);
+	}
+
+	public String getString(String key) {
+		Object ret = map.get(key);
+		if (ret != null)
+			return (String) ret;
+		else
+			return null;
+	}
+
+	public int getInt(String key) throws NumberFormatException {
+		String str = getString(key);
+		if (str != null)
+			return Integer.parseInt(str);
+		else
+			throw new NumberFormatException();
+	}
+
+	public double getDouble(String key) throws NumberFormatException {
+		String str = getString(key);
+		if (str != null)
+			return Double.parseDouble(str);
+		else
+			throw new NumberFormatException();
+	}
+
+	public boolean getBoolean(String key) {
+		String str = getString(key);
+		return Boolean.parseBoolean(str);
+	}
+}
@@ -0,0 +1,310 @@
+package org.retroarch.browser;
+
+import org.retroarch.R;
+
+import java.util.*;
+import java.io.*;
+
+import android.content.*;
+import android.app.*;
+import android.media.AudioManager;
+import android.os.*;
+import android.preference.PreferenceManager;
+import android.widget.*;
+import android.view.*;
+import android.graphics.drawable.*;
+
+class FileWrapper implements IconAdapterItem {
+	public final File file;
+	public final boolean parentItem;
+	public final boolean dirSelectItem;
+	
+	protected final boolean enabled;
+	
+	public static final int DIRSELECT = 0;
+	public static final int PARENT = 1;
+	public static final int FILE = 2;
+	
+	protected final int typeIndex;
+
+	public FileWrapper(File aFile, int type, boolean aIsEnabled) {
+		file = aFile;
+		
+		parentItem = type == PARENT;
+		dirSelectItem = type == DIRSELECT;		
+		typeIndex = type == FILE ? (FILE + (file.isDirectory() ? 0 : 1)) : type;	
+		
+		enabled = parentItem || dirSelectItem || aIsEnabled;
+	}
+
+	@Override
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	@Override
+	public String getText() {
+		if (dirSelectItem)
+			return "[[Use this directory]]";
+		else if (parentItem)
+			return "[Parent Directory]";
+		else
+			return file.getName();
+	}
+
+	@Override
+	public int getIconResourceId() {
+		if (!parentItem && !dirSelectItem) {
+			return file.isFile() ? R.drawable.ic_file : R.drawable.ic_dir;
+		} else {
+			return R.drawable.ic_dir;
+		}
+	}
+
+	@Override
+	public Drawable getIconDrawable() {
+		return null;
+	}
+
+	public int compareTo(FileWrapper aOther) {
+		if (aOther != null) {
+			// Who says ternary is hard to follow
+			if (isEnabled() == aOther.isEnabled()) {
+				return (typeIndex == aOther.typeIndex) ? file
+						.compareTo(aOther.file)
+						: ((typeIndex < aOther.typeIndex) ? -1 : 1);
+			} else {
+				return isEnabled() ? -1 : 1;
+			}
+		}
+
+		return -1;
+	}
+}
+
+public class DirectoryActivity extends Activity implements
+		AdapterView.OnItemClickListener {
+	private IconAdapter<FileWrapper> adapter;
+	private File listedDirectory;
+
+	public static class BackStackItem implements Parcelable {
+		public String path;
+		public boolean parentIsBack;
+
+		public BackStackItem(String aPath, boolean aParentIsBack) {
+			path = aPath;
+			parentIsBack = aParentIsBack;
+		}
+
+		private BackStackItem(Parcel aIn) {
+			path = aIn.readString();
+			parentIsBack = aIn.readInt() != 0;
+		}
+
+		public int describeContents() {
+			return 0;
+		}
+
+		public void writeToParcel(Parcel out, int flags) {
+			out.writeString(path);
+			out.writeInt(parentIsBack ? 1 : 0);
+		}
+
+		public static final Parcelable.Creator<BackStackItem> CREATOR = new Parcelable.Creator<BackStackItem>() {
+			public BackStackItem createFromParcel(Parcel in) {
+				return new BackStackItem(in);
+			}
+
+			public BackStackItem[] newArray(int size) {
+				return new BackStackItem[size];
+			}
+		};
+
+	}
+
+	private ArrayList<BackStackItem> backStack;
+	
+	protected String startDirectory;
+	protected String pathSettingKey;
+	
+	protected void setStartDirectory(String path) {
+		startDirectory = path;
+	}
+	
+	protected void setPathSettingKey(String key) {
+		pathSettingKey = key;
+	}
+	
+	private boolean isDirectoryTarget;
+	protected void setIsDirectoryTarget(boolean enable) {
+		isDirectoryTarget = enable;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.line_list);
+
+		// Setup the list
+		adapter = new IconAdapter<FileWrapper>(this, R.layout.line_list_item);
+		ListView list = (ListView) findViewById(R.id.list);
+		list.setAdapter(adapter);
+		list.setOnItemClickListener(this);
+
+		// Load Directory
+		if (savedInstanceState != null) {
+			backStack = savedInstanceState.getParcelableArrayList("BACKSTACK");
+		}
+
+		if (backStack == null || backStack.size() == 0) {
+			backStack = new ArrayList<BackStackItem>();
+			String startPath = (startDirectory == null || startDirectory.isEmpty()) ? Environment
+					.getExternalStorageDirectory().getPath() : startDirectory;
+			backStack.add(new BackStackItem(startPath, false));
+		}
+
+		wrapFiles();
+		this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
+	}
+
+	@Override
+	protected void onSaveInstanceState(Bundle aState) {
+		super.onSaveInstanceState(aState);
+		aState.putParcelableArrayList("BACKSTACK", backStack);
+	}
+	
+	private void finishWithPath(String path) {
+		if (pathSettingKey != null && !pathSettingKey.isEmpty()) {
+			SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
+			SharedPreferences.Editor editor = settings.edit();
+			editor.putString(pathSettingKey, path);
+			editor.commit();
+		}
+		
+		Intent intent = new Intent();			
+		intent.putExtra("PATH", path);
+		setResult(RESULT_OK, intent);
+		finish();
+	}
+
+	@Override
+	public void onItemClick(AdapterView<?> aListView, View aView,
+			int aPosition, long aID) {
+		final FileWrapper item = adapter.getItem(aPosition);
+
+		if (item.parentItem && backStack.get(backStack.size() - 1).parentIsBack) {
+			backStack.remove(backStack.size() - 1);
+			wrapFiles();
+			return;
+		} else if (item.dirSelectItem) {
+			finishWithPath(listedDirectory.getAbsolutePath());
+			return;
+		}
+
+		final File selected = item.parentItem ? listedDirectory.getParentFile()
+				: item.file;
+
+		if (selected.isDirectory()) {
+			backStack.add(new BackStackItem(selected.getAbsolutePath(),
+					!item.parentItem));
+			wrapFiles();
+		} else {
+			String filePath = selected.getAbsolutePath();
+			finishWithPath(filePath);
+		}
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		if (keyCode == KeyEvent.KEYCODE_BACK) {
+			if (backStack.size() > 1) {
+				backStack.remove(backStack.size() - 1);
+				wrapFiles();
+			} else {
+				Intent intent = new Intent();
+				setResult(RESULT_CANCELED, intent);
+				finish();
+			}
+			return true;
+		}
+
+		return super.onKeyDown(keyCode, event);
+	}
+	
+	private ArrayList<String> allowedExt;
+	private ArrayList<String> disallowedExt;
+	
+	private boolean filterPath(String path) {
+		if (disallowedExt != null) {
+			for (String ext : disallowedExt)
+				if (path.endsWith(ext))
+					return false;
+		}
+		
+		if (allowedExt != null) {
+			for (String ext : allowedExt)
+				if (path.endsWith(ext))
+					return true;
+			
+			return false;
+		}
+
+		return true;
+	}
+	
+	protected void addAllowedExt(String ext) {
+		if (allowedExt == null)
+			allowedExt = new ArrayList<String>();
+		
+		allowedExt.add(ext);
+	}
+	
+	protected void addDisallowedExt(String ext) {
+		if (disallowedExt == null)
+			disallowedExt = new ArrayList<String>();
+		
+		disallowedExt.add(ext);
+	}
+
+	private void wrapFiles() {
+		listedDirectory = new File(backStack.get(backStack.size() - 1).path);
+
+		if (!listedDirectory.isDirectory()) {
+			throw new IllegalArgumentException("Directory is not valid.");
+		}
+
+		adapter.clear();
+		setTitle(listedDirectory.getAbsolutePath());
+		
+		if (isDirectoryTarget)
+			adapter.add(new FileWrapper(null, FileWrapper.DIRSELECT, true));
+
+		if (listedDirectory.getParentFile() != null)
+			adapter.add(new FileWrapper(null, FileWrapper.PARENT, true));
+
+		// Copy new items
+		final File[] files = listedDirectory.listFiles();
+		if (files != null) {
+			for (File file : files) {
+				String path = file.getName();
+
+				boolean allowFile = file.isDirectory() || (filterPath(path) && !isDirectoryTarget);
+
+				if (allowFile)
+					adapter.add(new FileWrapper(file, FileWrapper.FILE,
+							file.isDirectory() || true));
+			}
+		}
+
+		// Sort items
+		adapter.sort(new Comparator<FileWrapper>() {
+			@Override
+			public int compare(FileWrapper aLeft, FileWrapper aRight) {
+				return aLeft.compareTo(aRight);
+			};
+		});
+
+		// Update
+		adapter.notifyDataSetChanged();
+	}
+}
@@ -0,0 +1,125 @@
+package org.retroarch.browser;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.opengl.GLES20;
+import android.opengl.GLSurfaceView;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.WindowManager;
+import android.widget.Toast;
+
+public class DisplayRefreshRateTest extends Activity {
+
+	private class Renderer implements GLSurfaceView.Renderer {
+		private static final String TAG = "GLESRenderer";
+		private static final double WARMUP_SECONDS = 2.0;
+		private static final double TEST_SECONDS = 10.0;
+		// Test states
+		private static final int STATE_START = 0;
+		private static final int STATE_WARMUP = 1;
+		private static final int STATE_TEST = 2;
+		private static final int STATE_DONE = 3;
+		private static final int STATE_DEAD = 4;
+		private int mState = STATE_START;
+		private double mStartTime = 0.0;
+		private int mNumFrames = 0;
+		
+		private Activity activity;
+		
+		public Renderer(Activity activity) {
+			this.activity = activity;
+		}
+		
+		private void setFPSSetting(double fps) {
+			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
+			SharedPreferences.Editor edit = prefs.edit();
+			edit.putString("video_refresh_rate", Double.valueOf(fps).toString());
+			edit.commit();
+		}
+
+		@Override
+		public void onDrawFrame(GL10 gl) {
+			double t = System.nanoTime() * 1.0e-9;
+			switch (mState) {
+			case STATE_START:
+				mStartTime = t;
+				mState = STATE_WARMUP;
+				break;
+
+			case STATE_WARMUP:
+				if ((t - mStartTime) >= WARMUP_SECONDS) {
+					mStartTime = t;
+					mNumFrames = 0;
+					mState = STATE_TEST;
+				}
+				break;
+
+			case STATE_TEST:
+				mNumFrames++;
+				double elapsed = t - mStartTime;
+				if (elapsed >= TEST_SECONDS) {
+					double fps = (double)mNumFrames / elapsed;
+					Log.i(TAG, "Measured FPS to: " + fps);
+					setFPSSetting(fps);
+					mState = STATE_DONE;
+				}
+				break;
+
+			case STATE_DONE:
+				activity.runOnUiThread(new Runnable() {
+					public void run() {
+						finish();
+					}
+				});
+				mState = STATE_DEAD;
+				break;
+				
+			case STATE_DEAD:
+				break;
+			}
+
+			float luma = (float)Math.sin((double)mNumFrames * 0.10);
+			luma *= 0.2f;
+			luma += 0.5f;
+			GLES20.glClearColor(luma, luma, luma, 1.0f);
+			GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
+		}
+
+		@Override
+		public void onSurfaceChanged(GL10 gl, int width, int height) {
+			// TODO Auto-generated method stub
+		}
+
+		@Override
+		public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+			// TODO Auto-generated method stub
+		}
+	}
+
+	private GLSurfaceView surfaceView;
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		Toast.makeText(this, "Touch the screen with your fingers for more accurate measurements.", Toast.LENGTH_LONG).show();
+		surfaceView = new GLSurfaceView(this);
+		surfaceView.setEGLContextClientVersion(2);
+		surfaceView.setRenderer(new Renderer(this));
+		getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+		setTitle("Refresh rate calibration");
+		setContentView(surfaceView);
+	}
+	
+	@Override
+	protected void onDestroy() {
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
+		String fps = prefs.getString("video_refresh_rate", "ERROR");
+		Toast.makeText(this, "Refresh rate measured to: " + fps + " Hz.", Toast.LENGTH_LONG).show();
+		super.onDestroy();
+	}
+}
@@ -0,0 +1,17 @@
+package org.retroarch.browser;
+
+import org.retroarch.R;
+
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
+
+public class HelpActivity extends PreferenceActivity {
+	@SuppressWarnings("deprecation")
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		addPreferencesFromResource(R.xml.help);
+		PreferenceManager.setDefaultValues(this, R.xml.help, false);
+	}
+}
@@ -0,0 +1,71 @@
+package org.retroarch.browser;
+
+import org.retroarch.R;
+
+import android.app.*;
+import android.content.*;
+import android.graphics.drawable.*;
+import android.view.*;
+import android.widget.*;
+
+interface IconAdapterItem {
+	public abstract boolean isEnabled();
+
+	public abstract String getText();
+
+	public abstract int getIconResourceId();
+
+	public abstract Drawable getIconDrawable();
+}
+
+class IconAdapter<T extends IconAdapterItem> extends ArrayAdapter<T> {
+	private final int layout;
+
+	public IconAdapter(Activity aContext, int aLayout) {
+		super(aContext, aLayout);
+
+		layout = aLayout;
+	}
+
+	@Override
+	public View getView(int aPosition, View aConvertView, ViewGroup aParent) {
+		// Build the view
+		if (aConvertView == null) {
+			LayoutInflater inflater = (LayoutInflater) aParent.getContext()
+					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+			aConvertView = inflater.inflate(layout, aParent, false);
+		}
+
+		// Fill the view
+		IconAdapterItem item = getItem(aPosition);
+		final boolean enabled = item.isEnabled();
+
+		TextView textView = (TextView) aConvertView.findViewById(R.id.name);
+		if (null != textView) {
+			textView.setText(item.getText());
+			textView.setEnabled(enabled);
+		}
+
+		ImageView imageView = (ImageView) aConvertView.findViewById(R.id.icon);
+		if (null != imageView) {
+			if (enabled) {
+				final int id = item.getIconResourceId();
+				if (0 != id) {
+					imageView.setImageResource(id);
+				} else {
+					imageView.setImageDrawable(item.getIconDrawable());
+				}
+			} else {
+				imageView.setImageDrawable(null);
+			}
+		}
+
+		return aConvertView;
+	}
+
+	@Override
+	public boolean isEnabled(int aPosition) {
+		return getItem(aPosition).isEnabled();
+	}
+
+}
@@ -0,0 +1,139 @@
+package org.retroarch.browser;
+
+import android.content.Context;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ListView;
+import org.retroarch.R;
+
+class KeyBindEditText extends EditText
+{
+	KeyBindPreference pref;
+	public KeyBindEditText(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+	
+	public void setBoundPreference(KeyBindPreference pref)
+	{
+		this.pref = pref;
+	}
+	
+	@Override
+	public boolean onKeyPreIme(int keyCode, KeyEvent event)
+	{
+		return pref.onKey(null, event.getKeyCode(), event);
+	}
+	
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event)
+	{
+		return pref.onKey(null, event.getKeyCode(), event);
+	}
+}
+
+class KeyBindPreference extends DialogPreference implements View.OnKeyListener, AdapterView.OnItemClickListener, LayoutInflater.Factory {
+	private int key_bind_code;
+	private boolean grabKeyCode = false;
+	KeyBindEditText keyText;
+	private String[] key_labels;
+	private final int DEFAULT_KEYCODE = 0;
+
+	public KeyBindPreference(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		key_labels = getContext().getResources().getStringArray(R.array.key_bind_values);
+	}
+	
+	private void setKey(int keyCode, boolean force)
+	{
+		if (grabKeyCode || force)
+		{
+			grabKeyCode = false;
+			key_bind_code = keyCode;
+			keyText.setText("Current: " + key_labels[key_bind_code]);
+		}
+	}
+
+	@Override
+	protected void onBindDialogView(View view) {
+	    super.onBindDialogView(view);
+	}
+	
+	@Override
+	protected View onCreateDialogView()
+	{
+		LayoutInflater inflater = ((LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).cloneInContext(getContext());
+		inflater.setFactory(this);
+		View view = inflater.inflate(R.layout.key_bind_dialog, null);
+		keyText = (KeyBindEditText) view.findViewById(R.id.key_bind_value);
+		keyText.setBoundPreference(this);
+		view.setOnKeyListener(this);
+		((ListView) view.findViewById(R.id.key_bind_list)).setOnItemClickListener(this);
+		((Button) view.findViewById(R.id.key_bind_clear)).setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+        		setKey(0, true);
+            }
+        });
+		((Button) view.findViewById(R.id.key_bind_detect)).setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+            	grabKeyCode = true;
+    			keyText.setText("Press key to use");
+    			keyText.requestFocus();
+            }
+        });
+		InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+		imm.hideSoftInputFromWindow(keyText.getWindowToken(), 0);
+		setKey(getPersistedInt(DEFAULT_KEYCODE), true);
+		return view;
+	}
+
+	@Override
+	protected void onDialogClosed(boolean positiveResult) {
+	   super.onDialogClosed(positiveResult);
+	
+	    if (positiveResult) {
+	    	persistInt(key_bind_code);
+	    	notifyChanged();
+	    }
+	}
+	
+	@Override
+	public boolean onKey(View v, int keyCode, KeyEvent event) {
+		if (grabKeyCode && event.getAction() == KeyEvent.ACTION_DOWN && keyCode != 0 && keyCode < key_labels.length)
+		{
+			setKey(keyCode, false);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+		setKey((int)id, true);
+	}
+
+    @Override
+    public CharSequence getSummary() {
+    	int code = getPersistedInt(DEFAULT_KEYCODE);
+		if (code >= key_labels.length)
+			return "";
+		else
+			return key_labels[code];
+    }
+    
+    @Override
+    public View onCreateView(String name, Context context, AttributeSet attrs) {
+    	Log.i("RetroArch", "view name: " + name);
+    	if (name.equals("EditText"))
+    		return new KeyBindEditText(context, attrs);
+    	else
+    		return null;
+    }
+}
@@ -0,0 +1,18 @@
+package org.retroarch.browser;
+
+import java.io.File;
+
+import android.os.Bundle;
+
+public class OverlayActivity extends DirectoryActivity {
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		File overlayDir = new File(getCacheDir(), "Overlays");
+		if (overlayDir.exists())
+			super.setStartDirectory(overlayDir.getAbsolutePath());
+		
+		super.addAllowedExt(".cfg");
+		super.setPathSettingKey("input_overlay");
+		super.onCreate(savedInstanceState);
+	}
+}
@@ -0,0 +1,24 @@
+package org.retroarch.browser;
+
+import java.io.File;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+
+public class ROMActivity extends DirectoryActivity {
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
+		String startPath = prefs.getString("phoenix_rom_dir", "");
+		if (!startPath.isEmpty() && new File(startPath).exists())
+			super.setStartDirectory(startPath);
+
+		super.addDisallowedExt(".state");
+		super.addDisallowedExt(".srm");
+		super.addDisallowedExt(".state.auto");
+		super.addDisallowedExt(".rtc");
+		super.onCreate(savedInstanceState);
+	}
+}
@@ -0,0 +1,12 @@
+package org.retroarch.browser;
+
+import android.os.Bundle;
+
+public class ROMDirActivity extends DirectoryActivity {
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.setPathSettingKey("phoenix_rom_dir");
+		super.setIsDirectoryTarget(true);
+		super.onCreate(savedInstanceState);
+	}
+}