mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

be more aggressive about suppressing message boxes

Browse source
This commit is contained in:
Bret Curtis 2018-06-27 14:02:30 +00:00
parent f7e1083ba4
commit b6fc204dd3
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -52,7 +52,6 @@ Win10:
stage: build stage: build
allow_failure: true allow_failure: true
script: script:
- rm -fr build/* # remove anything in the build directory
- env - env
- sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V - sh %CI_PROJECT_DIR%/CI/before_script.msvc.sh -c Release -p x64 -v 2017 -V
- msbuild MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2 - msbuild MSVC2017_64\OpenMW.sln /t:Build /p:Configuration=Release /m:2
@ -61,4 +60,5 @@ Win10:
- deps - deps
artifacts: artifacts:
paths: paths:
- "*/OpenMW*.exe" - deps\boost_install.log
- "*\OpenMW*.exe"

3
CI/before_script.msvc.sh
View file

@ -421,8 +421,7 @@ 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="$(echo $BOOST_SDK | sed s,/,\\\\,g)" //VERYSILENT //NORESTART //SUPPRESSMSGBOXES //LOG="boost_install.log"
"${DEPS}/boost-1.61.0-msvc${MSVC_YEAR}-win${BITS}.exe" //dir="$(echo $BOOST_SDK | sed s,/,\\\\,g)"
fi fi
add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \ add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \