From 673e2513b8c010cc411cb1e83f9a425e5e71992a Mon Sep 17 00:00:00 2001 From: "David A. Mellis" Date: Thu, 12 Mar 2009 16:13:35 +0000 Subject: [PATCH] Upping version to 0015 and going back to use of core.a in build process. --- app/Base.java | 4 ++-- app/Compiler.java | 18 +++++++++--------- readme.txt | 6 ++++++ todo.txt | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/app/Base.java b/app/Base.java index 7825c1a3f..8ba6e91d1 100644 --- a/app/Base.java +++ b/app/Base.java @@ -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, diff --git a/app/Compiler.java b/app/Compiler.java index fcaab143c..9bf9b1670 100644 --- a/app/Compiler.java +++ b/app/Compiler.java @@ -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; diff --git a/readme.txt b/readme.txt index 34d93c56d..15335f70a 100644 --- a/readme.txt +++ b/readme.txt @@ -46,6 +46,12 @@ Processing and Wiring. UPDATES +0015 + +[environment] +* Reinstating use of core.a library in the build process, slightly shrinking + compiled sketch sizes. + 0014 - 2009.03.07 [core / libraries] diff --git a/todo.txt b/todo.txt index 5f18587d7..6fe1390e1 100644 --- a/todo.txt +++ b/todo.txt @@ -1,4 +1,4 @@ -0014 arduino +0015 arduino AVR