diff options
| author | Kevin Wasserman <kevin.wasserman@painless-security.com> | 2012-07-26 14:50:40 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-08-29 14:50:19 -0400 |
| commit | cd6fce8e66300ab0e62e5a0d3a3f3cf13cbe750f (patch) | |
| tree | 8de5c7582eb6af9bac3858e4b8c0953f2d0dabcc /src/windows/installer/wix/runtime.wxi | |
| parent | 4382b4a0d536cbefa672cd470b3cc57953028960 (diff) | |
| download | krb5-cd6fce8e66300ab0e62e5a0d3a3f3cf13cbe750f.tar.gz krb5-cd6fce8e66300ab0e62e5a0d3a3f3cf13cbe750f.tar.xz krb5-cd6fce8e66300ab0e62e5a0d3a3f3cf13cbe750f.zip | |
Add both x86 and x64 msm's to x64 installer
Since we have x86 dlls, we need the x86 msm's.
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
ticket: 7320 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
Diffstat (limited to 'src/windows/installer/wix/runtime.wxi')
| -rw-r--r-- | src/windows/installer/wix/runtime.wxi | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/windows/installer/wix/runtime.wxi b/src/windows/installer/wix/runtime.wxi index a5f2163b05..23a47a244e 100644 --- a/src/windows/installer/wix/runtime.wxi +++ b/src/windows/installer/wix/runtime.wxi @@ -1,8 +1,17 @@ <?xml version="1.0"?> <Include> <?ifdef CL1600 ?> - <MergeRef Id="MSVCRT100MEM"/> - <MergeRef Id="MSVCRT100MFC"/> - <MergeRef Id="MSVCRT100MFL"/> + <?if $(var.Platform) = "x64" ?> + <MergeRef Id="MSVCRT100MEM64"/> + <MergeRef Id="MSVCRT100MFC64"/> + <MergeRef Id="MSVCRT100MFL64"/> + <MergeRef Id="MSVCRT100MEM86"/> + <MergeRef Id="MSVCRT100MFC86"/> + <MergeRef Id="MSVCRT100MFL86"/> + <?else?> + <MergeRef Id="MSVCRT100MEM86"/> + <MergeRef Id="MSVCRT100MFC86"/> + <MergeRef Id="MSVCRT100MFL86"/> + <?endif?> <?endif?> </Include>
\ No newline at end of file |