diff --git a/Release/Release_GUI_Windows_i386.bat b/Release/Release_GUI_Windows_i386.bat index 2c4f8b4a2..5f89a9a16 100644 --- a/Release/Release_GUI_Windows_i386.bat +++ b/Release/Release_GUI_Windows_i386.bat @@ -29,6 +29,7 @@ copy BCB\GUI\MediaInfo_GUI.exe BCB\GUI\MediaInfo.exe copy ..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe MediaInfo_GUI_Windows_i386\MediaInfo.exe copy ..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo.dll MediaInfo_GUI_Windows_i386\MediaInfo_i386.dll xcopy ..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_i386\ /S +copy "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win32\WebView2Loader.dll" MediaInfo_All_Windows_i386\WebView2Loader.dll @rem --- Copying : Plugins --- xcopy ..\Source\Resource\Plugin\* MediaInfo_GUI_Windows_i386\Plugin\ /S diff --git a/Release/Release_GUI_Windows_x64.bat b/Release/Release_GUI_Windows_x64.bat index eb18014fe..de085d8da 100644 --- a/Release/Release_GUI_Windows_x64.bat +++ b/Release/Release_GUI_Windows_x64.bat @@ -27,6 +27,7 @@ copy ..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe MediaInfo_GUI_Windows_x xcopy ..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\ /S copy ..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\MediaInfo_i386.dll xcopy ..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_x64\ /S +copy "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win32\WebView2Loader.dll" MediaInfo_GUI_Windows_x64\WebView2Loader.dll @rem --- Copying : Plugins --- xcopy ..\Source\Resource\Plugin\* MediaInfo_GUI_Windows_x64\Plugin\ /S diff --git a/Source/Install/MediaInfo_GUI_Windows.nsi b/Source/Install/MediaInfo_GUI_Windows.nsi index 20f922148..45cec4fcf 100644 --- a/Source/Install/MediaInfo_GUI_Windows.nsi +++ b/Source/Install/MediaInfo_GUI_Windows.nsi @@ -124,6 +124,7 @@ Section "SectionPrincipale" SEC01 SetOutPath "$INSTDIR" File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe" File "/oname=MediaInfo_i386.dll" "..\..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo.dll" + File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win32\WebView2Loader.dll" ${If} ${RunningX64} File "..\..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo_InfoTip.dll" File "..\..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo.dll" @@ -202,6 +203,7 @@ Section Uninstall Delete "$INSTDIR\MediaInfo_InfoTip.dll" Delete "$INSTDIR\MediaInfo.dll" Delete "$INSTDIR\MediaInfo_i386.dll" + Delete "$INSTDIR\WebView2Loader.dll" Delete "$INSTDIR\History.txt" Delete "$INSTDIR\License.html" Delete "$INSTDIR\License.NoModifications.html" @@ -225,6 +227,7 @@ Section Uninstall RMDir "$INSTDIR\Plugin\Sheet" RMDir "$INSTDIR\Plugin\Tree" RMDir "$INSTDIR\Plugin" + RMDir /r "$INSTDIR\WebView2" RMDir "$INSTDIR" SetRegView 64