From ef03421aeaac6a2e8add161aa3f7fe3ebcb89f0f Mon Sep 17 00:00:00 2001 From: maron2000 <68574602+maron2000@users.noreply.github.com> Date: Mon, 26 Jun 2023 16:04:08 +0900 Subject: [PATCH] Fix 64-bit detection in installer --- contrib/windows/installer/DOSBox-X-installer.iss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contrib/windows/installer/DOSBox-X-installer.iss b/contrib/windows/installer/DOSBox-X-installer.iss index d2c3f78f873..2f5c6eb602b 100644 --- a/contrib/windows/installer/DOSBox-X-installer.iss +++ b/contrib/windows/installer/DOSBox-X-installer.iss @@ -43,6 +43,7 @@ PrivilegesRequired=lowest UninstallDisplayName={#MyAppName} {#MyAppVersion} {#MyAppBit} UninstallDisplayIcon={app}\{#MyAppExeName} WizardSmallImageFile=..\..\icons\dosbox-x.bmp +;MinVersion below 6.1 is not recommended, however set to 6.0 to support Vista MinVersion=6.0 [Messages] @@ -380,6 +381,7 @@ begin if not IsWin64 then begin PageBuild.CheckListBox.ItemEnabled[0] := False; + PageBuild.CheckListBox.ItemEnabled[2] := False; PageBuild.Values[1] := True; end else @@ -398,6 +400,12 @@ begin PageBuild.CheckListBox.ItemEnabled[2] := False; PageBuild.CheckListBox.ItemEnabled[3] := False; PageBuild.Values[4] := True; + if not IsARM64 then + begin + PageBuild.CheckListBox.ItemEnabled[4] := False; + PageBuild.Values[4] := False; + PageBuild.Values[5] := True; + end end; PageBuild.CheckListBox.AddGroup('Check the following box to select the SDL2 build as the default DOSBox-X build.', '', 0, nil); PageBuild.CheckListBox.AddCheckBox('Default to SDL2 build (instead of SDL1 build) ', '', 0, False, True, False, True, nil);