diff options
| author | Paul Sander <nintendo6496@googlemail.com> | 2018-12-18 23:13:33 +0100 |
|---|---|---|
| committer | Paul Sander <nintendo6496@googlemail.com> | 2018-12-18 23:13:33 +0100 |
| commit | f04f8baa5b3c4f5d239d8be4da4d9a99141bbf9b (patch) | |
| tree | 594a78b48ab1280e477fe39b6d2b01e51fa06ab7 /berry_fix | |
| parent | 478c7b5421f596ac9c1e6f4faedfe3faec6a68cf (diff) | |
| parent | 74137d7448c62e462e39b373693bc4b9f0d72055 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'berry_fix')
| -rw-r--r-- | berry_fix/Makefile | 9 | ||||
| -rw-r--r-- | berry_fix/payload/Makefile | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/berry_fix/Makefile b/berry_fix/Makefile index ffe0cf251..d449fdbef 100644 --- a/berry_fix/Makefile +++ b/berry_fix/Makefile @@ -1,6 +1,7 @@ -include $(DEVKITARM)/base_tools -export CPP := $(PREFIX)cpp -export LD := $(PREFIX)ld +AS := ../tools/binutils/bin/arm-none-eabi-as +CPP := $(CC) -E +LD := ../tools/binutils/bin/arm-none-eabi-ld +OBJCOPY := ../tools/binutils/bin/arm-none-eabi-objcopy ifeq ($(OS),Windows_NT) EXE := .exe @@ -152,7 +153,7 @@ $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s $(AS) $(ASFLAGS) -I sound -o $@ $< $(ELF): ld_script.txt $(OBJS) - cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../ld_script.txt -o ../$@ + cd $(OBJ_DIR) && ../$(LD) $(LDFLAGS) -T ../ld_script.txt -o ../$@ $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ diff --git a/berry_fix/payload/Makefile b/berry_fix/payload/Makefile index e63d74234..b97556774 100644 --- a/berry_fix/payload/Makefile +++ b/berry_fix/payload/Makefile @@ -1,6 +1,7 @@ -include $(DEVKITARM)/base_tools -export CPP := $(PREFIX)cpp -export LD := $(PREFIX)ld +AS := ../../tools/binutils/bin/arm-none-eabi-as +CPP := $(CC) -E +LD := ../../tools/binutils/bin/arm-none-eabi-ld +OBJCOPY := ../../tools/binutils/bin/arm-none-eabi-objcopy ifeq ($(OS),Windows_NT) EXE := .exe @@ -152,7 +153,7 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../$< | sed "s#tools/#../tools/#g" > ld_script.ld $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) - cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../$@ $(LIB) + cd $(OBJ_DIR) && ../$(LD) $(LDFLAGS) -T ld_script.ld -o ../$@ $(LIB) $(ROM): $(ELF) $(OBJCOPY) -O binary $< $@ |