ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

fix: nisi needs !include "x64.nsh" now. also, there were some broken varible

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2024-10-03 22:38:30 -07:00
parent bcb1d456d4
commit 63172540fb
No known key found for this signature in database
GPG Key ID: E10E321EB160949B
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
program_info/CMakeLists.txt
View File

@ -53,11 +53,11 @@ Section "Visual Studio Runtime"
StrCpy $vc_redist_exe "vc_redist.x64.exe"
${EndIf}
DetailPrint 'Downloading Microsoft Visual C++ Redistributable...'
NScurl::http GET "https://aka.ms/vs/17/release/${vc_redist_exe}" "$INSTDIR\vc_redist\${vc_redist_exe}" /INSIST /CANCEL /Zone.Identifier /END
NScurl::http GET "https://aka.ms/vs/17/release/$vc_redist_exe" "$INSTDIR\vc_redist\$vc_redist_exe" /INSIST /CANCEL /Zone.Identifier /END
Pop $0
${If} $0 == "OK"
DetailPrint "Download successful"
ExecWait "$INSTDIR\vc_redist\${vc_redist_exe} /install /passive /norestart\"
ExecWait "$INSTDIR\vc_redist\$vc_redist_exe /install /passive /norestart\"
${Else}
DetailPrint "Download failed with error $0"
${EndIf}

8
program_info/win_install.nsi.in
View File

@ -2,6 +2,8 @@
!include "LogicLib.nsh"
!include "MUI2.nsh"
!include "x64.nsh"
Unicode true
Name "@Launcher_DisplayName@"
@ -185,7 +187,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@
!macroend
!macro APP_UNASSOCIATE EXT APP_ID
!macro APP_UNASSOCIATE EXT APP_ID APP_EXE
# Unregister file type
ClearErrors
@ -489,8 +491,8 @@ Section -un.ShellAssoc
!insertmacro APP_TEARDOWN_DEFAULT `${APPID}` `${APPNAME}` `${APPEXE}`
!insertmacro APP_UNASSOCIATE ".zip" `${APPID}`
!insertmacro APP_UNASSOCIATE ".mrpack" `${APPID}`
!insertmacro APP_UNASSOCIATE ".zip" `${APPID}` `${APPEXE}`
!insertmacro APP_UNASSOCIATE ".mrpack" `${APPID}` `${APPEXE}`
!insertmacro NotifyShell_AssocChanged
SectionEnd