Issue chipKIT32#588 updated Compiler.java to compile all files in the…

… variants folder.
ricklon · Oct 29, 2015 · ee20933 · ee20933
1 parent b5b174c
commit ee20933
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -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