sed -i "s/\$MSVC_DISPLAY_YEAR/$MSVC_DISPLAY_YEAR/g" activate_msvc.sh
source ./activate_msvc.sh
@ -983,39 +966,47 @@ if [ -z $VERBOSE ]; then
else
echo"- cmake .. $CMAKE_OPTS"
fi
run_cmd cmake .. $CMAKE_OPTS
RET=$?
RET=0
run_cmd cmake .. $CMAKE_OPTS||RET=$?
if[ -z $VERBOSE];then
if[$RET -eq 0];then
echo Done.
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
echo"Some scripts have been created in the build directory to do so in an existing shell."
echo"Bash: source activate_msvc.sh"
echo"CMD: ActivateMSVC.bat"
echo"PowerShell: ActivateMSVC.ps1"
echo
echo"You may find options to launch a Development/Native Tools/Cross Tools shell in your start menu or Visual Studio."
echo
if[$(uname -m)=='x86_64'];then
if[$BITS -eq 64];then
inheritEnvironments=msvc_x64_x64
else
inheritEnvironments=msvc_x64
fi
else
if[$BITS -eq 64];then
inheritEnvironments=msvc_x86_x64
else
inheritEnvironments=msvc_x86
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
if[$RET -ne 0];then
wrappedExit $RET
fi
echo"Script completed successfully."
echo"You now have an OpenMW build system at $(unixPathAsWindows "$(pwd)")"
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
echo"Some scripts have been created in the build directory to do so in an existing shell."
echo"Bash: source activate_msvc.sh"
echo"CMD: ActivateMSVC.bat"
echo"PowerShell: ActivateMSVC.ps1"
echo
echo"You may find options to launch a Development/Native Tools/Cross Tools shell in your start menu or Visual Studio."
echo
if[$(uname -m)=='x86_64'];then
if[$BITS -eq 64];then
inheritEnvironments=msvc_x64_x64
else
inheritEnvironments=msvc_x64
fi
else
if[$BITS -eq 64];then
inheritEnvironments=msvc_x86_x64
else
inheritEnvironments=msvc_x86
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."
message(FATAL_ERROR"macOS packaging is broken in early CMake 3.13 releases, see https://gitlab.com/OpenMW/openmw/issues/4767. Please use at least 3.13.4 or an older version like 3.12.4")
// Qt5 is currently crashing and reporting "Cannot make QOpenGLContext current in a different thread" when the viewer is run multi-threaded, this is regression from Qt4
Mads Buvik Sandvei
5 years ago