Fix issue #7 bug with arch selection logic in VC++ 14 runtime

This commit is contained in:
Homes32
2022-08-31 11:09:51 -05:00
parent 1b4cb18972
commit f242bd973d

View File

@@ -32,11 +32,11 @@
Title=Visual C++ 14 Runtime Title=Visual C++ 14 Runtime
Author=Homes32 Author=Homes32
Description=Allows you to run programs created with Microsoft Visual C++ 2017/2018/2019/2022 Description=Allows you to run programs created with Microsoft Visual C++ 2017/2018/2019/2022
Version=1.3.1.0 Version=1.3.2.0
Level=4 Level=4
Selected=False Selected=False
Mandatory=False Mandatory=False
Date=2022-08-12 Date=2022-08-29
[Variables] [Variables]
@@ -48,17 +48,17 @@ If,%SourceArch%,Equal,x64,Begin
Decompress,%ProjectTemp%\x86\VC14.7z,%TargetWindows%\SysWOW64 Decompress,%ProjectTemp%\x86\VC14.7z,%TargetWindows%\SysWOW64
Decompress,%ProjectTemp%\x64\VC14.7z,%TargetSystem32% Decompress,%ProjectTemp%\x64\VC14.7z,%TargetSystem32%
End End
If,%SourceArch%,Equal,arm64,Begin Else,If,%SourceArch%,Equal,arm64,Begin
ExtractFile,%ScriptFile%,x86,VC14.7z,%ProjectTemp%\x86 ExtractFile,%ScriptFile%,x86,VC14.7z,%ProjectTemp%\x86
ExtractFile,%ScriptFile%,arm64,VC14.7z,%ProjectTemp%\x64 ExtractFile,%ScriptFile%,arm64,VC14.7z,%ProjectTemp%\x64
Decompress,%ProjectTemp%\x86\VC14.7z,%TargetWindows%\SysWOW64 Decompress,%ProjectTemp%\x86\VC14.7z,%TargetWindows%\SysWOW64
Decompress,%ProjectTemp%\arm64\VC14.7z,%TargetSystem32% Decompress,%ProjectTemp%\arm64\VC14.7z,%TargetSystem32%
End End
Else,If,%SourceArch%,Equal,x86,Begin Else,Begin
// fallback to x86
ExtractFile,%ScriptFile%,x86,VC14.7z,%ProjectTemp%\x86 ExtractFile,%ScriptFile%,x86,VC14.7z,%ProjectTemp%\x86
Decompress,%ProjectTemp%\x86\VC14.7z,%TargetSystem32% Decompress,%ProjectTemp%\x86\VC14.7z,%TargetSystem32%
End End
Else,Halt,"INTERNAL LOGIC ERROR: Only x86 and x64 sources are supported."
[#Interface#] [#Interface#]
// =============================================================================================================================== // ===============================================================================================================================