diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-06 07:57:56 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-06 07:57:56 -0400 |
| commit | 36a866f34478d15b587aae227a9288277a2171cd (patch) | |
| tree | ca78a2f7776ebda3450204de585a5fe22b79321a /arm9 | |
| parent | c8230ac1a65a367f7796a2c8afed9533ba135faf (diff) | |
Grab scaninc from gba repos
Diffstat (limited to 'arm9')
| -rw-r--r-- | arm9/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arm9/Makefile b/arm9/Makefile index bef45759..d96f5ba1 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -98,8 +98,9 @@ LDFLAGS = -map -nodead -w off -proc v5te -interworking -map -symtab -m _start # DS TOOLS SHA1SUM = sha1sum -JSONPROC = $(TOOLS_DIR)/jsonproc/jsonproc -GFX = $(TOOLS_DIR)/nitrogfx/nitrogfx +JSONPROC = $(TOOLS_DIR)/jsonproc/jsonproc$(EXE) +GFX = $(TOOLS_DIR)/nitrogfx/nitrogfx$(EXE) +SCANINC = $(TOOLS_DIR)/scaninc/scaninc$(EXE) MWASMARM_PATCHER = $(TOOLS_DIR)/mwasmarm_patcher/mwasmarm_patcher$(EXE) -q TOOLDIRS = $(filter-out $(TOOLS_DIR)/mwccarm $(TOOLS_DIR)/bin,$(wildcard $(TOOLS_DIR)/*)) @@ -156,7 +157,7 @@ build/src/FUN_020910A4.o: MWCCVERSION = 1.2/sp2p3 ####################### Everything Else ###################### ifeq (,$(NODEP)) -$(BUILD_DIR)/%.o: dep = $(shell grep -E '(#\s*|\.)(include|incbin)\s*"(\S+?)"' $*.[cs] | cut -d'"' -f2 | sort -u) +$(BUILD_DIR)/%.o: dep = $(shell $(SCANINC) -I ../include -I ../include-mw -I lib/include $*.[cs]) else $(BUILD_DIR)/%.o: dep := endif |