From 084b18928556640b396d8788145539f5cbd2dbff Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 7 Oct 2019 16:53:00 +0200 Subject: Don't assume which mode (-m32/-m64, etc) is required in environment setup --- etc/environments/default-msvc.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'etc/environments/default-msvc.bat') diff --git a/etc/environments/default-msvc.bat b/etc/environments/default-msvc.bat index a7d4f16..fcb3155 100644 --- a/etc/environments/default-msvc.bat +++ b/etc/environments/default-msvc.bat @@ -8,12 +8,6 @@ rem rem Environment setup script for C/C++ compilation with Visual Studio. rem -rem %1 - target -rem %2 - bbot executable -rem %3+ - bbot options - -setlocal EnableExtensions EnableDelayedExpansion - rem set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community" rem set "MSVC_VER=14.1" @@ -23,6 +17,12 @@ set "MSVC_VER=14.2" set "VCVARS32=VC\Auxiliary\Build\vcvarsamd64_x86.bat" set "VCVARS64=VC\Auxiliary\Build\vcvars64.bat" +rem %1 - target +rem %2 - bbot executable +rem %3+ - bbot options + +setlocal EnableExtensions EnableDelayedExpansion + rem Based on target determine what we are building. rem if "_%1_" == "_x86_64-microsoft-win32-msvc%MSVC_VER%_" ( -- cgit v1.1