LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Include base_tools instead of specifying binaries manually

Browse Source
This commit is contained in:
Aurora 2016-11-26 18:00:17 +01:00
parent 3bb01ffd68
commit 9c9fd2deef
4 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -4,10 +4,7 @@ ifeq ($(strip $(DEVKITARM)),)
$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM") $(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
endif endif
CC := arm-none-eabi-gcc include $(DEVKITARM)/base_tools
AS := arm-none-eabi-as
LD := arm-none-eabi-ld
OC := arm-none-eabi-objcopy
name := Luma3DS name := Luma3DS
revision := $(shell git describe --tags --match v[0-9]* --abbrev=8 | sed 's/-[0-9]*-g/-/i') revision := $(shell git describe --tags --match v[0-9]* --abbrev=8 | sed 's/-[0-9]*-g/-/i')
@ -75,7 +72,7 @@ $(dir_out)/arm9loaderhax.bin: $(dir_build)/main.bin $(dir_out)
@cp -a $(dir_build)/main.bin $@ @cp -a $(dir_build)/main.bin $@
$(dir_build)/main.bin: $(dir_build)/main.elf $(dir_build)/main.bin: $(dir_build)/main.elf
$(OC) -S -O binary $< $@ $(OBJCOPY) -S -O binary $< $@
$(dir_build)/main.elf: $(bundled) $(objects) $(dir_build)/main.elf: $(bundled) $(objects)
$(LINK.o) -T linker.ld $(OUTPUT_OPTION) $^ $(LINK.o) -T linker.ld $(OUTPUT_OPTION) $^

7
haxloader/Makefile
View File

@ -4,10 +4,7 @@ ifeq ($(strip $(DEVKITARM)),)
$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM") $(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
endif endif
CC := arm-none-eabi-gcc include $(DEVKITARM)/base_tools
AS := arm-none-eabi-as
LD := arm-none-eabi-ld
OC := arm-none-eabi-objcopy
dir_source := source dir_source := source
dir_diffs := diffs dir_diffs := diffs
@ -61,7 +58,7 @@ $(dir_out)/mset/$(name).nds:
@mv $(dir_cakesrop)/CakesROP.nds $@ @mv $(dir_cakesrop)/CakesROP.nds $@
$(dir_build)/main.bin: $(dir_build)/main.elf $(dir_build)/main.bin: $(dir_build)/main.elf
$(OC) -S -O binary $< $@ $(OBJCOPY) -S -O binary $< $@
$(dir_build)/main.elf: $(objects) ../$(dir_build)/loader.bin.o $(dir_build)/main.elf: $(objects) ../$(dir_build)/loader.bin.o
$(LINK.o) -T linker.ld $(OUTPUT_OPTION) $^ $(LINK.o) -T linker.ld $(OUTPUT_OPTION) $^

5
injector/Makefile
View File

@ -6,11 +6,6 @@ endif
include $(DEVKITARM)/3ds_rules include $(DEVKITARM)/3ds_rules
CC := arm-none-eabi-gcc
AS := arm-none-eabi-as
LD := arm-none-eabi-ld
OC := arm-none-eabi-objcopy
name := $(shell basename $(CURDIR)) name := $(shell basename $(CURDIR))
dir_source := source dir_source := source

7
loader/Makefile
View File

@ -4,10 +4,7 @@ ifeq ($(strip $(DEVKITARM)),)
$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM") $(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
endif endif
CC := arm-none-eabi-gcc include $(DEVKITARM)/base_tools
AS := arm-none-eabi-as
LD := arm-none-eabi-ld
OC := arm-none-eabi-objcopy
name := $(shell basename $(CURDIR)) name := $(shell basename $(CURDIR))
@ -31,7 +28,7 @@ clean:
@rm -rf $(dir_build) @rm -rf $(dir_build)
$(dir_out)/$(name).bin: $(dir_build)/$(name).elf $(dir_out)/$(name).bin: $(dir_build)/$(name).elf
$(OC) -S -O binary $< $@ $(OBJCOPY) -S -O binary $< $@
$(dir_build)/$(name).elf: $(objects) $(dir_build)/$(name).elf: $(objects)
$(LINK.o) -T linker.ld $(OUTPUT_OPTION) $^ $(LINK.o) -T linker.ld $(OUTPUT_OPTION) $^