Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-18 00:38:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fz-dev' into dev

Browse Source
This commit is contained in:
MX
2022-08-23 19:20:06 +03:00
parent baffcc5cf4 9bfb641d3e
commit 11e73cc670
204 changed files with 10940 additions and 4979 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/toolchain/fbtenv.cmd
+1 -1
View File
@@ -13,7 +13,7 @@ if not [%FBT_NOENV%] == [] (
exit /b 0
)
set "FLIPPER_TOOLCHAIN_VERSION=8"
set "FLIPPER_TOOLCHAIN_VERSION=9"
set "FBT_TOOLCHAIN_ROOT=%FBT_ROOT%\toolchain\i686-windows"
scripts/toolchain/fbtenv.sh
+2 -4
View File
@@ -13,12 +13,9 @@ fbtenv_check_sourced()
case "${ZSH_EVAL_CONTEXT:-""}" in *:file:*)
return 0;;
esac
case ${0##*/} in dash|-dash|bash|-bash|ksh|-ksh|sh|-sh)
case ${0##*/} in dash|-dash|bash|-bash|ksh|-ksh|sh|-sh|*.sh|fbt)
return 0;;
esac
if [ "$(basename $0)" = "fbt" ]; then
return 0;
fi
echo "Running this script manually is wrong, please source it";
echo "Example:";
printf "\tsource scripts/toolchain/fbtenv.sh\n";
@@ -212,6 +209,7 @@ fbtenv_main()
fbtenv_check_script_path || return 1;
fbtenv_get_kernel_type || return 1;
fbtenv_check_download_toolchain || return 1;
PS1="[FBT]${PS1-}";
PATH="$TOOLCHAIN_ARCH_DIR/python/bin:$PATH";
PATH="$TOOLCHAIN_ARCH_DIR/bin:$PATH";
PATH="$TOOLCHAIN_ARCH_DIR/protobuf/bin:$PATH";