diff --git a/Makefile b/Makefile index 09130f8..3baccfc 100644 --- a/Makefile +++ b/Makefile @@ -35,16 +35,16 @@ @$(MAKE) -j4 --no-print-directory -C arm11 #--------------------------------------------------------------------------------- -$(TARGET).firm: arm9/$(TARGET).bin arm11/$(TARGET).bin +$(TARGET).firm: arm9/$(TARGET)9.bin arm11/$(TARGET)11.bin firm_builder $(TARGET).firm $(ENTRY9) $(ENTRY11) $(SECTION0_ADR) $(SECTION0_TYPE) \ - arm9/$(TARGET).bin $(SECTION1_ADR) $(SECTION1_TYPE) arm11/$(TARGET).bin + arm9/$(TARGET)9.bin $(SECTION1_ADR) $(SECTION1_TYPE) arm11/$(TARGET)11.bin #--------------------------------------------------------------------------------- -arm9/$(TARGET).bin: +arm9/$(TARGET)9.bin: @$(MAKE) -j4 --no-print-directory -C arm9 #--------------------------------------------------------------------------------- -arm11/$(TARGET).bin: +arm11/$(TARGET)11.bin: @$(MAKE) -j4 --no-print-directory -C arm11 #--------------------------------------------------------------------------------- @@ -57,6 +57,6 @@ @$(MAKE) -j4 --no-print-directory -C arm9 NO_DEBUG=1 @$(MAKE) -j4 --no-print-directory -C arm11 NO_DEBUG=1 firm_builder $(TARGET).firm $(ENTRY9) $(ENTRY11) $(SECTION0_ADR) $(SECTION0_TYPE) \ - arm9/$(TARGET).bin $(SECTION1_ADR) $(SECTION1_TYPE) arm11/$(TARGET).bin + arm9/$(TARGET)9.bin $(SECTION1_ADR) $(SECTION1_TYPE) arm11/$(TARGET)11.bin @7z a -mx -m0=ARM -m1=LZMA $(TARGET)$(VERS_STRING).7z $(TARGET).firm @7z u -mx -m0=PPMD $(TARGET)$(VERS_STRING).7z LICENSE.txt README.md diff --git a/arm11/Makefile b/arm11/Makefile index 1697d01..0994956 100644 --- a/arm11/Makefile +++ b/arm11/Makefile @@ -118,7 +118,7 @@ #--------------------------------------------------------------------------------- clean: @echo clean ... - @rm -fr $(BUILD) $(TARGET).bin $(TARGET).elf + @rm -fr $(BUILD) $(TARGET)11.bin $(TARGET)11.elf #--------------------------------------------------------------------------------- @@ -129,13 +129,13 @@ #--------------------------------------------------------------------------------- # main targets #--------------------------------------------------------------------------------- -$(OUTPUT).bin : $(OUTPUT).elf +$(OUTPUT)11.bin : $(OUTPUT)11.elf @$(OBJCOPY) --gap-fill 0xFF -O binary $< $@ @echo built ... $(notdir $@) $(OFILES_SOURCES) : $(HFILES) -$(OUTPUT).elf : $(OFILES) +$(OUTPUT)11.elf : $(OFILES) #--------------------------------------------------------------------------------- # you need a rule like this for each extension you use as binary data diff --git a/arm9/Makefile b/arm9/Makefile index d09180c..80d2556 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -114,7 +114,7 @@ #--------------------------------------------------------------------------------- clean: @echo clean ... - @rm -fr $(BUILD) $(TARGET).bin $(TARGET).elf + @rm -fr $(BUILD) $(TARGET)9.bin $(TARGET)9.elf #--------------------------------------------------------------------------------- @@ -125,13 +125,13 @@ #--------------------------------------------------------------------------------- # main targets #--------------------------------------------------------------------------------- -$(OUTPUT).bin : $(OUTPUT).elf +$(OUTPUT)9.bin : $(OUTPUT)9.elf @$(OBJCOPY) --gap-fill 0xFF -O binary $< $@ @echo built ... $(notdir $@) $(OFILES_SOURCES) : $(HFILES) -$(OUTPUT).elf : $(OFILES) +$(OUTPUT)9.elf : $(OFILES) #--------------------------------------------------------------------------------- # you need a rule like this for each extension you use as binary data