From c3ac725269ce4f4aade3d6cbcbd812130d907177 Mon Sep 17 00:00:00 2001
From: aliaspider <aliaspider@gmail.com>
Date: Sun, 13 Sep 2015 22:27:28 +0100
Subject: [PATCH 1/5] (CTR/3DS) improve vsync. gfxSwapBuffersGpu needs to be
 called immediately after initiating a display transfer.

---
 gfx/drivers/ctr_gfx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c
index c891619425..18da5807e0 100644
--- a/gfx/drivers/ctr_gfx.c
+++ b/gfx/drivers/ctr_gfx.c
@@ -253,7 +253,6 @@ static bool ctr_frame(void* data, const void* frame,
    svcWaitSynchronization(gspEvents[GSPEVENT_PPF], 20000000);
    svcClearEvent(gspEvents[GSPEVENT_PPF]);
 
-   gfxSwapBuffersGpu();   
    frames++;
 
    if (ctr->vsync)
@@ -361,6 +360,7 @@ static bool ctr_frame(void* data, const void* frame,
    ctrGuDisplayTransfer(true, CTR_GPU_FRAMEBUFFER, 240,400, CTRGU_RGBA8,
                         gfxGetFramebuffer(GFX_TOP, GFX_LEFT, NULL, NULL), 240,400,CTRGU_RGB8, CTRGU_MULTISAMPLE_NONE);
 
+   gfxSwapBuffersGpu();
    RARCH_PERFORMANCE_STOP(ctrframe_f);
 
    return true;

From 3733956fd005d445688d0b3ec57e6dafebe84591 Mon Sep 17 00:00:00 2001
From: aliaspider <aliaspider@gmail.com>
Date: Sun, 13 Sep 2015 22:33:35 +0100
Subject: [PATCH 2/5] (CTR/3DS) update makefile.ctr - move per-core build
 settings to a seperate file. - make the griffin build optional (enabled by
 default).

---
 Makefile.ctr                    | 273 +++++++++++++++++++++++---------
 ctr/Makefile.cores              |  73 +++++++++
 frontend/drivers/platform_ctr.c |   2 +
 menu/drivers/rgui.c             |   1 +
 menu/menu_driver.c              |   1 +
 5 files changed, 277 insertions(+), 73 deletions(-)
 create mode 100644 ctr/Makefile.cores

diff --git a/Makefile.ctr b/Makefile.ctr
index add1f93198..460fbac86a 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -2,6 +2,8 @@ TARGET := retroarch_3ds
 LIBRETRO =
 
 DEBUG = 0
+GRIFFIN_BUILD = 1
+
 
 APP_TITLE         = Retroarch 3DS
 APP_DESCRIPTION   = Retroarch 3DS
@@ -12,82 +14,207 @@ APP_ICON          = ctr/default.png
 APP_BANNER        = ctr/libretro_banner.png
 APP_AUDIO         = ctr/silent.wav
 
-ifeq ($(LIBRETRO), gambatte)
-	APP_TITLE         = Gambatte Libretro
-	#APP_DESCRIPTION   = Retroarch 3DS
-	#APP_AUTHOR        = Team Libretro
-	APP_PRODUCT_CODE  = RARCH-GAMBATTE
-	APP_UNIQUE_ID     = 0xBAC01
-	APP_ICON          = ctr/gambatte.png
-	#APP_BANNER        = ctr/libretro_banner.png
-	#APP_AUDIO         = ctr/silent.wav
-
-else ifeq ($(LIBRETRO), gpsp)
-	APP_TITLE         = gpSP Libretro
-	#APP_DESCRIPTION   = Retroarch 3DS
-	#APP_AUTHOR        = Team Libretro
-	APP_PRODUCT_CODE  = RARCH-GPSP
-	APP_UNIQUE_ID     = 0xBAC02
-	APP_ICON          = ctr/gpsp.png
-	#APP_BANNER        = ctr/libretro_banner.png
-	#APP_AUDIO         = ctr/silent.wav
-
-else ifeq ($(LIBRETRO), fceumm)
-	APP_TITLE         = FCeumm Libretro
-	#APP_DESCRIPTION   = Retroarch 3DS
-	#APP_AUTHOR        = Team Libretro
-	APP_PRODUCT_CODE  = RARCH-FCEUMM
-	APP_UNIQUE_ID     = 0xBAC03
-	APP_ICON          = ctr/fceumm.png
-	#APP_BANNER        = ctr/libretro_banner.png
-	#APP_AUDIO         = ctr/silent.wav
-
-else ifeq ($(LIBRETRO), nestopia)
-	APP_TITLE         = Nestopia Libretro
-	#APP_DESCRIPTION   = Retroarch 3DS
-	#APP_AUTHOR        = Team Libretro
-	APP_PRODUCT_CODE  = RARCH-NESTOPIA
-	APP_UNIQUE_ID     = 0xBAC04
-	APP_ICON          = ctr/nestopia.png
-	#APP_BANNER        = ctr/libretro_banner.png
-	#APP_AUDIO         = ctr/silent.wav
-
-else ifeq ($(LIBRETRO), nxengine)
-	APP_TITLE         = NXengine Libretro
-	#APP_DESCRIPTION   = Retroarch 3DS
-	#APP_AUTHOR        = Team Libretro
-	APP_PRODUCT_CODE  = RARCH-NXENGINE
-	APP_UNIQUE_ID     = 0xBAC05
-	APP_ICON          = ctr/nxengine.png
-	#APP_BANNER        = ctr/libretro_banner.png
-	#APP_AUDIO         = ctr/silent.wav
-
-else ifeq ($(LIBRETRO), genesis_plus_gx)
-	APP_TITLE         = Genesis Plus GX Libretro
-	#APP_DESCRIPTION   = Retroarch 3DS
-	#APP_AUTHOR        = Team Libretro
-	APP_PRODUCT_CODE  = RARCH-GENPLUSGX
-	APP_UNIQUE_ID     = 0xBAC06
-	APP_ICON          = ctr/gambatte.png
-	#APP_BANNER        = ctr/libretro_banner.png
-	#APP_AUDIO         = ctr/silent.wav
-
-else ifeq ($(LIBRETRO), catsfc)
-	APP_TITLE         = CATSFC Libretro
-	#APP_DESCRIPTION   = Retroarch 3DS
-	#APP_AUTHOR        = Team Libretro
-	APP_PRODUCT_CODE  = RARCH-CATSFC
-	APP_UNIQUE_ID     = 0xBAC07
-	APP_ICON          = ctr/gambatte.png
-	#APP_BANNER        = ctr/libretro_banner.png
-	#APP_AUDIO         = ctr/silent.wav
-
-endif
+include ctr/Makefile.cores
 
 
 OBJS :=
 OBJS += gfx/drivers/ctr_sprite.o
-OBJS += griffin/griffin.o
+
+ifeq ($(GRIFFIN_BUILD), 1)
+	OBJS += griffin/griffin.o
+else
+	OBJS += libretro-common/file/file_extract.o
+	OBJS += performance.o
+	OBJS += libretro-common/compat/compat.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 += gfx/video_texture.o
+	OBJS += libretro-common/formats/tga/tga_decode.o
+	OBJS += libretro-common/formats/png/rpng_fbio.o
+	OBJS += libretro-common/formats/png/rpng_nbio.o
+	OBJS += libretro-common/formats/png/rpng_decode.o
+	OBJS += libretro-common/formats/png/rpng_encode.o
+	OBJS += gfx/drivers/ctr_gfx.o
+	OBJS += gfx/drivers/nullgfx.o
+	OBJS += gfx/font_renderer_driver.o
+	OBJS += gfx/drivers_font_renderer/bitmapfont.o
+	OBJS += gfx/font_driver.o
+	OBJS += input/input_autodetect.o
+	OBJS += input/input_joypad_driver.o
+	OBJS += input/input_joypad.o
+	OBJS += input/input_hid_driver.o
+	OBJS += input/input_common.o
+	OBJS += input/input_keymaps.o
+	OBJS += input/input_remapping.o
+	OBJS += input/input_sensor.o
+	OBJS += input/keyboard_line.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_audio.o
+	OBJS += audio/drivers/nullaudio.o
+	OBJS += gfx/video_driver.o
+	OBJS += gfx/video_common.o
+	OBJS += gfx/video_pixel_converter.o
+	OBJS += gfx/video_viewport.o
+	OBJS += input/input_driver.o
+	OBJS += audio/audio_driver.o
+	OBJS += camera/camera_driver.o
+	OBJS += location/location_driver.o
+	OBJS += menu/menu_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 += dir_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 += retroarch_info.o
+	OBJS += runloop.o
+	OBJS += runloop_data.o
+	OBJS += runloop_msg.o
+	OBJS += system.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_file_transfer.o
+	OBJS += screenshot.o
+	OBJS += playlist.o
+	OBJS += menu/menu.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_list.o
+	OBJS += menu/menu_cbs.o
+	OBJS += menu/menu_video.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/menu_iterate.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/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
 
 
 ifeq ($(strip $(DEVKITARM)),)
@@ -159,7 +286,7 @@ $(TARGET).elf: $(OBJS) libretro_ctr.a
 
 ctr_sprite_shader_shbin.h: gfx/drivers/ctr_sprite.o
 gfx/drivers/ctr_gfx.c: ctr_sprite_shader_shbin.h
-griffin/griffin.c: gfx/drivers/ctr_gfx.c
+griffin/griffin.o: gfx/drivers/ctr_gfx.c
 
 
 PREFIX		:=	$(DEVKITARM)/bin/arm-none-eabi-
diff --git a/ctr/Makefile.cores b/ctr/Makefile.cores
new file mode 100644
index 0000000000..363f251536
--- /dev/null
+++ b/ctr/Makefile.cores
@@ -0,0 +1,73 @@
+
+
+ifeq ($(LIBRETRO), gambatte)
+	APP_TITLE         = Gambatte Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-GAMBATTE
+	APP_UNIQUE_ID     = 0xBAC01
+	APP_ICON          = ctr/gambatte.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), gpsp)
+	APP_TITLE         = gpSP Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-GPSP
+	APP_UNIQUE_ID     = 0xBAC02
+	APP_ICON          = ctr/gpsp.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), fceumm)
+	APP_TITLE         = FCeumm Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-FCEUMM
+	APP_UNIQUE_ID     = 0xBAC03
+	APP_ICON          = ctr/fceumm.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), nestopia)
+	APP_TITLE         = Nestopia Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-NESTOPIA
+	APP_UNIQUE_ID     = 0xBAC04
+	APP_ICON          = ctr/nestopia.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), nxengine)
+	APP_TITLE         = NXengine Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-NXENGINE
+	APP_UNIQUE_ID     = 0xBAC05
+	APP_ICON          = ctr/nxengine.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), genesis_plus_gx)
+	APP_TITLE         = Genesis Plus GX Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-GENPLUSGX
+	APP_UNIQUE_ID     = 0xBAC06
+	APP_ICON          = ctr/gambatte.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), catsfc)
+	APP_TITLE         = CATSFC Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-CATSFC
+	APP_UNIQUE_ID     = 0xBAC07
+	APP_ICON          = ctr/gambatte.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+endif
diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index f9509aa4ec..dc415f52bc 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -26,10 +26,12 @@
 #endif
 
 #include "../../general.h"
