diff options
| author | Kevin Wasserman <kevin.wasserman@painless-security.com> | 2012-06-29 15:15:08 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-08-27 19:27:23 -0400 |
| commit | 7f73cad3f08eadaa38299d004ac721cea74a0658 (patch) | |
| tree | b989bdb56215618d632ca4481607ff184951d0ad /src/windows/installer/wix/files.wxi | |
| parent | e2b8ec99dd4a898d29eab8f5ed19f03b238fef0f (diff) | |
| download | krb5-7f73cad3f08eadaa38299d004ac721cea74a0658.tar.gz krb5-7f73cad3f08eadaa38299d004ac721cea74a0658.tar.xz krb5-7f73cad3f08eadaa38299d004ac721cea74a0658.zip | |
KfW make 64-bit MSI include 32-bit dlls
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
ticket: 7293 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
Diffstat (limited to 'src/windows/installer/wix/files.wxi')
| -rw-r--r-- | src/windows/installer/wix/files.wxi | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi index 63339baaf9..abcb3ec7c7 100644 --- a/src/windows/installer/wix/files.wxi +++ b/src/windows/installer/wix/files.wxi @@ -292,8 +292,34 @@ <Component Win64="$(var.Win64)" Id="cmf_xpprof32_dll" Guid="$(var.cmf_xpprof32_dll_guid)" DiskId="1"> <File Id="fil_xpprof32_dll" Name="$(var.cmf_xpprof32_dll_name)" KeyPath="yes" /> </Component> - - <!-- Debug symbols --> + <?if $(var.Platform) = "x64"?> + <Component Win64="$(var.Win64)" Id="cmf_krb5_64_dll" Guid="$(var.cmf_krb5_64_dll_guid)" DiskId="1"> + <File Id="fil_krb5_64_dll" Name="$(var.cmf_krb5_64_dll_name)" KeyPath="yes" /> + </Component> + <Component Win64="$(var.Win64)" Id="cmf_k5sprt64_dll" Guid="$(var.cmf_k5sprt64_dll_guid)" DiskId="1"> + <File Id="fil_k5sprt64_dll" Name="$(var.cmf_k5sprt64_dll_name)" /> + </Component> + <Component Win64="$(var.Win64)" Id="cmf_krbcc64_dll" Guid="$(var.cmf_krbcc64_dll_guid)" DiskId="1"> + <File Id="fil_krbcc64_dll" Name="$(var.cmf_krbcc64_dll_name)" KeyPath="yes" /> + </Component> + <Component Win64="$(var.Win64)" Id="cmf_gssapi64_dll" Guid="$(var.cmf_gssapi64_dll_guid)" DiskId="1"> + <File Id="fil_gssapi64_dll" Name="$(var.cmf_gssapi64_dll_name)" KeyPath="yes" /> + </Component> + <Component Win64="$(var.Win64)" Id="cmf_comerr64_dll" Guid="$(var.cmf_comerr64_dll_guid)" DiskId="1"> + <File Id="fil_comerr64_dll" Name="$(var.cmf_comerr64_dll_name)" KeyPath="yes" /> + </Component> + <Component Win64="$(var.Win64)" Id="cmf_leashw64_dll" Guid="$(var.cmf_leashw64_dll_guid)" DiskId="1"> + <File Id="fil_leashw64_dll" Name="$(var.cmf_leashw64_dll_name)" KeyPath="yes" /> + </Component> + <Component Win64="$(var.Win64)" Id="cmf_wshelp64_dll" Guid="$(var.cmf_wshelp64_dll_guid)" DiskId="1"> + <File Id="fil_wshelp64_dll" Name="$(var.cmf_wshelp64_dll_name)" KeyPath="yes" /> + </Component> + <Component Win64="$(var.Win64)" Id="cmf_xpprof64_dll" Guid="$(var.cmf_xpprof64_dll_guid)" DiskId="1"> + <File Id="fil_xpprof64_dll" Name="$(var.cmf_xpprof64_dll_name)" KeyPath="yes" /> + </Component> + <?endif?> + + <!-- Debug symbols --> <?ifdef DebugSyms?> <Component Win64="$(var.Win64)" Id="cmf_bin_debug" Guid="$(var.cmf_bin_debug_guid)" DiskId="1"> <?if $(var.Platform) = "Intel" ?> |