From fbe9175e0c828a54e651ee11f64f10f21e36a907 Mon Sep 17 00:00:00 2001 From: RogueMaster Date: Wed, 26 Oct 2022 01:31:14 -0400 Subject: [PATCH] lets try this --- assets/SConscript | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/assets/SConscript b/assets/SConscript index 3f5b886df0a..c3da6ab8749 100644 --- a/assets/SConscript +++ b/assets/SConscript @@ -63,23 +63,24 @@ assetsenv.Install("${LIB_DIST_DIR}", assetslib) if assetsenv["IS_BASE_FIRMWARE"]: # External dolphin animations - dolphin_external = assetsenv.DolphinExtBuilder( - assetsenv.Dir("#/assets/resources/dolphin"), - assetsenv.Dir("#/assets/dolphin"), - DOLPHIN_RES_TYPE="external", - ) - assetsenv.NoClean(dolphin_external) - if assetsenv["FORCE"]: - assetsenv.AlwaysBuild(dolphin_external) - assetsenv.Alias("dolphin_ext", dolphin_external) + # dolphin_external = assetsenv.DolphinExtBuilder( + # assetsenv.Dir("#/assets/resources/dolphin"), + # assetsenv.Dir("#/assets/dolphin"), + # DOLPHIN_RES_TYPE="external", + # ) + # assetsenv.NoClean(dolphin_external) + # if assetsenv["FORCE"]: + # assetsenv.AlwaysBuild(dolphin_external) + # assetsenv.Alias("dolphin_ext", dolphin_external) # assetsenv.Clean(dolphin_external, assetsenv.Dir("#/assets/resources/dolphin")) # Resources manifest resources = assetsenv.Command( "#/assets/resources/Manifest", - assetsenv.GlobRecursive( - "*", assetsenv.Dir("resources").srcnode(), exclude="Manifest" - ), + assetsenv.GlobRecursive("*", "resources", exclude="Manifest"), + # assetsenv.GlobRecursive( + # "*", assetsenv.Dir("resources").srcnode(), exclude="Manifest" + # ), action=Action( '${PYTHON3} "${ASSETS_COMPILER}" manifest "${TARGET.dir.posix}" --timestamp=${GIT_UNIX_TIMESTAMP}', "${RESMANIFESTCOMSTR}",