From e5653931433bb44884440a608c44c6ce5048c998 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Fri, 12 Jul 2013 21:09:45 +0200 Subject: [PATCH 1/2] assembly compile recipe is missing (C. A. Church) Fixes #1457 --- platform.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform.txt b/platform.txt index 6bbe078..eaf9469 100644 --- a/platform.txt +++ b/platform.txt @@ -40,6 +40,9 @@ recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -mmcu={b ## Compile c++ files recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {build.extra_flags} {includes} "{source_file}" -o "{object_file}" +## Compile S files +recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.S.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {build.extra_flags} {includes} "{source_file}" -o "{object_file}" + ## Create archives recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} "{build.path}/{archive_file}" "{object_file}" From 77678f3af1b667b21ee4bf6f62ed233735d68d1a Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Sun, 14 Jul 2013 11:51:50 +0200 Subject: [PATCH 2/2] Merge branch 'master' into ide-1.5.x --- libraries/SoftwareSerial/keywords.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/SoftwareSerial/keywords.txt b/libraries/SoftwareSerial/keywords.txt index 3f36dfc..aaea17c 100644 --- a/libraries/SoftwareSerial/keywords.txt +++ b/libraries/SoftwareSerial/keywords.txt @@ -1,6 +1,6 @@ ####################################### # Syntax Coloring Map for SoftwareSerial -# (formely NewSoftSerial) +# (formerly NewSoftSerial) ####################################### #######################################