jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-04 20:43:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

More 32bit and cleanup

Browse source
This commit is contained in:
tooomm 2026-07-04 16:41:39 +02:00
parent 2ce9168afb
commit 73626c98a6
2 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cmake/NSIS.template.in
View file

@ -170,11 +170,11 @@ SetShellVarContext all
SetRegView 64
ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
StrCmp $R0 "" done64
DetailPrint "Removing previous version (64-bit)..."
StrCmp $R0 "" done
DetailPrint "Removing previous version..."
ExecWait '$R0'
done64:
done:
FunctionEnd
@ -226,7 +226,7 @@ ${If} $PortableMode = 0
SetRegView 64
ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString"
StrCmp $R0 "" done64
StrCmp $R0 "" done
${If} $ReinstallMode = 0
MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst64
@ -235,11 +235,11 @@ ${If} $PortableMode = 0
Goto uninst64
${EndIf}
uninst64:
uninst:
ClearErrors
ExecWait "$R0"
done64:
done:
${Else}
Abort
@ -302,21 +302,13 @@ ${If} $PortableMode = 0
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMajor" "@CPACK_PACKAGE_VERSION_MAJOR@"
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMinor" "@CPACK_PACKAGE_VERSION_MINOR@"
IfFileExists "$INSTDIR\vc_redist.x86.exe" VcRedist86Exists PastVcRedist86Check
VcRedist86Exists:
ExecWait '"$INSTDIR\vc_redist.x86.exe" /passive /norestart'
DetailPrint "Wait to ensure unlock of vc_redist file after installation..."
Sleep 3000
Delete "$INSTDIR\vc_redist.x86.exe"
PastVcRedist86Check:
IfFileExists "$INSTDIR\vc_redist.x64.exe" VcRedist64Exists PastVcRedist64Check
VcRedist64Exists:
IfFileExists "$INSTDIR\vc_redist.x64.exe" VcRedistExists PastVcRedistCheck
VcRedistExists:
ExecWait '"$INSTDIR\vc_redist.x64.exe" /passive /norestart'
DetailPrint "Sleep to ensure unlock of vc_redist file after installation..."
Sleep 3000
Delete "$INSTDIR\vc_redist.x64.exe"
PastVcRedist64Check:
PastVcRedistCheck:
${Else}
; Create the file the application uses to detect portable mode