diff --git a/examples/graphics/printing/colored-text/Makefile b/examples/graphics/printing/colored-text/Makefile index c4c758e..d75f548 100755 --- a/examples/graphics/printing/colored-text/Makefile +++ b/examples/graphics/printing/colored-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/colored-text/source/main.c b/examples/graphics/printing/colored-text/source/main.c index f0326e1..3acaaf1 100644 --- a/examples/graphics/printing/colored-text/source/main.c +++ b/examples/graphics/printing/colored-text/source/main.c @@ -18,10 +18,7 @@ int main(int argc, char **argv) { // Initialize services - srvInit(); - aptInit(); - gfxInit(); - hidInit(NULL); + gfxInitDefault(); //Initialize console on top screen. Using NULL as the second argument tells the console library to use the internal console structure as current one consoleInit(GFX_TOP, NULL); @@ -75,8 +72,6 @@ int main(int argc, char **argv) // Exit services gfxExit(); - hidExit(); - aptExit(); - srvExit(); + return 0; }