diff options
| author | Ben Kaduk <kaduk@mit.edu> | 2013-06-26 15:11:37 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2013-06-28 13:10:33 -0400 |
| commit | 03b2650337de03e2cd54896c2e86b0f76e1491fe (patch) | |
| tree | e6789cb82a3e85072fca266e3700c7dbd723cf92 /src/windows/installer/wix/files.wxi | |
| parent | ed515a396ee78361ca514be464978da38305f0fb (diff) | |
| download | krb5-03b2650337de03e2cd54896c2e86b0f76e1491fe.tar.gz krb5-03b2650337de03e2cd54896c2e86b0f76e1491fe.tar.xz krb5-03b2650337de03e2cd54896c2e86b0f76e1491fe.zip | |
WiX support for building with VS 2012
The merge modules need to reference VC110 paths.
Use a variable for VC100 versus VC110 so that we don't copy a lot
of boilerplate around.
ticket: 7666 (new)
queue: kfw
tags: pullup
target_version: 1.11.4
Diffstat (limited to 'src/windows/installer/wix/files.wxi')
| -rw-r--r-- | src/windows/installer/wix/files.wxi | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi index cf07d176cb..02cb830150 100644 --- a/src/windows/installer/wix/files.wxi +++ b/src/windows/installer/wix/files.wxi @@ -591,29 +591,29 @@ <?endif?> <?if $(var.Platform) = "x64" ?> <?ifndef Debug?> - <Merge Id="MSVCRT100MEM64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_CRT_x64.msm"/> - <Merge Id="MSVCRT100MFC64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFC_x64.msm"/> - <Merge Id="MSVCRT100MFL64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x64.msm"/> - <Merge Id="MSVCRT100MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_CRT_x86.msm"/> - <Merge Id="MSVCRT100MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFC_x86.msm"/> - <Merge Id="MSVCRT100MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x86.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MEM64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_CRT_x64.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MFC64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFC_x64.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MFL64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x64.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_CRT_x86.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFC_x86.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/> <?else?> - <Merge Id="MSVCRT100MEM64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugCRT_x64.msm"/> - <Merge Id="MSVCRT100MFC64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugMFC_x64.msm"/> - <Merge Id="MSVCRT100MFL64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x64.msm"/> - <Merge Id="MSVCRT100MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm"/> - <Merge Id="MSVCRT100MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugMFC_x86.msm"/> - <Merge Id="MSVCRT100MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x86.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MEM64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugCRT_x64.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MFC64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugMFC_x64.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MFL64" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x64.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugCRT_x86.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugMFC_x86.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/> <?endif?> <?else?> <?ifndef Debug?> - <Merge Id="MSVCRT100MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_CRT_x86.msm"/> - <Merge Id="MSVCRT100MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFC_x86.msm"/> - <Merge Id="MSVCRT100MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x86.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_CRT_x86.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFC_x86.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/> <?else?> - <Merge Id="MSVCRT100MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm"/> - <Merge Id="MSVCRT100MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_DebugMFC_x86.msm"/> - <Merge Id="MSVCRT100MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC100_MFCLOC_x86.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MEM86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugCRT_x86.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MFC86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_DebugMFC_x86.msm"/> + <Merge Id="MSVCRT$(var.VCVer)MFL86" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC$(var.VCVer)_MFCLOC_x86.msm"/> <?endif?> <?endif?> <?endif?> |