jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-02-01 05:57:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

windows-wix-vs8-20060505

Browse Source 
Enable wix installers to build with VS8 compiler on X86
This commit is contained in:
Jeffrey Altman 2006-05-05 16:50:21 +00:00
parent c17eb1925c
commit 86ff4c4d6b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/WINNT/install/wix/files.wxi
View File

@ -1392,11 +1392,15 @@
<!-- Shared assembly runtime for VS 2005 --> <!-- Shared assembly runtime for VS 2005 -->
<?if $(env.AFSVER_CL) = "1400"?> <?if $(env.AFSVER_CL) = "1400"?>
<?ifdef env.CommonProgramFiles6432?> <?if $(var.Platform) = "x64" ?>
<?define CPF="$(env.CommonProgramFiles)"?> <?ifdef env.CommonProgramFiles6432?>
<?else?> <?define CPF="$(env.CommonProgramFiles)"?>
<?define CPF="$(env.CommonProgramFiles(x86))"?> <?else?>
<?endif?> <?define CPF="$(env.CommonProgramFiles(x86))"?>
<?endif?>
<?else?>
<?define CPF="$(env.CommonProgramFiles)"?>
<?endif?>
<?if $(var.Platform) = "x64" ?> <?if $(var.Platform) = "x64" ?>
<?ifndef Debug?> <?ifndef Debug?>
<Merge Id="MSVCRT8MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_CRT_x86_x64.msm"/> <Merge Id="MSVCRT8MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_CRT_x86_x64.msm"/>