From 6cf2ab29daaa522834186afe53f9f951bf6fd6f0 Mon Sep 17 00:00:00 2001
From: Valeriy Koval <valeros@bigmir.net>
Date: Wed, 8 Apr 2015 20:49:48 +0300
Subject: [PATCH] Improve ESP8266 platform support

---
 platformio/builder/scripts/espressif.py          | 11 +++--------
 platformio/builder/scripts/frameworks/arduino.py |  4 ++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/platformio/builder/scripts/espressif.py b/platformio/builder/scripts/espressif.py
index 5d2d3c85..78dfced8 100644
--- a/platformio/builder/scripts/espressif.py
+++ b/platformio/builder/scripts/espressif.py
@@ -58,20 +58,15 @@ env.Replace(
         "ICACHE_FLASH"
     ],
 
-    CPPPATH=[
-        join("$PIOPACKAGES_DIR", "sdk-esp8266", "include"),
-        "$PROJECTSRC_DIR"
-    ],
-
     LINKFLAGS=[
         "-nostdlib",
-        "-Wl,--no-check-section",
+        "-Wl,--no-check-sections",
         "-u", "call_user_start",
         "-Wl,-static"
     ],
 
-    LIBPATH=[join("$PIOPACKAGES_DIR", "sdk-esp8266", "lib")],
-    LIBS=["c", "gcc", "hal", "phy", "net80211", "lwip", "wpa", "main", "pp"],
+    LIBPATH=[join("$PLATFORMFW_DIR", "sdk", "lib")],
+    LIBS=["hal", "phy", "net80211", "lwip", "wpa", "main", "pp", "c", "gcc"],
 
     SIZEPRINTCMD='"$SIZETOOL" -B -d $SOURCES',
 
diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py
index cbeb1e42..4b6acde2 100644
--- a/platformio/builder/scripts/frameworks/arduino.py
+++ b/platformio/builder/scripts/frameworks/arduino.py
@@ -42,6 +42,10 @@ elif env.get("PLATFORM") == "timsp430":
         "$PIOPACKAGES_DIR",
         "framework-arduinomsp430"
     )
+elif env.get("PLATFORM") == "espressif":
+    env.Prepend(
+        CPPPATH=[join("$PLATFORMFW_DIR", "sdk", "include")]
+    )
 
 env.Replace(PLATFORMFW_DIR=PLATFORMFW_DIR)