diff options
Diffstat (limited to 'scp2/source/ooo/vc_redist.scp')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 427f698bd467..b7e6e81dc331 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -30,15 +30,29 @@ #include "macros.inc" #if defined(WITH_VC_REDIST) -WindowsCustomAction gid_Customaction_InstallRuntime - Name = "InstallRuntime"; - Typ = "98"; - Source = "SystemFolder"; - Target = "[SourceDir]redist\vcredist_x86.exe /qb"; - Inbinarytable = 0; - Styles = (NO_FILE); - Assignment1 = ("InstallUISequence", "VersionNT >= 600 and VersionNT < 700 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction"); -End + +// WindowsCustomAction gid_Customaction_InstallRuntime +// Name = "InstallRuntime"; +// Typ = "98"; +// Source = "SystemFolder"; +// Target = "[SourceDir]redist\vcredist_x86.exe /qb"; +// Inbinarytable = 0; +// Styles = (NO_FILE); +// Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction"); +// // Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "FileCost"); +// End + +// WindowsCustomAction gid_Customaction_InstallRuntime_X64 +// Name = "InstallRuntimeX64"; +// Typ = "98"; +// Source = "SystemFolder"; +// Target = "[SourceDir]redist\vcredist_x64.exe /qb"; +// Inbinarytable = 0; +// Styles = (NO_FILE); +// Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction"); +// // Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "FileCost"); +// End + ScpAction scp_Copy_vcredist_x86 #if defined(BUILD_SPECIAL) @@ -49,4 +63,11 @@ ScpAction scp_Copy_vcredist_x86 Name = "vcredist_x86.exe"; Subdir = "redist"; End + +ScpAction scp_Copy_vcredist_x64 + Copy = "vcredist_x64.exe"; + Name = "vcredist_x64.exe"; + Subdir = "redist"; +End + #endif |