continuation of msbuild enabled automated installers for Win32/X64

diff --git a/w32/Setup/Product.wxs b/w32/Setup/Product.wxs
index aa49748a6788df12e07680c21500b95b4621a678..2c783a84607658e3d39f6cc288923f2f7ad48df0 100644 (file)
--- a/w32/Setup/Product.wxs
+++ b/w32/Setup/Product.wxs
@@ -12,23 +12,35 @@
 \r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
        <Product Id="b004a325-1272-47e5-a415-a74e9fc99865" Name="$(var.ProductName)" Language="1033" Version="1.0.0.0" Manufacturer="FreeSWITCH" UpgradeCode="3af7020b-1348-45e8-a0cf-80909d4eb421">\r
-               <Package InstallerVersion="200" Compressed="yes" />\r
+               <Package InstallerVersion="300" Compressed="yes" />\r
 \r
                <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />\r
 \r
                <Directory Id="TARGETDIR" Name="SourceDir">\r
                        <Directory Id="$(var.PlatformProgramFilesFolder)">\r
                                <Directory Id="INSTALLLOCATION" Name="FreeSWITCH">\r
-          <Directory Id="MODLOCATION" Name="mod">\r
-          </Directory>\r
-          <Directory Id="CONFLOCATION" Name="conf">\r
-          </Directory>\r
-          <Directory Id="SOUNDLOCATION" Name="sounds">\r
-          </Directory>\r
+                                        <Directory Id="MODLOCATION" Name="mod">\r
+                                        </Directory>\r
+                                        <Directory Id="CONFLOCATION" Name="conf">\r
+                                        </Directory>\r
+                                        <Directory Id="SOUNDLOCATION" Name="sounds">\r
+                                        </Directory>\r
                                        <!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->\r
                                        <!-- <Component Id="ProductComponent" Guid="6f1498a7-d029-430b-b9d9-fe12e17bdbab"> -->\r
                                                <!-- TODO: Insert files, registry keys, and other resources here. -->\r
                                        <!-- </Component> -->\r
+                                       <?if $(var.Platform) != x86 ?>\r
+                                               <Merge Id="CrtFiles_x86"\r
+                                               SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm"\r
+                                               DiskId="1"\r
+                                               Language="1033"/>\r
+                                       <?endif ?>\r
+                                       <?if $(var.Platform) = x64 ?>\r
+                                               <Merge Id="CrtFiles_x64"\r
+                                               SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x64.msm"\r
+                                               DiskId="1"\r
+                                               Language="1033"/>\r
+                                       <?endif ?>\r
                                </Directory>\r
                        </Directory>\r
                </Directory>\r
@@ -39,7 +51,13 @@
                        \r
                        <!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. -->\r
                        <ComponentGroupRef Id="Product.Generated" />\r
-               </Feature>\r
+                       <?if $(var.Platform) != x86 ?>\r
+                         <MergeRef Id="CrtFiles_x86"/>\r
+                       <?endif ?>\r
+                       <?if $(var.Platform) = x64 ?>\r
+                         <MergeRef Id="CrtFiles_x64"/>\r
+                       <?endif ?>\r
+    </Feature>\r
     <Feature Id="ProductFeatureConf" Title="FreeSWITCH Configuration Sample" Level="1">\r
       <ComponentGroupRef Id="FreeSWITCHConfFiles" />\r
     </Feature>\r