diff options
| -rw-r--r-- | Makefile | 115 | ||||
| -rw-r--r-- | source/3ds/main.c | 3 |
2 files changed, 86 insertions, 32 deletions
@@ -6,11 +6,6 @@ ifeq ($(strip $(DEVKITARM)),) $(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM") endif -ifeq ($(strip $(CTRULIB)),) -# THIS IS TEMPORARY - in the future it should be at $(DEVKITPRO)/libctru -$(error "Please set CTRULIB in your environment. export CTRULIB=<path to>libctru") -endif - TOPDIR ?= $(CURDIR) include $(DEVKITARM)/3ds_rules @@ -20,8 +15,13 @@ include $(DEVKITARM)/3ds_rules # SOURCES is a list of directories containing source code # DATA is a list of directories containing data files # INCLUDES is a list of directories containing header files +# GRAPHICS is a list of directories containing graphics files +# GFXBUILD is the directory where converted graphics files will be placed +# If set to $(BUILD), it will statically link in the converted +# files as if they were data files. # # NO_SMDH: if set to anything, no SMDH file is generated. +# ROMFS is the directory which contains the RomFS, relative to the Makefile (Optional) # APP_TITLE is the name of the app stored in the SMDH file (Optional) # APP_DESCRIPTION is the description of the app stored in the SMDH file (Optional) # APP_AUTHOR is the author of the app stored in the SMDH file (Optional) @@ -36,6 +36,10 @@ BUILD := build SOURCES := source/common source/3ds source/common/inih DATA := data INCLUDES := include source/common/inih +GRAPHICS := gfx +#GFXBUILD := $(BUILD) +ROMFS := romfs +GFXBUILD := $(ROMFS)/gfx include $(TOPDIR)/resources/AppInfo @@ -52,10 +56,11 @@ ICON := icon.png #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft -CFLAGS := -Wall -mword-relocations \ - -fomit-frame-pointer -ffast-math \ +# FIXME: Remove -fcommon once all multiple definitions are fixed +CFLAGS := -g -Wall -O2 -mword-relocations \ + -ffunction-sections -fcommon \ $(ARCH) CFLAGS += $(INCLUDE) -DARM11 -D_3DS $(EXTRA_CFLAGS) @@ -100,6 +105,7 @@ export OUTPUT := $(CURDIR)/$(TARGET) export TOPDIR := $(CURDIR) export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ + $(foreach dir,$(GRAPHICS),$(CURDIR)/$(dir)) \ $(foreach dir,$(DATA),$(CURDIR)/$(dir)) export DEPSDIR := $(CURDIR)/$(BUILD) @@ -107,6 +113,9 @@ export DEPSDIR := $(CURDIR)/$(BUILD) CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) +PICAFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.v.pica))) +SHLISTFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.shlist))) +GFXFILES := $(foreach dir,$(GRAPHICS),$(notdir $(wildcard $(dir)/*.t3s))) BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) #--------------------------------------------------------------------------------- @@ -123,8 +132,19 @@ else endif #--------------------------------------------------------------------------------- -export OFILES := $(addsuffix .o,$(BINFILES)) \ - $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) +export T3XFILES := $(GFXFILES:.t3s=.t3x) + +export OFILES_SOURCES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) + +export OFILES_BIN := $(addsuffix .o,$(BINFILES)) \ + $(PICAFILES:.v.pica=.shbin.o) $(SHLISTFILES:.shlist=.shbin.o) \ + $(if $(filter $(BUILD),$(GFXBUILD)),$(addsuffix .o,$(T3XFILES))) + +export OFILES := $(OFILES_BIN) $(OFILES_SOURCES) + +export HFILES := $(PICAFILES:.v.pica=_shbin.h) $(SHLISTFILES:.shlist=_shbin.h) \ + $(addsuffix .h,$(subst .,_,$(BINFILES))) \ + $(GFXFILES:.t3s=.h) export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ @@ -132,6 +152,8 @@ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) +export _3DSXDEPS := $(if $(NO_SMDH),,$(OUTPUT).smdh) + ifeq ($(strip $(ICON)),) icons := $(wildcard *.png) ifneq (,$(findstring $(TARGET).png,$(icons))) @@ -145,6 +167,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: release testing debug slowdebug $(BUILD) clean all #--------------------------------------------------------------------------------- @@ -154,23 +184,19 @@ testing: export EXTRA_CFLAGS := -O3 -DDEBUGLEVEL=1 debug: export EXTRA_CFLAGS := -g -O0 -DDEBUGLEVEL=2 slowdebug: export EXTRA_CFLAGS := -g -O0 -DDEBUGLEVEL=3 -release testing debug slowdebug: $(BUILD) - -$(BUILD): - @[ -d $@ ] || mkdir -p $@ - @make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile +release testing debug slowdebug: + @mkdir -p $(BUILD) $(GFXBUILD) + @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile #--------------------------------------------------------------------------------- clean: @echo clean ... - @rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf + @rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf $(TARGET).cia #--------------------------------------------------------------------------------- else -DEPENDS := $(OFILES:.o=.d) - #--------------------------------------------------------------------------------- # main targets #--------------------------------------------------------------------------------- @@ -178,7 +204,10 @@ ifeq ($(strip $(NO_SMDH)),) .PHONY: all all : $(OUTPUT).3dsx $(OUTPUT).smdh $(OUTPUT).cia endif -$(OUTPUT).3dsx : $(OUTPUT).elf +$(OUTPUT).3dsx : $(OUTPUT).elf $(_3DSXDEPS) + +$(OFILES_SOURCES) : $(HFILES) + $(OUTPUT).elf : $(OFILES) banner.bnr: $(TOPDIR)/resources/banner.png $(TOPDIR)/resources/audio.wav @@ -198,24 +227,50 @@ $(OUTPUT).cia: banner.bnr icon.icn cia.rsf #--------------------------------------------------------------------------------- # you need a rule like this for each extension you use as binary data #--------------------------------------------------------------------------------- -%.bin.o : %.bin +%.bin.o %_bin.h : %.bin #--------------------------------------------------------------------------------- @echo $(notdir $<) @$(bin2o) -# WARNING: This is not the right way to do this! TODO: Do it right! #--------------------------------------------------------------------------------- -%.vsh.o : %.vsh +.PRECIOUS : %.t3x +%.t3x.o %_t3x.h : %.t3x #--------------------------------------------------------------------------------- + @$(bin2o) + +#--------------------------------------------------------------------------------- +# rules for assembling GPU shaders +#--------------------------------------------------------------------------------- +define shader-as + $(eval CURBIN := $*.shbin) + $(eval DEPSFILE := $(DEPSDIR)/$*.shbin.d) + echo "$(CURBIN).o: $< $1" > $(DEPSFILE) + echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h + echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h + echo "extern const u32" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(CURBIN) | tr . _)`.h + picasso -o $(CURBIN) $1 + bin2s $(CURBIN) | $(AS) -o $*.shbin.o +endef + +%.shbin.o %_shbin.h : %.v.pica %.g.pica + @echo $(notdir $^) + @$(call shader-as,$^) + +%.shbin.o %_shbin.h : %.v.pica @echo $(notdir $<) - @python $(AEMSTRO)/aemstro_as.py $< ../$(notdir $<).shbin - @bin2s ../$(notdir $<).shbin | $(PREFIX)as -o $@ - @echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(notdir $<).shbin | tr . _)`.h - @echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(notdir $<).shbin | tr . _)`.h - @echo "extern const u32" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(notdir $<).shbin | tr . _)`.h - @rm ../$(notdir $<).shbin - --include $(DEPENDS) + @$(call shader-as,$<) + +%.shbin.o %_shbin.h : %.shlist + @echo $(notdir $<) + @$(call shader-as,$(foreach file,$(shell cat $<),$(dir $<)$(file))) + +#--------------------------------------------------------------------------------- +%.t3x %.h : %.t3s +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + @tex3ds -i $< -H $*.h -d $*.d -o $(TOPDIR)/$(GFXBUILD)/$*.t3x + +-include $(DEPSDIR)/*.d #--------------------------------------------------------------------------------------- endif diff --git a/source/3ds/main.c b/source/3ds/main.c index 266bafe..f31a2d1 100644 --- a/source/3ds/main.c +++ b/source/3ds/main.c @@ -27,7 +27,7 @@ int main() { gfxInit(GSP_RGB565_OES, GSP_RGB565_OES, false); fsInit(); - sdmcInit(); + archiveMountSdmc(); #if DEBUGLEVEL == 0 consoleInit(GFX_BOTTOM, &debug_console); @@ -136,7 +136,6 @@ exit: sound_close(); drc_exit(); - sdmcExit(); fsExit(); gfxExit(); return 0; |