rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-15 12:29:26 +01:00
Code Issues Releases Activity

Reference libraries in hardware addons when they reference another core.

Browse Source 
Fixes #1445
This commit is contained in:
Cristian Maglie 2013-11-03 20:30:50 +01:00
parent 8e3da56624
commit be30113f09
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/processing/app/Base.java
View File

@ -1230,6 +1230,15 @@ public class Base {
File platformFolder = targetPlatform.getFolder(); File platformFolder = targetPlatform.getFolder();
librariesFolders = new ArrayList<File>(); librariesFolders = new ArrayList<File>();
librariesFolders.add(getContentFile("libraries")); 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(new File(platformFolder, "libraries"));
librariesFolders.add(getSketchbookLibrariesFolder()); librariesFolders.add(getSketchbookLibrariesFolder());