rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-27 14:22:04 +01:00
Code Issues Releases Activity

Fixing a couple of small bugs.

Browse Source
This commit is contained in:
David A. Mellis 2011-06-16 14:14:25 +02:00
parent b0556c2e74
commit 1ab0f721ee
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/processing/app/debug/Compiler.java
View File

@ -159,7 +159,7 @@ public class Compiler implements MessageConsumer {
}
}
List<File> objectFiles = new ArrayList<File>();
objectFiles = new ArrayList<File>();
// 0. include paths for core + all libraries
@ -966,7 +966,7 @@ public class Compiler implements MessageConsumer {
String includes = "";
for (int i = 0; i < includePaths.size(); i++)
{
includes = includes + (" -I" + (String) includePaths.get(i)) + ",";
includes = includes + (i > 0 ? "," : "") + ("-I" + (String) includePaths.get(i));
}
//logger.debug("Paths prepared: " + includes);
return includes;

12
hardware/arduino/platforms.txt
View File

@ -42,17 +42,17 @@ avr.name=Arduino
#avr.compiler.path Official default is correct, only need to change this if you want to overide the initial default
#avr.compiler.path={0}/hardware/tools/avr/bin/
avr.compiler.c.cmd=avr-gcc
avr.compiler.c.flags=,-c,-g,-Os,-w,-ffunction-sections,-fdata-sections
avr.compiler.c.elf.flags=,-Os,-Wl,--gc-sections
avr.compiler.c.flags=-c,-g,-Os,-w,-ffunction-sections,-fdata-sections
avr.compiler.c.elf.flags=-Os,-Wl,--gc-sections
avr.compiler.c.elf.cmd=avr-gcc
avr.compiler.S.flags=,-c,-g,-assembler-with-cpp
avr.compiler.S.flags=-c,-g,-assembler-with-cpp
avr.compiler.cpp.cmd=avr-g++
avr.compiler.cpp.flags=,-c,-g,-Os,-w,-fno-exceptions,-ffunction-sections,-fdata-sections
avr.compiler.cpp.flags=-c,-g,-Os,-w,-fno-exceptions,-ffunction-sections,-fdata-sections
avr.compiler.ar.cmd=avr-ar
avr.compiler.ar.flags=rcs
avr.compiler.objcopy.cmd=avr-objcopy
avr.compiler.objcopy.eep.flags=,-O,ihex,-j,.eeprom,--set-section-flags=.eeprom=alloc,load,--no-change-warnings,--change-section-lma,.eeprom=0
avr.compiler.elf2hex.flags=,-O,ihex,-R,.eeprom
avr.compiler.objcopy.eep.flags=-O,ihex,-j,.eeprom,--set-section-flags=.eeprom=alloc,load,--no-change-warnings,--change-section-lma,.eeprom=0
avr.compiler.elf2hex.flags=-O,ihex,-R,.eeprom
avr.compiler.elf2hex.cmd=avr-objcopy
avr.compiler.ldflags=
avr.compiler.cpudef=-mmcu=