+#include "retroarch.h"
 
 #ifdef IS_SALAMANDER
 #include "../../file_ext.h"
 #else
+#include "../../menu/menu.h"
 #include "../../menu/menu_list.h"
 #endif
 
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index ab4912e063..cca06db0f6 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -26,6 +26,7 @@
 #include <file/file_path.h>
 #include <retro_inline.h>
 
+#include "general.h"
 #include "../menu.h"
 #include "../menu_hash.h"
 #include "../menu_video.h"
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index aafffe0643..017ec897e7 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -19,6 +19,7 @@
 
 #include "menu.h"
 #include "menu_video.h"
+#include "general.h"
 
 static bool menu_alive = false;
 

From 41019503e881230efb38ccad3817ed2642a57f50 Mon Sep 17 00:00:00 2001
From: aliaspider <aliaspider@gmail.com>
Date: Sun, 13 Sep 2015 22:58:37 +0100
Subject: [PATCH 3/5] (CTR/3DS) build update. - add IDs and icons for more
 libretro cores. - add support for WHOLE_ARCHIVE_LINK

---
 Makefile.ctr           |  21 +++++++++++--
 ctr/2048.png           | Bin 0 -> 1880 bytes
 ctr/Makefile.cores     |  65 +++++++++++++++++++++++++++++++++++++++--
 ctr/mednafen_ngp.png   | Bin 0 -> 1880 bytes
 ctr/mednafen_vb.png    | Bin 0 -> 1880 bytes
 ctr/mednafen_wswan.png | Bin 0 -> 1880 bytes
 ctr/picodrive.png      | Bin 0 -> 1880 bytes
 ctr/snes9x_next.png    | Bin 0 -> 1880 bytes
 8 files changed, 81 insertions(+), 5 deletions(-)
 create mode 100644 ctr/2048.png
 create mode 100644 ctr/mednafen_ngp.png
 create mode 100644 ctr/mednafen_vb.png
 create mode 100644 ctr/mednafen_wswan.png
 create mode 100644 ctr/picodrive.png
 create mode 100644 ctr/snes9x_next.png

