|
@@ -4,7 +4,11 @@ |
|
|
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider"> |
|
|
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider"> |
|
|
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> |
|
|
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> |
|
|
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> |
|
|
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> |
|
|
|
|
|
<<<<<<< Upstream, based on origin/master |
|
|
<provider class="io.sloeber.core.toolchain.ArduinoLanguageProvider" console="false" env-hash="959438751749300006" id="io.sloeber.languageSettingsProvider" keep-relative-paths="false" name="Arduino Compiler Settings" parameter="${COMMAND} -E -P -v -dD -D__IN_ECLIPSE__ "${INPUTS}"" prefer-non-shared="true"> |
|
|
<provider class="io.sloeber.core.toolchain.ArduinoLanguageProvider" console="false" env-hash="959438751749300006" id="io.sloeber.languageSettingsProvider" keep-relative-paths="false" name="Arduino Compiler Settings" parameter="${COMMAND} -E -P -v -dD -D__IN_ECLIPSE__ "${INPUTS}"" prefer-non-shared="true"> |
|
|
|
|
|
======= |
|
|
|
|
|
<provider class="io.sloeber.core.toolchain.ArduinoLanguageProvider" console="false" env-hash="924733868962110222" id="io.sloeber.languageSettingsProvider" keep-relative-paths="false" name="Arduino Compiler Settings" parameter="${COMMAND} -E -P -v -dD -D__IN_ECLIPSE__ "${INPUTS}"" prefer-non-shared="true"> |
|
|
|
|
|
>>>>>>> 092ee8e log changes |
|
|
<language-scope id="org.eclipse.cdt.core.gcc"/> |
|
|
<language-scope id="org.eclipse.cdt.core.gcc"/> |
|
|
<language-scope id="org.eclipse.cdt.core.g++"/> |
|
|
<language-scope id="org.eclipse.cdt.core.g++"/> |
|
|
</provider> |
|
|
</provider> |
|
|