From 409004d47191354b2f8d00c311efb014f2ed6129 Mon Sep 17 00:00:00 2001 From: Vovodroid Date: Sat, 29 Jun 2024 17:21:57 +0300 Subject: [PATCH] VS2022 Win10 build fix (#5806) * VS2022 Win10 build: - use DEPS variable for both deps and slicer build - use installed WinSDK version - echo real cmake command line --- build_release_vs2022.bat | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build_release_vs2022.bat b/build_release_vs2022.bat index 870bad7bb..76e8c14f0 100644 --- a/build_release_vs2022.bat +++ b/build_release_vs2022.bat @@ -44,9 +44,10 @@ if "%1"=="slicer" ( ) echo "building deps.." -echo cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo% -cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo% +echo on +cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%DEPS%" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo% cmake --build . --config %build_type% --target deps -- -m +@echo off if "%1"=="deps" exit /b 0 @@ -56,9 +57,10 @@ cd %WP% mkdir %build_dir% cd %build_dir% -echo cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.22000.0" +echo on +cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="%WindowsSdkDir%Include\%WindowsSDKVersion%\" cmake --build . --config %build_type% --target ALL_BUILD -- -m +@echo off cd .. call run_gettext.bat cd %build_dir%