diff --git a/Makefile.ctr b/Makefile.ctr
index 460fbac86a..dd093ffe04 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -3,7 +3,9 @@ LIBRETRO =
 
 DEBUG = 0
 GRIFFIN_BUILD = 1
-
+WHOLE_ARCHIVE_LINK = 0
+BUILD_3DSX = 1
+BUILD_CIA  = 1
 
 APP_TITLE         = Retroarch 3DS
 APP_DESCRIPTION   = Retroarch 3DS
@@ -256,6 +258,12 @@ ifeq ($(DEBUG), 1)
 else
    CFLAGS	+= -O3
 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
@@ -272,15 +280,22 @@ LDFLAGS   =	-specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 CFLAGS   += -std=gnu99 -ffast-math
 
 
-LIBS	:= -lretro_ctr -lctru -lm
+LIBS	:= $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lctru -lm
 
 
+ifeq ($(BUILD_3DSX), 1)
+TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
+endif
+
+ifeq ($(BUILD_CIA), 1)
+TARGET_CIA := $(TARGET).cia
+else
 
 .PHONY: $(BUILD) clean all
 
 all: $(TARGET)
 
-$(TARGET): $(TARGET).3dsx $(TARGET).smdh $(TARGET).cia
+$(TARGET): $(TARGET_3DSX) $(TARGET_CIA)
 $(TARGET).3dsx: $(TARGET).elf
 $(TARGET).elf: $(OBJS) libretro_ctr.a
 
