Absolute CPPPATH instead BUILD_DIR; better output without verbose
This commit is contained in:
parent
d67b1c88fe
commit
da82d327c0
|
@ -36,16 +36,13 @@ platform = env.PioPlatform()
|
|||
FRAMEWORK_DIR = platform.get_package_dir("framework-cmsis")
|
||||
assert isdir(FRAMEWORK_DIR)
|
||||
|
||||
env.VariantDirWrap(
|
||||
join("$BUILD_DIR", "FrameworkCMSIS"),
|
||||
join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core"))
|
||||
)
|
||||
|
||||
env.Append(
|
||||
CPPPATH=[
|
||||
join("$BUILD_DIR", "FrameworkCMSIS"),
|
||||
join("$BUILD_DIR", "FrameworkCMSISCommon"),
|
||||
join("$BUILD_DIR", "FrameworkCMSISVariant")
|
||||
join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core")),
|
||||
join(FRAMEWORK_DIR, "variants", env.BoardConfig().get(
|
||||
"build.variant")[0:7], "common"),
|
||||
join(FRAMEWORK_DIR, "variants", env.BoardConfig().get(
|
||||
"build.variant")[0:7], env.BoardConfig().get("build.variant"))
|
||||
]
|
||||
)
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 85d1dd26ec7df8e61271911c41a16a9334224a24
|
||||
Subproject commit 609cd63986b52d2cd5ae601b39ba4108068ea1a6
|
|
@ -1 +1 @@
|
|||
Subproject commit 05e061aded4848c28ba5129cc586603960af9bc2
|
||||
Subproject commit 2959e0f0466d512bd6996f7a6f9441d7338a123c
|
|
@ -33,34 +33,22 @@ platform = env.PioPlatform()
|
|||
FRAMEWORK_DIR = platform.get_package_dir("framework-spl")
|
||||
assert isdir(FRAMEWORK_DIR)
|
||||
|
||||
env.VariantDirWrap(
|
||||
join("$BUILD_DIR", "FrameworkCMSIS"),
|
||||
join(FRAMEWORK_DIR, env.BoardConfig().get("build.core"),
|
||||
"cmsis", "cores", env.BoardConfig().get("build.core"))
|
||||
)
|
||||
|
||||
env.VariantDirWrap(
|
||||
join("$BUILD_DIR", "FrameworkSPLInc"),
|
||||
join(
|
||||
FRAMEWORK_DIR, env.BoardConfig().get("build.core"), "spl",
|
||||
"variants", env.BoardConfig().get("build.variant")[0:7],
|
||||
"inc"
|
||||
)
|
||||
)
|
||||
|
||||
env.Append(
|
||||
CPPPATH=[
|
||||
join("$BUILD_DIR", "FrameworkCMSIS"),
|
||||
join("$BUILD_DIR", "FrameworkCMSISVariant"),
|
||||
join("$BUILD_DIR", "FrameworkSPLInc"),
|
||||
join("$BUILD_DIR", "FrameworkSPL")
|
||||
join(FRAMEWORK_DIR, env.BoardConfig().get("build.core"),
|
||||
"cmsis", "cores", env.BoardConfig().get("build.core")),
|
||||
join(FRAMEWORK_DIR, env.BoardConfig().get("build.core"), "cmsis",
|
||||
"variants", env.BoardConfig().get("build.variant")[0:7]),
|
||||
join(FRAMEWORK_DIR, env.BoardConfig().get("build.core"), "spl",
|
||||
"variants", env.BoardConfig().get("build.variant")[0:7], "inc"),
|
||||
join(FRAMEWORK_DIR, env.BoardConfig().get("build.core"), "spl",
|
||||
"variants", env.BoardConfig().get("build.variant")[0:7], "src")
|
||||
]
|
||||
)
|
||||
|
||||
envsafe = env.Clone()
|
||||
|
||||
envsafe.Append(
|
||||
CPPPATH=["$BUILDSRC_DIR"],
|
||||
CPPDEFINES=[
|
||||
"USE_STDPERIPH_DRIVER"
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue