mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 12:09:41 +00:00
Code Issues Releases Wiki Activity

Merge branch 'always-say-what-to-do' into 'master'

Browse source 
Print MSVC activation info in verbose mode, too.

See merge request OpenMW/openmw!212
This commit is contained in:
AnyOldName3 2020-06-08 21:42:28 +00:00
commit be22e80d33
1 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CI/before_script.msvc.sh
View file

@ -1002,7 +1002,12 @@ RET=$?
if [ -z $VERBOSE ]; then if [ -z $VERBOSE ]; then
if [ $RET -eq 0 ]; then if [ $RET -eq 0 ]; then
echo Done. echo Done.
if [ -n $ACTIVATE_MSVC ]; then else
echo Failed.
fi
fi
if [ -n $ACTIVATE_MSVC ]; then
echo echo
echo "Note: you must manually activate MSVC for the shell in which you want to do the build." echo "Note: you must manually activate MSVC for the shell in which you want to do the build."
echo echo
@ -1027,9 +1032,6 @@ if [ -z $VERBOSE ]; then
fi fi
fi fi
echo "In Visual Studio 15.3 (2017 Update 3) or later, try setting '\"inheritEnvironments\": [ \"$inheritEnvironments\" ]' in CMakeSettings.json to build in the IDE." echo "In Visual Studio 15.3 (2017 Update 3) or later, try setting '\"inheritEnvironments\": [ \"$inheritEnvironments\" ]' in CMakeSettings.json to build in the IDE."
fi
else
echo Failed.
fi
fi fi
wrappedExit $RET wrappedExit $RET