-@if not defined __echo @echo off
+@if not defined _echo @echo off
setlocal EnableDelayedExpansion
:: Set the default arguments
set __BuildArch=x64
set __BuildType=Debug
set __BuildOS=Windows_NT
+set __MSBuildBuildArch=x64
:: Default to highest Visual Studio version available
set __VSVersion=vs2015