Skip to content

Commit

Permalink
InnoSetup 6.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
clsid2 committed Jun 17, 2024
1 parent 6582461 commit be2cf38
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 21 deletions.
4 changes: 2 additions & 2 deletions common.bat
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ EXIT /B

:SubDetectInnoSetup
FOR /F "tokens=5*" %%A IN (
'REG QUERY "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Inno Setup 5_is1" /v "Inno Setup: App Path" 2^>NUL ^| FIND "REG_SZ" ^|^|
REG QUERY "HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Inno Setup 5_is1" /v "Inno Setup: App Path" 2^>NUL ^| FIND "REG_SZ"') DO SET "InnoSetupPath=%%B\ISCC.exe"
'REG QUERY "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Inno Setup 6_is1" /v "Inno Setup: App Path" 2^>NUL ^| FIND "REG_SZ" ^|^|
REG QUERY "HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Inno Setup 6_is1" /v "Inno Setup: App Path" 2^>NUL ^| FIND "REG_SZ"') DO SET "InnoSetupPath=%%B\ISCC.exe"
EXIT /B

:SubDetectSevenzipPath
Expand Down
23 changes: 4 additions & 19 deletions distrib/mpc-hc_setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
; Inno Setup Unicode: http://www.jrsoftware.org/isdl.php


#if VER < EncodeVer(5,5,9)
#error Update your Inno Setup version (5.5.9 or newer)
#if VER < EncodeVer(6,3,1)
#error Update your Inno Setup version (6.3.1 or newer)
#endif

#ifndef UNICODE
Expand Down Expand Up @@ -126,8 +126,8 @@
#ifdef x64Build
AppId = {{2ACBF1FA-F5C3-4B19-A774-B22A31F231B9}
DefaultGroupName = {#app_name} x64
ArchitecturesAllowed = x64 arm64
ArchitecturesInstallIn64BitMode = x64 arm64
ArchitecturesAllowed = x64compatible
ArchitecturesInstallIn64BitMode = x64compatible
#else
AppId = {{2624B969-7135-4EB1-B0F6-2D8C397B45F7}
DefaultGroupName = {#app_name}
Expand Down Expand Up @@ -176,9 +176,6 @@ Name: ca; MessagesFile: compiler:Languages\Catalan.isl
Name: cs; MessagesFile: compiler:Languages\Czech.isl
Name: da; MessagesFile: compiler:Languages\Danish.isl
Name: de; MessagesFile: compiler:Languages\German.isl
#if VER <= EncodeVer(5,5,9)
Name: el; MessagesFile: compiler:Languages\Greek.isl
#endif
Name: en_GB; MessagesFile: Languages\EnglishBritish.isl
Name: es; MessagesFile: compiler:Languages\Spanish.isl
Name: eu; MessagesFile: Languages\Basque.isl
Expand All @@ -188,11 +185,7 @@ Name: gl; MessagesFile: Languages\Galician.isl
Name: he; MessagesFile: compiler:Languages\Hebrew.isl
Name: hr; MessagesFile: Languages\Croatian.isl
Name: hu; MessagesFile: compiler:Languages\Hungarian.isl
#if VER < EncodeVer(6,0,0)
Name: hy; MessagesFile: compiler:Languages\Armenian.islu
#else
Name: hy; MessagesFile: compiler:Languages\Armenian.isl
#endif
Name: id; MessagesFile: Languages\Indonesian.isl
Name: it; MessagesFile: compiler:Languages\Italian.isl
Name: ja; MessagesFile: compiler:Languages\Japanese.isl
Expand All @@ -207,9 +200,6 @@ Name: ro; MessagesFile: Languages\Romanian.isl
Name: ru; MessagesFile: compiler:Languages\Russian.isl
Name: sk; MessagesFile: Languages\Slovak.isl
Name: sl; MessagesFile: compiler:Languages\Slovenian.isl
#if VER <= EncodeVer(5,5,9)
Name: sr; MessagesFile: compiler:Languages\SerbianCyrillic.isl
#endif
Name: sv; MessagesFile: Languages\Swedish.isl
Name: th_TH; MessagesFile: Languages\Thai.isl
Name: tt; MessagesFile: Languages\Tatar.isl
Expand Down Expand Up @@ -561,11 +551,6 @@ begin
SuppressibleMsgBox(CustomMessage('msg_simd_sse2'), mbCriticalError, MB_OK, MB_OK);
Result := False;
end;
#elif defined(sse_required)
if not Is_SSE_Supported() then begin
SuppressibleMsgBox(CustomMessage('msg_simd_sse'), mbCriticalError, MB_OK, MB_OK);
Result := False;
end;
#endif
end;

0 comments on commit be2cf38

Please sign in to comment.