aboutsummaryrefslogtreecommitdiff
path: root/etc/environments/default-msvc-14.bat
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-10-07 16:53:00 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-10-08 11:23:52 +0200
commit084b18928556640b396d8788145539f5cbd2dbff (patch)
tree9fdff81898de125b13fd11be29c2e4c474258784 /etc/environments/default-msvc-14.bat
parent3e888ccbc044f1b87140db8c8523d793fc7f6481 (diff)
Don't assume which mode (-m32/-m64, etc) is required in environment setup
Diffstat (limited to 'etc/environments/default-msvc-14.bat')
-rw-r--r--etc/environments/default-msvc-14.bat8
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/environments/default-msvc-14.bat b/etc/environments/default-msvc-14.bat
index cd78b04..76e2385 100644
--- a/etc/environments/default-msvc-14.bat
+++ b/etc/environments/default-msvc-14.bat
@@ -8,15 +8,15 @@ rem
rem Environment setup script for C/C++ compilation with Visual Studio 14.
rem
+set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio 14.0"
+set "VCVARS=VC\vcvarsall.bat"
+
rem %1 - target
rem %2 - bbot executable
rem %3+ - bbot options
setlocal EnableExtensions EnableDelayedExpansion
-set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio 14.0"
-set "VCVARS=%MSVC%\VC\vcvarsall.bat"
-
rem Based on target determine what we are building.
rem
if "_%1_" == "_x86_64-microsoft-win32-msvc14.0_" (
@@ -30,7 +30,7 @@ if "_%1_" == "_x86_64-microsoft-win32-msvc14.0_" (
)
)
-call "%VCVARS%" %VCARCH%
+call "%MSVC%\%VCVARS%" %VCARCH%
if errorlevel 1 goto error
%2 %3 %4 %5 %6 %7 %8 %9 cc config.c=cl config.cxx=cl