From ed09b7ba31e538878c86063c4c4a89bbcdcbc710 Mon Sep 17 00:00:00 2001 From: ssg <64012165+ssg3d@users.noreply.github.com> Date: Sat, 12 Feb 2022 14:47:03 +0800 Subject: [PATCH] Fixed failure for VS2017 Script was trying to pick up vs19 instead of vs15 even for builds on vs15, fixed that by adding a check for vs15. --- win/build-deps.cmd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/win/build-deps.cmd b/win/build-deps.cmd index dad6ff0d51..3d5b705bd0 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -227,7 +227,12 @@ powershell -c "get-content %~dp0patches\mpfr.patch | %%{$_ -replace \"sdk\",\"%U IF NOT %ERRORLEVEL%==0 GOTO :Error if NOT "%USE_STATIC_RUNTIME%"=="FALSE" git apply "%~dp0patches\mpfr_runtime.patch" --unidiff-zero --ignore-whitespace IF NOT %ERRORLEVEL%==0 GOTO :Error -call :BuildSolution "%DEPENDENCY_DIR%\build.vs19\lib_mpfr.sln" %DEBUG_OR_RELEASE% lib_mpfr +if "%VS_VER%"=="2017" ( + set mpfr_sln=build.vc15 +) else ( + set mpfr_sln=build.vs19 +) +call :BuildSolution "%DEPENDENCY_DIR%\%mpfr_sln%\lib_mpfr.sln" %DEBUG_OR_RELEASE% lib_mpfr IF NOT %ERRORLEVEL%==0 GOTO :Error REM This command fails because not all msvc projects are patched with the right sdk version IF NOT EXIST lib\%VS_PLATFORM%\Release\mpfr.lib GOTO :Error