Skip to content

Commit e94e224

Browse files
committed
Add CIA buildng to makefile and build fixed libfat
1 parent efd3601 commit e94e224

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

Makefile

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@ endif
99

1010
include $(DEVKITARM)/ds_rules
1111

12+
#---------------------------------------------------------------------------------
13+
# External tools
14+
#---------------------------------------------------------------------------------
15+
ifeq ($(OS),Windows_NT)
16+
MAKECIA ?= make_cia.exe
17+
18+
else
19+
MAKECIA ?= make_cia
20+
21+
endif
22+
#---------------------------------------------------------------------------------
23+
1224
export TARGET := GodMode9i
1325

1426
export GAME_TITLE := $(TARGET)
@@ -17,9 +29,7 @@ export NITRODATA := nitrofiles
1729

1830
.PHONY: all bootloader bootstub clean dsi arm7/$(TARGET).elf arm9/$(TARGET).elf
1931

20-
all: bootloader bootstub $(TARGET).nds
21-
22-
dsi: $(TARGET).dsi
32+
all: libfat4 $(TARGET).nds $(TARGET).dsi
2333

2434
$(TARGET).nds: arm7/$(TARGET).elf arm9/$(TARGET).elf
2535
ndstool -c $(TARGET).nds -7 arm7/$(TARGET).elf -9 arm9/$(TARGET).elf -d $(NITRODATA) \
@@ -31,6 +41,8 @@ $(TARGET).dsi: arm7/$(TARGET).elf arm9/$(TARGET).elf
3141
-b icon.bmp "GodMode9i;Rocket Robz" \
3242
-g HGMA 00 "GODMODE9I" -z 80040000 -u 00030004
3343

44+
@$(TOPDIR)/$(MAKECIA) --srl=$(TARGET).dsi
45+
3446
#---------------------------------------------------------------------------------
3547
arm7/$(TARGET).elf:
3648
@$(MAKE) -C arm7
@@ -47,14 +59,18 @@ arm9/$(TARGET).elf:
4759
clean:
4860
@echo clean ...
4961
@rm -fr data/*.bin
50-
@rm -fr $(BUILD) $(TARGET).elf $(TARGET).nds
62+
@$(MAKE) -C libs/libfat4 clean
63+
@rm -fr $(BUILD) $(TARGET).elf $(TARGET).nds $(TARGET).dsi $(TARGET).cia
5164
@rm -fr $(TARGET).arm7.elf
5265
@rm -fr $(TARGET).arm9.elf
5366
@$(MAKE) -C bootloader clean
5467
@$(MAKE) -C bootstub clean
5568
@$(MAKE) -C arm9 clean
5669
@$(MAKE) -C arm7 clean
5770

71+
libfat4:
72+
$(MAKE) -C libs/libfat4
73+
5874
bootloader: data
5975
@$(MAKE) -C bootloader LOADBIN=$(CURDIR)/data/load.bin
6076

clean and compile.bat

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
make clean
22
make
3-
make dsi
4-
make_cia --srl="GodMode9i.dsi"
53
pause

compile.bat

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
make
2-
make dsi
3-
make_cia --srl="GodMode9i.dsi"
42
pause

0 commit comments

Comments
 (0)