From 887a05a7653f1c50af3eafa2c9c97e6e66fae675 Mon Sep 17 00:00:00 2001
From: Aurelio Mannara <aurelio.mannara@gmail.com>
Date: Mon, 25 May 2015 22:35:55 +0200
Subject: [PATCH] Updated for latest ctrulib

---
 examples/graphics/printing/both-screen-text/Makefile | 12 ++++++++----
 .../graphics/printing/both-screen-text/source/main.c |  9 ++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/examples/graphics/printing/both-screen-text/Makefile b/examples/graphics/printing/both-screen-text/Makefile
index c4c758e..d75f548 100755
--- a/examples/graphics/printing/both-screen-text/Makefile
+++ b/examples/graphics/printing/both-screen-text/Makefile
@@ -35,7 +35,7 @@ INCLUDES	:=	include
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=softfp
+ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard
 
 CFLAGS	:=	-g -Wall -O2 -mword-relocations \
 			-fomit-frame-pointer -ffast-math \
@@ -113,6 +113,10 @@ else
 	export APP_ICON := $(TOPDIR)/$(ICON)
 endif
 
+ifeq ($(strip $(NO_SMDH)),)
+	export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
+endif
+
 .PHONY: $(BUILD) clean all
 
 #---------------------------------------------------------------------------------
@@ -137,10 +141,10 @@ DEPENDS	:=	$(OFILES:.o=.d)
 # main targets
 #---------------------------------------------------------------------------------
 ifeq ($(strip $(NO_SMDH)),)
-.PHONY: all
-all	:	$(OUTPUT).3dsx $(OUTPUT).smdh
-endif
+$(OUTPUT).3dsx	:	$(OUTPUT).elf $(OUTPUT).smdh
+else
 $(OUTPUT).3dsx	:	$(OUTPUT).elf
+endif
 $(OUTPUT).elf	:	$(OFILES)
 
 #---------------------------------------------------------------------------------
diff --git a/examples/graphics/printing/both-screen-text/source/main.c b/examples/graphics/printing/both-screen-text/source/main.c
index b69c48f..688b136 100644
--- a/examples/graphics/printing/both-screen-text/source/main.c
+++ b/examples/graphics/printing/both-screen-text/source/main.c
@@ -18,10 +18,7 @@
 int main(int argc, char **argv)
 {
 	// Initialize services
-	srvInit();
-	aptInit();
-	gfxInit();
-	hidInit(NULL);
+	gfxInitDefault();
 
 	//In this example we need one PrintConsole for each screen
 	PrintConsole topScreen, bottomScreen;
@@ -63,8 +60,6 @@ int main(int argc, char **argv)
 
 	// Exit services
 	gfxExit();
-	hidExit();
-	aptExit();
-	srvExit();
+	
 	return 0;
 }