diff --git a/nsis/SharedDefs.nsh b/nsis/SharedDefs.nsh index 57560ce4a4..43646f4121 100644 --- a/nsis/SharedDefs.nsh +++ b/nsis/SharedDefs.nsh @@ -22,8 +22,6 @@ Name "${APP_NAME}" !define APP_FILENAME "pcsx2" !define APP_EXE "$INSTDIR\${APP_FILENAME}.exe" -!define PCSX2_README "PCSX2_Readme.pdf" -!define PCSX2_FAQ "PCSX2_FAQ.pdf" ;=============================== ; MUI STUFF !include "MUI2.nsh" diff --git a/nsis/pcsx2_full_install.nsi b/nsis/pcsx2_full_install.nsi index b7ad6ed065..f7521130e1 100644 --- a/nsis/pcsx2_full_install.nsi +++ b/nsis/pcsx2_full_install.nsi @@ -27,7 +27,8 @@ InstallDir "$PROGRAMFILES\PCSX2 ${APP_VERSION}" !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES -; RequestExecutionLevel is admin for the full install, so we need to avoid transferring the elevated rights to the child process. +; RequestExecutionLevel is admin for the full install, so we need to avoid transferring the elevated rights to PCSX2 +; if the user chooses to run from the installer upon completion. !define MUI_FINISHPAGE_RUN "$WINDIR\explorer.exe" !define MUI_FINISHPAGE_RUN_PARAMETERS "$INSTDIR\pcsx2.exe" !define MUI_PAGE_CUSTOMFUNCTION_SHOW ModifyRunCheckbox diff --git a/nsis/pcsx2_shared_init.nsi b/nsis/pcsx2_shared_init.nsi index 3862dc6e53..1ef1929417 100644 --- a/nsis/pcsx2_shared_init.nsi +++ b/nsis/pcsx2_shared_init.nsi @@ -92,7 +92,7 @@ ${NSD_KillTimer} NSD_Timer.Callback # If the user is running at least Windows 8.1 # or has no admin rights, don't waste time trying -# to install the DX and VS2015 runtimes. +# to install the DX and VS runtimes. # (head straight to the first installer section) ${If} ${AtLeastWin8.1} ${OrIf} $IsAdmin == 0 @@ -100,7 +100,7 @@ Call PreInstall_UsrWait SendMessage $HWNDPARENT ${WM_COMMAND} 1 0 ${EndIf} -# Check if the VC 2015 runtimes are installed +# Check if the VC runtimes are installed ${If} ${RunningX64} ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed" ${Else} @@ -113,15 +113,15 @@ ${If} $R0 == "1" Goto ExecDxSetup ${EndIf} -# Download and install the VC 2015 redistributable from the internet -${NSD_CreateLabel} 0 45 100% 10u "Downloading Visual C++ 2015 package" +# Download and install the VC redistributable from the internet +${NSD_CreateLabel} 0 45 100% 10u "Downloading Visual C++ package" Pop $hwnd -inetc::get "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe" "$TEMP\vcredist_2015_Update_1_x86.exe" /SILENT /CONNECTTIMEOUT 30 /RECEIVETIMEOUT 30 /END - ${NSD_CreateLabel} 0 45 100% 10u "Installing Visual C++ 2015 package" +inetc::get "https://aka.ms/vs/16/release/VC_redist.x86.exe" "$TEMP\vcredist_Update_x86.exe" /SILENT /CONNECTTIMEOUT 30 /RECEIVETIMEOUT 30 /END + ${NSD_CreateLabel} 0 45 100% 10u "Installing Visual C++ package" Pop $hwnd - ExecWait '"$TEMP\vcredist_2015_Update_1_x86.exe /S"' + ExecWait '"$TEMP\vcredist_Update_x86.exe /S"' SendMessage $hwnd ${PBM_SETPOS} 40 0 - Delete "$TEMP\vcredist_2015_Update_1_x86.exe" + Delete "$TEMP\vcredist_Update_x86.exe" # Download and install DirectX