From f2052ca8ef06f858037d6657b377197dd8772f4c Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sun, 12 Apr 2020 17:17:21 -0400
Subject: more work

---
 Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 738cc646..cb5149ba 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ MWCCVERSION := 2.0/base
 
 CROSS   := arm-linux-gnueabi-
 
-MWCCARM := tools/mwccarm/2.0/base/mwccarm.exe
+MWCCARM := tools/mwccarm/$(MWCCVERSION)/mwccarm.exe
 
 AS      := $(CROSS)as
 CC      := $(MWCCARM)
@@ -65,8 +65,11 @@ $(BUILD_DIR)/%.o: %.c
 $(BUILD_DIR)/%.o: %.s
 	$(AS) $(ASFLAGS) -MD $(BUILD_DIR)/$*.d -o $@ $<
 
-$(ELF): $(O_FILES) $(LD_SCRIPT) undefined_syms.txt
-	$(LD) -T undefined_syms.txt -T $(LD_SCRIPT) -o $(ELF)
+$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT)
+	$(CPP) $(VERSION_CFLAGS) -MMD -MP -MT $@ -MF $@.d -I include/ -I . -DBUILD_DIR=$(BUILD_DIR) -o $@ $<
+
+$(ELF): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) undefined_syms.txt
+	$(LD) -T undefined_syms.txt -T $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) -Map $(BUILD_DIR)/$(TARGET).map
 
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary $< $@
-- 
cgit v1.2.3