Merge branch 'develop' of https://github.com/ivankravets/platformio into develop

This commit is contained in:
Valeriy Koval
2015-02-02 13:13:56 +02:00

View File

@ -22,10 +22,12 @@ def ProcessGeneral(env):
if "FRAMEWORK" in env: if "FRAMEWORK" in env:
if env['FRAMEWORK'] in ("arduino", "energia"): if env['FRAMEWORK'] in ("arduino", "energia"):
env.ConvertInoToCpp() env.ConvertInoToCpp()
SConscriptChdir(0) for f in env['FRAMEWORK'].split(","):
corelibs = SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", SConscriptChdir(0)
"frameworks", "${FRAMEWORK}.py")), corelibs = SConscript(
exports="env") env.subst(join("$PIOBUILDER_DIR", "scripts",
"frameworks", "%s.py" % f.strip().lower())),
exports="env")
return corelibs return corelibs