From 3dc783911840a61e3e8e6dd834c7fc8f0b532fd3 Mon Sep 17 00:00:00 2001
From: Dave Murphy <davem@devkitpro.org>
Date: Wed, 30 Dec 2015 02:20:26 +0000
Subject: [PATCH 1/2] fixes for latetst libctru changes

---
 source/ftp.c | 39 +++------------------------------------
 1 file changed, 3 insertions(+), 36 deletions(-)

diff --git a/source/ftp.c b/source/ftp.c
index bbb3170..88e0a35 100644
--- a/source/ftp.c
+++ b/source/ftp.c
@@ -968,22 +968,6 @@ ftp_init(void)
 #ifdef _3DS
   Result  ret;
 
-  /* initialize FS service */
-  ret = fsInit();
-  if(ret != 0)
-  {
-    console_print(RED "fsInit: 0x%08X\n" RESET, (unsigned int)ret);
-    goto fs_fail;
-  }
-
-  /* initialize sdmc_dev */
-  ret = sdmcInit();
-  if(ret != 0)
-  {
-    console_print(RED "sdmcInit: 0x%08X\n" RESET, (unsigned int)ret);
-    goto sdmc_fail;
-  }
-
 #if ENABLE_LOGGING
   /* open log file */
   FILE *fp = freopen("/ftbrony.log", "wb", stderr);
@@ -1010,7 +994,7 @@ ftp_init(void)
   }
 
   /* initialize SOC service */
-  ret = SOC_Initialize(SOC_buffer, SOC_BUFFERSIZE);
+  ret = socInit(SOC_buffer, SOC_BUFFERSIZE);
   if(ret != 0)
   {
     console_print(RED "SOC_Initialize: 0x%08X\n" RESET, (unsigned int)ret);
@@ -1118,17 +1102,8 @@ ftruncate_fail:
 
 stderr_fail:
 #endif
-  ret = sdmcExit();
-  if(ret != 0)
-    console_print(RED "sdmcExit: 0x%08X\n" RESET, (unsigned int)ret);
-
-sdmc_fail:
-  ret = fsExit();
-  if(ret != 0)
-    console_print(RED "fsExit: 0x%08X\n" RESET, (unsigned int)ret);
-
-fs_fail:
   return -1;
+
 #endif
 }
 
@@ -1150,7 +1125,7 @@ ftp_exit(void)
 
 #ifdef _3DS
   /* deinitialize SOC service */
-  ret = SOC_Shutdown();
+  ret = socExit();
   if(ret != 0)
     console_print(RED "SOC_Shutdown: 0x%08X\n" RESET, (unsigned int)ret);
   free(SOC_buffer);
@@ -1160,16 +1135,8 @@ ftp_exit(void)
   if(fclose(stderr) != 0)
     console_print(RED "fclose: 0x%08X\n" RESET, errno);
 
-  /* deinitialize sdmc_dev */
-  ret = sdmcExit();
-  if(ret != 0)
-    console_print(RED "sdmcExit: 0x%08X\n" RESET, (unsigned int)ret);
 #endif
 
-  /* deinitialize FS service */
-  ret = fsExit();
-  if(ret != 0)
-    console_print(RED "fsExit: 0x%08X\n" RESET, (unsigned int)ret);
 #endif
 }
 

From c2d307a9d977be715c5cf4bb1320475897b4f560 Mon Sep 17 00:00:00 2001
From: Dave Murphy <davem@devkitpro.org>
Date: Wed, 30 Dec 2015 14:13:32 +0000
Subject: [PATCH 2/2] support embedded smdh

---
 Makefile.3ds | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Makefile.3ds b/Makefile.3ds
index 8deb9e3..189d609 100644
--- a/Makefile.3ds
+++ b/Makefile.3ds
@@ -43,7 +43,6 @@ ICON            := ftbrony.png
 ARCH     := -march=armv6k -mtune=mpcore -mfloat-abi=hard
 
 CFLAGS   := -g -Wall -O3 -mword-relocations \
-            -fomit-frame-pointer -ffast-math \
             $(ARCH) \
             -DSTATUS_STRING="\"ftbrony v1.1\""
 
@@ -117,6 +116,14 @@ else
 	export APP_ICON := $(TOPDIR)/$(ICON)
 endif
 
+ifeq ($(strip $(NO_SMDH)),)
+	export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
+endif
+
+ifneq ($(ROMFS),)
+	export _3DSXFLAGS += --romfs=$(CURDIR)/$(ROMFS)
+endif
+
 .PHONY: $(BUILD) clean all
 
 #---------------------------------------------------------------------------------
@@ -143,6 +150,8 @@ DEPENDS := $(OFILES:.o=.d)
 ifeq ($(strip $(NO_SMDH)),)
 .PHONY: all
 all	:	$(OUTPUT).3dsx $(OUTPUT).smdh
+$(OUTPUT).smdh : $(TOPDIR)/Makefile
+$(OUTPUT).3dsx: $(OUTPUT).smdh
 endif
 $(OUTPUT).3dsx: $(OUTPUT).elf
 $(OUTPUT).elf:  $(OFILES)