From 372d3500329dcb69dd5d3af12c4d6ce48a621aee Mon Sep 17 00:00:00 2001 From: Maxime Gervais Date: Mon, 25 Nov 2024 01:43:06 +0100 Subject: [PATCH] Package scripts for MSVC2022 build Signed-off-by: Maxime Gervais --- Project/MSVC2022/MediaInfo_UWP/MediaInfo.vcxproj | 12 ++++++------ Release/Release_CLI_Windows_i386.bat | 2 +- Release/Release_CLI_Windows_x64.bat | 2 +- Release/Release_GUI_Windows_i386.bat | 4 ++-- Release/Release_GUI_Windows_x64.bat | 4 ++-- Source/Install/MediaInfo_GUI_Windows.nsi | 8 ++++---- Source/Install/MediaInfo_GUI_Windows_i386.nsi | 4 ++-- Source/Install/MediaInfo_GUI_Windows_x64.nsi | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Project/MSVC2022/MediaInfo_UWP/MediaInfo.vcxproj b/Project/MSVC2022/MediaInfo_UWP/MediaInfo.vcxproj index c58d6a018..70e129985 100644 --- a/Project/MSVC2022/MediaInfo_UWP/MediaInfo.vcxproj +++ b/Project/MSVC2022/MediaInfo_UWP/MediaInfo.vcxproj @@ -103,7 +103,7 @@ MediaInfo-Static_UWP.lib;ZenLib_UWP.lib;zlibuwp.lib;%(AdditionalDependencies) - ..\..\..\..\MediaInfoLib\Project\MSVC2022\Arm\Debug;..\..\..\..\ZenLib\Project\MSVC2022\Arm\Debug;..\..\..\..\zlib\contrib\vstudio\vc15\Arm\Debug\zlibuwp;%(AdditionalLibraryDirectories) + ..\..\..\..\MediaInfoLib\Project\MSVC2022\Arm\Debug;..\..\..\..\ZenLib\Project\MSVC2022\Arm\Debug;..\..\..\..\zlib\contrib\vstudio\vc17\Arm\Debug\zlibuwp;%(AdditionalLibraryDirectories) @@ -115,7 +115,7 @@ MediaInfo-Static_UWP.lib;ZenLib_UWP.lib;zlibuwp.lib;%(AdditionalDependencies) - ..\..\..\..\MediaInfoLib\Project\MSVC2022\Arm\Release;..\..\..\..\ZenLib\Project\MSVC2022\Arm\Release;..\..\..\..\zlib\contrib\vstudio\vc15\Arm\Release\zlibuwp;%(AdditionalLibraryDirectories) + ..\..\..\..\MediaInfoLib\Project\MSVC2022\Arm\Release;..\..\..\..\ZenLib\Project\MSVC2022\Arm\Release;..\..\..\..\zlib\contrib\vstudio\vc17\Arm\Release\zlibuwp;%(AdditionalLibraryDirectories) @@ -127,7 +127,7 @@ MediaInfo-Static_UWP.lib;ZenLib_UWP.lib;zlibuwp.lib;%(AdditionalDependencies) - ..\..\..\..\MediaInfoLib\Project\MSVC2022\Win32\Debug;..\..\..\..\ZenLib\Project\MSVC2022\Win32\Debug;..\..\..\..\zlib\contrib\vstudio\vc15\Debug\zlibuwp;%(AdditionalLibraryDirectories) + ..\..\..\..\MediaInfoLib\Project\MSVC2022\Win32\Debug;..\..\..\..\ZenLib\Project\MSVC2022\Win32\Debug;..\..\..\..\zlib\contrib\vstudio\vc17\Debug\zlibuwp;%(AdditionalLibraryDirectories) @@ -139,7 +139,7 @@ MediaInfo-Static_UWP.lib;ZenLib_UWP.lib;zlibuwp.lib;%(AdditionalDependencies) - ..\..\..\..\MediaInfoLib\Project\MSVC2022\Win32\Release;..\..\..\..\ZenLib\Project\MSVC2022\Win32\Release;..\..\..\..\zlib\contrib\vstudio\vc15\Release\zlibuwp;%(AdditionalLibraryDirectories) + ..\..\..\..\MediaInfoLib\Project\MSVC2022\Win32\Release;..\..\..\..\ZenLib\Project\MSVC2022\Win32\Release;..\..\..\..\zlib\contrib\vstudio\vc17\Release\zlibuwp;%(AdditionalLibraryDirectories) @@ -151,7 +151,7 @@ MediaInfo-Static_UWP.lib;ZenLib_UWP.lib;zlibuwp.lib;%(AdditionalDependencies) - ..\..\..\..\MediaInfoLib\Project\MSVC2022\x64\Debug;..\..\..\..\ZenLib\Project\MSVC2022\x64\Debug;..\..\..\..\zlib\contrib\vstudio\vc15\x64\Debug\zlibuwp;%(AdditionalLibraryDirectories) + ..\..\..\..\MediaInfoLib\Project\MSVC2022\x64\Debug;..\..\..\..\ZenLib\Project\MSVC2022\x64\Debug;..\..\..\..\zlib\contrib\vstudio\vc17\x64\Debug\zlibuwp;%(AdditionalLibraryDirectories) @@ -163,7 +163,7 @@ MediaInfo-Static_UWP.lib;ZenLib_UWP.lib;zlibuwp.lib;%(AdditionalDependencies) - ..\..\..\..\MediaInfoLib\Project\MSVC2022\x64\Release;..\..\..\..\ZenLib\Project\MSVC2022\x64\Release;..\..\..\..\zlib\contrib\vstudio\vc15\x64\Release\zlibuwp;%(AdditionalLibraryDirectories) + ..\..\..\..\MediaInfoLib\Project\MSVC2022\x64\Release;..\..\..\..\ZenLib\Project\MSVC2022\x64\Release;..\..\..\..\zlib\contrib\vstudio\vc17\x64\Release\zlibuwp;%(AdditionalLibraryDirectories) diff --git a/Release/Release_CLI_Windows_i386.bat b/Release/Release_CLI_Windows_i386.bat index b5278a627..61ac82f9a 100644 --- a/Release/Release_CLI_Windows_i386.bat +++ b/Release/Release_CLI_Windows_i386.bat @@ -21,7 +21,7 @@ rmdir MediaInfo_CLI_Windows_i386 /S /Q mkdir MediaInfo_CLI_Windows_i386 rem --- Copying : Exe --- -xcopy ..\Project\MSVC2019\Win32\Release\MediaInfo.exe MediaInfo_CLI_Windows_i386\ /S +xcopy ..\Project\MSVC2022\Win32\Release\MediaInfo.exe MediaInfo_CLI_Windows_i386\ /S rem --- Copying : Plugins --- xcopy ..\Source\Resource\Plugin\Custom\* MediaInfo_CLI_Windows_i386\Plugin\Custom\ /S diff --git a/Release/Release_CLI_Windows_x64.bat b/Release/Release_CLI_Windows_x64.bat index 365b25402..366b25b4b 100644 --- a/Release/Release_CLI_Windows_x64.bat +++ b/Release/Release_CLI_Windows_x64.bat @@ -21,7 +21,7 @@ rmdir MediaInfo_CLI_Windows_x64 /S /Q mkdir MediaInfo_CLI_Windows_x64 rem --- Copying : Exe --- -xcopy ..\Project\MSVC2019\x64\Release\MediaInfo.exe MediaInfo_CLI_Windows_x64\ /S +xcopy ..\Project\MSVC2022\x64\Release\MediaInfo.exe MediaInfo_CLI_Windows_x64\ /S rem --- Copying : Plugins --- xcopy ..\Source\Resource\Plugin\Custom\* MediaInfo_CLI_Windows_x64\Plugin\Custom\ /S diff --git a/Release/Release_GUI_Windows_i386.bat b/Release/Release_GUI_Windows_i386.bat index fe71b09e2..3593ee938 100644 --- a/Release/Release_GUI_Windows_i386.bat +++ b/Release/Release_GUI_Windows_i386.bat @@ -27,8 +27,8 @@ copy BCB\GUI\MediaInfo_GUI.exe BCB\GUI\MediaInfo.exe @rem --- Copying : Exe --- copy ..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe MediaInfo_GUI_Windows_i386\MediaInfo.exe -xcopy ..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo.dll MediaInfo_GUI_Windows_i386\ /S -xcopy ..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_i386\ /S +xcopy ..\..\MediaInfoLib\Project\MSVC2022\Win32\Release\MediaInfo.dll MediaInfo_GUI_Windows_i386\ /S +xcopy ..\..\MediaInfoLib\Project\MSVC2022\Win32\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_i386\ /S xcopy "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win32\WebView2Loader.dll" MediaInfo_GUI_Windows_i386\ @rem --- Copying : Plugins --- diff --git a/Release/Release_GUI_Windows_x64.bat b/Release/Release_GUI_Windows_x64.bat index 4bad46868..8d5b8f4b9 100644 --- a/Release/Release_GUI_Windows_x64.bat +++ b/Release/Release_GUI_Windows_x64.bat @@ -24,8 +24,8 @@ mkdir MediaInfo_GUI_Windows_x64 @rem --- Copying : Exe --- copy ..\Project\BCB\GUI\Win64\Release\MediaInfo_GUI.exe MediaInfo_GUI_Windows_x64\MediaInfo.exe -xcopy ..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\ /S -xcopy ..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_x64\ /S +xcopy ..\..\MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\ /S +xcopy ..\..\MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_x64\ /S xcopy "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win64\WebView2Loader.dll" MediaInfo_GUI_Windows_x64\ @rem --- Copying : Plugins --- diff --git a/Source/Install/MediaInfo_GUI_Windows.nsi b/Source/Install/MediaInfo_GUI_Windows.nsi index 0e86a6a49..8e9ba447b 100644 --- a/Source/Install/MediaInfo_GUI_Windows.nsi +++ b/Source/Install/MediaInfo_GUI_Windows.nsi @@ -134,14 +134,14 @@ Section "SectionPrincipale" SEC01 SetOutPath "$INSTDIR" ${If} ${RunningX64} File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win64\Release\MediaInfo_GUI.exe" - File "..\..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo_InfoTip.dll" - File "..\..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo.dll" + File "..\..\..\MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo_InfoTip.dll" + File "..\..\..\MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo.dll" File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win64\WebView2Loader.dll" File "$%BPATH%\Windows\libcurl\x64\Release\LIBCURL.DLL" ${Else} File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe" - File "..\..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo_InfoTip.dll" - File "..\..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo.dll" + File "..\..\..\MediaInfoLib\Project\MSVC2022\Win32\Release\MediaInfo_InfoTip.dll" + File "..\..\..\MediaInfoLib\Project\MSVC2022\Win32\Release\MediaInfo.dll" File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win32\WebView2Loader.dll" File "$%BPATH%\Windows\libcurl\Win32\Release\LIBCURL.DLL" ${EndIf} diff --git a/Source/Install/MediaInfo_GUI_Windows_i386.nsi b/Source/Install/MediaInfo_GUI_Windows_i386.nsi index 24a0e8654..68108de87 100644 --- a/Source/Install/MediaInfo_GUI_Windows_i386.nsi +++ b/Source/Install/MediaInfo_GUI_Windows_i386.nsi @@ -127,8 +127,8 @@ Section "SectionPrincipale" SEC01 CreateShortCut "$SMPROGRAMS\MediaInfo.lnk" "$INSTDIR\MediaInfo.exe" "" "" "" "" "" "Convenient unified display of the most relevant technical and tag data for video and audio files" SetOutPath "$INSTDIR" File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe" - File "..\..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo_InfoTip.dll" - File "..\..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo.dll" + File "..\..\..\MediaInfoLib\Project\MSVC2022\Win32\Release\MediaInfo_InfoTip.dll" + File "..\..\..\MediaInfoLib\Project\MSVC2022\Win32\Release\MediaInfo.dll" File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win32\WebView2Loader.dll" File "$%BPATH%\Windows\libcurl\Win32\Release\LIBCURL.DLL" File "$%BPATH%\Windows\libcurl\curl-ca-bundle.crt" diff --git a/Source/Install/MediaInfo_GUI_Windows_x64.nsi b/Source/Install/MediaInfo_GUI_Windows_x64.nsi index 9b9be06b0..e3520eeda 100644 --- a/Source/Install/MediaInfo_GUI_Windows_x64.nsi +++ b/Source/Install/MediaInfo_GUI_Windows_x64.nsi @@ -136,8 +136,8 @@ Section "SectionPrincipale" SEC01 CreateShortCut "$SMPROGRAMS\MediaInfo.lnk" "$INSTDIR\MediaInfo.exe" "" "" "" "" "" "Convenient unified display of the most relevant technical and tag data for video and audio files" SetOutPath "$INSTDIR" File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win64\Release\MediaInfo_GUI.exe" - File "..\..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo_InfoTip.dll" - File "..\..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo.dll" + File "..\..\..\MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo_InfoTip.dll" + File "..\..\..\MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo.dll" File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win64\WebView2Loader.dll" File "$%BPATH%\Windows\libcurl\x64\Release\LIBCURL.DLL" File "$%BPATH%\Windows\libcurl\curl-ca-bundle.crt"