fixed #107 and #109 IN_ECLIPSE and custom options for indexer

Author: jantje

it.baeyens.arduino.core/plugin.xml

@@ -467,7 +467,7 @@
            <tool
                  announcement="%tool.announcement"
                  command="${A.RECIPE.CPP.O.PATTERN}"
-                 commandLinePattern="${A.RECIPE.CPP.O.PATTERN.1} ${FLAGS} -x c++ ${INPUTS} ${A.RECIPE.CPP.O.PATTERN.2} ${OUTPUT} ${A.RECIPE.CPP.O.PATTERN.3} ${JANTJE.WARNING_LEVEL} ${JANTJE.EXTRA.COMPILE} ${JANTJE.EXTRA.CPP.COMPILE}"
+                 commandLinePattern="${A.RECIPE.CPP.O.PATTERN.1} ${FLAGS} -D__IN_ECLIPSE__=1 -x c++ ${INPUTS} ${A.RECIPE.CPP.O.PATTERN.2} ${OUTPUT} ${A.RECIPE.CPP.O.PATTERN.3} ${JANTJE.WARNING_LEVEL} ${JANTJE.EXTRA.COMPILE} ${JANTJE.EXTRA.CPP.COMPILE}"
                  errorParsers="org.eclipse.cdt.core.GCCErrorParser"
                  id="it.baeyens.arduino.tool.sketch.compiler.cpp"
                  name="%tool.name"
@@ -514,7 +514,7 @@
            <tool
                  announcement="%tool.announcement.0"
                  command="${A.RECIPE.C.O.PATTERN}"
-                 commandLinePattern="${A.RECIPE.C.O.PATTERN.1} ${FLAGS} ${INPUTS} ${A.RECIPE.C.O.PATTERN.2} ${OUTPUT} ${A.RECIPE.C.O.PATTERN.3} ${JANTJE.WARNING_LEVEL} ${JANTJE.EXTRA.COMPILE} ${JANTJE.EXTRA.C.COMPILE}"
+                 commandLinePattern="${A.RECIPE.C.O.PATTERN.1} ${FLAGS} -D__IN_ECLIPSE__=1 ${INPUTS} ${A.RECIPE.C.O.PATTERN.2} ${OUTPUT} ${A.RECIPE.C.O.PATTERN.3} ${JANTJE.WARNING_LEVEL} ${JANTJE.EXTRA.COMPILE} ${JANTJE.EXTRA.C.COMPILE}"
                  errorParsers="org.eclipse.cdt.core.GCCErrorParser"
                  id="it.baeyens.arduino.tool.compiler.c"
                  name="%tool.name.0"

it.baeyens.arduino.core/src/it/baeyens/arduino/toolchain/ArduinoLanguageProvider.java

@@ -153,8 +153,18 @@ protected String getCompilerCommand(String languageId) {
 	// End of Bug fix for CDT 8.1 fixed in 8.2
 	if (languageId.equals("org.eclipse.cdt.core.gcc")) {
 	    compilerCommand = envManager.getVariable(ArduinoConst.ENV_KEY_recipe_c_o_pattern, confDesc, true).getValue().replace(" -o ", "");
+	    compilerCommand = compilerCommand + " "
+		    + envManager.getVariable(ArduinoConst.ENV_KEY_JANTJE_ADDITIONAL_COMPILE_OPTIONS, confDesc, true).getValue();
+	    compilerCommand = compilerCommand + " "
+		    + envManager.getVariable(ArduinoConst.ENV_KEY_JANTJE_ADDITIONAL_C_COMPILE_OPTIONS, confDesc, true).getValue();
+	    compilerCommand = compilerCommand + " -D__IN_ECLIPSE__=1";
 	} else if (languageId.equals("org.eclipse.cdt.core.g++")) {
 	    compilerCommand = envManager.getVariable(ArduinoConst.ENV_KEY_recipe_cpp_o_pattern, confDesc, true).getValue().replace(" -o ", "");
+	    compilerCommand = compilerCommand + " "
+		    + envManager.getVariable(ArduinoConst.ENV_KEY_JANTJE_ADDITIONAL_COMPILE_OPTIONS, confDesc, true).getValue();
+	    compilerCommand = compilerCommand + " "
+		    + envManager.getVariable(ArduinoConst.ENV_KEY_JANTJE_ADDITIONAL_CPP_COMPILE_OPTIONS, confDesc, true).getValue();
+	    compilerCommand = compilerCommand + " -D__IN_ECLIPSE__=1";
 	} else {
 	    ManagedBuilderCorePlugin.error("Unable to find compiler command for language " + languageId + " in toolchain=" + getToolchainId()); //$NON-NLS-1$
 	}