Revert "[CMAKE] include Arduino.h in main sketch file"

facchinm · facchinm · commit 748c70d06261 · 2018-01-24T16:25:09.000+01:00
This reverts commit e7600b5.
diff --git a/sketch_source_merger.go b/sketch_source_merger.go
@@ -31,10 +31,9 @@
 package builder
 
 import (
-	"regexp"
-
 	"github.com/arduino/arduino-builder/types"
 	"github.com/arduino/arduino-builder/utils"
+	"regexp"
 )
 
 type SketchSourceMerger struct{}
@@ -44,12 +43,12 @@ func (s *SketchSourceMerger) Run(ctx *types.Context) error {
 
 	lineOffset := 0
 	includeSection := ""
-	includeSection += "#line 1 " + utils.QuoteCppString(sketch.MainFile.Name) + "\n"
-	lineOffset++
 	if !sketchIncludesArduinoH(&sketch.MainFile) {
 		includeSection += "#include <Arduino.h>\n"
 		lineOffset++
 	}
+	includeSection += "#line 1 " + utils.QuoteCppString(sketch.MainFile.Name) + "\n"
+	lineOffset++
 	ctx.IncludeSection = includeSection
 
 	source := includeSection
