Commit: 597eaeaa1154938f1bc1dd9db71e3ee25ca37f8c
Author: Ray Molenkamp
Date: Tue Jan 25 13:55:18 2022 -0700
Branches: master
https://developer.blender.org/rB597eaeaa1154938f1bc1dd9db71e3ee25ca37f8c
Deps builder: add VS2019, remove 2013/2015 support
This will allow building most deps with VS2019
SDL has some linker issues that are resolved in
a newer version, but that would be better handled
in a separate change.
VS2013 and VS2015 support which was broken has
been removed.
===================================================================
M build_files/build_environment/cmake/boost.cmake
M build_files/build_environment/windows/build_deps.cmd
===================================================================
diff --git a/build_files/build_environment/cmake/boost.cmake
b/build_files/build_environment/cmake/boost.cmake
index 5170a3a123e..f2944a41af8 100644
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -25,8 +25,13 @@ else()
endif()
if(WIN32)
- set(BOOST_TOOLSET toolset=msvc-14.1)
- set(BOOST_COMPILER_STRING -vc141)
+ if(MSVC_VERSION GREATER_EQUAL 1920) # 2019
+ set(BOOST_TOOLSET toolset=msvc-14.2)
+ set(BOOST_COMPILER_STRING -vc142)
+ else() # 2017
+ set(BOOST_TOOLSET toolset=msvc-14.1)
+ set(BOOST_COMPILER_STRING -vc141)
+ endif()
set(BOOST_CONFIGURE_COMMAND bootstrap.bat)
set(BOOST_BUILD_COMMAND b2)
diff --git a/build_files/build_environment/windows/build_deps.cmd
b/build_files/build_environment/windows/build_deps.cmd
index 5174af8e20d..c0e13ac3a55 100644
--- a/build_files/build_environment/windows/build_deps.cmd
+++ b/build_files/build_environment/windows/build_deps.cmd
@@ -1,64 +1,39 @@
@echo off
if NOT "%1" == "" (
- if "%1" == "2013" (
- echo "Building for VS2013"
- set VSVER=12.0
- set VSVER_SHORT=12
- set BuildDir=VS12
- goto par2
- )
- if "%1" == "2015" (
- echo "Building for VS2015"
- set VSVER=14.0
- set VSVER_SHORT=14
- set BuildDir=VS14
- goto par2
- )
if "%1" == "2017" (
echo "Building for VS2017"
set VSVER=15.0
set VSVER_SHORT=15
set BuildDir=VS15
goto par2
+ )
+ if "%1" == "2019" (
+ echo "Building for VS2019"
+ set VSVER=15.0
+ set VSVER_SHORT=15
+ set BuildDir=VS15
+ goto par2
)
)
:usage
-Echo Usage build_deps 2013/2015/2017 x64/x86
+Echo Usage build_deps 2017/2019 x64
goto exit
:par2
if NOT "%2" == "" (
- if "%2" == "x86" (
- echo "Building for x86"
- set HARVESTROOT=Windows_vc
- set ARCH=86
- if "%1" == "2013" (
- set CMAKE_BUILDER=Visual Studio 12 2013
- )
- if "%1" == "2015" (
- set CMAKE_BUILDER=Visual Studio 14 2015
- )
- if "%1" == "2017" (
- set CMAKE_BUILDER=Visual Studio 15 2017
- )
-
- goto start
- )
if "%2" == "x64" (
echo "Building for x64"
set HARVESTROOT=Win64_vc
set ARCH=64
- if "%1" == "2013" (
- set CMAKE_BUILDER=Visual Studio 12 2013 Win64
- )
- if "%1" == "2015" (
- set CMAKE_BUILDER=Visual Studio 14 2015 Win64
+ if "%1" == "2019" (
+ set CMAKE_BUILDER=Visual Studio 16 2019
+ set CMAKE_BUILD_ARCH=-A x64
)
if "%1" == "2017" (
set CMAKE_BUILDER=Visual Studio 15 2017 Win64
+ set CMAKE_BUILD_ARCH=
)
-
goto start
)
)
@@ -120,7 +95,7 @@ set
path=%BUILD_DIR%\downloads\mingw\mingw64\msys\1.0\bin\;%BUILD_DIR%\downloads
mkdir %STAGING%\%BuildDir%%ARCH%R
cd %Staging%\%BuildDir%%ARCH%R
echo %DATE% %TIME% : Start > %StatusFile%
-cmake -G "%CMAKE_BUILDER%" -Thost=x64 %SOURCE_DIR%
-DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads
-DBUILD_MODE=Release -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/
+cmake -G "%CMAKE_BUILDER%" %CMAKE_BUILD_ARCH% -Thost=x64 %SOURCE_DIR%
-DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads
-DBUILD_MODE=Release -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/
echo %DATE% %TIME% : Release Configuration done >> %StatusFile%
if "%dobuild%" == "1" (
msbuild /m "ll.vcxproj" /p:Configuration=Release /fl
/flp:logfile=BlenderDeps_llvm.log;Verbosity=normal
@@ -133,7 +108,7 @@ if "%NODEBUG%" == "1" goto exit
cd %BUILD_DIR%
mkdir %STAGING%\%BuildDir%%ARCH%D
cd %Staging%\%BuildDir%%ARCH%D
-cmake -G "%CMAKE_BUILDER%" -Thost=x64 %SOURCE_DIR%
-DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads
-DCMAKE_BUILD_TYPE=Debug -DBUILD_MODE=Debug
-DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/
%CMAKE_DEBUG_OPTIONS%
+cmake -G "%CMAKE_BUILDER%" %CMAKE_BUILD_ARCH% -Thost=x64 %SOURCE_DIR%
-DPACKAGE_DIR=%BUILD_DIR%/packages -DDOWNLOAD_DIR=%BUILD_DIR%/downloads
-DCMAKE_BUILD_TYPE=Debug -DBUILD_MODE=Debug
-DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/
%CMAKE_DEBUG_OPTIONS%
echo %DATE% %TIME% : Debug Configuration done >> %StatusFile%
if "%dobuild%" == "1" (
msbuild /m "ll.vcxproj" /p:Configuration=Debug /fl
/flp:logfile=BlenderDeps_llvm.log;;Verbosity=normal
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
