diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2013-07-14 12:01:03 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2013-07-14 12:01:03 +0200 |
| commit | 5836db3ddb6fa757169aede51395b7e39669ff4c (patch) | |
| tree | cb76a6f7aa51b7742a627c73c4bb5f62fb7c1de5 | |
| parent | bd1e2ab33250588b33038ab0e9a57437ed1d6e98 (diff) | |
| parent | 77678f3af1b667b21ee4bf6f62ed233735d68d1a (diff) | |
Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts:
app/src/cc/arduino/packages/uploaders/SerialUploader.java
app/src/processing/app/Editor.java
app/src/processing/app/Sketch.java
app/src/processing/app/debug/Uploader.java
| -rw-r--r-- | libraries/SoftwareSerial/keywords.txt | 2 | ||||
| -rw-r--r-- | platform.txt | 3 |
2 files changed, 4 insertions, 1 deletions
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) ####################################### ####################################### 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}" |