DEVEL15-windows-wix-vs8-20060505

Enable wix installers to build with VS8 compiler on X86

(cherry picked from commit 86ff4c4d6bd264210990b57cbdbbf6b40d742716)

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index ab19ec16c8e3ee7c39cec527568b09dc8db64cb3..80dc8b62af254588d7ea65b7cd61623289bf8163 100644 (file)
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -1392,11 +1392,15 @@
 
        <!-- Shared assembly runtime for VS 2005 -->
        <?if $(env.AFSVER_CL) = "1400"?>
-               <?ifdef env.CommonProgramFiles6432?>
-                 <?define CPF="$(env.CommonProgramFiles)"?>
-               <?else?>
-                 <?define CPF="$(env.CommonProgramFiles(x86))"?>
-               <?endif?>
+               <?if $(var.Platform) = "x64" ?>
+                   <?ifdef env.CommonProgramFiles6432?>
+                       <?define CPF="$(env.CommonProgramFiles)"?>
+                   <?else?>
+                       <?define CPF="$(env.CommonProgramFiles(x86))"?>
+                   <?endif?>
+                <?else?>
+                   <?define CPF="$(env.CommonProgramFiles)"?>
+                <?endif?>
                <?if $(var.Platform) = "x64" ?>
                        <?ifndef Debug?>
                                <Merge Id="MSVCRT8MEM" DiskId="1" Language="0" src="$(var.CPF)\Merge Modules\Microsoft_VC80_CRT_x86_x64.msm"/>