jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into idf-release/v3.3

Browse Source
This commit is contained in:
Me No Dev 2020-11-16 12:09:23 +02:00 committed by GitHub
commit a59eb5d51e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/platformio-build.py
View File

@ -194,16 +194,20 @@ if not env.BoardConfig().get("build.ldscript", ""):
libs = [] libs = []
variants_dir = join(FRAMEWORK_DIR, "variants")
if "build.variants_dir" in env.BoardConfig():
variants_dir = join("$PROJECT_DIR", env.BoardConfig().get("build.variants_dir"))
if "build.variant" in env.BoardConfig(): if "build.variant" in env.BoardConfig():
env.Append( env.Append(
CPPPATH=[ CPPPATH=[
join(FRAMEWORK_DIR, "variants", join(variants_dir, env.BoardConfig().get("build.variant"))
env.BoardConfig().get("build.variant"))
] ]
) )
libs.append(env.BuildLibrary( libs.append(env.BuildLibrary(
join("$BUILD_DIR", "FrameworkArduinoVariant"), join("$BUILD_DIR", "FrameworkArduinoVariant"),
join(FRAMEWORK_DIR, "variants", env.BoardConfig().get("build.variant")) join(variants_dir, env.BoardConfig().get("build.variant"))
)) ))
envsafe = env.Clone() envsafe = env.Clone()