Removed terminal colors from makefile messages, because DS-5 doesn't support them.

master
Ondřej Hruška 9 years ago
parent d65fe652eb
commit 2ba25d0f98
  1. 7
      .project
  2. 18
      Makefile

@ -11,13 +11,8 @@
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<triggers>full,incremental,</triggers>
<arguments> <arguments>
<dictionary>
<key>LaunchConfigHandle</key>
<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder.launch</value>
</dictionary>
</arguments> </arguments>
</buildCommand> </buildCommand>
</buildSpec> </buildSpec>

@ -80,26 +80,26 @@ all: build
# Link object files to AXF file # Link object files to AXF file
output.axf: $(main_base).o $(startup_base).o output.axf: $(main_base).o $(startup_base).o
@echo -e "\e[0;33mLinking object files to $@\e[0m" @echo "== Linking object files to $@ =="
@$(LD) $(LDOPTS) --output $@ "$(main_base).o" "$(startup_base).o" @$(LD) $(LDOPTS) --output $@ "$(main_base).o" "$(startup_base).o"
# Get BIN image file from AXF file # Get BIN image file from AXF file
%.bin: %.axf %.bin: %.axf
@echo -e "\e[0;33mConverting $< to $@\e[0m" @echo "== Converting $< to $@ =="
@$(FROMELF) --bincombined --output $@ $< @$(FROMELF) --bincombined --output $@ $<
# Get Intel Hex file from AXF file # Get Intel Hex file from AXF file
%.hex: %.axf %.hex: %.axf
@echo -e "\e[0;33mConverting $< to $@\e[0m" @echo "== Converting $< to $@ =="
@$(FROMELF) --i32combined --output $@ $< @$(FROMELF) --i32combined --output $@ $<
# Get Object file from Assembler source file # Get Object file from Assembler source file
$(main_base).o: $(main_file) $(main_base).o: $(main_file)
@echo -e "\e[0;32mCompiling $< to $@\e[0m" @echo "== Compiling $< to $@ =="
@$(AS) $(ASOPTS) --list $(main_base).lst -o $@ --depend $(main_base).d $< @$(AS) $(ASOPTS) --list $(main_base).lst -o $@ --depend $(main_base).d $<
$(startup_base).o: $(startup_file) $(startup_base).o: $(startup_file)
@echo -e "\e[0;32mCompiling $< to $@\e[0m" @echo "== Compiling $< to $@ =="
@$(AS) $(ASOPTS) --list $(startup_base).lst -o $@ --depend $(startup_base).d $< @$(AS) $(ASOPTS) --list $(startup_base).lst -o $@ --depend $(startup_base).d $<
# Get binary image (compile and link) # Get binary image (compile and link)
@ -116,17 +116,17 @@ link: output.axf
# Flash using st-link # Flash using st-link
flash: output.bin flash: output.bin
@echo -e "\e[0;96mWriting image to device via ST-Link\e[0m" @echo "== Writing image to device via ST-Link =="
@$(STFLASH) write "output.bin" 0x8000000 @$(STFLASH) write "output.bin" 0x8000000
@echo -e "\e[0;96mWrite OK!\e[0m" @echo "== Write OK! =="
disasm: output.axf disasm: output.axf
@echo -e "\e[0;33mDisassembling $< to output.disasm\e[0m" @echo "== Disassembling $< to output.disasm =="
@$(OBJDUMP) -d $< > output.disasm @$(OBJDUMP) -d $< > output.disasm
# Remove temporary files # Remove temporary files
clean: clean:
@echo -e "\e[0;32mRemoving temporary files\e[0m" @echo "== Removing temporary files =="
$(RM) -f *.bak *.lnp *.iex *.hex *.elf *.axf *.htm *.lnp *.lst *.plg *.tra *.o *.map *.d *.dep *.disasm *.bin *.uvguix.* $(RM) -f *.bak *.lnp *.iex *.hex *.elf *.axf *.htm *.lnp *.lst *.plg *.tra *.o *.map *.d *.dep *.disasm *.bin *.uvguix.*
$(RM) -rf ./RTE $(RM) -rf ./RTE

Loading…
Cancel
Save