mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 15:35:23 +00:00
Code Issues Projects Releases Wiki Activity

Use the VS2017 packaging of Qt5 for Appveyor

Browse Source
This commit is contained in:
Alexander "Ananace" Olofsson 2018-05-20 18:09:31 +02:00 committed by GitHub
parent e1e7a4b11a
commit bcfa2a13a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CI/before_script.msvc.sh
View File

@ -385,7 +385,7 @@ 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... "
else else
printf "Boost 1.60.0 AppVeyor... " printf "Boost 1.67.0 AppVeyor... "
fi fi
fi fi
{ {
@ -411,7 +411,7 @@ fi
if [ $MSVC_VER -eq 12 ]; then if [ $MSVC_VER -eq 12 ]; then
BOOST_SDK="c:/Libraries/boost_1_58_0" BOOST_SDK="c:/Libraries/boost_1_58_0"
else else
BOOST_SDK="c:/Libraries/boost_1_60_0" BOOST_SDK="c:/Libraries/boost_1_67_0"
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}.0"
@ -618,7 +618,7 @@ fi
echo Done. echo Done.
else else
QT_SDK="C:/Qt/5.10/msvc${MSVC_YEAR}${SUFFIX}" QT_SDK="C:/Qt/5.10/msvc${MSVC_DISPLAY_YEAR}${SUFFIX}"
add_cmake_opts -DDESIRED_QT_VERSION=5 \ add_cmake_opts -DDESIRED_QT_VERSION=5 \
-DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \ -DQT_QMAKE_EXECUTABLE="${QT_SDK}/bin/qmake.exe" \