diff --git a/ctr/2048.png b/ctr/2048.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0e98e66dc3e01923e4288b27980b3eecd0c0090
GIT binary patch
literal 1880
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
G*?$Ab@K;g*

literal 0
HcmV?d00001

diff --git a/ctr/Makefile.cores b/ctr/Makefile.cores
index 363f251536..b973716d2b 100644
--- a/ctr/Makefile.cores
+++ b/ctr/Makefile.cores
@@ -39,6 +39,7 @@ else ifeq ($(LIBRETRO), nestopia)
 	APP_ICON          = ctr/nestopia.png
 	#APP_BANNER        = ctr/libretro_banner.png
 	#APP_AUDIO         = ctr/silent.wav
+	BUILD_3DSX        = 0
 
 else ifeq ($(LIBRETRO), nxengine)
 	APP_TITLE         = NXengine Libretro
@@ -56,7 +57,7 @@ else ifeq ($(LIBRETRO), genesis_plus_gx)
 	#APP_AUTHOR        = Team Libretro
 	APP_PRODUCT_CODE  = RARCH-GENPLUSGX
 	APP_UNIQUE_ID     = 0xBAC06
-	APP_ICON          = ctr/gambatte.png
+	APP_ICON          = ctr/genesis_plus_gx.png
 	#APP_BANNER        = ctr/libretro_banner.png
 	#APP_AUDIO         = ctr/silent.wav
 
