From 6368a9a21ec2197ea6750cfb2b99fc00102cde03 Mon Sep 17 00:00:00 2001 From: Maxime Gervais Date: Fri, 22 Nov 2024 11:33:55 +0100 Subject: [PATCH] Use MSVC2022 for build Signed-off-by: Maxime Gervais --- Project/MSVC2022/CLI/DVRescue.vcxproj | 2 +- Source/Install/dvrescue.nsi | 4 ++-- Source/Install/vcruntime.nsh | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Project/MSVC2022/CLI/DVRescue.vcxproj b/Project/MSVC2022/CLI/DVRescue.vcxproj index 94dbd8f67..ac8181923 100644 --- a/Project/MSVC2022/CLI/DVRescue.vcxproj +++ b/Project/MSVC2022/CLI/DVRescue.vcxproj @@ -202,7 +202,7 @@ - + {20e0f8d6-213c-460b-b361-9c725cb375c7} diff --git a/Source/Install/dvrescue.nsi b/Source/Install/dvrescue.nsi index 24156d024..11db8c6dc 100644 --- a/Source/Install/dvrescue.nsi +++ b/Source/Install/dvrescue.nsi @@ -92,9 +92,9 @@ Section "SectionPrincipale" SEC01 SetOutPath "$INSTDIR" File "..\..\..\..\xmlstarlet-1.6.1\xml.exe" File "..\..\..\ffmpeg\ffmpeg.exe" - File "..\..\..\MediaInfo\Project\MSVC2019\CLI\x64\Release\mediainfo.exe" + File "..\..\..\MediaInfo\Project\MSVC2022\CLI\x64\Release\mediainfo.exe" File "/oname=dvrescue-gui.exe" "..\..\Source\GUI\dvrescue\build\dvrescue\release\dvrescue.exe" - File "..\..\Project\MSVC2017\CLI\x64\Release\dvrescue.exe" + File "..\..\Project\MSVC2022\CLI\x64\Release\dvrescue.exe" File "..\..\Source\GUI\dvrescue\build\dvrescue\release\QtAVPlayer.dll" File "..\..\Source\GUI\dvrescue\build\dvrescue\release\qwt.dll" File "..\..\History.txt" diff --git a/Source/Install/vcruntime.nsh b/Source/Install/vcruntime.nsh index 00c5c022e..a1765bff7 100644 --- a/Source/Install/vcruntime.nsh +++ b/Source/Install/vcruntime.nsh @@ -1,14 +1,14 @@ !macro Install_VC_Runtime SetOutPath "$INSTDIR" - File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29910\X64\Microsoft.VC142.CRT\concrt140.dll" - File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29910\X64\Microsoft.VC142.CRT\msvcp140.dll" - File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29910\X64\Microsoft.VC142.CRT\msvcp140_1.dll" - File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29910\X64\Microsoft.VC142.CRT\msvcp140_2.dll" - File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29910\X64\Microsoft.VC142.CRT\msvcp140_atomic_wait.dll" - File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29910\X64\Microsoft.VC142.CRT\msvcp140_codecvt_ids.dll" - File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29910\X64\Microsoft.VC142.CRT\vccorlib140.dll" - File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29910\X64\Microsoft.VC142.CRT\vcruntime140.dll" - File "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.28.29910\X64\Microsoft.VC142.CRT\vcruntime140_1.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\concrt140.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140_1.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140_2.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140_atomic_wait.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\msvcp140_codecvt_ids.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\vccorlib140.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\vcruntime140.dll" + File "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\X64\Microsoft.VC143.CRT\vcruntime140_1.dll" !macroend !macro Uninstall_VC_Runtime