From 297f132a0cfbd2ec11acd5e843f3cf61e9b5e0e2 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 2 Feb 2015 13:12:18 +0200 Subject: [PATCH] Allow multiple frameworks for env --- platformio/builder/tools/platformio.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py index ab982f8c..71feb13d 100644 --- a/platformio/builder/tools/platformio.py +++ b/platformio/builder/tools/platformio.py @@ -22,10 +22,12 @@ def ProcessGeneral(env): if "FRAMEWORK" in env: if env['FRAMEWORK'] in ("arduino", "energia"): env.ConvertInoToCpp() - SConscriptChdir(0) - corelibs = SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", - "frameworks", "${FRAMEWORK}.py")), - exports="env") + for f in env['FRAMEWORK'].split(","): + SConscriptChdir(0) + corelibs = SConscript( + env.subst(join("$PIOBUILDER_DIR", "scripts", + "frameworks", "%s.py" % f.strip().lower())), + exports="env") return corelibs