@@ -66,7 +67,67 @@ else ifeq ($(LIBRETRO), catsfc)
 	#APP_AUTHOR        = Team Libretro
 	APP_PRODUCT_CODE  = RARCH-CATSFC
 	APP_UNIQUE_ID     = 0xBAC07
-	APP_ICON          = ctr/gambatte.png
+	APP_ICON          = ctr/catsfc.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), mednafen_wswan)
+	APP_TITLE         = Mednafen wswan Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-M-WSWAN
+	APP_UNIQUE_ID     = 0xBAC08
+	APP_ICON          = ctr/mednafen_wswan.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), mednafen_vb)
+	APP_TITLE         = Mednafen VB Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-M-VB
+	APP_UNIQUE_ID     = 0xBAC09
+	APP_ICON          = ctr/mednafen_vb.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), mednafen_ngp)
+	APP_TITLE         = Mednafen NGP Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-M-NGP
+	APP_UNIQUE_ID     = 0xBAC0A
+	APP_ICON          = ctr/mednafen_ngp.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), 2048)
+	APP_TITLE         = 2048 Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-2048
+	APP_UNIQUE_ID     = 0xBAC0B
+	APP_ICON          = ctr/2048.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), picodrive)
+	APP_TITLE         = Picodrive Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-PICODRIVE
+	APP_UNIQUE_ID     = 0xBAC0C
+	APP_ICON          = ctr/picodrive.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), snes9x_next)
+	APP_TITLE         = Snes9x Next Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-SNES9XNEXT
+	APP_UNIQUE_ID     = 0xBAC0D
+	APP_ICON          = ctr/snes9x_next.png
 	#APP_BANNER        = ctr/libretro_banner.png
 	#APP_AUDIO         = ctr/silent.wav
 
