Merge branch 'release/v1.4.0'

platformio · Dec 7, 2016 · 96cadbf · 96cadbf
2 parents 1672913 + 0bd21a4
commit 96cadbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/builder/main.py b/builder/main.py
@@ -48,7 +48,7 @@
     ],
 
     CPPDEFINES=[
-        "F_CPU=$BOARD_F_CPU"
+        ("F_CPU", "$BOARD_F_CPU")
     ],
 
     LINKFLAGS=[

diff --git a/platform.json b/platform.json
@@ -6,14 +6,13 @@
   "homepage": "http://platformio.org/platforms/freescalekinetis",
   "license": "Apache-2.0",
   "engines": {
-    "platformio": "^3.0.0",
-    "scons": ">=2.3.0,<2.6.0"
+    "platformio": "^3.0.0"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/platformio/platform-freescalekinetis.git"
   },
-  "version": "1.3.0",
+  "version": "1.4.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -33,7 +32,7 @@
     "framework-mbed": {
       "type": "framework",
       "optional": true,
-      "version": "~3.127.0"
+      "version": "~3.126.0"
     }
   }
 }