From ef9e1a017081416524f216d9e6bc6fd00f061813 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Thu, 28 Jul 2016 18:44:29 +0300
Subject: [PATCH] Fix Project Generator for ESP8266 and ARM mbed based projects

---
 HISTORY.rst                         | 3 ++-
 platformio/builder/tools/piomisc.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index cb5f44b4..f76adc2e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -12,7 +12,8 @@ PlatformIO 2.0
 * Added support for `Teensy USB Features <http://docs.platformio.org/en/latest/platforms/teensy.html#usb-features>`__
   (HID, SERIAL_HID, DISK, DISK_SDFLASH, MIDI, etc.)
   (`issue #722 <https://github.com/platformio/platformio/issues/722>`_)
-* Improved Project Generator for PlatformIO IDE (fixes incorrect linter errors)
+* Fixed Project Generator for ESP8266 and ARM mbed based projects
+  (resolves incorrect linter errors)
 * Fixed broken LD Script for Element14 chipKIT Pi board
   (`issue #725 <https://github.com/platformio/platformio/issues/725>`_)
 
diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py
index 0ca830f3..b24fca21 100644
--- a/platformio/builder/tools/piomisc.py
+++ b/platformio/builder/tools/piomisc.py
@@ -151,7 +151,7 @@ def DumpIDEData(env):
             invardir = False
             for vardiritem in env_.get("VARIANT_DIRS", []):
                 if item == vardiritem[0]:
-                    includes.append(vardiritem[1])
+                    includes.append(env_.subst(vardiritem[1]))
                     invardir = True
                     break
             if not invardir: