Skip to content

Commit 1ab0f72

Browse files
committed
Fixing a couple of small bugs.
1 parent b0556c2 commit 1ab0f72

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

app/src/processing/app/debug/Compiler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public boolean compile(Sketch sketch,
159159
}
160160
}
161161

162-
List<File> objectFiles = new ArrayList<File>();
162+
objectFiles = new ArrayList<File>();
163163

164164
// 0. include paths for core + all libraries
165165

@@ -966,7 +966,7 @@ private static String preparePaths(ArrayList<String> includePaths) {
966966
String includes = "";
967967
for (int i = 0; i < includePaths.size(); i++)
968968
{
969-
includes = includes + (" -I" + (String) includePaths.get(i)) + ",";
969+
includes = includes + (i > 0 ? "," : "") + ("-I" + (String) includePaths.get(i));
970970
}
971971
//logger.debug("Paths prepared: " + includes);
972972
return includes;

hardware/arduino/platforms.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ avr.name=Arduino
4242
#avr.compiler.path Official default is correct, only need to change this if you want to overide the initial default
4343
#avr.compiler.path={0}/hardware/tools/avr/bin/
4444
avr.compiler.c.cmd=avr-gcc
45-
avr.compiler.c.flags=,-c,-g,-Os,-w,-ffunction-sections,-fdata-sections
46-
avr.compiler.c.elf.flags=,-Os,-Wl,--gc-sections
45+
avr.compiler.c.flags=-c,-g,-Os,-w,-ffunction-sections,-fdata-sections
46+
avr.compiler.c.elf.flags=-Os,-Wl,--gc-sections
4747
avr.compiler.c.elf.cmd=avr-gcc
48-
avr.compiler.S.flags=,-c,-g,-assembler-with-cpp
48+
avr.compiler.S.flags=-c,-g,-assembler-with-cpp
4949
avr.compiler.cpp.cmd=avr-g++
50-
avr.compiler.cpp.flags=,-c,-g,-Os,-w,-fno-exceptions,-ffunction-sections,-fdata-sections
50+
avr.compiler.cpp.flags=-c,-g,-Os,-w,-fno-exceptions,-ffunction-sections,-fdata-sections
5151
avr.compiler.ar.cmd=avr-ar
5252
avr.compiler.ar.flags=rcs
5353
avr.compiler.objcopy.cmd=avr-objcopy
54-
avr.compiler.objcopy.eep.flags=,-O,ihex,-j,.eeprom,--set-section-flags=.eeprom=alloc,load,--no-change-warnings,--change-section-lma,.eeprom=0
55-
avr.compiler.elf2hex.flags=,-O,ihex,-R,.eeprom
54+
avr.compiler.objcopy.eep.flags=-O,ihex,-j,.eeprom,--set-section-flags=.eeprom=alloc,load,--no-change-warnings,--change-section-lma,.eeprom=0
55+
avr.compiler.elf2hex.flags=-O,ihex,-R,.eeprom
5656
avr.compiler.elf2hex.cmd=avr-objcopy
5757
avr.compiler.ldflags=
5858
avr.compiler.cpudef=-mmcu=

0 commit comments

Comments
 (0)