diff --git a/UI/installer/mp-installer.nsi b/UI/installer/mp-installer.nsi index 7b87dc722..ba6edc729 100644 --- a/UI/installer/mp-installer.nsi +++ b/UI/installer/mp-installer.nsi @@ -25,8 +25,8 @@ ManifestDPIAware true !define APPNAME "OBS Studio" !ifndef APPVERSION -!define APPVERSION "25.0.8" -!define SHORTVERSION "25.0.8" +!define APPVERSION "28.0.0" +!define SHORTVERSION "28.0.0" !endif !define APPNAMEANDVERSION "${APPNAME} ${SHORTVERSION}" @@ -217,11 +217,11 @@ Var dllFilesInUse Function checkDLLs OBSInstallerUtils::ResetInUseFileChecks !ifdef INSTALL64 - OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\bin\64bit\avutil-56.dll" - OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\bin\64bit\swscale-5.dll" + OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\bin\64bit\avutil-57.dll" + OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\bin\64bit\swscale-6.dll" !else - OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\bin\32bit\avutil-56.dll" - OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\bin\32bit\swscale-5.dll" + OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\bin\32bit\avutil-57.dll" + OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\bin\32bit\swscale-6.dll" !endif OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\data\obs-plugins\win-capture\graphics-hook32.dll" OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\data\obs-plugins\win-capture\graphics-hook64.dll" @@ -266,8 +266,6 @@ Section "OBS Studio" SecCore ; Set Section Files and Shortcuts SetOutPath "$INSTDIR" - OBSInstallerUtils::KillProcess "obs-plugins\32bit\cef-bootstrap.exe" - OBSInstallerUtils::KillProcess "obs-plugins\64bit\cef-bootstrap.exe" File /r "new\core\data" @@ -320,10 +318,8 @@ Section "OBS Studio" SecCore SetOutPath "$INSTDIR" File /r "new\obs-browser\data" SetOutPath "$INSTDIR\obs-plugins" - OBSInstallerUtils::KillProcess "32bit\cef-bootstrap.exe" OBSInstallerUtils::KillProcess "32bit\obs-browser-page.exe" ${if} ${RunningX64} - OBSInstallerUtils::KillProcess "64bit\cef-bootstrap.exe" OBSInstallerUtils::KillProcess "64bit\obs-browser-page.exe" ${endif} !ifdef INSTALL64