Fix merge conflicts

Author: facchinm

create_cmake_rule.go

@@ -206,7 +206,7 @@ func canExportCmakeProject(ctx *types.Context) bool {
 }
 
 func extractCompileFlags(ctx *types.Context, receipe string, defines, libs, linkerflags, linkDirectories *[]string, logger i18n.Logger) {
-	command, _ := builder_utils.PrepareCommandForRecipe(ctx.BuildProperties, receipe, true, false, false, logger)
+	command, _ := builder_utils.PrepareCommandForRecipe(ctx, ctx.BuildProperties, receipe, true)
 
 	for _, arg := range command.Args {
 		if strings.HasPrefix(arg, "-D") {

preprocess_sketch.go

@@ -48,7 +48,6 @@ type PreprocessSketch struct{}
 func (s *PreprocessSketch) Run(ctx *types.Context) error {
 	sourceFile := filepath.Join(ctx.SketchBuildPath, filepath.Base(ctx.Sketch.MainFile.Name)+".cpp")
 	commands := []types.Command{
-		&GCCPreprocRunner{SourceFilePath: sourceFile, TargetFileName: constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E, Includes: ctx.IncludeFolders},
 		&ArduinoPreprocessorRunner{},
 	}
 
@@ -58,6 +57,8 @@ func (s *PreprocessSketch) Run(ctx *types.Context) error {
 		commands = append(commands, &SketchSaver{})
 	}
 
+	GCCPreprocRunner(ctx, sourceFile, constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E, ctx.IncludeFolders)
+
 	for _, command := range commands {
 		PrintRingNameIfDebug(ctx, command)
 		err := command.Run(ctx)
@@ -73,7 +74,7 @@ type ArduinoPreprocessorRunner struct{}
 
 func (s *ArduinoPreprocessorRunner) Run(ctx *types.Context) error {
 	buildProperties := ctx.BuildProperties
-	targetFilePath := ctx.FileToRead
+	targetFilePath := constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E
 	logger := ctx.GetLogger()
 
 	properties := buildProperties.Clone()