diff options
| author | Doug Schaefer | 2016-07-17 21:25:22 +0000 |
|---|---|---|
| committer | Doug Schaefer | 2016-07-17 21:25:22 +0000 |
| commit | f70020baf1059a7a349d83db0b9dcbff1c62e98c (patch) | |
| tree | a7267dde66e0d2762eb5b5865bf3dec54cb40a59 | |
| parent | 57237cb5a49dc013bde55134bcf0b26febbd6c54 (diff) | |
| download | org.eclipse.cdt-f70020baf1059a7a349d83db0b9dcbff1c62e98c.tar.gz org.eclipse.cdt-f70020baf1059a7a349d83db0b9dcbff1c62e98c.tar.xz org.eclipse.cdt-f70020baf1059a7a349d83db0b9dcbff1c62e98c.zip | |
[Arduino] Library includes were broken.
Change-Id: I29782971f3b1a494cd842010c141aa2734cddafa
| -rw-r--r-- | toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java index e337c1d2624..273a312126a 100644 --- a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java +++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java @@ -277,18 +277,18 @@ public class ArduinoBuildConfiguration extends CBuildConfiguration includes += '"' + pathString(include) + '"'; } - // Magic recipes for platform builds with platform includes - properties.put("includes", includes); //$NON-NLS-1$ - buildModel.put("recipe_cpp_o_pattern_plat", resolveProperty("recipe.cpp.o.pattern", properties)); //$NON-NLS-1$ //$NON-NLS-2$ - buildModel.put("recipe_c_o_pattern_plat", resolveProperty("recipe.c.o.pattern", properties)); //$NON-NLS-1$ //$NON-NLS-2$ - buildModel.put("recipe_S_o_pattern_plat", resolveProperty("recipe.S.o.pattern", properties)); //$NON-NLS-1$ //$NON-NLS-2$ - for (ArduinoLibrary lib : manager.getLibraries(project)) { for (Path include : lib.getIncludePath()) { includes += " -I\"" + pathString(include) + '"'; //$NON-NLS-1$ } } + // Magic recipes for platform builds with platform includes + properties.put("includes", includes); //$NON-NLS-1$ + buildModel.put("recipe_cpp_o_pattern_plat", resolveProperty("recipe.cpp.o.pattern", properties)); //$NON-NLS-1$ //$NON-NLS-2$ + buildModel.put("recipe_c_o_pattern_plat", resolveProperty("recipe.c.o.pattern", properties)); //$NON-NLS-1$ //$NON-NLS-2$ + buildModel.put("recipe_S_o_pattern_plat", resolveProperty("recipe.S.o.pattern", properties)); //$NON-NLS-1$ //$NON-NLS-2$ + ArduinoPlatform corePlatform = platform; String core = properties.getProperty("build.core"); //$NON-NLS-1$ if (core.contains(":")) { //$NON-NLS-1$ |