arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

Merge branch 'ide-1.5.x-timer-variant' of github.com:matthijskooijman/Arduino into matthijskooijman-ide-1.5.x-timer-variant

Browse Source
This commit is contained in:
Cristian Maglie
2014-07-01 18:29:07 +02:00
parent 00087c11f4 4014dd6070
commit e5f34e5a83
6 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -693,6 +693,8 @@ public class Compiler implements MessageConsumer {
// 3. compile the core, outputting .o files to <buildPath> and then
// collecting them into the core.a library file.
// Also compiles the variant (if it supplies actual source files),
// which are included in the link directly (not through core.a)
void compileCore()
throws RunnerException {
@ -705,13 +707,9 @@ public class Compiler implements MessageConsumer {
if (variantFolder != null)
includeFolders.add(variantFolder);
List<File> objectFiles = compileFiles(buildFolder, coreFolder, true,
includeFolders);
if (variantFolder != null)
objectFiles.addAll(compileFiles(buildFolder, variantFolder, true,
includeFolders));
for (File file : objectFiles) {
List<File> coreObjectFiles = compileFiles(buildFolder, coreFolder, true,
includeFolders);
for (File file : coreObjectFiles) {
PreferencesMap dict = new PreferencesMap(prefs);
dict.put("ide_version", "" + Base.REVISION);
@ -727,6 +725,10 @@ public class Compiler implements MessageConsumer {
}
execAsynchronously(cmdArray);
}
if (variantFolder != null)
objectFiles.addAll(compileFiles(buildFolder, variantFolder, true,
includeFolders));
}
// 4. link it all together into the .elf file

2
app/src/processing/app/debug/TargetPlatform.java
View File

@ -71,7 +71,7 @@ public class TargetPlatform {
if (!boardsFile.exists() || !boardsFile.canRead())
throw new TargetPlatformException(
format(_("Could not find boards.txt in {0}. Is it pre-1.5?"),
boardsFile.getAbsolutePath()));
folder.getAbsolutePath()));
// Load boards
try {