Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix sprites.t3x not being included in 3ds .cia #488

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix sprites.t3x not being included in 3ds .cia #488

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix sprites.t3x not being included in 3ds .cia
  • Loading branch information
@l-austenfeld
l-austenfeld committed Oct 3, 2023
commit 21a8de0afce6fcabd3368ae9675ed75b5cbf9881
15 changes: 7 additions & 8 deletions 3ds/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ endif
.PHONY: all clean format cheats

#---------------------------------------------------------------------------------
all: cheats
all: cheats sprites
@mkdir -p $(BUILD) $(GFXBUILD) $(OUTDIR)
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile $(OUTPUT).3dsx
@bannertool makebanner -i "$(BANNER_IMAGE)" -a "$(BANNER_AUDIO)" -o $(BUILD)/banner.bnr
Expand All @@ -192,7 +192,7 @@ all: cheats
#---------------------------------------------------------------------------------
clean:
@echo clean ...
@rm -fr $(BUILD) $(OUTDIR)
@rm -fr $(BUILD) $(GFXBUILD) $(OUTDIR) $(ROMFS)/$(CHEATS)
#---------------------------------------------------------------------------------
cheats:
@mkdir -p $(BUILD) $(ROMFS)/$(CHEATS)
Expand All @@ -203,6 +203,11 @@ else
endif
@cd $(SHARKIVE)/$(BUILD) && mv 3ds.json.bz2 ../../3ds/$(ROMFS)/$(CHEATS)/$(CHEATS).json.bz2
#---------------------------------------------------------------------------------
sprites:
@mkdir -p $(BUILD) $(GFXBUILD)
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile sprites.t3x
@cp $(BUILD)/sprites.t3x $(GFXBUILD)/sprites.t3x
#---------------------------------------------------------------------------------
format:
clang-format -i -style=file $(foreach dir,$(FORMATSOURCES),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cpp) $(wildcard $(dir)/*.tcc)) $(foreach dir,$(FORMATINCLUDES),$(wildcard $(dir)/*.h) $(wildcard $(dir)/*.hpp))
#---------------------------------------------------------------------------------
Expand Down Expand Up @@ -256,12 +261,6 @@ endef
@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

#---------------------------------------------------------------------------------------
Expand Down