提交 207716f6 编写于 作者: R Richard Stanway

UI/installer: Add additional VS2019 DLL check

Also updates references from 2017 to 2019 for consistency.
上级 96da863f
...@@ -104,34 +104,35 @@ Function PreReqCheck ...@@ -104,34 +104,35 @@ Function PreReqCheck
${EndIf} ${EndIf}
!ifdef INSTALL64 !ifdef INSTALL64
; 64 bit Visual Studio 2017 runtime check ; 64 bit Visual Studio 2019 runtime check
ClearErrors ClearErrors
SetOutPath "$PLUGINSDIR" SetOutPath "$PLUGINSDIR"
File check_for_64bit_visual_studio_2017_runtimes.exe File check_for_64bit_visual_studio_2019_runtimes.exe
ExecWait "$PLUGINSDIR\check_for_64bit_visual_studio_2017_runtimes.exe" $R0 ExecWait "$PLUGINSDIR\check_for_64bit_visual_studio_2019_runtimes.exe" $R0
Delete "$PLUGINSDIR\check_for_64bit_visual_studio_2017_runtimes.exe" Delete "$PLUGINSDIR\check_for_64bit_visual_studio_2019_runtimes.exe"
IntCmp $R0 126 vs2017Missing_64 vs2017OK_64 IntCmp $R0 126 vs2019Missing_64 vs2019OK_64
vs2017Missing_64: vs2019Missing_64:
MessageBox MB_YESNO|MB_ICONEXCLAMATION "Your system is missing runtime components that ${APPNAME} requires. Would you like to download them?" IDYES vs2017true_64 IDNO vs2017false_64 MessageBox MB_YESNO|MB_ICONEXCLAMATION "Your system is missing runtime components that ${APPNAME} requires. Would you like to download them?" IDYES vs2019true_64 IDNO vs2019false_64
vs2017true_64: vs2019true_64:
ExecShell "open" "https://obsproject.com/visual-studio-2017-runtimes-64-bit" ExecShell "open" "https://obsproject.com/visual-studio-2019-runtimes-64-bit"
vs2017false_64: vs2019false_64:
Quit Quit
vs2017OK_64: vs2019OK_64:
ClearErrors ClearErrors
!else !else
; 32 bit Visual Studio 2017 runtime check ; 32 bit Visual Studio 2019 runtime check
ClearErrors ClearErrors
GetDLLVersion "vcruntime140.DLL" $R0 $R1 GetDLLVersion "vcruntime140.DLL" $R0 $R1
GetDLLVersion "vcruntime140_1.DLL" $R0 $R1
GetDLLVersion "msvcp140.DLL" $R0 $R1 GetDLLVersion "msvcp140.DLL" $R0 $R1
IfErrors vs2017Missing_32 vs2017OK_32 IfErrors vs2019Missing_32 vs2019OK_32
vs2017Missing_32: vs2019Missing_32:
MessageBox MB_YESNO|MB_ICONEXCLAMATION "Your system is missing runtime components that ${APPNAME} requires. Would you like to download them?" IDYES vs2017true_32 IDNO vs2017false_32 MessageBox MB_YESNO|MB_ICONEXCLAMATION "Your system is missing runtime components that ${APPNAME} requires. Would you like to download them?" IDYES vs2019true_32 IDNO vs2019false_32
vs2017true_32: vs2019true_32:
ExecShell "open" "https://obsproject.com/visual-studio-2017-runtimes-32-bit" ExecShell "open" "https://obsproject.com/visual-studio-2019-runtimes-32-bit"
vs2017false_32: vs2019false_32:
Quit Quit
vs2017OK_32: vs2019OK_32:
ClearErrors ClearErrors
!endif !endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册