summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-04-19 17:14:41 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-04-19 17:14:41 -0400
commit84053dd3ef9f6d0b720abdbaa7d7b72d73403b01 (patch)
treed38271dbec7f1ee3f5a40814ad10c70245e89f72 /Makefile
parentb0db4cab2ec010386a5619687944bdf7a5321ed4 (diff)
parenta2617364ed8c55a276e0ad626895294aed306a4b (diff)
Merge branch 'master' of https://github.com/martmists/pokediamond into finish_header
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index c5d2dfae..3026cc2d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# Makefile to build Pokemon Diamond image
-.PHONY: clean tidy all default
+.PHONY: clean tidy all default patch_mwasmarm
# Try to include devkitarm if installed
TOOLCHAIN := $(DEVKITARM)
@@ -79,8 +79,8 @@ OBJCOPY := $(CROSS)objcopy
# ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm9_thumb.s -o arm9.o
ASFLAGS = -proc arm5te
-CFLAGS = -O4,p -proc v5te -thumb -fp soft -lang c -Cpp_exceptions off -interworking -i nitro
-LDFLAGS = -nodead -w off -proc v5te -map -symtab -m Entry
+CFLAGS = -O4,p -proc v5te -thumb -fp soft -lang c -Cpp_exceptions off -i nitro
+LDFLAGS = -map -nodead -w off -proc v5te -interworking -map -symtab -m Entry
####################### Other Tools #########################
@@ -138,7 +138,7 @@ $(BUILD_DIR)/%.o: %.c
$(BUILD_DIR)/%.o: %.s
$(AS) $(ASFLAGS) $< -o $@
-$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT)
+$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) undefined_syms.txt
$(CPP) $(VERSION_CFLAGS) -MMD -MP -MT $@ -MF $@.d -I include/ -I . -DBUILD_DIR=$(BUILD_DIR) -o $@ $<
$(ELF): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT)