Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2019-11-08 19:01:00 +0300
committerRay Molenkamp <github@lazydodo.com>2019-11-08 19:01:00 +0300
commita67aa11b12ec27a1abb9badb513a516c8d90daf5 (patch)
tree19bb438d8ec845427968f30240c8c846eca156bf /build_files/windows/check_libraries.cmd
parente408a62c2a4b1bec44be06b533b20ce9822d92f2 (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/check_libraries.cmd')
-rw-r--r--build_files/windows/check_libraries.cmd5
1 files changed, 2 insertions, 3 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%"