summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2020-04-12 16:15:06 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2020-04-12 16:15:06 -0400
commit41fa994a86914812d866f4822c0f55a6ed073c39 (patch)
treee4330fbc530a821ab37e7aba10884213b5b2deaf /Makefile
parent7e14113e47c5c8e2f218c69e11ec947b6a02f66e (diff)
up to date repo
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 03388c21..738cc646 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ TARGET := pokediamond.us
ROM := $(BUILD_DIR)/$(TARGET).nds
ELF := $(BUILD_DIR)/$(TARGET).elf
-LD_SCRIPT := pokediamond.lcf
+LD_SCRIPT := ld_script.txt
# Directories containing source files
SRC_DIRS := src
@@ -31,20 +31,17 @@ MWCCVERSION := 2.0/base
CROSS := arm-linux-gnueabi-
-# TODO: Replace mwldarm with gnu ld
-
-MWLDARM := ./tools/mwccarm/$(MWCCVERSION)/mwldarm.exe
-MWCCARM := ./tools/mwccarm/$(MWCCVERSION)/mwccarm.exe
+MWCCARM := tools/mwccarm/2.0/base/mwccarm.exe
AS := $(CROSS)as
CC := $(MWCCARM)
CPP := cpp -P
-LD := $(MWLDARM)
+LD := $(CROSS)ld
AR := $(CROSS)ar
OBJDUMP := $(CROSS)objdump
OBJCOPY := $(CROSS)objcopy
-CFLAGS = -c -O4,p -proc arm946e -thumb -fp soft -lang c -Cpp_exceptions off
+CFLAGS = -O4,p -proc arm946e -thumb -fp soft -lang c -Cpp_exceptions off
####################### Other Tools #########################
@@ -62,11 +59,14 @@ clean:
ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(ASM_DIRS))
+$(BUILD_DIR)/%.o: %.c
+ $(CC) -c $(CFLAGS) -o $@ $<
+
$(BUILD_DIR)/%.o: %.s
$(AS) $(ASFLAGS) -MD $(BUILD_DIR)/$*.d -o $@ $<
-$(ELF): $(O_FILES) $(LD_SCRIPT)
- $(MWLDARM) -LC:/pokediamond/$(BUILD_DIR)/asm/ $(O_FILES) $(LD_SCRIPT) -o $@ -nodead
+$(ELF): $(O_FILES) $(LD_SCRIPT) undefined_syms.txt
+ $(LD) -T undefined_syms.txt -T $(LD_SCRIPT) -o $(ELF)
$(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@