(Wii) Bump up to version 1.2.2

(Android) Bump up APK version code; bump up version
(OSX) Bump up to version 1.2.2
2026-11-09 03:29:43 -10:00 · 2015-07-19 11:50:27 +02:00 · 2015-07-19 11:50:00 +02:00 · 2015-07-19 00:14:31 +02:00 · 2015-07-18 23:49:58 +02:00 · 2015-07-18 23:41:42 +02:00
1512 changed files with 72609 additions and 92521 deletions
@@ -23,7 +23,7 @@ Debug
 Release
 ipch
 *.user
-/bootstrap/gx/wii/app_booter/app_booter.bin
+/wii/app_booter/app_booter.bin
 *.zip
 RetroArch-w32/
 RetroArch-w64/
@@ -46,7 +46,6 @@ DerivedData
 apple/tmp
 apple/*.mobileprovision
 apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
-menu/driverspzarch.c
 /Cg/
 /GL/
 /SDL/
@@ -63,12 +62,12 @@ menu/driverspzarch.c
 /obj-w32/

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

 # Cloned by libretro-fetch.sh
 /media/assets/
@@ -77,8 +76,8 @@ menu/driverspzarch.c
 /media/shaders_cg/
 /media/libretrodb/

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

 obj-unix/
 .vagrant/
@@ -0,0 +1,73 @@
+Hans-Kristian Arntzen - <[email protected]>
+   - Main code
+   - Initial Gamecube/Wii libogc port
+
+Daniel De Matteis - <[email protected]>
+   - Maintainer
+   - Main code
+
+Devin J. Pohly - <[email protected]>
+   - Joypad axis support
+
+Chris Moeller - <[email protected]> 
+   - CoreAudio audio driver
+
+Tobias Jakobi - <TBA>
+   - OMAP graphics driver
+
+Jason Fetters - <TBA>
+   - Phoenix Java frontend
+   - Android port patches
+   - iOS port
+
+CatalystG - <[email protected]>
+   - Blackberry 10/Playbook input driver
+   - Blackberry 10/Playbook patches
+
+David Reichelt - <[email protected]>
+   - XBox 1 port
+
+tukuyomi - <[email protected]>
+   - Cleanups in quickbuild
+
+Michael Lelli - <[email protected]>
+   - Gamecube/Wii libogc port
+   - Raspberry Pi video driver
+   - Linux Raw keyboard input driver
+   - Android port patches
+
+Ali Bouhlel - <[email protected]>
+   - PSP port
+   - Convoluted Cosine resampler
+
+Darren Alton -
+   - OpenPandora port
+
+Fabian Knopf -
+   - WGL multi-monitor support
+   - D3D9 overlay, multi-monitor and menu support
+
+Gražvydas Ignotas -
+   - ARM Linux patches
+
+Saggi Mizrahi - 
+   - RetroLaunch utility
+
+Alfred Agrell - <[email protected]>
+   - Rewritten savestate manager
+   
+Jean-André Santoni - <[email protected]>
+   - Lakka menu driver
+
+Morgane Alonso -
+   - Lakka menu driver (graphic design)
+
+Timo Strunk - <[email protected]>
+   - 7zip support
+
+Higor Euripedes - <TBA>
+   - SDL2 drivers
+
+Jay McCarthy - <[email protected]>
+   - CoreText font driver
+   - (Apple) CFRunLoop improvements
@@ -1,13 +1,9 @@
 HAVE_FILE_LOGGER=1
-MISSING_DECLS   =0
-
-ifneq ($(C90_BUILD),)
-   C89_BUILD=1
-endif

 include config.mk

 TARGET = retroarch
+JTARGET = tools/retroarch-joyconfig 

 OBJDIR := obj-unix

@@ -16,6 +12,7 @@ ifeq ($(GLOBAL_CONFIG_DIR),)
 endif

 OBJ := 
+JOYCONFIG_OBJ :=
 LIBS :=
 DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
@@ -26,16 +23,8 @@ endif

 include Makefile.common

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

-ifeq ($(MISSING_DECLS), 1)
-	DEFINES += -Werror=missing-declarations
-endif
-
 ifeq ($(HAVE_DYLIB), 1)
   LIBS += $(DYLIB_LIB)
 endif
@@ -54,13 +43,10 @@ ifeq ($(DEBUG), 1)
   OPTIMIZE_FLAG = -O0 -g
 else
   OPTIMIZE_FLAG = -O3 -ffast-math
-ifneq ($(findstring Win32,$(OS)),)
-   LDFLAGS += -mwindows
-endif
 endif

 CFLAGS   += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) $(DEBUG_FLAG) -I.
-CXXFLAGS := $(CFLAGS) -std=c++98 -D__STDC_CONSTANT_MACROS
+CXXFLAGS := $(CFLAGS) -std=c++0x -D__STDC_CONSTANT_MACROS
 OBJCFLAGS :=  $(CFLAGS) -D__STDC_CONSTANT_MACROS

 ifeq ($(CXX_BUILD), 1)
@@ -82,8 +68,9 @@ else
      endif
   endif

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

@@ -97,6 +84,7 @@ ifeq ($(NOUNUSED_VARIABLE), yes)
 endif

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

 ifneq ($(SANITIZER),)
    CFLAGS   := -fsanitize=$(SANITIZER) $(CFLAGS)
@@ -104,16 +92,9 @@ ifneq ($(SANITIZER),)
    LDFLAGS  := -fsanitize=$(SANITIZER) $(LDLAGS)
 endif

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

-all: $(TARGET) config.mk
-
-include $(RARCH_OBJ:.o=.d)
+-include $(RARCH_OBJ:.o=.d) $(RARCH_JOYCONFIG_OBJ:.o=.d)
 config.mk: configure qb/*
 	@echo "config.mk is outdated or non-existing. Run ./configure again."
 	@exit 1
@@ -122,6 +103,10 @@ retroarch: $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
 	$(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS)

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

+$(OBJDIR)/tools/linuxraw_joypad.o: input/linuxraw_joypad.c
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -DIS_JOYCONFIG -c -o $@ $<
+
+$(OBJDIR)/tools/parport_joypad.o: input/parport_joypad.c
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -DIS_JOYCONFIG -c -o $@ $<
+
+$(OBJDIR)/tools/udev_joypad.o: input/udev_joypad.c
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo CC $<),)
+	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -DIS_JOYCONFIG -c -o $@ $<
+
 $(OBJDIR)/%.o: %.S config.h config.mk $(HEADERS)
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo AS $<),)
@@ -158,29 +158,33 @@ install: $(TARGET)
 	rm -f $(OBJDIR)/git_version.o
 	mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true
 	mkdir -p $(DESTDIR)$(GLOBAL_CONFIG_DIR) 2>/dev/null || /bin/true
-	mkdir -p $(DESTDIR)$(PREFIX)/share/applications 2>/dev/null || /bin/true
-	mkdir -p $(DESTDIR)$(MAN_DIR) 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 -m755 tools/cg2glsl.py $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
+	install -m755 $(JTARGET) $(DESTDIR)$(PREFIX)/bin
 	install -m644 retroarch.cfg $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
-	install -m644 retroarch.desktop $(DESTDIR)$(PREFIX)/share/applications
 	install -m644 docs/retroarch.1 $(DESTDIR)$(MAN_DIR)
 	install -m644 docs/retroarch-cg2glsl.1 $(DESTDIR)$(MAN_DIR)
+	install -m644 docs/retroarch-joyconfig.1 $(DESTDIR)$(MAN_DIR)
+	install -m644 media/retroarch.png $(DESTDIR)$(PREFIX)/share/pixmaps
 	install -m644 media/retroarch.svg $(DESTDIR)$(PREFIX)/share/pixmaps

 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch
+	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-joyconfig
 	rm -f $(DESTDIR)$(PREFIX)/bin/retroarch-cg2glsl
 	rm -f $(DESTDIR)$(GLOBAL_CONFIG_DIR)/retroarch.cfg
-	rm -f $(DESTDIR)$(PREFIX)/share/applications/retroarch.desktop
-	rm -f $(DESTDIR)$(MAN_DIR)/retroarch.1
-	rm -f $(DESTDIR)$(MAN_DIR)/retroarch-cg2glsl.1
+	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch.1
+	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-cg2glsl.1
+	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/retroarch-joyconfig.1
+	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.png
 	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/retroarch.svg

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

 .PHONY: all install uninstall clean
@@ -28,6 +28,7 @@ endif

 ifeq ($(HAVE_DYLIB), 1)
   DEFINES += -DHAVE_DYLIB
+	JOYCONFIG_LIBS += $(DYLIB_LIB)
 endif

 ifeq ($(SCALER_NO_SIMD), 1)
@@ -53,7 +54,7 @@ ifeq ($(TDM_GCC),)
 endif

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

 CFLAGS += -I./libretro-common/include
@@ -70,17 +71,17 @@ endif
 ifneq ($(findstring Darwin,$(OS)),)
   OSX := 1
   LIBS += -framework AppKit
+   JOYCONFIG_LIBS += -framework CoreFoundation
 else
   OSX := 0
 endif

 ifneq ($(findstring Linux,$(OS)),)
   LIBS += -lrt
+   JOYCONFIG_LIBS += -lrt -lpthread
   OBJ += input/drivers/linuxraw_input.o \
-			 input/common/linux_common.o \
-			 input/common/epoll_common.o \
-          input/drivers_joypad/linuxraw_joypad.o \
-          frontend/drivers/platform_linux.o
+			 input/drivers_joypad/linuxraw_joypad.o \
+			 frontend/drivers/platform_linux.o
 endif

 ifeq ($(findstring Haiku,$(OS)),)
@@ -103,143 +104,136 @@ endif
 # General object files

 OBJ += frontend/frontend.o \
-       frontend/frontend_driver.o \
-       frontend/drivers/platform_null.o \
-       ui/ui_companion_driver.o \
-       ui/drivers/ui_null.o \
-       libretro_version_1.o \
-       retroarch.o \
-		 input/input_keyboard.o \
-       command_event.o \
-       msg_hash.o \
-       intl/msg_hash_de.o \
-       intl/msg_hash_eo.o \
-       intl/msg_hash_es.o \
-       intl/msg_hash_fr.o \
-       intl/msg_hash_it.o \
-       intl/msg_hash_nl.o \
-       intl/msg_hash_pl.o \
-       intl/msg_hash_pt.o \
-       intl/msg_hash_us.o \
-       runloop.o \
-       tasks/tasks.o \
-       tasks/task_file_transfer.o \
-       content.o \
-		 libretro-common/encodings/encoding_utf.o \
-       libretro-common/file/file_list.o \
-       libretro-common/file/dir_list.o \
-       libretro-common/file/retro_dirent.o \
-       libretro-common/file/retro_file.o \
-       libretro-common/file/retro_stat.o \
-       libretro-common/string/string_list.o \
-       libretro-common/string/stdstring.o \
-       libretro-common/memmap/memalign.o \
-       dir_list_special.o \
-       string_list_special.o \
-       file_ops.o \
-       libretro-common/file/nbio/nbio_stdio.o \
-       libretro-common/file/file_path.o \
-       file_path_special.o \
-       libretro-common/hash/rhash.o \
-       audio/audio_driver.o \
-       input/input_driver.o \
-       input/input_hid_driver.o \
-       gfx/video_common.o \
-       gfx/video_driver.o \
-       camera/camera_driver.o \
-       location/location_driver.o \
-       driver.o \
-       configuration.o \
-       libretro-common/dynamic/dylib.o \
-       dynamic.o \
-       cores/dynamic_dummy.o \
-       libretro-common/queues/message_queue.o \
-       rewind.o \
-       gfx/drivers_font_renderer/bitmapfont.o \
-       input/input_autodetect.o \
-       input/input_joypad_driver.o \
-       input/input_config.o \
-       input/input_keymaps.o \
-       input/input_remapping.o \
-       tasks/task_overlay.o \
-       input/input_overlay.o \
-       patch.o \
-       libretro-common/queues/fifo_buffer.o \
-       core_options.o \
-       libretro-common/compat/compat_fnmatch.o \
-		 libretro-common/compat/compat_posix_string.o \
-       cheats.o \
-       core_info.o \
-       libretro-common/file/config_file.o \
-       libretro-common/file/config_file_userdata.o \
-       screenshot.o \
-       libretro-common/gfx/scaler/scaler.o \
-       gfx/drivers_shader/shader_null.o \
-       gfx/video_shader_driver.o \
-       gfx/video_shader_parse.o \
-       libretro-common/gfx/scaler/pixconv.o \
-       libretro-common/gfx/scaler/scaler_int.o \
-       libretro-common/gfx/scaler/scaler_filter.o \
-       gfx/font_driver.o \
-       gfx/video_filter.o \
-       audio/audio_resampler_driver.o \
-       audio/audio_dsp_filter.o \
-       audio/drivers_resampler/sinc.o \
-       audio/drivers_resampler/nearest.o \
-       audio/drivers_resampler/cc_resampler.o \
-       location/drivers/nulllocation.o \
-       camera/drivers/nullcamera.o \
-       gfx/drivers/nullgfx.o \
-       audio/drivers/nullaudio.o \
-       input/drivers/nullinput.o \
-       input/drivers_hid/null_hid.o \
-       input/drivers_joypad/null_joypad.o \
-       input/drivers_joypad/hid_joypad.o \
-       playlist.o \
-       movie.o \
-       record/record_driver.o \
-       record/drivers/record_null.o \
-       performance.o \
-		 verbosity.o
+		frontend/frontend_driver.o \
+		frontend/drivers/platform_null.o \
+		ui/ui_companion_driver.o \
+		ui/drivers/ui_null.o \
+		libretro_version_1.o \
+		retroarch.o \
+		system.o \
+		retroarch_info.o \
+		command_event.o \
+		msg_hash.o \
+		intl/msg_hash_de.o \
+		intl/msg_hash_eo.o \
+		intl/msg_hash_es.o \
+		intl/msg_hash_fr.o \
+		intl/msg_hash_it.o \
+		intl/msg_hash_nl.o \
+		intl/msg_hash_pl.o \
+		intl/msg_hash_pt.o \
+		intl/msg_hash_us.o \
+		runloop.o \
+		runloop_data.o \
+		runloop_msg.o \
+		tasks/task_file_transfer.o \
+		content.o \
+		libretro-common/file/file_list.o \
+		libretro-common/file/dir_list.o \
+		libretro-common/string/string_list.o \
+		libretro-common/string/stdstring.o \
+		dir_list_special.o \
+		file_ops.o \
+		libretro-common/file/nbio/nbio_stdio.o \
+		libretro-common/file/file_path.o \
+		file_path_special.o \
+		libretro-common/hash/rhash.o \
+		audio/audio_driver.o \
+		input/input_driver.o \
+		input/input_hid_driver.o \
+		gfx/video_common.o \
+		gfx/video_driver.o \
+		gfx/video_pixel_converter.o \
+		gfx/video_viewport.o \
+		camera/camera_driver.o \
+		menu/menu_driver.o \
+		location/location_driver.o \
+		driver.o \
+		configuration.o \
+		libretro-common/dynamic/dylib.o \
+		dynamic.o \
+		cores/dynamic_dummy.o \
+		libretro-common/queues/message_queue.o \
+		rewind.o \
+		gfx/drivers_font_renderer/bitmapfont.o \
+		input/input_autodetect.o \
+		input/input_joypad_driver.o \
+		input/input_joypad.o \
+		input/input_common.o \
+		input/input_keymaps.o \
+		input/input_remapping.o \
+		input/input_sensor.o \
+		input/keyboard_line.o \
+		tasks/task_overlay.o \
+		input/input_overlay.o \
+		patch.o \
+		libretro-common/queues/fifo_buffer.o \
+		core_options.o \
+		libretro-common/compat/compat.o \
+		libretro-common/compat/compat_fnmatch.o \
+		cheats.o \
+		core_info.o \
+		libretro-common/file/config_file.o \
+		libretro-common/file/config_file_userdata.o \
+		screenshot.o \
+		libretro-common/gfx/scaler/scaler.o \
+		gfx/drivers_shader/shader_null.o \
+		gfx/video_shader_driver.o \
+		gfx/video_shader_parse.o \
+		libretro-common/gfx/scaler/pixconv.o \
+		libretro-common/gfx/scaler/scaler_int.o \
+		libretro-common/gfx/scaler/scaler_filter.o \
+		gfx/font_driver.o \
+		gfx/font_renderer_driver.o \
+		gfx/video_filter.o \
+		audio/audio_resampler_driver.o \
+		audio/audio_dsp_filter.o \
+		audio/drivers_resampler/sinc.o \
+		audio/drivers_resampler/nearest.o \
+		audio/drivers_resampler/cc_resampler.o \
+		location/drivers/nulllocation.o \
+		camera/drivers/nullcamera.o \
+		gfx/drivers/nullgfx.o \
+		audio/drivers/nullaudio.o \
+		input/drivers/nullinput.o \
+		input/drivers_hid/null_hid.o \
+		input/drivers_joypad/null_joypad.o \
+		input/drivers_joypad/hid_joypad.o \
+		playlist.o \
+		movie.o \
+		record/record_driver.o \
+		record/drivers/record_null.o \
+		performance.o

-ifneq ($(HAVE_GETOPT_LONG), 1)
-OBJ += libretro-common/compat/compat_getopt.o
-endif
-
-ifneq ($(HAVE_STRCASESTR), 1)
-OBJ += libretro-common/compat/compat_strcasestr.o
-endif
-
-ifneq ($(HAVE_STRL), 1)
-OBJ += libretro-common/compat/compat_strl.o
-endif

 OBJ += gfx/image/image.o

+ifneq ($(C89_BUILD), 1)
+# stb_image is not a C89-compliant API.
 ifeq ($(HAVE_IMAGEVIEWER), 1)
 DEFINES += -DHAVE_IMAGEVIEWER
 OBJ += cores/image_core.o
 endif
+endif

 # Qt

 ifeq ($(HAVE_QT), 1)
 OBJ += ui/drivers/ui_qt.o
 # TODO/FIXME - figure out which libraries we need to link against
-LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -lglu32 -lopengl32 -L./ui/drivers/qt/wrapper/build/release -lwrapper
+LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -lglu32 -lopengl32 -L./ui/drivers/qt/release -lwrapper
 endif

 # LibretroDB

 ifeq ($(HAVE_LIBRETRODB), 1)
 OBJ += libretro-db/bintree.o \
-       libretro-db/libretrodb.o \
-       libretro-db/query.o \
-       libretro-db/rmsgpack.o \
-       libretro-db/rmsgpack_dom.o \
-       database_info.o \
-       tasks/task_database.o \
-       tasks/task_database_cue.o
+		 libretro-db/libretrodb.o \
+		 libretro-db/query.o \
+		 libretro-db/rmsgpack.o \
+		 libretro-db/rmsgpack_dom.o \
+		 database_info.o \
+		 tasks/task_database.o 
 endif

 # Miscellaneous
@@ -248,17 +242,20 @@ ifeq ($(HAVE_STDIN_CMD), 1)
   DEFINES += -DHAVE_COMMAND -DHAVE_STDIN_CMD
 endif

+ifneq ($(C89_BUILD), 1)
+# Python 3.x bindings are not C89-compliant.
 ifeq ($(HAVE_PYTHON), 1)
   DEFINES += $(PYTHON_CFLAGS) -Wno-unused-parameter
   LIBS += $(PYTHON_LIBS)
   OBJ += gfx/video_state_python.o
 endif
+endif

 ifeq ($(HAVE_EMSCRIPTEN), 1)
 OBJ += frontend/drivers/platform_emscripten.o \
-       input/drivers/rwebinput_input.o \
-       audio/drivers/rwebaudio.o \
-       camera/drivers/rwebcam.o
+		input/drivers/rwebinput_input.o \
+		audio/drivers/rwebaudio.o \
+		camera/drivers/rwebcam.o
 endif

 # Audio
@@ -303,7 +300,7 @@ ifeq ($(HAVE_AL), 1)
 endif

 ifneq ($(findstring Darwin,$(OS)),)
-   OBJ += frontend/drivers/platform_darwin.o
+	OBJ += frontend/drivers/platform_darwin.o
 endif

 ifeq ($(HAVE_JACK),1)
@@ -312,11 +309,14 @@ ifeq ($(HAVE_JACK),1)
   DEFINES += $(JACK_CFLAGS)
 endif

+ifneq ($(C89_BUILD), 1)
+# PulseAudio is not a C89-compliant API.
 ifeq ($(HAVE_PULSE), 1)
   OBJ += audio/drivers/pulse.o
   LIBS += $(PULSE_LIBS)
   DEFINES += $(PULSE_CFLAGS)
 endif
+endif

 ifeq ($(HAVE_OSS_LIB), 1)
   LIBS += -lossaudio
@@ -344,7 +344,7 @@ endif

 ifeq ($(HAVE_NEON),1)
   OBJ += audio/drivers_resampler/sinc_neon.o \
-          audio/drivers_resampler/cc_resampler_neon.o
+			 audio/drivers_resampler/cc_resampler_neon.o
   # When compiled without this, tries to attempt to compile sinc lerp,
   # which will error out
 	#
@@ -359,36 +359,27 @@ ifeq ($(HAVE_NEON),1)
   OBJ += audio/audio_utils_neon.o
 endif

-# XMB and MaterialUI are always enabled if supported and not explicitly disabled
+# XMB and GLUI are always enabled if supported and not explicitly disabled
 ifeq ($(HAVE_RGUI)$(HAVE_GL_CONTEXT), 11)
-   ifeq ($(HAVE_ZARCH),)
-      HAVE_ZARCH = 1
-   endif
-
-   ifeq ($(HAVE_MATERIALUI),)
-      HAVE_MATERIALUI = 1
+   ifeq ($(HAVE_GLUI),)
+      HAVE_GLUI = 1
   endif

   ifeq ($(HAVE_XMB),)
      HAVE_XMB = 1
   endif
 else
-   HAVE_ZARCH = 0
-   HAVE_MATERIALUI  = 0
-   HAVE_XMB   = 0
+   HAVE_GLUI = 0
+   HAVE_XMB  = 0
 endif

 ifeq ($(HAVE_RGUI), 1)
   OBJ += menu/drivers/rgui.o
   DEFINES += -DHAVE_MENU -DHAVE_RGUI
   HAVE_MENU_COMMON = 1
-ifeq ($(HAVE_MATERIALUI), 1)
-   OBJ += menu/drivers/materialui.o
-   DEFINES += -DHAVE_MATERIALUI
-endif
-ifeq ($(HAVE_ZARCH), 1)
-   OBJ += menu/drivers/zarch.o
-   DEFINES += -DHAVE_ZARCH
+ifeq ($(HAVE_GLUI), 1)
+   OBJ += menu/drivers/glui.o
+   DEFINES += -DHAVE_GLUI
 endif
 ifeq ($(HAVE_XMB), 1)
   OBJ += menu/drivers/xmb.o
@@ -396,59 +387,47 @@ ifeq ($(HAVE_XMB), 1)
 endif
 endif

-ifeq ($(HAVE_LAKKA), 1)
-   DEFINES += -DHAVE_LAKKA
-endif
-
 ifeq ($(HAVE_MENU_COMMON), 1)
-   ifeq ($(PSEUDOLOC), 1)
-      PSEUDO_NS := pseudo
-   else
-      PSEUDO_NS :=
-   endif
-   OBJ += menu/menu_hash.o \
-			 menu/menu_driver.o \
-          menu/intl/menu_hash_de.o \
-          menu/intl/menu_hash_es.o \
-          menu/intl/menu_hash_eo.o \
-          menu/intl/menu_hash_fr.o \
-          menu/intl/menu_hash_it.o \
-          menu/intl/menu_hash_nl.o \
-          menu/intl/menu_hash_pl.o \
-          menu/intl/menu_hash_pt.o \
-          menu/intl/menu_hash_us$(PSEUDO_NS).o \
-          menu/menu_input.o \
-          menu/menu_entry.o \
-          menu/menu_entries.o \
-          menu/menu_navigation.o  \
-          menu/menu_setting.o \
-          menu/menu_shader.o \
-          menu/menu_cbs.o \
-          menu/cbs/menu_cbs_ok.o \
-          menu/cbs/menu_cbs_cancel.o \
-          menu/cbs/menu_cbs_select.o \
-          menu/cbs/menu_cbs_start.o \
-          menu/cbs/menu_cbs_info.o \
-          menu/cbs/menu_cbs_refresh.o \
-          menu/cbs/menu_cbs_left.o \
-          menu/cbs/menu_cbs_right.o \
-          menu/cbs/menu_cbs_deferred_push.o \
-          menu/cbs/menu_cbs_scan.o \
-          menu/cbs/menu_cbs_get_value.o \
-          menu/cbs/menu_cbs_title.o \
-          menu/cbs/menu_cbs_up.o \
-          menu/cbs/menu_cbs_down.o \
-          menu/cbs/menu_cbs_contentlist_switch.o \
-          menu/menu_display.o \
-          menu/menu_displaylist.o \
-          menu/menu_animation.o \
-          menu/drivers_display/menu_display_null.o \
-          menu/drivers/menu_generic.o \
-          menu/drivers/null.o
-endif
-
-ifeq ($(UTF8), 1)
-   DEFINES += -DHAVE_UTF8
+   OBJ += menu/menu.o \
+			 menu/menu_hash.o \
+			 menu/intl/menu_hash_de.o \
+			 menu/intl/menu_hash_es.o \
+			 menu/intl/menu_hash_eo.o \
+			 menu/intl/menu_hash_fr.o \
+			 menu/intl/menu_hash_it.o \
+			 menu/intl/menu_hash_nl.o \
+			 menu/intl/menu_hash_pl.o \
+			 menu/intl/menu_hash_pt.o \
+			 menu/intl/menu_hash_us.o \
+			 menu/menu_input.o \
+			 menu/menu_entry.o \
+			 menu/menu_entries.o \
+			 menu/menu_navigation.o  \
+			 menu/menu_setting.o \
+			 menu/menu_shader.o \
+			 menu/menu_video.o \
+			 menu/menu_cbs.o \
+			 menu/cbs/menu_cbs_ok.o \
+			 menu/cbs/menu_cbs_cancel.o \
+			 menu/cbs/menu_cbs_select.o \
+			 menu/cbs/menu_cbs_start.o \
+			 menu/cbs/menu_cbs_info.o \
+			 menu/cbs/menu_cbs_refresh.o \
+			 menu/cbs/menu_cbs_left.o \
+			 menu/cbs/menu_cbs_right.o \
+			 menu/cbs/menu_cbs_deferred_push.o \
+			 menu/cbs/menu_cbs_scan.o \
+			 menu/cbs/menu_cbs_get_value.o \
+			 menu/cbs/menu_cbs_iterate.o \
+			 menu/cbs/menu_cbs_title.o \
+			 menu/cbs/menu_cbs_up.o \
+			 menu/cbs/menu_cbs_down.o \
+			 menu/cbs/menu_cbs_contentlist_switch.o \
+			 menu/menu_list.o \
+			 menu/menu_display.o \
+			 menu/menu_displaylist.o \
+			 menu/menu_animation.o \
+			 menu/drivers/null.o
 endif

 ifeq ($(HAVE_STB_FONT), 1)
@@ -464,8 +443,6 @@ endif
 ifeq ($(HAVE_THREADS), 1)
   OBJ += autosave.o \
 			 libretro-common/rthreads/rthreads.o \
-			 libretro-common/rthreads/rsemaphore.o  \
-			 libretro-common/rthreads/async_job.o \
 			 gfx/video_thread_wrapper.o \
 			 audio/audio_thread_wrapper.o
   DEFINES += -DHAVE_THREADS
@@ -478,23 +455,23 @@ ifeq ($(HAVE_COMMAND), 1)
   OBJ += command.o
 endif

-ifeq ($(HAVE_NETWORK_GAMEPAD), 1)
-   OBJ += remote.o
-endif
-
 #Input

+ifneq ($(C89_BUILD), 1)
+# Wayland is not a C89-compliant API.
 ifeq ($(HAVE_WAYLAND), 1)
 #OBJ += input/drivers/wayland.o
 DEFINES += $(WAYLAND_CFLAGS)
 LIBS += $(WAYLAND_LIBS)
 endif
+endif

 ifeq ($(HAVE_DINPUT), 1)
   LIBS += -ldinput8 -ldxguid -lole32
   DEFINES += -DHAVE_DINPUT
   OBJ += input/drivers/dinput.o \
-          input/drivers_joypad/dinput_joypad.o
+			 input/drivers_joypad/dinput_joypad.o
+   JOYCONFIG_LIBS += -ldinput8 -ldxguid -lole32
 endif

 ifeq ($(HAVE_XINPUT), 1)
@@ -504,11 +481,9 @@ ifeq ($(HAVE_XINPUT), 1)
 endif

 ifeq ($(HAVE_X11), 1)
-   OBJ += input/common/input_x11_common.o \
-			 input/drivers/x11_input.o \
-          gfx/common/x11_common.o \
-          input/drivers_keyboard/keyboard_event_x11.o
-
+   OBJ += input/drivers/x11_input.o \
+			 gfx/common/x11_common.o \
+			 input/drivers_keyboard/keyboard_event_x11.o
   LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
   DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
 endif
@@ -522,24 +497,28 @@ endif
 ifeq ($(HAVE_UDEV), 1)
   DEFINES += $(UDEV_CFLAGS)
   LIBS += $(UDEV_LIBS)
+   JOYCONFIG_LIBS += $(UDEV_LIBS)
   OBJ += input/drivers/udev_input.o \
-			 input/common/udev_common.o \
-			 input/drivers_keyboard/keyboard_event_udev.o \
-          input/drivers_joypad/udev_joypad.o
+			 input/drivers_joypad/udev_joypad.o
 endif

+ifneq ($(C89_BUILD), 1)
+# libusb is not a C89-compliant API.
 ifeq ($(HAVE_LIBUSB), 1)
 	DEFINES += -DHAVE_LIBUSB
 	OBJ += input/drivers_hid/libusb_hid.o
 	LIBS += -lusb-1.0
+	JOYCONFIG_LIBS += -lusb-1.0
 	HAVE_HID = 1
 endif
+endif

 ifeq ($(HAVE_IOHIDMANAGER), 1)
 	DEFINES += -DHAVE_IOHIDMANAGER
 	OBJ += input/drivers_hid/iohidmanager_hid.o
 	HAVE_HID = 1
 	LIBS += -framework IOKit
+	JOYCONFIG_LIBS += -framework IOKit
 endif

 ifeq ($(HAVE_CORELOCATION), 1)
@@ -550,43 +529,30 @@ endif
 ifeq ($(HAVE_HID), 1)
 	DEFINES += -DHAVE_HID
 	OBJ += input/connect/joypad_connection.o \
-               input/connect/connect_ps3.o \
-               input/connect/connect_ps4.o \
-               input/connect/connect_wii.o \
-               input/connect/connect_wiiupro.o
+			 input/connect/connect_ps3.o \
+			 input/connect/connect_ps4.o \
+			 input/connect/connect_wii.o
 endif

 ifeq ($(HAVE_PARPORT), 1)
   OBJ += input/drivers_joypad/parport_joypad.o
 endif

-# Companion UI
-
-ifneq ($(findstring Win32,$(OS)),)
-OBJ += ui/drivers/ui_win32.o
-endif
-
 # Video

-OBJ += gfx/video_context_driver.o \
-       gfx/drivers_context/gfx_null_ctx.o \
-       gfx/video_state_tracker.o \
-		 libretro-common/gfx/math/matrix_4x4.o \
-		 libretro-common/gfx/math/matrix_3x3.o
-
 ifeq ($(HAVE_GL_CONTEXT), 1)
   DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
   OBJ += gfx/drivers/gl.o \
-          gfx/common/gl_common.o \
-          gfx/drivers_font/gl_raster_font.o \
-          libretro-common/glsym/rglgen.o
-	
-   ifeq ($(HAVE_MENU_COMMON), 1)
-		OBJ += menu/drivers_display/menu_display_gl.o
-	endif
+			gfx/video_context_driver.o \
+			gfx/drivers_context/gfx_null_ctx.o \
+			gfx/drivers/gl_common.o \
+			gfx/drivers_font/gl_raster_font.o \
+			libretro-common/gfx/math/matrix_4x4.o \
+			gfx/video_state_tracker.o \
+			gfx/video_texture.o \
+			libretro-common/glsym/rglgen.o

   ifeq ($(HAVE_KMS), 1)
-	   HAVE_AND_WILL_USE_DRM = 1
      OBJ += gfx/drivers_context/drm_egl_ctx.o
      DEFINES += $(GBM_CFLAGS) $(DRM_CFLAGS) $(EGL_CFLAGS)
      LIBS += $(GBM_LIBS) $(DRM_LIBS) $(EGL_LIBS)
@@ -625,12 +591,15 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
 		endif
   endif

+ifneq ($(C89_BUILD), 1)
+	# Wayland is not a C89-compliant API.
   ifeq ($(HAVE_WAYLAND), 1)
 	   ifeq ($(HAVE_EGL), 1)
 	     OBJ += gfx/drivers_context/wayland_ctx.o
      endif
   endif
-
+endif
+	
   ifeq ($(HAVE_GLES), 1)
      LIBS += $(GLES_LIBS)
      DEFINES += $(GLES_CFLAGS) -DHAVE_OPENGLES -DHAVE_OPENGLES2
@@ -647,47 +616,45 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
         OBJ += gfx/drivers_context/cgl_ctx.o
      else ifneq ($(findstring Win32,$(OS)),)
         GL_LIBS := -lopengl32 -lgdi32 -lcomdlg32 -lcomctl32
-         OBJ += gfx/drivers_context/wgl_ctx.o
+         OBJ += gfx/drivers_context/wgl_ctx.o gfx/drivers_wm/win32_shader_dlg.o
      endif
 		LIBS += $(GL_LIBS)
   endif

-   OBJ += gfx/drivers_shader/shader_glsl.o
+   OBJ += gfx/drivers_shader/shader_glsl.o 
   DEFINES += -DHAVE_GLSL
 endif

-ifeq ($(HAVE_EGL), 1)
-	OBJ += gfx/common/egl_common.o
-endif
-
 ifeq ($(HAVE_SDL2), 1)
   HAVE_SDL=0
 endif

 ifeq ($(HAVE_SDL), 1)
   OBJ += gfx/drivers/sdl_gfx.o \
-          input/drivers/sdl_input.o \
-          input/drivers_joypad/sdl_joypad.o \
-          audio/drivers/sdl_audio.o
+			 input/drivers/sdl_input.o \
+			 input/drivers_joypad/sdl_joypad.o \
+			 audio/drivers/sdl_audio.o

   ifeq ($(HAVE_GL_CONTEXT), 1)
     OBJ += gfx/drivers_context/sdl_gl_ctx.o
   endif

+   JOYCONFIG_LIBS += $(SDL_LIBS)
   DEFINES += $(SDL_CFLAGS) $(BSD_LOCAL_INC)
   LIBS += $(SDL_LIBS)
 endif

 ifeq ($(HAVE_SDL2), 1)
   OBJ += gfx/drivers/sdl2_gfx.o \
-          input/drivers/sdl_input.o \
-          input/drivers_joypad/sdl_joypad.o \
-          audio/drivers/sdl_audio.o
+			 input/drivers/sdl_input.o \
+			 input/drivers_joypad/sdl_joypad.o \
+			 audio/drivers/sdl_audio.o

   ifeq ($(HAVE_GL_CONTEXT), 1)
     OBJ += gfx/drivers_context/sdl_gl_ctx.o
   endif

+   JOYCONFIG_LIBS += $(SDL2_LIBS)
   DEFINES += $(SDL2_CFLAGS) $(BSD_LOCAL_INC)
   LIBS += $(SDL2_LIBS)
   HAVE_SDL = 0
@@ -699,46 +666,35 @@ endif

 ifeq ($(HAVE_EXYNOS), 1)
   OBJ += gfx/drivers/exynos_gfx.o \
-          memory/neon/memcpy-neon.o
+			 mem/neon/memcpy-neon.o
   LIBS += $(DRM_LIBS) $(EXYNOS_LIBS)
   DEFINES += $(DRM_CFLAGS) $(EXYNOS_CFLAGS)
-	HAVE_AND_WILL_USE_DRM = 1
-endif
-
-ifeq ($(HAVE_AND_WILL_USE_DRM), 1)
-	OBJ += gfx/common/drm_common.o
 endif

 ifeq ($(HAVE_DISPMANX), 1)
   OBJ += gfx/drivers/dispmanx_gfx.o
-	HAVE_VIDEOCORE = 1
   LIBS += $(DISPMANX_LIBS)
   DEFINES += $(DISPMANX_CFLAGS)
 endif

 ifeq ($(HAVE_SUNXI), 1)
   OBJ += gfx/drivers/sunxi_gfx.o \
-          gfx/include/pixman/pixman-arm-neon-asm.o
+			 gfx/pixman/pixman-arm-neon-asm.o
 endif

 ifeq ($(HAVE_VG), 1)
-   OBJ += gfx/drivers/vg.o
+   OBJ += gfx/drivers/vg.o \
+			 libretro-common/gfx/math/matrix_3x3.o
   DEFINES += $(VG_CFLAGS)
   LIBS += $(VG_LIBS)
 endif

 ifeq ($(HAVE_XVIDEO), 1)
   OBJ += gfx/drivers/xvideo.o
-   LIBS += $(XVIDEO_LIBS)
+   LIBS += $(XVIDEO_LIBS) 
   DEFINES += $(XVIDEO_CFLAGS)
 endif

-ifeq ($(HAVE_XSHM), 1)
-   OBJ += gfx/drivers/xshm.o
-   LIBS += $(XSHM_LIBS)
-   DEFINES += $(XSHM_CFLAGS)
-endif
-
 ifeq ($(HAVE_CG), 1)
 	DEFINES += -DHAVE_CG
   OBJ += gfx/drivers_shader/shader_gl_cg.o
@@ -747,21 +703,17 @@ endif

 ifeq ($(HAVE_D3D9), 1)
   OBJ += gfx/d3d/d3d.o \
-          gfx/d3d/render_chain_null.o \
-          gfx/d3d/render_chain_driver.o \
-          gfx/common/d3d_common.o \
-          gfx/drivers_font/d3d_w32_font.o \
-          gfx/drivers_context/d3d_ctx.o
+			 gfx/d3d/render_chain_null.o \
+			 gfx/d3d/render_chain_driver.o \
+			 gfx/d3d/d3d_wrapper.o \
+			 gfx/drivers_font/d3d_w32_font.o \
+			 gfx/drivers_context/d3d_ctx.o
   DEFINES += -DHAVE_D3D -DHAVE_D3D9
   LIBS += -ld3d9 -ld3dx9 -ldxguid

-   ifeq ($(HAVE_MENU_COMMON), 1)
-		OBJ += menu/drivers_display/menu_display_d3d.o
-	endif
-
   ifeq ($(HAVE_CG), 1)
      LIBS += -lcgD3D9
-      OBJ  += gfx/d3d/render_chain_cg.o
+		OBJ  += gfx/d3d/render_chain_cg.o
   endif
 endif

@@ -776,33 +728,36 @@ endif

 ifeq ($(HAVE_7ZIP),1)
   CFLAGS  += -I./deps/7zip
-   HAVE_COMPRESSION = 1
+   HAVE_COMPRESSION = 1 
   DEFINES += -DHAVE_7ZIP
-   7ZOBJ = deps/7zip/7zIn.o \
-           deps/7zip/7zAlloc.o \
-           deps/7zip/Bra86.o \
-           deps/7zip/7zFile.o \
-           deps/7zip/7zStream.o \
-           deps/7zip/7zBuf2.o \
-           deps/7zip/LzmaDec.o \
-           deps/7zip/7zCrcOpt.o \
-           deps/7zip/Bra.o \
-           deps/7zip/7zDec.o \
-           deps/7zip/Bcj2.o \
-           deps/7zip/7zCrc.o \
-           deps/7zip/Lzma2Dec.o \
-   deps/7zip/7zBuf.o
+   7ZOBJ = 	deps/7zip/7zIn.o \
+		deps/7zip/7zAlloc.o \
+		deps/7zip/Bra86.o \
+		deps/7zip/CpuArch.o \
+		deps/7zip/7zFile.o \
+		deps/7zip/7zStream.o \
+		deps/7zip/7zBuf2.o \
+		deps/7zip/LzmaDec.o \
+		deps/7zip/7zCrcOpt.o \
+		deps/7zip/Bra.o \
+		deps/7zip/7zDec.o \
+		deps/7zip/Bcj2.o \
+		deps/7zip/7zCrc.o \
+		deps/7zip/Lzma2Dec.o \
+		deps/7zip/7zBuf.o \
+		decompress/7zip_support.o 
   OBJ += $(7ZOBJ)
 endif

+   OBJ += libretro-common/formats/tga/tga_decode.o

 ifeq ($(HAVE_ZLIB), 1)
-   OBJ += libretro-common/file/file_extract.o \
-          tasks/task_decompress.o
+   ZLIB_OBJS =	decompress/zip_support.o 
+	OBJ += libretro-common/file/file_extract.o
   OBJ += $(ZLIB_OBJS)
   DEFINES += -DHAVE_ZLIB
 	HAVE_RPNG = 1
-   HAVE_COMPRESSION = 1
+   HAVE_COMPRESSION = 1 
   ifeq ($(WANT_ZLIB), 1)
      DEFINES += -DWANT_ZLIB
   else
@@ -816,38 +771,37 @@ ifdef HAVE_RPNG
 endif

 ifeq ($(HAVE_RPNG), 1)
-   OBJ += libretro-common/formats/png/rpng.o \
-          libretro-common/formats/png/rpng_encode.o
+   OBJ += libretro-common/formats/png/rpng_nbio.o \
+			 libretro-common/formats/png/rpng_fbio.o \
+			 libretro-common/formats/png/rpng_decode.o \
+			 libretro-common/formats/png/rpng_encode.o
 endif
-OBJ += libretro-common/formats/bmp/rbmp_encode.o \
-       libretro-common/formats/tga/rtga.o \
-       libretro-common/formats/json/jsonsax.o

 ifdef HAVE_COMPRESSION
   DEFINES += -DHAVE_COMPRESSION
 endif

 ifeq ($(WANT_ZLIB),1)
-   OBJ += deps/zlib/adler32.o \
-          deps/zlib/compress.o \
-          deps/zlib/crc32.o \
-          deps/zlib/deflate.o \
-          deps/zlib/gzclose.o \
-          deps/zlib/gzlib.o \
-          deps/zlib/gzread.o \
-          deps/zlib/gzwrite.o \
-          deps/zlib/inffast.o \
-          deps/zlib/inflate.o \
-          deps/zlib/inftrees.o \
-          deps/zlib/trees.o \
-          deps/zlib/uncompr.o \
-          deps/zlib/zutil.o \
-          deps/zlib/ioapi.o \
-          deps/zlib/unzip.o
+	OBJ += deps/zlib/adler32.o \
+			 deps/zlib/compress.o \
+			 deps/zlib/crc32.o \
+			 deps/zlib/deflate.o \
+			 deps/zlib/gzclose.o \
+			 deps/zlib/gzlib.o \
+			 deps/zlib/gzread.o \
+			 deps/zlib/gzwrite.o \
+			 deps/zlib/inffast.o \
+			 deps/zlib/inflate.o \
+			 deps/zlib/inftrees.o \
+			 deps/zlib/trees.o \
+			 deps/zlib/uncompr.o \
+			 deps/zlib/zutil.o \
+			 deps/zlib/ioapi.o \
+			 deps/zlib/unzip.o
 else
 ifeq ($(HAVE_ZLIB),1)
 ZLIB_OBJS = deps/zlib/unzip.o \
-            deps/zlib/ioapi.o
+				deps/zlib/ioapi.o
 OBJ += $(ZLIB_OBJS)
 HAVE_ZLIB_DEFLATE = 1
 endif
@@ -864,46 +818,34 @@ ifeq ($(HAVE_V4L2),1)
   DEFINES += -DHAVE_V4L2
 endif

-# Things that depend on network availability
+# Netplay

 ifeq ($(HAVE_NETWORKING), 1)
   DEFINES += -DHAVE_NETWORKING
   OBJ += libretro-common/net/net_compat.o \
-			 libretro-common/net/net_http.o \
-			 net_http_special.o \
-			 tasks/task_http.o
+	  libretro-common/net/net_http.o \
+          tasks/task_http.o

   ifneq ($(findstring Win32,$(OS)),)
      LIBS += -lws2_32
   endif

-   # Netplay
-
   ifeq ($(HAVE_NETPLAY), 1)
-      DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD -DHAVE_NETWORK_GAMEPAD
-      OBJ += netplay/netplay_net.o netplay/netplay_spectate.o netplay/netplay_common.o netplay/netplay.o
-   endif
-
-   # Retro Achievements (also depends on threads)
-   
-   ifeq ($(HAVE_CHEEVOS), 1)
-      ifeq ($(HAVE_THREADS), 1)
-         DEFINES += -DHAVE_CHEEVOS
-         OBJ += cheevos.o libretro-common/utils/md5.o
-      endif
+      DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD
+      OBJ += netplay.o
   endif
 endif

 ifneq ($(findstring Win32,$(OS)),)
   OBJ += media/rarch.o \
          input/drivers_keyboard/keyboard_event_win32.o \
-          gfx/common/win32_common.o \
-          frontend/drivers/platform_win32.o
+			 gfx/common/win32_common.o \
+			 frontend/drivers/platform_win32.o
 endif

 ifeq ($(HAVE_AVFOUNDATION), 1)
 ifeq ($(HAVE_COCOA), 1)
-   DEFINES += -DHAVE_AVFOUNDATION
+   DEFINES += -DHAVE_AVFOUNDATION 
   LIBS += -framework AVFoundation
   LIBS += -framework CoreVideo
   LIBS += -framework CoreMedia
@@ -912,23 +854,30 @@ endif

 # Record

+ifneq ($(C89_BUILD), 1)
+# ffmpeg and friends are not C89-compliant APIs. 
 ifeq ($(HAVE_FFMPEG), 1)
   OBJ += record/drivers/record_ffmpeg.o \
-          cores/libretro-ffmpeg/ffmpeg_core.o
+			 cores/ffmpeg_core.o
   LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS)
   DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS) $(SWRESAMPLE_CFLAGS)
 	DEFINES += -DHAVE_FFMPEG -Iffmpeg
 endif
+endif

 ifeq ($(HAVE_COMPRESSION), 1)
   DEFINES += -DHAVE_COMPRESSION
-endif
+endif 

 ifeq ($(HAVE_COCOA),1)
 	DEFINES += -DHAVE_MAIN
 	OBJ += input/drivers/cocoa_input.o \
-               input/drivers_keyboard/keyboard_event_apple.o \
-               ui/drivers/ui_cocoa.o \
-               ui/drivers/cocoa/cocoa_common.o \
-               gfx/drivers_context/cocoa_gl_ctx.o
+			 input/drivers_keyboard/keyboard_event_apple.o \
+			 ui/drivers/ui_cocoa.o \
+			 ui/drivers/cocoa/cocoa_common.o \
+			 gfx/drivers_context/cocoa_gl_ctx.o
 endif
+
+
+# Joyconfig binary
+JOYCONFIG_OBJ  += tools/retroarch-joyconfig-griffin.o
@@ -1,229 +1,8 @@
 TARGET := retroarch_3ds
-LIBRETRO =
-
-DEBUG                   = 0
-GRIFFIN_BUILD           = 1
-WHOLE_ARCHIVE_LINK      = 0
-BUILD_3DSX              = 1
-BUILD_3DS               = 1
-BUILD_CIA               = 1
-LIBCTRU_NO_DEPRECATION  = 1
-
-APP_TITLE            = Retroarch 3DS
-APP_DESCRIPTION      = Retroarch 3DS
-APP_AUTHOR           = Team Libretro
-APP_PRODUCT_CODE     = RETROARCH-3DS
-APP_UNIQUE_ID        = 0xBAC00
-APP_ICON             = ctr/assets/default.png
-APP_BANNER           = ctr/assets/libretro_banner.png
-APP_AUDIO            = ctr/assets/silent.wav
-APP_RSF              = ctr/tools/template.rsf
-APP_SYSTEM_MODE      = 64MB
-APP_SYSTEM_MODE_EXT  = 124MB
-APP_BIG_TEXT_SECTION = 0
-
-include ctr/Makefile.cores
-
 OBJS :=
-OBJS += gfx/drivers/ctr_sprite.o
-OBJS += ctr/ctr_system.o
-OBJS += ctr/ctr_memory.o
-OBJS += ctr/ctr_linear.o
-OBJS += ctr/ctr_svchax.o
-
-ifeq ($(GRIFFIN_BUILD), 1)
-	OBJS += griffin/griffin.o
-else
-	OBJS += libretro-common/file/file_extract.o
-	OBJS += verbosity.o
-	OBJS += performance.o
-	OBJS += libretro-common/compat/compat_getopt.o
-	OBJS += libretro-common/compat/compat_strcasestr.o
-	OBJS += libretro-common/compat/compat_strl.o
-	OBJS += libretro-common/compat/compat_fnmatch.o
-	OBJS += libretro-common/memmap/memalign.o
-	OBJS += libretro-common/file/config_file.o
-	OBJS += libretro-common/file/config_file_userdata.o
-	OBJS += core_options.o
-	OBJS += cheats.o
-	OBJS += libretro-common/hash/rhash.o
-	OBJS += gfx/video_context_driver.o
-	OBJS += gfx/drivers_context/gfx_null_ctx.o
-	OBJS += gfx/image/image.o
-	OBJS += libretro-common/formats/tga/rtga.o
-	OBJS += libretro-common/formats/png/rpng.o
-	OBJS += libretro-common/formats/png/rpng_encode.o
-	OBJS += libretro-common/formats/bmp/rbmp_encode.o
-	OBJS += libretro-common/gfx/math/matrix_4x4.o
-	OBJS += libretro-common/gfx/math/matrix_3x3.o
-	OBJS += gfx/drivers/ctr_gfx.o
-	OBJS += gfx/drivers/nullgfx.o
-	OBJS += gfx/font_driver.o
-	OBJS += gfx/drivers_font_renderer/bitmapfont.o
-	OBJS += input/input_autodetect.o
-	OBJS += input/input_joypad_driver.o
-	OBJS += input/input_hid_driver.o
-	OBJS += input/input_config.o
-	OBJS += input/input_keymaps.o
-	OBJS += input/input_remapping.o
-	OBJS += input/input_keyboard.o
-	OBJS += input/drivers/ctr_input.o
-	OBJS += input/drivers_joypad/ctr_joypad.o
-	OBJS += input/autoconf/builtin_ctr.o
-	OBJS += input/drivers/nullinput.o
-	OBJS += input/drivers_joypad/null_joypad.o
-	OBJS += input/drivers_joypad/hid_joypad.o
-	OBJS += input/drivers_hid/null_hid.o
-	OBJS += gfx/video_state_tracker.o
-	OBJS += libretro-common/queues/fifo_buffer.o
-	OBJS += audio/audio_resampler_driver.o
-	OBJS += audio/drivers_resampler/sinc.o
-	OBJS += audio/drivers_resampler/nearest.o
-	OBJS += audio/drivers_resampler/cc_resampler.o
-	OBJS += camera/drivers/nullcamera.o
-	OBJS += location/drivers/nulllocation.o
-	OBJS += audio/drivers/ctr_csnd_audio.o
-	OBJS += audio/drivers/ctr_dsp_audio.o
-	OBJS += audio/drivers/nullaudio.o
-	OBJS += gfx/video_driver.o
-	OBJS += gfx/video_common.o
-	OBJS += input/input_driver.o
-	OBJS += audio/audio_driver.o
-	OBJS += camera/camera_driver.o
-	OBJS += location/location_driver.o
-	OBJS += driver.o
-	OBJS += libretro-common/gfx/scaler/scaler_filter.o
-	OBJS += libretro-common/gfx/scaler/pixconv.o
-	OBJS += libretro-common/gfx/scaler/scaler.o
-	OBJS += libretro-common/gfx/scaler/scaler_int.o
-	OBJS += gfx/video_filters/2xsai.o
-	OBJS += gfx/video_filters/super2xsai.o
-	OBJS += gfx/video_filters/supereagle.o
-	OBJS += gfx/video_filters/2xbr.o
-	OBJS += gfx/video_filters/darken.o
-	OBJS += gfx/video_filters/epx.o
-	OBJS += gfx/video_filters/scale2x.o
-	OBJS += gfx/video_filters/blargg_ntsc_snes.o
-	OBJS += gfx/video_filters/lq2x.o
-	OBJS += gfx/video_filters/phosphor2x.o
-	OBJS += audio/audio_filters/echo.o
-	OBJS += audio/audio_filters/eq.o
-	OBJS += audio/audio_filters/chorus.o
-	OBJS += audio/audio_filters/iir.o
-	OBJS += audio/audio_filters/panning.o
-	OBJS += audio/audio_filters/phaser.o
-	OBJS += audio/audio_filters/reverb.o
-	OBJS += audio/audio_filters/wahwah.o
-	OBJS += libretro-common/dynamic/dylib.o
-	OBJS += dynamic.o
-	OBJS += gfx/video_filter.o
-	OBJS += audio/audio_dsp_filter.o
-	OBJS += cores/dynamic_dummy.o
-	OBJS += content.o
-	OBJS += libretro-common/file/file_path.o
-	OBJS += file_path_special.o
-	OBJS += libretro-common/file/dir_list.o
-	OBJS += libretro-common/file/retro_dirent.o
-	OBJS += libretro-common/file/retro_file.o
-	OBJS += libretro-common/file/retro_stat.o
-	OBJS += dir_list_special.o
-	OBJS += string_list_special.o
-	OBJS += libretro-common/string/string_list.o
-	OBJS += libretro-common/string/stdstring.o
-	OBJS += file_ops.o
-	OBJS += libretro-common/file/nbio/nbio_stdio.o
-	OBJS += libretro-common/file/file_list.o
-	OBJS += libretro-common/queues/message_queue.o
-	OBJS += patch.o
-	OBJS += configuration.o
-	OBJS += rewind.o
-	OBJS += frontend/frontend_driver.o
-	OBJS += frontend/drivers/platform_ctr.o
-	OBJS += frontend/drivers/platform_null.o
-	OBJS += core_info.o
-	OBJS += ui/ui_companion_driver.o
-	OBJS += ui/drivers/ui_null.o
-	OBJS += frontend/frontend.o
-	OBJS += libretro_version_1.o
-	OBJS += retroarch.o
-	OBJS += runloop.o
-	OBJS += tasks/tasks.o
-	OBJS += msg_hash.o
-	OBJS += intl/msg_hash_de.o
-	OBJS += intl/msg_hash_es.o
-	OBJS += intl/msg_hash_eo.o
-	OBJS += intl/msg_hash_fr.o
-	OBJS += intl/msg_hash_it.o
-	OBJS += intl/msg_hash_nl.o
-	OBJS += intl/msg_hash_pt.o
-	OBJS += intl/msg_hash_pl.o
-	OBJS += intl/msg_hash_us.o
-	OBJS += movie.o
-	OBJS += record/record_driver.o
-	OBJS += record/drivers/record_null.o
-	OBJS += tasks/task_decompress.o
-	OBJS += tasks/task_file_transfer.o
-	OBJS += screenshot.o
-	OBJS += playlist.o
-	OBJS += menu/menu_driver.o
-	OBJS += menu/menu_hash.o
-	OBJS += menu/menu_input.o
-	OBJS += menu/menu_entry.o
-	OBJS += menu/menu_entries.o
-	OBJS += menu/menu_setting.o
-	OBJS += menu/menu_cbs.o
-	OBJS += menu/cbs/menu_cbs_ok.o
-	OBJS += menu/cbs/menu_cbs_cancel.o
-	OBJS += menu/cbs/menu_cbs_select.o
-	OBJS += menu/cbs/menu_cbs_start.o
-	OBJS += menu/cbs/menu_cbs_info.o
-	OBJS += menu/cbs/menu_cbs_refresh.o
-	OBJS += menu/cbs/menu_cbs_left.o
-	OBJS += menu/cbs/menu_cbs_right.o
-	OBJS += menu/cbs/menu_cbs_title.o
-	OBJS += menu/cbs/menu_cbs_deferred_push.o
-	OBJS += menu/cbs/menu_cbs_scan.o
-	OBJS += menu/cbs/menu_cbs_get_value.o
-	OBJS += menu/cbs/menu_cbs_up.o
-	OBJS += menu/cbs/menu_cbs_down.o
-	OBJS += menu/cbs/menu_cbs_contentlist_switch.o
-	OBJS += menu/menu_shader.o
-	OBJS += menu/menu_navigation.o
-	OBJS += menu/menu_display.o
-	OBJS += menu/menu_displaylist.o
-	OBJS += menu/menu_animation.o
-	OBJS += menu/intl/menu_hash_de.o
-	OBJS += menu/intl/menu_hash_es.o
-	OBJS += menu/intl/menu_hash_eo.o
-	OBJS += menu/intl/menu_hash_fr.o
-	OBJS += menu/intl/menu_hash_it.o
-	OBJS += menu/intl/menu_hash_nl.o
-	OBJS += menu/intl/menu_hash_pl.o
-	OBJS += menu/intl/menu_hash_pt.o
-	OBJS += menu/intl/menu_hash_us.o
-	OBJS += menu/drivers/null.o
-	OBJS += menu/drivers/menu_generic.o
-	OBJS += menu/drivers_display/menu_display_null.o
-	OBJS += menu/drivers/rgui.o
-	OBJS += command_event.o
-	OBJS += deps/zlib/adler32.o
-	OBJS += deps/zlib/compress.o
-	OBJS += deps/zlib/crc32.o
-	OBJS += deps/zlib/deflate.o
-	OBJS += deps/zlib/gzclose.o
-	OBJS += deps/zlib/gzlib.o
-	OBJS += deps/zlib/gzread.o
-	OBJS += deps/zlib/gzwrite.o
-	OBJS += deps/zlib/inffast.o
-	OBJS += deps/zlib/inflate.o
-	OBJS += deps/zlib/inftrees.o
-	OBJS += deps/zlib/trees.o
-	OBJS += deps/zlib/uncompr.o
-	OBJS += deps/zlib/zutil.o
-	OBJS += deps/zlib/ioapi.o
-	OBJS += deps/zlib/unzip.o
-	OBJS += audio/audio_utils.o
-endif
+OBJS += gfx/drivers/ctr_sprite.o griffin/griffin.o
+#NO_SMDH = 1
+DEBUG = 0


 ifeq ($(strip $(DEVKITARM)),)
@@ -238,24 +17,14 @@ ifeq ($(strip $(AEMSTRO)),)
 $(error "Please set AEMSTRO in your environment. export AEMSTRO=<path to>aemstro")
 endif

-
-APP_TITLE         := $(shell echo "$(APP_TITLE)" | cut -c1-128)
-APP_DESCRIPTION   := $(shell echo "$(APP_DESCRIPTION)" | cut -c1-256)
-APP_AUTHOR        := $(shell echo "$(APP_AUTHOR)" | cut -c1-128)
-APP_PRODUCT_CODE  := $(shell echo $(APP_PRODUCT_CODE) | cut -c1-16)
-APP_UNIQUE_ID     := $(shell echo $(APP_UNIQUE_ID) | cut -c1-7)
-
-MAKEROM_ARGS_COMMON = -rsf $(APP_RSF) -exefslogo -elf $(TARGET).elf -icon $(TARGET).icn -banner $(TARGET).bnr -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(APP_PRODUCT_CODE)" -DAPP_UNIQUE_ID=$(APP_UNIQUE_ID) -DAPP_SYSTEM_MODE=$(APP_SYSTEM_MODE) -DAPP_SYSTEM_MODE_EXT=$(APP_SYSTEM_MODE_EXT)
-
 INCDIRS := -I$(CTRULIB)/include
 LIBDIRS := -L. -L$(CTRULIB)/lib


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

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

 #CFLAGS	+= -Wall
@@ -266,16 +35,6 @@ ifeq ($(DEBUG), 1)
 else
   CFLAGS	+= -O3
 endif
-
-ifeq ($(LIBCTRU_NO_DEPRECATION), 1)
-   CFLAGS	+= -DLIBCTRU_NO_DEPRECATION
-endif
-
-ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START := -Wl,--whole-archive
-   WHOLE_END := -Wl,--no-whole-archive
-endif
-
 CFLAGS += -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include

 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE -DSINC_LOWEST_QUALITY
@@ -286,39 +45,45 @@ CFLAGS += -DHAVE_ZLIB -DHAVE_RPNG -DWANT_ZLIB -DHAVE_BUILTIN_AUTOCONFIG

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

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


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


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

 .PHONY: $(BUILD) clean all

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

-$(TARGET): $(TARGET_3DSX) $(TARGET_3DS) $(TARGET_CIA)
-$(TARGET).3dsx: $(TARGET).elf
-$(TARGET).elf: $(OBJS) libretro_ctr.a
+clean:
+	rm -f $(OBJS)
+	rm -f $(TARGET).3dsx
+	rm -f $(TARGET).elf

-ctr_sprite_shader_shbin.h: gfx/drivers/ctr_sprite.o
-gfx/drivers/ctr_gfx.c: ctr_sprite_shader_shbin.h
-griffin/griffin.o: gfx/drivers/ctr_gfx.c

+$(TARGET): $(TARGET).3dsx
+$(TARGET).3dsx	:	$(TARGET).elf
+$(TARGET).elf	:	$(OBJS)
+
+ifeq ($(strip $(APP_TITLE)),)
+APP_TITLE	:=	$(notdir $(TARGET))
+endif
+
+ifeq ($(strip $(APP_DESCRIPTION)),)
+APP_DESCRIPTION	:=	Built with devkitARM & libctru
+endif
+
+ifeq ($(strip $(APP_AUTHOR)),)
+APP_AUTHOR	:=	Unspecified Author
+endif
+
+ifeq ($(strip $(APP_ICON)),)
+APP_ICON	:=	$(CTRULIB)/default_icon.png
+endif

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

@@ -331,20 +96,12 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)

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

 %.o: %.shader
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
 	python $(AEMSTRO)/aemstro_as.py $< $(notdir $<).shbin
-	$(DEVKITARM)/bin/bin2s $(notdir $<).shbin | $(PREFIX)as -o $@
+	bin2s $(notdir $<).shbin | $(PREFIX)as -o $@
 	echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(notdir $<).shbin | tr . _)`.h
 	echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(notdir $<).shbin | tr . _)`.h
 	echo "extern const u32" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(notdir $<).shbin | tr . _)`.h
@@ -368,46 +125,22 @@ endif

 %.vsh:

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

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

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

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

-$(TARGET).icn: $(APP_ICON)
-	$(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_TITLE)" -p "$(APP_AUTHOR)" -i $(APP_ICON) -o $@
-
-$(TARGET).3ds: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
-	$(MAKEROM) -f cci -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=true
-
-$(TARGET).cia: $(TARGET).elf $(TARGET).bnr $(TARGET).icn $(APP_RSF)
-	$(MAKEROM) -f cia -o $@ $(MAKEROM_ARGS_COMMON) -DAPP_ENCRYPTED=false
-
-
-clean:
-	rm -f $(OBJS)
-	rm -f $(TARGET).3dsx
-	rm -f $(TARGET).elf
-	rm -f $(TARGET).3ds
-	rm -f $(TARGET).cia
-	rm -f $(TARGET).smdh
-	rm -f $(TARGET).bnr
-	rm -f $(TARGET).icn
-	rm -f *_shader_shbin.h
-	rm -f ctr/ctr_config_*.o
-	rm -f ctr/3dsx_custom_crt0.o
-
-.PHONY: clean
+.PHONY: .FORCE

@@ -5,7 +5,6 @@ OBJ :=
 DEFINES := -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_MAIN
 DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVERLAY -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN

-HAVE_EGL    = 1
 HAVE_OPENGL = 1
 HAVE_GLES = 1
 HAVE_EMSCRIPTEN = 1
@@ -24,11 +23,7 @@ ifneq ($(NATIVE_ZLIB),)
 endif

 LIBS    :=
-LDFLAGS := -L. --no-heap-copy -s USE_ZLIB=1 -s TOTAL_MEMORY=$(MEMORY) -s OUTLINING_LIMIT=50000 \
-           -s EXPORTED_FUNCTIONS="['_main', '_malloc', '_cmd_savefiles', '_cmd_save_state', '_cmd_load_state', '_cmd_take_screenshot']" \
-           --js-library emscripten/library_rwebaudio.js \
-           --js-library emscripten/library_rwebinput.js \
-           --js-library emscripten/library_rwebcam.js
+LDFLAGS := -L. -s TOTAL_MEMORY=$(MEMORY) -s OUTLINING_LIMIT=50000 --js-library emscripten/library_rwebaudio.js --js-library emscripten/library_rwebinput.js --js-library emscripten/library_rwebcam.js --no-heap-copy

 include Makefile.common

@@ -72,8 +67,7 @@ else
   CFLAGS += -O2
 endif

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

 all: $(TARGET)

@@ -117,3 +111,4 @@ clean:
 	rm -f *.d

 .PHONY: all clean
+
@@ -5,8 +5,6 @@ WHOLE_ARCHIVE_LINK         = 0
 BIG_STACK		            = 1
 PC_DEVELOPMENT_IP_ADDRESS	= 255.255.255.255
 PC_DEVELOPMENT_UDP_PORT		= 3490
-RARCH_CONSOLE					= 0
-USBGECKO                   = 0

 ifneq ($(EMSCRIPTEN),)
   platform = emscripten
@@ -36,197 +34,110 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
   system_platform = win
 endif

-TARGET_NAME        := retroarch
+TARGET_NAME := retroarch

-INCLUDE            :=
-LDFLAGS            :=
-LIBDIRS            :=
+INCLUDE :=
+LDFLAGS :=
+LIBDIRS :=

 SHADER_CG_DIR      := media/shaders_cg
-OVERLAY_DIR        := media/overlays
-SHADER_GLSL_DIR    := media/shaders_glsl
+OVERLAY_DIR     := media/overlays
+SHADER_GLSL_DIR := media/shaders_glsl

-PYTHON2		       := python2$(EXE_EXT)
-PYTHON3		       := python3$(EXE_EXT)
-GIT			       := git$(EXE_EXT)
+PYTHON2		= python2$(EXE_EXT)
+PYTHON3		= python3$(EXE_EXT)
+GIT			= git$(EXE_EXT)

 ifeq ($(WHOLE_ARCHIVE_LINK), 1)
-   WHOLE_START     := -Wl,--whole-archive
-   WHOLE_END       := -Wl,--no-whole-archive
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
 endif

-LIBS               := $(WHOLE_START) -lretro_$(platform) $(WHOLE_END)
-
-libogc_platform    :=
-
 ifeq ($(platform), ngc)
-libogc_platform    := 1
-else ifeq ($(platform), wii)
-libogc_platform    := 1
-endif
-
-# PS3
-ifeq ($(platform), ps3)
-	#TODO
-  MEDIA_SHADER_DIR := pkg/ps3/USRDIR/cores/shaders
-  RARCH_CONSOLE          = 1
-
-# PS3 - Cobra
-else ifeq ($(platform), ps3-cobra)
-	#TODO
-  MEDIA_SHADER_DIR := ps3/iso/PS3_GAME/USRDIR/cores/shaders
-  RARCH_CONSOLE          = 1
-
-# NGC/Wii - libogc
-else ifeq ($(libogc_platform), 1)
  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)
-  EXT_TARGET := $(TARGET_NAME)_$(platform).dol
-  EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
-
+  EXT_TARGET := $(TARGET_NAME)_ngc.dol
+  EXT_INTER_TARGET := $(TARGET_NAME)_ngc.elf
  INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/zlib
-
-ifeq ($(platform), ngc)
-  LIBDIRS += -L$(DEVKITPRO)/libogc/lib/cube
-  MACHDEP := -DHW_DOL -mogc
-else ifeq ($(platform), wii)
-  LIBDIRS += -L$(DEVKITPRO)/libogc/lib/wii
-  MACHDEP := -DHW_RVL -mrvl
-endif
-  LIBDIRS += -L.
-  MACHDEP += -DGEKKO -mcpu=750 -meabi -mhard-float -DMSB_FIRST
-
-ifeq ($(platform), ngc)
-	LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_TARGET)).map
+  LIBDIRS += -L$(DEVKITPRO)/libogc/lib/cube -L.
+  MACHDEP := -DGEKKO -DHW_DOL -mogc -mcpu=750 -meabi -mhard-float -DMSB_FIRST
+  LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_TARGET)).map
 ifeq ($(BIG_STACK), 1)
-   LDFLAGS += -T bootstrap/gx/ogc.ld
+   LDFLAGS += -T gx/ld/ogc.ld
 endif
-else ifeq ($(platform), wii)
-	LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_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 bootstrap/gx/rvl.ld
-endif
-endif
-  LIBS += -lfat -logc
-
-ifeq ($(platform), wii)
-  LIBS += -lwiiuse -lbte
-ifeq ($(USBGECKO), 1)
-  LIBS += -ldb
-endif
-else ifeq ($(platform), ngc)
+  LIBS := -lfat $(WHOLE_START) -lretro_ngc $(WHOLE_END) -logc
 ifeq ($(HAVE_LOGGER), 1)
  LIBS += -lbba
 endif
-endif
-
-  CFLAGS += -DGEKKO
+  PLATCFLAGS := -DGEKKO

  HAVE_FILTERS_BUILTIN     := 1
  HAVE_THREADS             := 1
+  HAVE_ZLIB                := 1
  HAVE_RPNG						:= 1
+  HAVE_7ZIP                := 1
+  HAVE_RPNG                := 1
  HAVE_OVERLAY             := 1
  HAVE_BUILTIN_AUTOCONFIG  := 1
-  HAVE_ZLIB                := 1
-  HAVE_7ZIP                := 1
-  RARCH_CONSOLE          = 1
-
-ifeq ($(platform), wii)
-  HAVE_WIIUSB_HID          := 1
-  HAVE_RARCH_EXEC          := 1
-  HAVE_RSOUND              := 1
-  HAVE_LIBRETRO_MANAGEMENT := 1
-
+else ifeq ($(platform), ps3)
+	#TODO
+  MEDIA_SHADER_DIR := ps3/pkg/USRDIR/cores/shaders
+else ifeq ($(platform), ps3-cobra)
+	#TODO
+  MEDIA_SHADER_DIR := ps3/iso/PS3_GAME/USRDIR/cores/shaders
+else ifeq ($(platform), wii)
+  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)
+  EXT_TARGET := $(TARGET_NAME)_wii.dol
+  EXT_INTER_TARGET := $(TARGET_NAME)_wii.elf
+  INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/zlib
+  LIBDIRS += -L$(DEVKITPRO)/libogc/lib/wii -L.
+  MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -DMSB_FIRST
+  LDFLAGS += $(MACHDEP) -Wl,-Map,$(notdir $(EXT_INTER_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
+ifeq ($(USBGECKO), 1)
+  LIBS += -ldb
+endif
  APP_BOOTER_DIR = wii/app_booter
  PLATOBJS := $(APP_BOOTER_DIR)/app_booter.binobj
+  CFLAGS += -DGEKKO
 ifeq ($(USBGECKO), 1)
  CFLAGS += -DUSBGECKO
 endif
-endif

-# Libxenon (Xbox 360)
-else ifeq ($(platform), xenon360)
-	CC = xenon-gcc$(EXE_EXT)
-	CXX = xenon-g++$(EXE_EXT)
-	OBJCOPY = xenon-objcopy$(EXE_EXT)
-	LD    = xenon-ld$(EXE_EXT)
-	STRIP = xenon-strip$(EXE_EXT)
-	INCLUDE += -I$(DEVKITXENON)/usr/include
-
-	EXT_TARGET := $(TARGET_NAME)_$(platform).elf32
-	EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
-
-	LIBS                    += -lxenon -lm -lc
-
-  LIBDIRS                  += -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32
-  LDFLAGS                  +=  -Wl,-q -m32 -n -T$(DEVKITXENON)/app.lds
-  PLATCFLAGS               := -DHAVE_GETOPT_LONG=1
-  PLATCFLAGS               += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DXENON $(INCDIRS) -Wno-char-subscripts
-  PLATCFLAGS               += -u read -u _start -u exc_base
+  HAVE_FILTERS_BUILTIN     := 1
+  HAVE_RARCH_EXEC          := 1
  HAVE_THREADS             := 1
-  HAVE_GETOPT_LONG         := 1
-  RARCH_CONSOLE          = 1
-
-# PSP
+  HAVE_RSOUND              := 1
+HAVE_7ZIP                  := 1
+  HAVE_LIBRETRO_MANAGEMENT := 1
+  HAVE_ZLIB                := 1
+  HAVE_RPNG                := 1
+  HAVE_RPNG                := 1
+  HAVE_OVERLAY             := 1
+  HAVE_LIBSICKSAXIS        := 1
+  HAVE_BUILTIN_AUTOCONFIG  := 1
 else ifeq ($(platform), psp1)
  CC = psp-gcc$(EXE_EXT)
  CXX = psp-g++$(EXE_EXT)
  LD = psp-ld$(EXE_EXT)
  INCLUDE += -I$(PSPSDK)/psp/sdk/include
-  EXT_TARGET := $(TARGET_NAME)_$(platform).elf
-  EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
-  PLATCFLAGS := -DPSP -D_PSP_FW_VERSION=150 -G0 \
-	  -D_MIPS_ARCH_ALLEGREX
-  LIBS +=  -lpspgu -lpspgum -lm -lpspaudio -lpspfpu -lpsppower -lpsprtc -lpspkernel
+  EXT_TARGET := $(TARGET_NAME)_psp1.elf
+  EXT_INTER_TARGET := $(TARGET_NAME)_psp1.elf
+  PLATCFLAGS := -DPSP -D_PSP_FW_VERSION=150 -G0

-  LIBDIRS += -L.
-  LDFLAGS +=  -Wl,-q
-
-  BUILD_PRX                 = 1
  HAVE_LIBRETRO_MANAGEMENT := 1
  HAVE_RPNG                := 1
-  HAVE_KERNEL_PRX          := 1
-  RARCH_CONSOLE          = 1
-
-ifeq ($(BUILD_PRX), 1)
-	LDFLAGS += $(addprefix -L,$(PSPSDK)/lib) -specs=$(PSPSDK)/lib/prxspecs -Wl,-q,-T$(PSPSDK)/lib/linkfile.prx $(LDFLAGS)
 endif

-# Vita
-else ifeq ($(platform), vita)
-  CC = arm-vita-eabi-gcc$(EXE_EXT)
-  CXX = arm-vita-eabi-g++$(EXE_EXT)
-  LD = arm-vita-eabi-ld$(EXE_EXT)
-  EXT_TARGET := $(TARGET_NAME)_$(platform).velf
-  EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
-  MACHDEP := -DVITA
-  PLATCFLAGS :=  -O3 -mfloat-abi=hard -ffast-math -fsingle-precision-constant 
-  LIBS += -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
-			 -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub -lUVLoader_stub \
-			 -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lfreetype -lz -lm -lc -lpng
-
-  PLATOBJS += audio/audio_utils_neon.o audio/drivers_resampler/sinc_neon.o \
-              audio/drivers_resampler/cc_resampler_neon.o
-
-  LIBDIRS += -L.
-  LDFLAGS +=  -Wl,-q
-
-  HAVE_FILTERS_BUILTIN     := 1
-  HAVE_LIBRETRO_MANAGEMENT := 1
-  HAVE_BUILTIN_AUTOCONFIG  := 1
-  HAVE_RPNG                := 1
-  HAVE_ZLIB                := 1
-  HAVE_VITA2D              := 1
-  HAVE_NETWORKING          := 1
-  HAVE_NETPLAY             := 1
-  HAVE_OVERLAY             := 1
-  RARCH_CONSOLE          = 1
-endif
-
-
-CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE)
+CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)

 OBJ = griffin/griffin.o  $(PLATOBJS)

@@ -235,46 +146,28 @@ INCLUDE += -I./libretro-common/include
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS      += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-endif
-
-ifeq ($(platform), wii)
-CFLAGS      += -DHAVE_SOCKET_LEGACY
-endif
-
-ifeq ($(platform), vita)
-CFLAGS      += -DHAVE_SOCKET_LEGACY
+INCLUDE     += -Ilogger/netlogger
 endif

 ifeq ($(HAVE_LIBRETRO_MANAGEMENT), 1)
 CFLAGS		+= -DHAVE_LIBRETRO_MANAGEMENT
 endif

-ifeq ($(HAVE_KERNEL_PRX), 1)
-CFLAGS      += -DHAVE_KERNEL_PRX
-endif
-
-ifeq ($(HAVE_WIIUSB_HID), 1)
-CFLAGS		+= -DHAVE_WIIUSB_HID -DHAVE_HID
-endif
-
-ifeq ($(HAVE_VITA2D), 1)
-CFLAGS		+= -DHAVE_VITA2D
+ifeq ($(HAVE_LIBSICKSAXIS), 1)
+CFLAGS		+= -DHAVE_LIBSICKSAXIS
 endif

 ifeq ($(HAVE_LIBRETRODB), 1)
 CFLAGS		+= -DHAVE_LIBRETRODB
 endif

-ifeq ($(BIG_STACK),1)
-CFLAGS		+= -DBIG_STACK
-endif
-
 ifeq ($(HAVE_RPNG), 1)
 CFLAGS      += -DWANT_RPNG
 endif

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

 ifeq ($(HAVE_RARCH_EXEC), 1)
@@ -309,15 +202,7 @@ ifeq ($(HAVE_NETPLAY), 1)
 CFLAGS      += -DHAVE_NETPLAY
 endif

-ifeq ($(RARCH_CONSOLE), 1)
-CFLAGS += -DRARCH_CONSOLE
-endif
-
-ifeq ($(RARCH_MOBILE), 1)
-CFLAGS += -DRARCH_MOBILE
-endif
-
-CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DHAVE_MENU -DHAVE_GRIFFIN=1 -Wno-char-subscripts  -DRARCH_INTERNAL
+CFLAGS += -std=gnu99 -DSINC_LOWER_QUALITY -DHAVE_RGUI -DHAVE_MENU -DRARCH_CONSOLE -DHAVE_GRIFFIN=1 -Wno-char-subscripts  -DRARCH_INTERNAL

 ifeq ($(HAVE_FILTERS_BUILTIN), 1)
 CFLAGS += -DHAVE_FILTERS_BUILTIN
@@ -330,18 +215,10 @@ LIBS += -lpthread-psp
 endif
 endif

-ifeq ($(HAVE_VITA2D), 1)
-LIBS := -lvita2d $(LIBS)
-endif
-
 ifeq ($(HAVE_RSOUND), 1)
 CFLAGS += -DHAVE_RSOUND
 endif

-ifeq ($(HAVE_GETOPT_LONG), 1)
-CFLAGS += -DHAVE_GETOPT_LONG=1
-endif
-
 ifeq ($(DEBUG), 1)
   CFLAGS += -O0 -g -DDEBUG
 else ifeq ($(platform), psp1)
@@ -355,29 +232,12 @@ all: $(EXT_TARGET)
 %.dol: %.elf
 	$(ELF2DOL) $< $@

-%.velf: %.elf
-	arm-vita-eabi-strip -g $<
-	vita-elf-create $< $@ $(VITASDK)/bin/db.json $(VITASDK)/bin/extra.json
-
-%.elf32: %.elf
-ifeq ($(platform), xenon360)
-	$(OBJCOPY) -O elf32-powerpc --adjust-vma 0x80000000 $< $@
-endif
-
-%.prx: %.elf
-ifeq ($(platform),psp1)
-	psp-prxgen $< $@
-endif
-
 $(EXT_INTER_TARGET): $(OBJ)
 	$(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS)

 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<

-%.o: %.S
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 %.bmpobj: %.bmp
 	$(LD) -r -b binary -o $@ $<

@@ -389,9 +249,9 @@ $(APP_BOOTER_DIR)/app_booter.bin:

 pkg: all
 ifeq ($(platform), wii)
-	cp -r $(EXT_TARGET) pkg/wii/CORE.dol
+	cp -r $(EXT_TARGET) wii/pkg/CORE.dol
 else ifeq ($(platform), ngc)
-	cp -r $(EXT_TARGET) pkg/ngc/CORE.dol
+	cp -r $(EXT_TARGET) ngc/pkg/CORE.dol
 else ifeq ($(platform), psp1)
 	psp-fixup-imports$(EXT) $(EXT_TARGET)
 endif
@@ -2,7 +2,7 @@
 # $ source /usr/local/angstrom/arm/environment-setup
 # $ setprj retroarch

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

 all: $(BINDIR)/retroarch
@@ -6,7 +6,7 @@ CELL_BUILD_TOOLS	= SNC
 CELL_GPU_TYPE	   	= RSX
 CELL_PSGL_VERSION	= ultra-opt

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

 # options
 DOWNLOAD_SHADERS	= 1
@@ -30,11 +30,11 @@ include $(CELL_MK_DIR)/sdk.makedef.mk
 PPU_TARGET		= retroarch_ps3.elf
 SALAMANDER_TARGET	= retroarch-salamander_ps3.elf

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

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

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

-PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
+PKG_SCRIPT		= ps3/ps3py/pkg.py
 ifeq ($(shell uname), Linux)
 PKG_FINALIZE         	= package_finalize
 MAKE_SELF_WC		= make_self_wc
@@ -68,7 +68,7 @@ ifeq ($(HAVE_RLAUNCH), 1)
 	DEFINES += -DHAVE_RLAUNCH
 endif

-DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_MATERIALUI -DHAVE_XMB -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_STB_FONT
+DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_GLUI -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_STB_FONT

 ifeq ($(HAVE_GCMGL), 1)
 DEFINES			+= -DHAVE_GCMGL
@@ -116,6 +116,7 @@ endif

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

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

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

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

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

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

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

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

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

 clean-selfs:
@@ -6,6 +6,8 @@ CELL_BUILD_TOOLS	= SNC
 CELL_GPU_TYPE	   	= RSX
 CELL_PSGL_VERSION	= ultra-opt

+RMENU_IMG_DIR  := media/rmenu
+
 # options
 DOWNLOAD_SHADERS	= 1
 STRIPPING_ENABLE	= 0
@@ -28,11 +30,11 @@ include $(CELL_MK_DIR)/sdk.makedef.mk
 PPU_TARGET		= retroarch_ps3.elf
 SALAMANDER_TARGET	= retroarch-salamander_ps3.elf

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

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

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

-PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
+PKG_SCRIPT		= ps3/ps3py/pkg.py
 ifeq ($(shell uname), Linux)
 PKG_FINALIZE         	= package_finalize
 MAKE_SELF_WC		= make_self_wc
@@ -66,7 +68,7 @@ ifeq ($(HAVE_RLAUNCH), 1)
 	DEFINES += -DHAVE_RLAUNCH
 endif

-DEFINES += -DHAVE_RGUI -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_MENU -DRARCH_INTERNAL
+DEFINES += -DHAVE_RMENU -DHAVE_MENU -DRARCH_INTERNAL

 ifeq ($(HAVE_GCMGL), 1)
 DEFINES			+= -DHAVE_GCMGL
@@ -114,6 +116,7 @@ endif

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

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

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

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

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

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

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

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

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

 clean-selfs:
@@ -25,19 +25,14 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  frontend/drivers/platform_null.c \
 				  libretro-common/file/file_path.c \
 				  libretro-common/file/dir_list.c \
-				  libretro-common/file/retro_dirent.c \
-				  libretro-common/file/retro_stat.c \
 				  libretro-common/hash/rhash.c \
-				  libretro-common/string/stdstring.c \
 				  libretro-common/string/string_list.c \
-				  libretro-common/compat/compat_strl.c \
-				  libretro-common/file/retro_file.c \
-				  libretro-common/file/config_file.c \
-				  verbosity.c
+				  libretro-common/compat/compat.c \
+				  libretro-common/file/config_file.c

 ifeq ($(HAVE_LOGGER), 1)
-PPU_CFLAGS		+= -DHAVE_LOGGER 
-PPU_SRCS		   += netlogger.c
+PPU_CFLAGS		+= -DHAVE_LOGGER -Ilogger/netlogger
+PPU_SRCS		+= logger/netlogger/logger.c
 endif

 PPU_TARGET		= retroarch-salamander_ps3.elf
@@ -14,8 +14,8 @@ LD = $(PS3DEV)/ppu/bin/ppu-ld
 CONTENT_ID_FULL		= UP0001-SSNE10000_00-0000000000000001

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

 INCLUDE := -I. -I$(PS3DEV)/ppu/include -Ideps/zlib -Ips3/gcmgl/include/export -Ips3/include
 LIBDIRS := -L$(PS3DEV)/ppu/lib -L$(PS3DEV)/portlibs/ppu/lib -L.
@@ -36,7 +36,7 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
   system_platform = win
 endif

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

-PKG_SCRIPT		= tools/ps3/ps3py/pkg.py
+PKG_SCRIPT		= ps3/ps3py/pkg.py
 ifeq ($(shell uname), Linux)
 PKG_FINALIZE         	= package_finalize
 MAKE_SELF_WC		= make_self_wc
@@ -119,10 +119,10 @@ create-core:
 	$(MAKE_SELF_WC) $(ELF_TARGET) $(CORE_PATH)

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

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

 clean:
 	rm -f $(ELF_TARGET)
@@ -51,7 +51,7 @@ CFLAGS += $(RARCH_DEFINES)
 EXTRA_TARGETS = EBOOT.PBP
 PSP_EBOOT_TITLE = RetroArch PSP1

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

 OBJS = $(PSP_OBJECTS)

@@ -26,27 +26,22 @@ endif

 CFLAGS += $(RARCH_DEFINES)

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

 OBJS = frontend/frontend_salamander.o \
 		 frontend/frontend_driver.o \
 		 frontend/drivers/platform_psp.o \
 		 frontend/drivers/platform_null.o \
 		 libretro-common/file/file_path.o \
-		 libretro-common/string/stdstring.o \
 		 libretro-common/string/string_list.o \
 		 libretro-common/file/dir_list.o \
-		 libretro-common/file/retro_dirent.o \
-		 libretro-common/compat/compat_strl.o \
+		 libretro-common/compat/compat.o \
 		 libretro-common/file/config_file.o \
-		 libretro-common/file/retro_file.o \
-		 libretro-common/file/retro_stat.o \
 		 libretro-common/hash/rhash.o \
-		 verbosity.o \
-		 bootstrap/psp1/kernel_functions.o 
+		 psp1/kernel_functions.o 

 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak
@@ -39,35 +39,21 @@ LIBS := -lfat -lwiiuse -logc -lbte

 APP_BOOTER_DIR = wii/app_booter

-OBJ = frontend/frontend_salamander.o \
-		frontend/frontend_driver.o \
-		frontend/drivers/platform_gx.o \
-		frontend/drivers/platform_wii.o \
-		frontend/drivers/platform_null.o \
-		libretro-common/file/file_path.o \
-		libretro-common/hash/rhash.o \
-		libretro-common/string/stdstring.o \
-		libretro-common/string/string_list.o \
-		libretro-common/file/dir_list.o \
-		libretro-common/file/retro_file.o \
-		libretro-common/file/retro_dirent.o \
-		libretro-common/file/retro_stat.o \
-		libretro-common/compat/compat_strl.o \
-		libretro-common/file/config_file.o \
-		verbosity.o \
-		$(APP_BOOTER_DIR)/app_booter.binobj
+OBJ = frontend/frontend_salamander.o frontend/frontend_driver.o frontend/drivers/platform_gx.o frontend/drivers/platform_wii.o frontend/drivers/platform_null.o libretro-common/file/file_path.o libretro-common/hash/rhash.o libretro-common/string/string_list.o libretro-common/file/dir_list.o libretro-common/compat/compat.o libretro-common/file/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj

 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
 CFLAGS          += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
-OBJ             += logger/netlogger.o
+CFLAGS          += -Ilogger/netlogger
+OBJ             += logger/netlogger/logger.o
 endif

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

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

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

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

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

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

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

 .PHONY: clean
+
@@ -14,7 +14,7 @@ HAVE_STDIN_CMD = 1
 HAVE_COMMAND = 1
 HAVE_THREADS = 1
 HAVE_RGUI = 1
-HAVE_MATERIALUI = 1
+HAVE_GLUI = 1
 HAVE_7ZIP = 1
 HAVE_ZLIB_DEFLATE = 1
 HAVE_PYTHON = 0
@@ -127,9 +127,9 @@ else
 endif

 CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I.
-CXXFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -std=c++98 -D__STDC_CONSTANT_MACROS
+CXXFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -std=c++0x -D__STDC_CONSTANT_MACROS
 ifeq ($(CXX_BUILD), 1)
-   CFLAGS += -std=c++98 -xc++ -D__STDC_CONSTANT_MACROS
+   CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS
 else
   ifneq ($(GNU90_BUILD), 1)
      CFLAGS += -std=gnu99
@@ -147,26 +147,25 @@ $(TARGET): $(RARCH_OBJ)
 	@$(if $(Q), $(shell echo echo LD $@),)
 	$(Q)$(CXX) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LDCXXFLAGS)

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

 .FORCE:

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

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

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

@@ -0,0 +1,49 @@
+RARCH_VERSION		= "0.9.9.3"
+
+DEBUG = 0
+
+CC = xenon-gcc
+CXX = xenon-g++
+OBJCOPY = xenon-objcopy
+STRIP = xenon-strip
+
+PPU_TARGET := retroarch-libxenon.elf
+PPU_TARGET_ADJUSTED := retroarch-libxenon.elf32
+
+LDDIRS = -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32
+INCDIRS = -I. -I$(DEVKITXENON)/usr/include
+
+OBJ = griffin/griffin.o
+
+LIBS = -lretro_xenon360 -lxenon -lm -lc
+DEFINES = -std=gnu99 -DRARCH_CONSOLE -DHAVE_THREADS -DHAVE_GETOPT_LONG=1 -DHAVE_GRIFFIN -DRARCH_INTERNAL
+DEFINES += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DXENON $(INCDIRS) -Wno-char-subscripts
+DEFINES += -u read -u _start -u exc_base
+
+ifeq ($(DEBUG), 1)
+   OPTIMIZE_LV	:= -O0 -g
+else
+   OPTIMIZE_LV	:= -O3
+endif
+
+all: $(PPU_TARGET_ADJUSTED)
+
+CFLAGS := $(OPTIMIZE_LV) $(DEFINES)
+
+LDFLAGS := -m32 -n -T $(DEVKITXENON)/app.lds
+
+$(PPU_TARGET_ADJUSTED): $(PPU_TARGET)
+	$(OBJCOPY) -O elf32-powerpc --adjust-vma 0x80000000 $< $@
+	$(STRIP) $@
+
+$(PPU_TARGET): $(OBJ)
+	$(CXX) -o $@ $(OBJ) $(LDFLAGS) $(LDDIRS) $(LIBS)
+
+%.o: %.c config.h
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	rm -f $(PPU_TARGET)
+	rm -f $(OBJ)
+
+.PHONY: clean
@@ -123,20 +123,20 @@ make

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

 <b>PC</b><br/>
@@ -150,7 +150,15 @@ RetroArch PS3 needs to be compiled in the following order:

 <tt>make -f Makefile.ps3.salamander</tt>

-2) Finally, compile RetroArch packed together with the GUI:
+2) Compile the RGL video driver
+
+<tt>make -f Makefile.ps3.rgl</tt>
+
+3) Compile RetroArch as a library
+
+<tt>make -f Makefile.ps3.retroarch</tt>
+
+4) Finally, compile RetroArch packed together with the GUI:

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

@@ -178,9 +186,9 @@ You will need Microsoft Visual Studio 2010 installed (or higher) in order to com

 The solution file can be found at the following location:

-<tt>pkg/msvc-360/RetroArch-360.sln</tt>
+<tt>msvc-360/RetroArch-360.sln</tt>

-NOTE: A pre-existing libretro library needs to be present in the `pkg/msvc-360/RetroArch-360/Release` directory in order to link RetroArch 360. This file needs to be
+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 />
@@ -195,6 +203,6 @@ NOTE: A pre-existing libretro library needs to be present in the root directory

 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.griffin platform=wii</tt>
+<tt>make -f Makefile.wii</tt>

 NOTE: A pre-existing libretro library needs to be present in the root directory in order to link RetroArch Wii. This file needs to be called <em><b>`libretro_wii.a`</b></em>.
@@ -0,0 +1,20 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "ubuntu/trusty64"
+  config.vm.provision :shell, :inline => $BOOTSTRAP_SCRIPT # see below
+end
+
+$BOOTSTRAP_SCRIPT = <<EOF
+  set -e # Stop on any error
+
+  export DEBIAN_FRONTEND=noninteractive
+
+  echo VAGRANT SETUP: DOING APT-GET STUFF...
+  # Install prereqs
+  sudo apt-get update
+  sudo apt-get install -y make git-core curl g++ pkg-config libglu1-mesa-dev freeglut3-dev mesa-common-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev
+
+  # Make vagrant automatically go to /vagrant when we ssh in.
+  echo "cd /vagrant" | sudo tee -a ~vagrant/.profile
+
+  echo VAGRANT IS READY.
+EOF
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.retroarch"
-    android:versionCode="43"
-    android:versionName="1.3.0"
+    android:versionCode="42"
+    android:versionName="1.2.2"
    android:installLocation="preferExternal">
    <uses-feature android:glEsVersion="0x00020000" />
    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
@@ -12,14 +12,18 @@
        android:targetSdkVersion="21" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

    <application
        android:allowBackup="true"
        android:icon="@drawable/ic_launcher"
-        android:label="RetroArch"
+        android:label="@string/app_name"
        android:hasCode="true"
-        android:banner="@drawable/banner">
+        android:banner="@drawable/banner"
+    	android:debuggable="false">
        <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
        <activity android:name="com.retroarch.browser.mainmenu.MainMenuActivity" android:exported="true" android:launchMode="singleInstance">
            <intent-filter>
@@ -1,10 +1,18 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)

-RARCH_DIR := ../../../..
+LOCAL_MODULE := retroarch-jni
+RARCH_DIR := ../../..
+LOCAL_CFLAGS += -std=gnu99 -Wall -DHAVE_LOGGER -DRARCH_DUMMY_LOG -DHAVE_ZLIB -DHAVE_MMAP -DRARCH_INTERNAL
+LOCAL_LDLIBS := -llog -lz
+LOCAL_SRC_FILES := apk-extract/apk-extract.c $(RARCH_DIR)/libretro-common/file/file_extract.c $(RARCH_DIR)/libretro-common/file/file_path.c $(RARCH_DIR)/file_ops.c $(RARCH_DIR)/libretro-common/string/string_list.c $(RARCH_DIR)/libretro-common/compat/compat.c

-HAVE_NEON   := 1
-HAVE_LOGGER := 0
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/
+
+include $(BUILD_SHARED_LIBRARY)
+
+HAVE_NEON := 1
+HAVE_LOGGER := 1

 include $(CLEAR_VARS)
 ifeq ($(TARGET_ARCH),arm)
@@ -39,8 +47,8 @@ LOCAL_SRC_FILES  +=	$(RARCH_DIR)/griffin/griffin.c

 ifeq ($(HAVE_LOGGER), 1)
   LOCAL_CFLAGS += -DHAVE_LOGGER
+   LOGGER_LDLIBS := -llog
 endif
-LOGGER_LDLIBS := -llog

 ifeq ($(GLES),3)
   GLES_LIB := -lGLESv3
@@ -50,10 +58,8 @@ else
 endif


-LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT
+LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_GLUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT
 LOCAL_CFLAGS += -DHAVE_7ZIP
-LOCAL_CFLAGS += -DHAVE_CHEEVOS
-LOCAL_CFLAGS += -DDEBUG_ANDROID

 ifeq ($(NDK_DEBUG),1)
 LOCAL_CFLAGS += -O0 -g
@@ -0,0 +1,19 @@
+ifeq ($(GLES),3)
+   ifndef NDK_GL_HEADER_VER
+      APP_PLATFORM := android-18
+   else
+      APP_PLATFORM := $(NDK_GL_HEADER_VER)
+   endif
+else
+   ifndef NDK_NO_GL_HEADER_VER
+      APP_PLATFORM := android-9
+   else
+      APP_PLATFORM := $(NDK_NO_GL_HEADER_VER)
+   endif
+endif
+
+ifndef TARGET_ABIS
+   APP_ABI := armeabi-v7a mips x86
+else
+   APP_ABI := $(TARGET_ABIS)
+endif
@@ -0,0 +1,91 @@
+#include <file/file_extract.h>
+#include <file/file_path.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <retro_miscellaneous.h>
+#include "../native/com_retroarch_browser_NativeInterface.h"
+
+//#define VERBOSE_LOG
+
+#ifndef VERBOSE_LOG
+#undef RARCH_LOG
+#define RARCH_LOG(...)
+#endif
+
+struct userdata
+{
+   const char *subdir;
+   const char *dest;
+};
+
+static int zlib_cb(const char *name, const char *valid_exts,
+      const uint8_t *cdata,
+      unsigned cmode, uint32_t csize, uint32_t size,
+      uint32_t crc32, void *userdata)
+{
+   char path[PATH_MAX];
+   char path_dir[PATH_MAX];
+   struct userdata *user = userdata;
+   const char *subdir = user->subdir;
+   const char *dest   = user->dest;
+
+   if (strstr(name, subdir) != name)
+      return 1;
+
+   name += strlen(subdir) + 1;
+
+   fill_pathname_join(path, dest, name, sizeof(path));
+   fill_pathname_basedir(path_dir, path, sizeof(path_dir));
+
+   if (!path_mkdir(path_dir))
+   {
+      RARCH_ERR("Failed to create dir: %s.\n", path_dir);
+      return 0;
+   }
+
+   RARCH_LOG("Extracting %s -> %s ...\n", name, path);
+
+   if (!zlib_perform_mode(path, valid_exts,
+            cdata, cmode, csize, size, crc32, userdata))
+   {
+      if (cmode == 0)
+      {
+         RARCH_ERR("Failed to write file: %s.\n", path);
+         return 0;
+      }
+      goto error;
+   }
+
+   return 1;
+
+error:
+   RARCH_ERR("Failed to deflate to: %s.\n", path);
+   return 0;
+}
+
+JNIEXPORT jboolean JNICALL Java_com_retroarch_browser_NativeInterface_extractArchiveTo(
+      JNIEnv *env, jclass cls, jstring archive, jstring subdir, jstring dest)
+{
+   const char *archive_c = (*env)->GetStringUTFChars(env, archive, NULL);
+   const char *subdir_c  = (*env)->GetStringUTFChars(env, subdir, NULL);
+   const char *dest_c    = (*env)->GetStringUTFChars(env, dest, NULL);
+
+   jboolean ret = JNI_TRUE;
+
+   struct userdata data = {
+      .subdir = subdir_c,
+      .dest = dest_c,
+   };
+
+   if (!zlib_parse_file(archive_c, NULL, zlib_cb, &data))
+   {
+      RARCH_ERR("Failed to parse APK: %s.\n", archive_c);
+      ret = JNI_FALSE;
+   }
+
+   (*env)->ReleaseStringUTFChars(env, archive, archive_c);
+   (*env)->ReleaseStringUTFChars(env, subdir, subdir_c);
+   (*env)->ReleaseStringUTFChars(env, dest, dest_c);
+   return ret;
+}
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_retroarch_browser_NativeInterface */
+
+#ifndef _Included_com_retroarch_browser_NativeInterface
+#define _Included_com_retroarch_browser_NativeInterface
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_retroarch_browser_NativeInterface
+ * Method:    extractArchiveTo
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_retroarch_browser_NativeInterface_extractArchiveTo
+  (JNIEnv *, jclass, jstring, jstring, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry exported="true" kind="lib" path="libs/android-support-v4.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/android-support-v7-appcompat.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android-support-v7-appcompat</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.support.v7.appcompat">
+    <uses-sdk android:minSdkVersion="7"/>
+</manifest>
@@ -0,0 +1,10 @@
+Library Project including compatibility ActionBar.
+
+This can be used by an Android project to provide
+access to ActionBar on applications running on API 7+.
+
+There is technically no source, but the src folder is necessary
+to ensure that the build system works.  The content is actually
+located in libs/android-support-v7-appcompat.jar.
+The accompanying resources must also be included in the application.
+
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+       android:interpolator="@android:anim/decelerate_interpolator"
+       android:fromAlpha="0.0" android:toAlpha="1.0"
+       android:duration="@android:integer/config_mediumAnimTime" />
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+       android:interpolator="@android:anim/decelerate_interpolator"
+       android:fromAlpha="1.0" android:toAlpha="0.0"
+       android:duration="@android:integer/config_mediumAnimTime" />
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+           android:interpolator="@android:anim/decelerate_interpolator"
+           android:fromYDelta="50%p" android:toYDelta="0"
+           android:duration="@android:integer/config_mediumAnimTime"/>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+           android:interpolator="@android:anim/decelerate_interpolator"
+           android:fromYDelta="-50%p" android:toYDelta="0"
+           android:duration="@android:integer/config_mediumAnimTime"/>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+           android:interpolator="@android:anim/accelerate_interpolator"
+           android:fromYDelta="0" android:toYDelta="50%p"
+           android:duration="@android:integer/config_mediumAnimTime"/>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+           android:interpolator="@android:anim/accelerate_interpolator"
+           android:fromYDelta="0" android:toYDelta="-50%p"
+           android:duration="@android:integer/config_mediumAnimTime"/>
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:color="@color/abc_search_url_text_pressed"/>
+    <item android:state_selected="true" android:color="@color/abc_search_url_text_selected"/>
+    <item android:color="@color/abc_search_url_text_normal"/> <!-- not selected -->
+</selector>
Author	SHA1	Message	Date
twinaphex	589b92cc99	(Wii) Bump up to version 1.2.2	2015-07-19 11:50:27 +02:00
twinaphex	e223821c22	(Android) Bump up APK version code; bump up version	2015-07-19 11:50:00 +02:00
Twinaphex	f073739970	(OSX) Bump up to version 1.2.2	2015-07-19 00:14:31 +02:00
twinaphex	0bbb0d6913	(Darwin) Cleanups	2015-07-18 23:49:58 +02:00
twinaphex	c56f1403e5	(Darwin) Setup default shader dir	2015-07-18 23:41:42 +02:00
twinaphex	1fab41ad63	Cleanup	2015-07-18 23:32:23 +02:00
twinaphex	f3f238381f	Take out -Wno-invalid-encoding - GCC doesn't support this, and too much of a pain to selectively take it out	2015-07-18 22:48:45 +02:00
radius	49931f4df7	build fix	2015-07-18 15:45:58 -05:00
Twinaphex	d06bd1870e	Move Quick Menu to the top	2015-07-18 22:11:59 +02:00
twinaphex	2f36994f67	Finally linked openCore	2015-07-18 21:02:31 +02:00
twinaphex	5cd9fb1da2	(es) Buildfix	2015-07-18 20:59:42 +02:00
twinaphex	99e1a9b297	Get rid of builtin_bswap16/bswap32 - breaks on OSX 10.8	2015-07-18 20:56:47 +02:00
Twinaphex	60f681f5f8	Merge pull request #1991 from sergiobenrocha2/master Fix portuguese string.	2015-07-18 20:41:40 +02:00
Twinaphex	b886f7ab96	Merge pull request #1990 from IlDucci/patch-3 Update menu_hash_es.c	2015-07-18 20:40:58 +02:00
Twinaphex	727e71d206	Merge pull request #1992 from vanfanel/master VIDEO/SUNXI: fixed compilation because of a couple of small errors co…	2015-07-18 20:40:27 +02:00
vanfanel	824c647377	VIDEO/SUNXI: fixed compilation because of a couple of small errors coming from cleanups.	2015-07-18 20:33:07 +02:00
twinaphex	5c258a52f5	Revert "(MainMenu.xib) Try to add IBConnectionRecord" This reverts commit `0bc2a86fb5`.	2015-07-18 20:32:14 +02:00
twinaphex	0bc2a86fb5	(MainMenu.xib) Try to add IBConnectionRecord	2015-07-18 20:31:50 +02:00
sergiobenrocha2	8ee4fd9c15	Fix portuguese string.	2015-07-18 15:15:54 -03:00
twinaphex	cb9deedbf2	Remove showCores dialog	2015-07-18 20:06:31 +02:00
Twinaphex	8bf42618d9	(OSX) Fix IBAction openCores	2015-07-18 19:24:14 +02:00
IlDucci	cf915d6524	Update menu_hash_es.c Started with help screens. Spanish translation incomplete.	2015-07-18 19:07:17 +02:00
Twinaphex	0961446b19	Merge pull request #1988 from IlDucci/patch-2 Update msg_hash_es.c	2015-07-18 18:38:25 +02:00
IlDucci	09b9683e26	Update msg_hash_es.c Starting a Spanish translation.	2015-07-18 18:34:59 +02:00
twinaphex	88caa51a5e	(ES) Fix some labels	2015-07-18 18:32:24 +02:00
Twinaphex	eba3506b55	Merge pull request #1987 from IlDucci/patch-1 Update menu_hash_es.c	2015-07-18 18:30:12 +02:00
IlDucci	5a324c1dac	Update menu_hash_es.c Starting a Spanish translation.	2015-07-18 18:21:49 +02:00
Twinaphex	6cb42bde29	Set all paths to bundle dirs when RELEASE_BUILD is defined	2015-07-18 17:36:30 +02:00
twinaphex	d9a72d9b5c	(OSX) Set XMB driver as menu default driver from OSX 10.6 and up	2015-07-18 16:15:54 +02:00
twinaphex	fd33f2153a	Update openCore	2015-07-18 16:01:39 +02:00
twinaphex	e35fab5dc8	(OSX) Add HAVE_CORETEXT	2015-07-18 15:55:35 +02:00
twinaphex	f02f1ebc8f	(OSX) setWantsBestResolutionOpenGLSurface - OSX 10.7 and up	2015-07-18 15:46:48 +02:00
twinaphex	5bc03fb3a8	backingScaleFactor OSX 10.7 and up	2015-07-18 15:41:14 +02:00
twinaphex	edac6e0afc	Remove no-invalid-source-encoding - GCC on OSX can't handle this	2015-07-18 15:39:26 +02:00
twinaphex	7ad1beeb81	Some robustness checks	2015-07-18 15:26:31 +02:00
Twinaphex	a54a4d6cbe	(Menu) Cleanup unused variable	2015-07-18 15:25:42 +02:00
twinaphex	ffc075166e	(OSX) Add 'openCore'	2015-07-18 15:24:45 +02:00
Twinaphex	34c2791fa4	Revert "(OSX) Add default dirs for Pictures and Downloads" This reverts commit `b9831cdc14`.	2015-07-18 15:16:56 +02:00
twinaphex	b9831cdc14	(OSX) Add default dirs for Pictures and Downloads	2015-07-18 15:14:40 +02:00
Twinaphex	09ee27337c	(OSX) Fix crash at exit	2015-07-18 15:07:16 +02:00
twinaphex	67c5d14900	(OSX) Fix some paths	2015-07-18 15:05:22 +02:00
twinaphex	31e76e4329	Fix 'What Is A core' entry	2015-07-18 15:00:38 +02:00
twinaphex	b3bb7def66	Small nit	2015-07-18 14:58:14 +02:00
twinaphex	a86e4304b4	Add 'Scanning For Content' help	2015-07-18 14:57:20 +02:00
twinaphex	a919c26b81	Add 'Change Virtual Gamepad' help	2015-07-18 14:01:37 +02:00
Alcaro	b45c8bf916	Fix saying 'several ways' and only listing one way if net is off.	2015-07-18 11:34:50 +02:00
twinaphex	280fab6cab	Cleanup	2015-07-18 11:31:54 +02:00
twinaphex	ef1b066b64	Add 'What Is A Core?' to Help	2015-07-18 11:29:37 +02:00
twinaphex	d3b1eef196	Add MENU_LABEL_VALUE_MENU_CONTROLS_PROLOG	2015-07-18 08:39:52 +02:00
twinaphex	34be1b9c9c	Cleanup	2015-07-18 07:27:22 +02:00
twinaphex	6636fbaf15	(Help) Add 'Loading Content'	2015-07-17 22:11:24 +02:00
twinaphex	f48c31cf68	Update 'Basic Menu Controls'	2015-07-17 21:50:51 +02:00
twinaphex	ac9d54032f	Start creating Menu Help list	2015-07-17 20:33:09 +02:00
Twinaphex	d725ff9738	Merge pull request #1983 from heuripedes/master (stb.c) Fix growth conditional and limit growth to 2048x2048	2015-07-17 18:53:01 +02:00
Higor Eurípedes	ab55ed7908	(stb.c) Fix growth conditional and limit growth to 2048x2048	2015-07-17 13:38:24 -03:00
twinaphex	7f3424ab15	(Menu) More translatable strings	2015-07-17 18:22:59 +02:00
twinaphex	40541d60c9	Add more translatable strings	2015-07-17 15:53:02 +02:00
twinaphex	673e2ba57d	Add "Welcome to RetroArch" to translatable strings	2015-07-17 15:25:58 +02:00
twinaphex	4e64eac514	Add welcome start screen and make it have a 3-second timeout	2015-07-17 15:03:17 +02:00