diff --git a/ctr/mednafen_ngp.png b/ctr/mednafen_ngp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0e98e66dc3e01923e4288b27980b3eecd0c0090
GIT binary patch
literal 1880
zcmZ`)Ydq5p8~)E>lS8KTB*Y>z%tj6+nlZ76wj?~NiJ3WVX|d*6v8?p#pjOMNUWw(D
zOy<y%NTu|U*2!^Gmh-Wk?cv$;{@xGo`{Dg?-`DTD?%#D^-|qX;K|e1ob$xXJ0JL!4
zSb_pk{}fb3(aUou{1u==#vH%^KxKx8JWN%=Vd36{0|3A@2Y{3`09aN?DZ>D8T45X|
z0)TTC0Bok+5#e1F1Emu_Uf8uY-7?!Y1%uFW2RtEC<t^G42HBK-G5`SohQne4q9hYp
zXJS8j>b9Vt_ZjuPil$sv+N2v-nR1WUb9uvuAQ==|?ugf!X;gMm!rq9w&Pc&DnOH(M
z=3{RN@j4lw>~D9M+Cl|vm{%%$lclhRPpVy+%aB%#$A5IS$a>Y8={xB3OHzMEdWI_b
zQ?7Y^QTrxB45kC=LeN&gB+d<z;%(3Yf{DRcaEi`7^q^+sm3U*I;MtLN1!~Okw6qhu
zc0=X^-9I93Z+ir5RCNKnYP-L1q`hjAT<z$rVgV?Su;L19Uv~qhbeE;;4U?|P$Bg;@
z0q`J>?^D<;#c7cDw-?X%(Dng_dEOP*GF|!#O)nAVqc3&#hl@o%o-^F-yjU)CjbZ+J
zMTw>YMLpc$hWX>ktsy(D(z>8lriCE3Ri)%!=dHdfe|?d4dYEnC*013AEzS5MlM)@#
zLyj+GS1Zx!V2-jrkwdlBG*-`C0Q@<d-Wg4ggWo$7Rc2iPjU$)}!{TfpAVl=8X;>xv
zCoz`Yb=pLIdFsL^-+rG%c{89-)YKP04)$;@{M_EdX?;_~Jjio;D&h#FQ#tr1Kc|Gd
zf~2(PtribN^VucbqWuZac0Ad8D>P>NS2C9@k{3TIlQDx65Vfs@x7E_)`;fTFliU~%
zpUja-;9IZpz+0#DR&rYS=eKZ2`Mu}4akvy$)D-hjQlFPNuIdkWHTdaN;aFVtfpcTC
zB{dWA3p}xKa`n`X<2!if*>bTBAtBgco6MJU<#OAU2Nko#SPMP<%6vGnAzR5{-u)5e
z?23M@ZKStWmQscxC#xy{*RdJ<AeM14lmR)R-B>V|Pj&39ZE`4Rk|^h#L;WagX&hwe
zfoFd<n)Q8)8iS6`6$*FuVV7`KGR6n#Riuo0q-0cJKU|DPZ!AfSXIy^1cxtWE_7Gp5
zSucP5f$&}DT=q)o_OIu;E5Vf3G0EBA-<5Qejp$bP&lk#-4yd%4q$Aie2bA0+&+MVn
zisstk>K{N$^PV$T^w(<s!VyKatgaXoZ1a6>cK8-78pJEOXQMu@5%wlT&}L665VU{0
zQc0663@+3SbXXb8+Mty0jP)-|S&{N}!l$242I=etu10;fQE~(s=T69Yf@!PHq&<2b
znC5Ty+d3%eZ;go;+i?f`Hn?A-5YCeH8Y-O1MwbX*bl^?qW~<gm1%4t^|57UrWLjYR
zb?!CXB~`-xL!)>T)@Q@j)rt^nt$HzeW0L>H2D3&P)Mv=PEG?Q*fDS-wzqa1lYhw)z
z9d7LCFw)CZWi6)`?Ht~Pb;3v&QZF|DBA(C>JqkhBGKjP5MzA4joknHrs|opwa~OtJ
zSSyZ6F3@#&^V3bd-ohUuPGRk>%m(2S>x59vm^qJQjUF?1F^rR|2`!Upt}z%b;`U|V
zO11Idn}VrFiv|ddGrOnZlBW%z$+xtx;2=lv{p5>7k}BNN$TUr-j;d<Dgt~zF)ib@|
z4g2(YVd?d>)7P#CTo?EVuYbNPYW?>QrnHGVm`?x%L8&`R7h8gg-$!~Mg@$?tpdN(7
z<<n5ZQb@I7=t|Qt#MJA>kG=ghZJftNsmZC2K)T&-2HQwly>{yN5d#L37qpySR30Wq
z07fu_UTI1ZSO9qied(FxZOwagUC;XD`7UWW*0Oy;#2j)Q>Avmcf%d5>w|jYOBotnr
z$Y?QMbJI7bUiGh$f%ixF)Nhu%ZZLE+_`$Xj|HN~9a_X1iBmYt^DpD>K;=~Vpk?9B)
zKXuP)`3{nB&O8YAj0?XT8t>N~WY)HN_;H2W6rxw8c^o-0DpSSZG2!=EH%!EW1iD?5
znUN8=xsorj1N=?e`-hP6b1Irei)q+v+YTdV*l*VGq9~7a@+2i0=9Lq)W8z#$^m1Ty
zjs*)3<IBTl!u^{U1E)fg^X-$%0;;^Ctuse+3!QxUi@a|m>vA}LW*NEp-*;ynQ#S%V
zB_<;RY9ewUBo=l=!oWFHcJIyUkEZ=u+OMHeOdyuZDKekUK;-hiD9yagzN_kYFMn&j
z0CZ<y7X8<g<n?&P0Y3C!^$}fYxrHQ%Wv(ioh8f*6h#nC}Cpm{FkQ4yep==!xsGSHq
zhX7j#XM2>hos$*H))|G`sbUEJA4429f)aV={~O$c3q=aU-hUEKC6b-Psc~_ncsc;{
z_;*qSEQvyog5lz0PKAfjNHB{iI-TZ>L?$IA*--u?+E5e7NH}cO)2m9c3BY;!VIR2@
G*?$Ab@K;g*

literal 0
HcmV?d00001

diff --git a/ctr/mednafen_vb.png b/ctr/mednafen_vb.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0e98e66dc3e01923e4288b27980b3eecd0c0090
GIT binary patch
literal 1880
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
G*?$Ab@K;g*

literal 0
HcmV?d00001

diff --git a/ctr/mednafen_wswan.png b/ctr/mednafen_wswan.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0e98e66dc3e01923e4288b27980b3eecd0c0090
GIT binary patch
literal 1880
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
G*?$Ab@K;g*

literal 0
HcmV?d00001

diff --git a/ctr/picodrive.png b/ctr/picodrive.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0e98e66dc3e01923e4288b27980b3eecd0c0090
GIT binary patch
literal 1880
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
G*?$Ab@K;g*

literal 0
HcmV?d00001

diff --git a/ctr/snes9x_next.png b/ctr/snes9x_next.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0e98e66dc3e01923e4288b27980b3eecd0c0090
GIT binary patch
literal 1880
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
G*?$Ab@K;g*

literal 0
HcmV?d00001


From 67dc806f7f6574fcbe89220a58f3a5c2b0b99e87 Mon Sep 17 00:00:00 2001
From: aliaspider <aliaspider@gmail.com>
Date: Sun, 13 Sep 2015 23:04:54 +0100
Subject: [PATCH 4/5] fix typo.

---
 Makefile.ctr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.ctr b/Makefile.ctr
index dd093ffe04..7b20d89b29 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -289,7 +289,7 @@ endif
 
 ifeq ($(BUILD_CIA), 1)
 TARGET_CIA := $(TARGET).cia
-else
+endif
 
 .PHONY: $(BUILD) clean all
 

From 224dc0d34b8a503e3583c388b6696eb02a9cfe1a Mon Sep 17 00:00:00 2001
From: aliaspider <aliaspider@gmail.com>
Date: Sun, 13 Sep 2015 23:13:36 +0100
Subject: [PATCH 5/5] use relative path in the include.

---
 menu/drivers/rgui.c | 2 +-
 menu/menu_driver.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index cca06db0f6..75813b915b 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -26,7 +26,7 @@
 #include <file/file_path.h>
 #include <retro_inline.h>
 
-#include "general.h"
+#include "../../general.h"
 #include "../menu.h"
 #include "../menu_hash.h"
 #include "../menu_video.h"
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 017ec897e7..671193b47b 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -19,7 +19,7 @@
 
 #include "menu.h"
 #include "menu_video.h"
-#include "general.h"
+#include "../general.h"
 
 static bool menu_alive = false;