Updated for latest ctrulib

diff --git a/examples/graphics/printing/multiple-windows-text/Makefile b/examples/graphics/printing/multiple-windows-text/Makefile
index c4c758ea3af42dd7efb4854ae74447f04a5370cc..d75f5482ead557cbc72a0e2aea60e01bbebfb590 100755 (executable)
--- a/examples/graphics/printing/multiple-windows-text/Makefile
+++ b/examples/graphics/printing/multiple-windows-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/multiple-windows-text/source/main.c b/examples/graphics/printing/multiple-windows-text/source/main.c
index ee268b65bbca61c7c92fa7c537ff15813fdc8b68..b18710b470106ea28b2bddf4f66287e33ad2b449 100644 (file)
--- a/examples/graphics/printing/multiple-windows-text/source/main.c
+++ b/examples/graphics/printing/multiple-windows-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 three PrintConsole, one for each window and one for the whole top screen
        PrintConsole leftWindow, rightWindow, topScreen;
@@ -72,8 +69,6 @@ int main(int argc, char **argv)
 
        // Exit services
        gfxExit();
-       hidExit();
-       aptExit();
-       srvExit();
+       
        return 0;
 }