From ee20933c2b881851b90db1324fa88a7906e53a41 Mon Sep 17 00:00:00 2001 From: ricklon Date: Thu, 29 Oct 2015 16:50:56 -0400 Subject: [PATCH] Issue #588 updated Compiler.java to compile all files in the variants folder. --- app/src/processing/app/debug/Compiler.java | 10 ++++++++++ hardware/pic32/platforms.txt | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/processing/app/debug/Compiler.java b/app/src/processing/app/debug/Compiler.java index 36d77199c..fda9f477e 100755 --- a/app/src/processing/app/debug/Compiler.java +++ b/app/src/processing/app/debug/Compiler.java @@ -666,6 +666,16 @@ void compileCore (String avrBasePath, String buildPath, String corePath, String includePaths.add(corePath); //include core path only if (variantPath != null) includePaths.add(variantPath); + if (variantPath != null) { + objectFiles.addAll(compileFiles(avrBasePath, buildPath, includePaths, + findFilesInPath(variantPath, "S", false), + findFilesInPath(variantPath, "c", false), + findFilesInPath(variantPath, "cpp", false), + systemFolder + )); + } + + String baseCommandString = configPreferences.get("recipe.ar.pattern"); String commandString = ""; MessageFormat compileFormat = new MessageFormat(baseCommandString); diff --git a/hardware/pic32/platforms.txt b/hardware/pic32/platforms.txt index eed701b10..234bdb03f 100644 --- a/hardware/pic32/platforms.txt +++ b/hardware/pic32/platforms.txt @@ -2,7 +2,7 @@ pic32.recipe.c.o.pattern={0}{1}::{2}::{3}{4}::-DF_CPU={5}::-D{6}::-D{7}::{8}::{9}::{10}::-o::{11} pic32.recipe.cpp.o.pattern={0}{1}::{2}::{3}{4}::-DF_CPU={5}::-D{6}::-D{7}::{8}::{9}::{10}::-o::{11} pic32.recipe.ar.pattern={0}{1}::{2}::{3}{4}::{5} -pic32.recipe.c.combine.pattern={0}{1}::{2}::{3}{4}::-o::{5}{6}.elf::{11}\cpp-startup.S::{7}::{8}::{9}::-L{10}::-lm::-T::{11}/{12}::-T{13}/{14} +pic32.recipe.c.combine.pattern={0}{1}::{2}::{3}{4}::-o::{5}{6}.elf::{13}/cpp-startup.S::{7}::{8}::{9}::-L{10}::-lm::-T::{11}/{12}::-T{13}/{14} pic32.recipe.objcopy.eep.pattern={0}{1}::{2}::{3}.elf::{4}.eep pic32.recipe.objcopy.hex.pattern={0}{1}::{2}::{3}.elf