mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix post-2015 Visual Studio

Browse Source
This commit is contained in:
AnyOldName3 2020-05-13 02:19:24 +01:00
parent 3679d329d6
commit ed4b73b8d2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CI/before_script.msvc.sh
View File

@ -441,7 +441,7 @@ if ! [ -z $ACTIVATE_MSVC ]; then
originalCmdEnv["${separatedPair[0]}"]="${separatedPair[1]}"
done
MSVC_INSTALLATION_PATH=$(vswhere -legacy -version [$MSVC_VER,$(awk "BEGIN { print $MSVC_VER + 1; exit }")\) -property installationPath)
MSVC_INSTALLATION_PATH=$(vswhere -legacy -version "[$MSVC_VER,$(awk "BEGIN { print $MSVC_REAL_VER + 1; exit }"))" -property installationPath)
# capture CMD environment in a shell with MSVC activated
if [ $MSVC_REAL_VER -ge 15 ]; then
cmdEnv="$(cmd //c "${MSVC_INSTALLATION_PATH}\Common7\Tools\VsDevCmd.bat" -no_logo -arch=$([ $BITS -eq 64 ] && echo "amd64" || echo "x86") -host_arch=$([ $(uname -m) == 'x86_64' ] && echo "amd64" || echo "x86") "&&" set)"