Merge branch 'fz-dev' into dev

xMasterX · xMasterX · commit 58a33a51eb89 · 2022-09-06T23:43:59.000+03:00
diff --git a/scripts/toolchain/fbtenv.cmd b/scripts/toolchain/fbtenv.cmd
@@ -13,7 +13,7 @@ if not [%FBT_NOENV%] == [] (
     exit /b 0
 )
 
-set "FLIPPER_TOOLCHAIN_VERSION=12"
+set "FLIPPER_TOOLCHAIN_VERSION=15"
 set "FBT_TOOLCHAIN_ROOT=%FBT_ROOT%\toolchain\i686-windows"
 
 
diff --git a/scripts/toolchain/fbtenv.sh b/scripts/toolchain/fbtenv.sh
@@ -5,7 +5,7 @@
 # public variables
 DEFAULT_SCRIPT_PATH="$(pwd -P)";
 SCRIPT_PATH="${SCRIPT_PATH:-$DEFAULT_SCRIPT_PATH}";
-FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"12"}";
+FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"15"}";
 FBT_TOOLCHAIN_PATH="${FBT_TOOLCHAIN_PATH:-$SCRIPT_PATH}";
 
 fbtenv_show_usage()

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ if not [%FBT_NOENV%] == [] (`
`13`	`13`	`exit /b 0`
`14`	`14`	`)`
`15`	`15`
`16`		`-set "FLIPPER_TOOLCHAIN_VERSION=12"`
	`16`	`+set "FLIPPER_TOOLCHAIN_VERSION=15"`
`17`	`17`	`set "FBT_TOOLCHAIN_ROOT=%FBT_ROOT%\toolchain\i686-windows"`
`18`	`18`
`19`	`19`