AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-22 11:23:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update before_script.msvc.sh

Browse Source 
This has working GL Win10 MSVC updates, should be cross-compatible with appveyor.
This commit is contained in:
Bret Curtis 2018-06-28 13:59:23 +02:00 committed by GitHub
parent f07d50e5bf
commit 660193ae1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CI/before_script.msvc.sh
View File

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
set -x
MISSINGTOOLS=0 MISSINGTOOLS=0
@ -235,7 +236,7 @@ case $VS_VERSION in
TOOLSET="vc140" TOOLSET="vc140"
TOOLSET_REAL="vc141" TOOLSET_REAL="vc141"
MSVC_REAL_VER="15" MSVC_REAL_VER="15"
MSVC_VER="14" MSVC_VER="14.1"
MSVC_YEAR="2015" MSVC_YEAR="2015"
MSVC_DISPLAY_YEAR="2017" MSVC_DISPLAY_YEAR="2017"
;; ;;
@ -245,7 +246,7 @@ case $VS_VERSION in
TOOLSET="vc140" TOOLSET="vc140"
TOOLSET_REAL="vc140" TOOLSET_REAL="vc140"
MSVC_REAL_VER="14" MSVC_REAL_VER="14"
MSVC_VER="14" MSVC_VER="14.0"
MSVC_YEAR="2015" MSVC_YEAR="2015"
MSVC_DISPLAY_YEAR="2015" MSVC_DISPLAY_YEAR="2015"
;; ;;
@ -255,7 +256,7 @@ case $VS_VERSION in
TOOLSET="vc120" TOOLSET="vc120"
TOOLSET_REAL="vc120" TOOLSET_REAL="vc120"
MSVC_REAL_VER="12" MSVC_REAL_VER="12"
MSVC_VER="12" MSVC_VER="12.0"
MSVC_YEAR="2013" MSVC_YEAR="2013"
MSVC_DISPLAY_YEAR="2013" MSVC_DISPLAY_YEAR="2013"
;; ;;
@ -325,9 +326,9 @@ if [ -z $SKIP_DOWNLOAD ]; then
# Boost # Boost
if [ -z $APPVEYOR ]; then if [ -z $APPVEYOR ]; then
download "Boost 1.61.0" \ download "Boost 1.67.0" \
"https://sourceforge.net/projects/boost/files/boost-binaries/1.61.0/boost_1_61_0-msvc-${MSVC_VER}.0-${BITS}.exe" \ "https://sourceforge.net/projects/boost/files/boost-binaries/1.67.0/boost_1_67_0-msvc-${MSVC_VER}-${BITS}.exe" \
"boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" "boost-1.67.0-msvc${MSVC_YEAR}-win${BITS}.exe"
fi fi
# Bullet # Bullet
@ -365,8 +366,8 @@ if [ -z $SKIP_DOWNLOAD ]; then
QT_SUFFIX="" QT_SUFFIX=""
fi fi
download "Qt 5.7.2" \ download "Qt 5.7.0" \
"https://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-windows-x86-msvc${MSVC_YEAR}${QT_SUFFIX}-5.7.0.exe" \ "https://download.qt.io/archive/qt/5.7/5.7.0/qt-opensource-windows-x86-msvc${MSVC_YEAR}${QT_SUFFIX}-5.7.0.exe" \
"qt-5.7.0-msvc${MSVC_YEAR}-win${BITS}.exe" \ "qt-5.7.0-msvc${MSVC_YEAR}-win${BITS}.exe" \
"https://www.lysator.liu.se/~ace/OpenMW/deps/qt-5-install.qs" \ "https://www.lysator.liu.se/~ace/OpenMW/deps/qt-5-install.qs" \
"qt-5-install.qs" "qt-5-install.qs"
@ -403,7 +404,7 @@ echo
# Boost # Boost
if [ -z $APPVEYOR ]; then if [ -z $APPVEYOR ]; then
printf "Boost 1.61.0... " printf "Boost 1.67.0... "
else else
if [ $MSVC_VER -eq 12 ]; then if [ $MSVC_VER -eq 12 ]; then
printf "Boost 1.58.0 AppVeyor... " printf "Boost 1.58.0 AppVeyor... "
@ -421,11 +422,12 @@ fi
printf "Exists. " printf "Exists. "
elif [ -z $SKIP_EXTRACT ]; then elif [ -z $SKIP_EXTRACT ]; then
rm -rf Boost rm -rf Boost
"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //verysilent "${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //DIR="${SYSTEMDRIVE}\boost" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"
mv "${SYSTEMDRIVE}\boost" ${BOOST_SDK}
fi fi
add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \ 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}" add_cmake_opts -DBoost_COMPILER="-${TOOLSET}"
echo Done. echo Done.