griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Deps: support vs2022 x64, git ignores

Browse Source 
Windows build_deps tweaks:
- Support VS2022 for building x64 dependencies (this is not used yet,
  but for local tests might be useful).
- Put artifacts and staging of windows deps builder under git ignore

Pull Request: https://projects.blender.org/blender/blender/pulls/130342
This commit is contained in:
Aras Pranckevicius
2024-12-09 17:23:17 +01:00
parent c77933e748
commit b17a31a9e3
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -38,8 +38,9 @@ Desktop.ini
/doc/python_api/sphinx-out/ /doc/python_api/sphinx-out/
/doc/python_api/rst/bmesh.ops.rst /doc/python_api/rst/bmesh.ops.rst
# in-source lib downloads # in-source lib downloads and staging
/build_files/build_environment/downloads/ /build_files/build_environment/downloads/
/build_files/build_environment/windows/build/
# in-source buildbot signing configuration # in-source buildbot signing configuration
/build_files/buildbot/codesign/config_server.py /build_files/buildbot/codesign/config_server.py

4
build_files/build_environment/windows/build_deps.cmd
View File

@@ -33,6 +33,10 @@ if NOT "%2" == "" (
echo "Building for x64" echo "Building for x64"
set HARVESTROOT=Win64_vc set HARVESTROOT=Win64_vc
set ARCH=64 set ARCH=64
if "%1" == "2022" (
set CMAKE_BUILDER=Visual Studio 17 2022
set CMAKE_BUILD_ARCH=-A x64 -Thost=x64
)
if "%1" == "2019" ( if "%1" == "2019" (
set CMAKE_BUILDER=Visual Studio 16 2019 set CMAKE_BUILDER=Visual Studio 16 2019
set CMAKE_BUILD_ARCH=-A x64 -Thost=x64 set CMAKE_BUILD_ARCH=-A x64 -Thost=x64