lImbus
diff --git a/‎app/src/processing/app/debug/Compiler.java
Copy file name to clipboardExpand all lines: app/src/processing/app/debug/Compiler.java
+66-66Lines changed: 66 additions & 66 deletions b/‎app/src/processing/app/debug/Compiler.java
Copy file name to clipboardExpand all lines: app/src/processing/app/debug/Compiler.java
+66-66Lines changed: 66 additions & 66 deletions
@@ -93,72 +93,72 @@ public boolean compile(Sketch sketch,
 
     List<File> objectFiles = new ArrayList<File>();
 
-    List includePaths = new ArrayList();
-    includePaths.add(corePath);
-    
-    String runtimeLibraryName = buildPath + File.separator + "core.a";
-
-    // 1. compile the core, outputting .o files to <buildPath> and then
-    // collecting them into the core.a library file.
-    
-    List<File> coreObjectFiles = 
-      compileFiles(avrBasePath, buildPath, includePaths,
-                   findFilesInPath(corePath, "S", true),
-                   findFilesInPath(corePath, "c", true),
-                   findFilesInPath(corePath, "cpp", true),
-                   boardPreferences);
-                   
-    List baseCommandAR = new ArrayList(Arrays.asList(new String[] {
-      avrBasePath + "avr-ar",
-      "rcs",
-      runtimeLibraryName
-    }));
-
-    for(File file : coreObjectFiles) {
-      List commandAR = new ArrayList(baseCommandAR);
-      commandAR.add(file.getAbsolutePath());
-      execAsynchronously(commandAR);
-    }
-
-    // 2. compile the libraries, outputting .o files to: <buildPath>/<library>/
-
-    // use library directories as include paths for all libraries
-    for (File file : sketch.getImportedLibraries()) {
-      includePaths.add(file.getPath());
-    }
-
-    for (File libraryFolder : sketch.getImportedLibraries()) {
-      File outputFolder = new File(buildPath, libraryFolder.getName());
-      File utilityFolder = new File(libraryFolder, "utility");
-      createFolder(outputFolder);
-      // this library can use includes in its utility/ folder
-      includePaths.add(utilityFolder.getAbsolutePath());
-      objectFiles.addAll(
-        compileFiles(avrBasePath, outputFolder.getAbsolutePath(), includePaths,
-                     findFilesInFolder(libraryFolder, "S", false),
-                     findFilesInFolder(libraryFolder, "c", false),
-                     findFilesInFolder(libraryFolder, "cpp", false),
-                     boardPreferences));
-      outputFolder = new File(outputFolder, "utility");
-      createFolder(outputFolder);
-      objectFiles.addAll(
-        compileFiles(avrBasePath, outputFolder.getAbsolutePath(), includePaths,
-                     findFilesInFolder(utilityFolder, "S", false),
-                     findFilesInFolder(utilityFolder, "c", false),
-                     findFilesInFolder(utilityFolder, "cpp", false),
-                     boardPreferences));
-      // other libraries should not see this library's utility/ folder
-      includePaths.remove(includePaths.size() - 1);
-    }
-
-    // 3. compile the sketch (already in the buildPath)
-
-    objectFiles.addAll(
-      compileFiles(avrBasePath, buildPath, includePaths,
-                   findFilesInPath(buildPath, "S", false),
-                   findFilesInPath(buildPath, "c", false),
-                   findFilesInPath(buildPath, "cpp", false),
-                   boardPreferences));
+   // 0. include paths for core + all libraries
+
+   List includePaths = new ArrayList();
+   includePaths.add(corePath);
+   for (File file : sketch.getImportedLibraries()) {
+     includePaths.add(file.getPath());
+   }
+
+   // 1. compile the sketch (already in the buildPath)
+
+   objectFiles.addAll(
+     compileFiles(avrBasePath, buildPath, includePaths,
+               findFilesInPath(buildPath, "S", false),
+               findFilesInPath(buildPath, "c", false),
+               findFilesInPath(buildPath, "cpp", false),
+               boardPreferences));
+
+   // 2. compile the libraries, outputting .o files to: <buildPath>/<library>/
+
+   for (File libraryFolder : sketch.getImportedLibraries()) {
+     File outputFolder = new File(buildPath, libraryFolder.getName());
+     File utilityFolder = new File(libraryFolder, "utility");
+     createFolder(outputFolder);
+     // this library can use includes in its utility/ folder
+     includePaths.add(utilityFolder.getAbsolutePath());
+     objectFiles.addAll(
+       compileFiles(avrBasePath, outputFolder.getAbsolutePath(), includePaths,
+               findFilesInFolder(libraryFolder, "S", false),
+               findFilesInFolder(libraryFolder, "c", false),
+               findFilesInFolder(libraryFolder, "cpp", false),
+               boardPreferences));
+     outputFolder = new File(outputFolder, "utility");
+     createFolder(outputFolder);
+     objectFiles.addAll(
+       compileFiles(avrBasePath, outputFolder.getAbsolutePath(), includePaths,
+               findFilesInFolder(utilityFolder, "S", false),
+               findFilesInFolder(utilityFolder, "c", false),
+               findFilesInFolder(utilityFolder, "cpp", false),
+               boardPreferences));
+     // other libraries should not see this library's utility/ folder
+     includePaths.remove(includePaths.size() - 1);
+   }
+
+   // 3. compile the core, outputting .o files to <buildPath> and then
+   // collecting them into the core.a library file.
+
+  includePaths.clear();
+  includePaths.add(corePath);  // include path for core only
+  List<File> coreObjectFiles =
+    compileFiles(avrBasePath, buildPath, includePaths,
+              findFilesInPath(corePath, "S", true),
+              findFilesInPath(corePath, "c", true),
+              findFilesInPath(corePath, "cpp", true),
+              boardPreferences);
+
+   String runtimeLibraryName = buildPath + File.separator + "core.a";
+   List baseCommandAR = new ArrayList(Arrays.asList(new String[] {
+     avrBasePath + "avr-ar",
+     "rcs",
+     runtimeLibraryName
+   }));
+   for(File file : coreObjectFiles) {
+     List commandAR = new ArrayList(baseCommandAR);
+     commandAR.add(file.getAbsolutePath());
+     execAsynchronously(commandAR);
+   }
 
     // 4. link it all together into the .elf file