mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-22 00:39:41 +00:00
Merge branch 'always-say-what-to-do' into 'master'
Print MSVC activation info in verbose mode, too. See merge request OpenMW/openmw!212
This commit is contained in:
commit
be22e80d33
1 changed files with 28 additions and 26 deletions
|
@ -1002,7 +1002,12 @@ RET=$?
|
|||
if [ -z $VERBOSE ]; then
|
||||
if [ $RET -eq 0 ]; then
|
||||
echo Done.
|
||||
if [ -n $ACTIVATE_MSVC ]; then
|
||||
else
|
||||
echo Failed.
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -n $ACTIVATE_MSVC ]; then
|
||||
echo
|
||||
echo "Note: you must manually activate MSVC for the shell in which you want to do the build."
|
||||
echo
|
||||
|
@ -1027,9 +1032,6 @@ if [ -z $VERBOSE ]; then
|
|||
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."
|
||||
fi
|
||||
else
|
||||
echo Failed.
|
||||
fi
|
||||
fi
|
||||
|
||||
wrappedExit $RET
|
||||
|
|
Loading…
Reference in a new issue