Skip to content

Commit

Permalink
Revert last two commits.
Browse files Browse the repository at this point in the history
They still didn't work appearently. Gonna give up on those commits for
now.
  • Loading branch information
ApacheThunder committed Feb 15, 2017
1 parent 3f441e2 commit 904e0c9
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,19 @@ export VERSION_MAJOR := 1
export VERSION_MINOR := 97
export VERSTRING := $(VERSION_MAJOR).$(VERSION_MINOR)


.PHONY: checkarm7 checkarm9

#---------------------------------------------------------------------------------
# main targets
# path to tools - this can be deleted if you set the path in windows
#---------------------------------------------------------------------------------
all: $(TARGET).nds checkarm7 checkarm9
export PATH := $(DEVKITARM)/bin:$(PATH)

#---------------------------------------------------------------------------------
checkarm7:
$(MAKE) -C arm7
.PHONY: $(TARGET).arm7 $(TARGET).arm9

#---------------------------------------------------------------------------------
checkarm9:
$(MAKE) -C arm9
# main targets
#---------------------------------------------------------------------------------
all: $(TARGET).nds

$(TARGET).nds : arm7/$(TARGET).elf arm9/$(TARGET).elf
$(TARGET).nds : $(TARGET).arm7 $(TARGET).arm9
ndstool -c $(TARGET).nds -7 arm7/$(TARGET).arm7.elf -9 arm9/$(TARGET).arm9.elf \
-b $(CURDIR)/icon.bmp "NTR Launcher;NitroHax provided by Chishm;Modified by Apache Thunder" \
-g KKGP 01 "TWL LAUNCHER" -z 80040000 -u 00030004
Expand Down

0 comments on commit 904e0c9

Please sign in to comment.