From 577c70da18d8fac21b0fd3581def6c44abd8761b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 17 Apr 2019 12:10:29 +0300 Subject: fix for building boost under VS2019 --- tools/boost/build_boost.bat | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tools/boost') diff --git a/tools/boost/build_boost.bat b/tools/boost/build_boost.bat index 9e1a6403cc..83c3d200c9 100644 --- a/tools/boost/build_boost.bat +++ b/tools/boost/build_boost.bat @@ -6,10 +6,16 @@ if "%p2%" == "" (echo "please specify target msvc compiler by adding '14.1' for call bootstrap.bat +if "%p2%" == "14.1" ( + set VCRoot=%VS141COMNTOOLS% +) else ( + set VCRoot=%VS142COMNTOOLS% +) + if /i '%1' == '86' ( - call "%VS141COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvars32.bat" + call "%VCRoot%\..\..\VC\Auxiliary\Build\vcvars32.bat" b2 --toolset=msvc-%2 runtime-link=shared threading=multi link=static architecture=x86 address-model=32 cxxflags=/Zc:threadSafeInit- ) else if /i '%1' == '64' ( - call "%VS141COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvars64.bat" + call "%VCRoot%\..\..\VC\Auxiliary\Build\vcvars64.bat" b2 --toolset=msvc-%2 runtime-link=shared threading=multi link=static architecture=x86 address-model=64 cxxflags=/Zc:threadSafeInit- --stagedir=stage64 ) \ No newline at end of file -- cgit v1.2.3