From cc63090b04e514b48f5b9cafcd9d73e9ccfeb84f Mon Sep 17 00:00:00 2001 From: Thomas Kent Date: Sun, 19 Mar 2017 08:38:04 -0500 Subject: [PATCH] Missed a couple instances --- src/engine/build.bat | 6 +++--- src/engine/build.jam | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/engine/build.bat b/src/engine/build.bat index 667a30dd8..6559ec925 100644 --- a/src/engine/build.bat +++ b/src/engine/build.bat @@ -486,12 +486,12 @@ set "BOOST_JAM_OPT_MKJAMBASE=/Febootstrap\mkjambase0" set "BOOST_JAM_OPT_YYACC=/Febootstrap\yyacc0" set "_known_=1" :Skip_VC14 -if NOT "_%BOOST_JAM_TOOLSET%_" == "_vc141_" goto Skip_VC1410 +if NOT "_%BOOST_JAM_TOOLSET%_" == "_vc141_" goto Skip_VC141 if NOT "_%VS150COMNTOOLS%_" == "__" ( set "BOOST_JAM_TOOLSET_ROOT=%VS150COMNTOOLS%..\..\VC\" ) -REM vc1410 vsvarsall requires the architecture as a parameter. +REM vc141 vsvarsall requires the architecture as a parameter. set BOOST_JAM_ARCH=x86 if NOT "_%PROCESSOR_ARCHITECTURE%_" == "__" set BOOST_JAM_ARCH=%PROCESSOR_ARCHITECTURE% if NOT "_%Platform%_" == "__" set BOOST_JAM_ARCH=%Platform% @@ -507,7 +507,7 @@ set "BOOST_JAM_OPT_JAM=/Febootstrap\jam0" set "BOOST_JAM_OPT_MKJAMBASE=/Febootstrap\mkjambase0" set "BOOST_JAM_OPT_YYACC=/Febootstrap\yyacc0" set "_known_=1" -:Skip_VC1410 +:Skip_VC141 if NOT "_%BOOST_JAM_TOOLSET%_" == "_borland_" goto Skip_BORLAND if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( call :Test_Path bcc32.exe ) diff --git a/src/engine/build.jam b/src/engine/build.jam index c37e1e753..842296a67 100644 --- a/src/engine/build.jam +++ b/src/engine/build.jam @@ -402,7 +402,7 @@ toolset vc14 cl : /Fe /Fe /Fd /Fo : -D -I$(--python-include) -I$(--extra-include) : kernel32.lib advapi32.lib user32.lib $(--python-lib[1]) ; ## Microsoft Visual C++ 2017 -toolset vc1410 cl : /Fe /Fe /Fd /Fo : -D +toolset vc141 cl : /Fe /Fe /Fd /Fo : -D : /nologo [ opt --release : /GL /MT /O2 /Ob2 /Gy /GF /GA /wd4996 ] [ opt --debug : /MTd /DEBUG /Z7 /Od /Ob0 /wd4996 ]