From 7ba6745b0888ae357a9ab4a0c54ed285bb09e75e Mon Sep 17 00:00:00 2001 From: basisunus Date: Mon, 11 Nov 2024 11:32:12 -0700 Subject: [PATCH] updated inno script for vc redist --- Install/Ubuntu/fluorender/usr/local/bin/.placeholder | 0 Install/Win/common_include.iss | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 Install/Ubuntu/fluorender/usr/local/bin/.placeholder diff --git a/Install/Ubuntu/fluorender/usr/local/bin/.placeholder b/Install/Ubuntu/fluorender/usr/local/bin/.placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/Install/Win/common_include.iss b/Install/Win/common_include.iss index 3b428a197..2539d8ba9 100644 --- a/Install/Win/common_include.iss +++ b/Install/Win/common_include.iss @@ -71,7 +71,7 @@ Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl" Source: ".\bin\VC_redist.x64.exe"; DestDir: {app}; Flags: deleteafterinstall [Run] -Filename: {app}\VC_redist.x64.exe; Check: VCRedistNeedsInstall; Parameters: "/passive"; StatusMsg: Installing VC++ 2017 Redistributable...; Flags: +Filename: {app}\VC_redist.x64.exe; Check: VCRedistNeedsInstall; Parameters: "/passive"; StatusMsg: Installing VC++ 2022 Redistributable...; Flags: Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent [Icons] @@ -83,7 +83,7 @@ Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Fil [Code] const - vcredist2017_productcode_x64 = '{2CD849A7-86A1-34A6-B8F9-D72F5B21A9AE}'; + vcredist2022_productcode_x64 = '{77169412-f642-45e7-b533-0c6f48de12f9}'; msvc_hkey_location = 'SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\'; fr64_hkey_location = 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\'; function VCRedistNeedsInstall: Boolean; begin @@ -92,8 +92,8 @@ begin // this statement, the following won't install your VC redist only when // the Visual C++ 2010 Redist (x86) and Visual C++ 2010 SP1 Redist(x86) // are installed for the current user - Result := not msiproduct(vcredist2017_productcode_x64) and - not RegKeyExists(HKEY_LOCAL_MACHINE, msvc_hkey_location + vcredist2017_productcode_x64); + Result := not msiproduct(vcredist2022_productcode_x64) and + not RegKeyExists(HKEY_LOCAL_MACHINE, msvc_hkey_location + vcredist2022_productcode_x64); end; function BeginSetup(MyAppName: string; MyAppID: string; MyAppVersion: string): boolean; var