DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated for latest ctrulib

Browse Source
This commit is contained in:
Aurelio Mannara 2015-05-25 22:40:31 +02:00
parent 4ca16228da
commit f32d31a806
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/graphics/printing/colored-text/Makefile
View File

@ -35,7 +35,7 @@ INCLUDES := include
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# options for code generation # 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 \ CFLAGS := -g -Wall -O2 -mword-relocations \
-fomit-frame-pointer -ffast-math \ -fomit-frame-pointer -ffast-math \
@ -113,6 +113,10 @@ else
export APP_ICON := $(TOPDIR)/$(ICON) export APP_ICON := $(TOPDIR)/$(ICON)
endif endif
ifeq ($(strip $(NO_SMDH)),)
export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh
endif
.PHONY: $(BUILD) clean all .PHONY: $(BUILD) clean all
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
@ -137,10 +141,10 @@ DEPENDS := $(OFILES:.o=.d)
# main targets # main targets
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
ifeq ($(strip $(NO_SMDH)),) ifeq ($(strip $(NO_SMDH)),)
.PHONY: all $(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).smdh
all : $(OUTPUT).3dsx $(OUTPUT).smdh else
endif
$(OUTPUT).3dsx : $(OUTPUT).elf $(OUTPUT).3dsx : $(OUTPUT).elf
endif
$(OUTPUT).elf : $(OFILES) $(OUTPUT).elf : $(OFILES)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

9
examples/graphics/printing/colored-text/source/main.c
View File

@ -18,10 +18,7 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
// Initialize services // Initialize services
srvInit(); gfxInitDefault();
aptInit();
gfxInit();
hidInit(NULL);
//Initialize console on top screen. Using NULL as the second argument tells the console library to use the internal console structure as current one //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); consoleInit(GFX_TOP, NULL);
@ -75,8 +72,6 @@ int main(int argc, char **argv)
// Exit services // Exit services
gfxExit(); gfxExit();
hidExit();
aptExit();
srvExit();
return 0; return 0;
} }