Merge branch 'hedger/faploader-api-1' into 420

This commit is contained in:
RogueMaster
2022-09-18 19:54:27 -04:00
8 changed files with 106 additions and 34 deletions
+1 -12
View File
@@ -1,16 +1,5 @@
Import("env")
from fbt.version import get_fast_git_version_id
# HACHHACK
# Currently injected to CPPPATH by libs - since they are built earlier and depend on assets
# env.Append(
# CPPPATH=[
# Dir("./compiled"),
# ]
# )
version_value = Value(get_fast_git_version_id())
assetsenv = env.Clone(
tools=["fbt_assets"],
FW_LIB_NAME="assets",
@@ -77,7 +66,6 @@ assetsenv.Alias("proto_ver", proto_ver)
# Gather everything into a static lib
assets_parts = (icons, proto, dolphin_blocking, dolphin_internal, proto_ver)
assetsenv.Depends(assets_parts, version_value)
assetslib = assetsenv.Library("${FW_LIB_NAME}", assets_parts)
assetsenv.Install("${LIB_DIST_DIR}", assetslib)
@@ -113,6 +101,7 @@ if assetsenv["IS_BASE_FIRMWARE"]:
)
# Exporting resources node to external environment
env["FW_ASSETS_HEADERS"] = assets_parts
env["FW_RESOURCES"] = resources
assetsenv.Alias("resources", resources)