summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2019-04-17 12:10:29 +0300
committerGeorge Hazan <ghazan@miranda.im>2019-04-17 12:10:29 +0300
commit577c70da18d8fac21b0fd3581def6c44abd8761b (patch)
treed45fdc97eff945304e672965dbfb1cf91934b59f /tools
parent34a7b7b35c879a067f389902ff62b76fe06a63b4 (diff)
fix for building boost under VS2019
Diffstat (limited to 'tools')
-rw-r--r--tools/boost/build_boost.bat10
1 files changed, 8 insertions, 2 deletions
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