diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2019-11-08 19:01:00 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2019-11-08 19:01:00 +0300 |
| commit | a67aa11b12ec27a1abb9badb513a516c8d90daf5 (patch) | |
| tree | 19bb438d8ec845427968f30240c8c846eca156bf /build_files/windows | |
| parent | e408a62c2a4b1bec44be06b533b20ce9822d92f2 (diff) | |
Windows: Switch to the dynamic C runtime
This change switches windows to the dynamic C runtime
avoiding issues coming from mixing the static and dynamic
runtime like the ones outlined in [1]
[1] https://developer.blender.org/D5387#122165
Differential Revision: https://developer.blender.org/D6175
Reviewed by: @Sergey
Diffstat (limited to 'build_files/windows')
| -rw-r--r-- | build_files/windows/check_libraries.cmd | 5 | ||||
| -rw-r--r-- | build_files/windows/find_dependencies.cmd | 2 | ||||
| -rw-r--r-- | build_files/windows/format.cmd | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/build_files/windows/check_libraries.cmd b/build_files/windows/check_libraries.cmd index 24b30c6a9b0..8e43cda9eb7 100644 --- a/build_files/windows/check_libraries.cmd +++ b/build_files/windows/check_libraries.cmd @@ -1,6 +1,5 @@ -if "%BUILD_VS_YEAR%"=="2015" set BUILD_VS_LIBDIRPOST=vc14 -if "%BUILD_VS_YEAR%"=="2017" set BUILD_VS_LIBDIRPOST=vc14 -if "%BUILD_VS_YEAR%"=="2019" set BUILD_VS_LIBDIRPOST=vc14 +if "%BUILD_VS_YEAR%"=="2017" set BUILD_VS_LIBDIRPOST=vc15 +if "%BUILD_VS_YEAR%"=="2019" set BUILD_VS_LIBDIRPOST=vc15 set BUILD_VS_SVNDIR=win64_%BUILD_VS_LIBDIRPOST% set BUILD_VS_LIBDIR="%BLENDER_DIR%..\lib\%BUILD_VS_SVNDIR%" diff --git a/build_files/windows/find_dependencies.cmd b/build_files/windows/find_dependencies.cmd index 7419a0bc77e..0b6ae2d3c32 100644 --- a/build_files/windows/find_dependencies.cmd +++ b/build_files/windows/find_dependencies.cmd @@ -3,7 +3,7 @@ for %%X in (svn.exe) do (set SVN=%%~$PATH:X) for %%X in (cmake.exe) do (set CMAKE=%%~$PATH:X) for %%X in (ctest.exe) do (set CTEST=%%~$PATH:X) for %%X in (git.exe) do (set GIT=%%~$PATH:X) -set PYTHON=%BLENDER_DIR%\..\lib\win64_vc14\python\37\bin\python.exe +set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\37\bin\python.exe if NOT "%verbose%" == "" ( echo svn : "%SVN%" echo cmake : "%CMAKE%" diff --git a/build_files/windows/format.cmd b/build_files/windows/format.cmd index 43f8b61727d..d19595bf042 100644 --- a/build_files/windows/format.cmd +++ b/build_files/windows/format.cmd @@ -1,5 +1,5 @@ -if EXIST %BLENDER_DIR%\..\lib\win64_vc14\llvm\bin\clang-format.exe ( - set CF_PATH=..\lib\win64_vc14\llvm\bin +if EXIST %BLENDER_DIR%\..\lib\win64_vc15\llvm\bin\clang-format.exe ( + set CF_PATH=..\lib\win64_vc15\llvm\bin goto detect_done ) @@ -10,7 +10,7 @@ exit /b 1 echo found clang-format in %CF_PATH% if EXIST %PYTHON% ( - set PYTHON=%BLENDER_DIR%\..\lib\win64_vc14\python\37\bin\python.exe + set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\37\bin\python.exe goto detect_python_done ) |