From a9a9545b3735b9d94cdaa8f42f64ea2c6b75f201 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 28 May 2015 00:19:55 +0300 Subject: [PATCH] Fix resolving of C/C++ std libs by Eclipse IDE // Resolve #220 --- HISTORY.rst | 6 ++++++ platformio/__init__.py | 2 +- platformio/builder/tools/platformio.py | 12 ++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index f11395b0..7246502b 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,12 @@ Release History =============== +2.0.3 (2015-??-??) +------------------ + +* Fixed resolving of C/C++ std libs by Eclipse IDE + (`issue #220 `_) + 2.0.2 (2015-05-27) ------------------ diff --git a/platformio/__init__.py b/platformio/__init__.py index a3dc3602..b4693b07 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -1,7 +1,7 @@ # Copyright (C) Ivan Kravets # See LICENSE for details. -VERSION = (2, 0, 2) +VERSION = (2, 0, "3.dev0") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py index b0673c06..2cd8b44e 100644 --- a/platformio/builder/tools/platformio.py +++ b/platformio/builder/tools/platformio.py @@ -426,10 +426,14 @@ def DumpIDEData(env): data['includes'].append(env.subst(item[1])) # includes from toolchain - for item in glob(env.subst( - join("$PIOPACKAGES_DIR", "$PIOPACKAGE_TOOLCHAIN", - "*", "include"))): - data['includes'].append(item) + toolchain_dir = env.subst( + join("$PIOPACKAGES_DIR", "$PIOPACKAGE_TOOLCHAIN")) + toolchain_incglobs = [ + join(toolchain_dir, "*", "include"), + join(toolchain_dir, "lib", "gcc", "*", "*", "include") + ] + for g in toolchain_incglobs: + data['includes'].extend(glob(g)) # global symbols for item in env.get("CPPDEFINES", []):