diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-11-11 15:21:59 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-11-11 15:21:59 -0500 |
| commit | 7af4107235e6c178d5740782fe510d2df1c825b1 (patch) | |
| tree | d548d9c443140e77e4e158171055d08ffb77e30b /arm9 | |
| parent | 94edcc1b5496a41478e10bd6aa4ff84f5c2ee5aa (diff) | |
Fix Makefile issues with OSX 11.6
Diffstat (limited to 'arm9')
| -rw-r--r-- | arm9/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/Makefile b/arm9/Makefile index 9529cc58..77141d34 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -135,7 +135,7 @@ 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)/asm_processor $(TOOLS_DIR)/mwccarm $(TOOLS_DIR)/bin,$(wildcard $(TOOLS_DIR)/*)) +TOOLDIRS = $(dir $(wildcard $(TOOLS_DIR)/*/Makefile)) TOOLBASE = $(TOOLDIRS:$(TOOLS_DIR)/%=%) TOOLS = $(foreach tool,$(TOOLBASE),$(TOOLS_DIR)/$(tool)/$(tool)$(EXE)) @@ -218,7 +218,7 @@ $(S_OBJS) $(LIBS_OBJS): $(BUILD_DIR)/%.o: %.s $$(dep) $(AS) $(ASFLAGS) -o $@ $< $(BUILD_DIR)/$(LD_TEMPLATE): $(BUILD_DIR)/%: % - (echo "KEEP_SECTION\n{\n\t.exceptix\n}\n"; cat $<) > $@ + (echo -e "KEEP_SECTION\n{\n\t.exceptix\n}\n"; cat $<) > $@ $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SPEC) $(BUILD_DIR)/$(LD_TEMPLATE) $(MAKELCF) $(MAKELCF_FLAGS) $^ $@ |