From be30113f094e77c31601e17437a35b2a746addce Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Sun, 3 Nov 2013 20:30:50 +0100 Subject: [PATCH] Reference libraries in hardware addons when they reference another core. Fixes #1445 --- app/src/processing/app/Base.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 7086854ec..54bef8e04 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -1230,6 +1230,15 @@ public class Base { File platformFolder = targetPlatform.getFolder(); librariesFolders = new ArrayList(); librariesFolders.add(getContentFile("libraries")); + String core = getBoardPreferences().get("build.core"); + if (core.contains(":")) { + String referencedCore = core.split(":")[0]; + TargetPlatform referencedPlatform = Base.getTargetPlatform(referencedCore, targetPlatform.getId()); + if (referencedPlatform != null) { + File referencedPlatformFolder = referencedPlatform.getFolder(); + librariesFolders.add(new File(referencedPlatformFolder, "libraries")); + } + } librariesFolders.add(new File(platformFolder, "libraries")); librariesFolders.add(getSketchbookLibrariesFolder());