|
|
|
@ -236,7 +236,7 @@ case $VS_VERSION in
|
|
|
|
|
TOOLSET="vc140"
|
|
|
|
|
TOOLSET_REAL="vc141"
|
|
|
|
|
MSVC_REAL_VER="15"
|
|
|
|
|
MSVC_VER="14"
|
|
|
|
|
MSVC_VER="14.1"
|
|
|
|
|
MSVC_YEAR="2015"
|
|
|
|
|
MSVC_DISPLAY_YEAR="2017"
|
|
|
|
|
;;
|
|
|
|
@ -246,7 +246,7 @@ case $VS_VERSION in
|
|
|
|
|
TOOLSET="vc140"
|
|
|
|
|
TOOLSET_REAL="vc140"
|
|
|
|
|
MSVC_REAL_VER="14"
|
|
|
|
|
MSVC_VER="14"
|
|
|
|
|
MSVC_VER="14.0"
|
|
|
|
|
MSVC_YEAR="2015"
|
|
|
|
|
MSVC_DISPLAY_YEAR="2015"
|
|
|
|
|
;;
|
|
|
|
@ -256,7 +256,7 @@ case $VS_VERSION in
|
|
|
|
|
TOOLSET="vc120"
|
|
|
|
|
TOOLSET_REAL="vc120"
|
|
|
|
|
MSVC_REAL_VER="12"
|
|
|
|
|
MSVC_VER="12"
|
|
|
|
|
MSVC_VER="12.0"
|
|
|
|
|
MSVC_YEAR="2013"
|
|
|
|
|
MSVC_DISPLAY_YEAR="2013"
|
|
|
|
|
;;
|
|
|
|
@ -326,9 +326,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
|
|
|
|
|
|
|
|
|
|
# Boost
|
|
|
|
|
if [ -z $APPVEYOR ]; then
|
|
|
|
|
download "Boost 1.61.0" \
|
|
|
|
|
"https://sourceforge.net/projects/boost/files/boost-binaries/1.61.0/boost_1_61_0-msvc-${MSVC_VER}.0-${BITS}.exe" \
|
|
|
|
|
"boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe"
|
|
|
|
|
download "Boost 1.67.0" \
|
|
|
|
|
"https://sourceforge.net/projects/boost/files/boost-binaries/1.67.0/boost_1_67_0-msvc-${MSVC_VER}-${BITS}.exe" \
|
|
|
|
|
"boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Bullet
|
|
|
|
@ -404,7 +404,7 @@ echo
|
|
|
|
|
|
|
|
|
|
# Boost
|
|
|
|
|
if [ -z $APPVEYOR ]; then
|
|
|
|
|
printf "Boost 1.61.0... "
|
|
|
|
|
printf "Boost 1.67.0... "
|
|
|
|
|
else
|
|
|
|
|
if [ $MSVC_VER -eq 12 ]; then
|
|
|
|
|
printf "Boost 1.58.0 AppVeyor... "
|
|
|
|
@ -427,7 +427,7 @@ fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
|
|
|
|
|
-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}.0"
|
|
|
|
|
-DBOOST_LIBRARYDIR="${BOOST_SDK}/lib${BITS}-msvc-${MSVC_VER}"
|
|
|
|
|
add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
|
|
|
|
|
|
|
|
|
|
echo Done.
|
|
|
|
|