arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-08-07 00:04:36 +03:00
Code Activity

Upping version to 0015 and going back to use of core.a in build process.

Browse Source
This commit is contained in:
David A. Mellis
2009-03-12 16:13:35 +00:00
parent fa3e49a126
commit 673e2513b8
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Base.java
View File

@@ -53,8 +53,8 @@ import processing.core.*;
* files and images, etc) that comes from that.
*/
public class Base {
static final int VERSION = 14;
static final String VERSION_NAME = "0014";
static final int VERSION = 15;
static final String VERSION_NAME = "0015";
/**
* Path of filename opened on the command line,

18
app/Compiler.java
View File

@@ -172,9 +172,9 @@ public class Compiler implements MessageConsumer {
}
baseCommandLinker.addAll(sketchObjectNames);
baseCommandLinker.addAll(targetObjectNames);
//baseCommandLinker.add(runtimeLibraryName);
//baseCommandLinker.add("-L" + buildPath);
//baseCommandLinker.addAll(targetObjectNames);
baseCommandLinker.add(runtimeLibraryName);
baseCommandLinker.add("-L" + buildPath);
baseCommandLinker.add("-lm");
firstErrorFound = false; // haven't found any errors yet
@@ -200,12 +200,12 @@ public class Compiler implements MessageConsumer {
return false;
}
// for(int i = 0; i < targetObjectNames.size(); i++) {
// List commandAR = new ArrayList(baseCommandAR);
// commandAR.add(targetObjectNames.get(i));
// if (execAsynchronously(commandAR) != 0)
// return false;
// }
for(int i = 0; i < targetObjectNames.size(); i++) {
List commandAR = new ArrayList(baseCommandAR);
commandAR.add(targetObjectNames.get(i));
if (execAsynchronously(commandAR) != 0)
return false;
}
if (execAsynchronously(baseCommandLinker) != 0)
return false;