Skip to content

Commit

Permalink
Update gitmodules to point to new repo.
Browse files Browse the repository at this point in the history
Update makefile to ensure everything builds as intended.
  • Loading branch information
PhlexPlexico committed Jan 13, 2024
1 parent d147bb8 commit 93e1e95
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "Z3DR"]
path = Z3DR
url = https://github.com/Z3DR/Z3DR.git
url = https://github.com/Z3DR/mm3dr.git
15 changes: 8 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ TARGET := $(notdir $(CURDIR))
BUILD := build
SOURCES := source
DATA := data
INCLUDES := source/include Z3DR/patch_code/mm3d/include
INCLUDES := source/include Z3DR/code/include
GRAPHICS := gfx
GFXBUILD := $(BUILD)
ROMFS := romfs
Expand Down Expand Up @@ -175,10 +175,10 @@ all: $(BUILD) $(GFXBUILD) $(DEPSDIR) $(ROMFS_T3XFILES) $(T3XHFILES)

$(BUILD):
@git submodule update --init
$(MAKE) -C Z3DR/patch_code/mm3d/
@mv Z3DR/patch_code/mm3d/basecode.ips $(ROMFS)/basecode.ips
@mv Z3DR/patch_code/mm3d/basecode1.1.ips $(ROMFS)/basecode1.1.ips
@mv Z3DR/patch_code/mm3d/patch_symbols.hpp $(CURDIR)/source/include/
$(MAKE) -C Z3DR/code/
@mv Z3DR/code/basecode.ips $(ROMFS)/basecode.ips
@mv Z3DR/code/basecode1.1.ips $(ROMFS)/basecode1.1.ips
@mv Z3DR/source/patch_symbols.hpp $(CURDIR)/source/include/
@mkdir -p $@

ifneq ($(GFXBUILD),$(BUILD))
Expand All @@ -195,8 +195,9 @@ endif
clean:
@echo Cleaning app and basecode ...
@rm -fr $(BUILD) $(TARGET).3dsx $(TARGET).cia $(OUTPUT).smdh $(TARGET).elf $(GFXBUILD) $(ROMFS)/basecode.ips source/include/patch_symbols.hpp
$(MAKE) clean -f Z3DR/patch_code/mm3d/Makefile
@rm -rf Z3DR/patch_code/mm3d/build
$(MAKE) clean -f Z3DR/code/Makefile
@rm -rf Z3DR/code/build
@rm -rf Z3DR/code/basecode.ips Z3DR/code/basecode1.1.ips Z3DR/code/code.elf Z3DR/source/patch_symbols.hpp
#---------------------------------------------------------------------------------
$(GFXBUILD)/%.t3x $(BUILD)/%.h : %.t3s
#---------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion Z3DR
Submodule Z3DR updated from b31a90 to 61d66d

0 comments on commit 93e1e95

Please sign in to comment.