installer: make WiX produce a working x64 installer.

5 files changed, 208 insertions, 171 deletions

diff --git a/installer/Files.wxs b/installer/Files.wxs
index 4de99c761..a8b185b5f 100644
--- a/installer/Files.wxs
+++ b/installer/Files.wxs
@@ -5,7 +5,7 @@
   <!-- Mumble -->
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
-      <Component Id="mumble.exe" Guid="A08F7909-1116-4AC8-9422-051FA1A1BE19">
+      <Component Id="mumble.exe" Guid="$(var.MumbleExeGuid)">
         <File Id="mumble.exe" Source="$(var.SourceDir)\release\mumble.exe" KeyPath="yes">
           <Shortcut Id="MumbleShortcut" Directory="ApplicationProgramsFolder" Name="Mumble" WorkingDirectory="INSTALLDIR">
             <ShortcutProperty Key="System.AppUserModel.ID" Value="net.sourceforge.mumble.Mumble" />
@@ -62,10 +62,10 @@
         </Component>
       <?endif ?>
 
-      <Component Id="licence.txt" Guid="87C7967B-5E4B-41DD-83F5-A9E9E8AD3B39">
+      <Component Id="licence.txt" Guid="$(var.LicenseTextGuid)">
         <File Source="$(var.SourceDir)\installer\gpl.txt" Name="licence.txt" KeyPath="yes" />
       </Component>
-      <Component Id="Readme.txt" Guid="15878902-B819-4E77-8C1D-0A915D79660B">
+      <Component Id="Readme.txt" Guid="$(var.ReadMeTextGuid)">
         <File Source="$(var.SourceDir)\README" Name="Readme.txt" KeyPath="yes" />
       </Component>
       <Component Id="Changes.txt">
diff --git a/installer/Plugins.wxs b/installer/Plugins.wxs
index c8819f22a..86d8672eb 100644
--- a/installer/Plugins.wxs
+++ b/installer/Plugins.wxs
@@ -5,177 +5,183 @@
   <!-- Plugins -->
   <Fragment>
     <DirectoryRef Id="PluginFolder">
-      <Component Id="aoc.dll">
-        <File Source="$(var.SourceDir)\release\plugins\aoc.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="arma2.dll">
-        <File Source="$(var.SourceDir)\release\plugins\arma2.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="bf1942.dll">
-        <File Source="$(var.SourceDir)\release\plugins\bf1942.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="bf2.dll">
-        <File Source="$(var.SourceDir)\release\plugins\bf2.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="bf2142.dll">
-        <File Source="$(var.SourceDir)\release\plugins\bf2142.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="bf3.dll">
-        <File Source="$(var.SourceDir)\release\plugins\bf3.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="bfbc2.dll">
-        <File Source="$(var.SourceDir)\release\plugins\bfbc2.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="bfheroes.dll">
-        <File Source="$(var.SourceDir)\release\plugins\bfheroes.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="blacklight.dll">
-        <File Source="$(var.SourceDir)\release\plugins\blacklight.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="borderlands.dll">
-        <File Source="$(var.SourceDir)\release\plugins\borderlands.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="borderlands2.dll">
-        <File Source="$(var.SourceDir)\release\plugins\borderlands2.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="breach.dll">
-        <File Source="$(var.SourceDir)\release\plugins\breach.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="cod2.dll">
-        <File Source="$(var.SourceDir)\release\plugins\cod2.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="cod4.dll">
-        <File Source="$(var.SourceDir)\release\plugins\cod4.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="cod5.dll">
-        <File Source="$(var.SourceDir)\release\plugins\cod5.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="codmw2.dll">
-        <File Source="$(var.SourceDir)\release\plugins\codmw2.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="codmw2so.dll">
-        <File Source="$(var.SourceDir)\release\plugins\codmw2so.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="cs.dll">
-        <File Source="$(var.SourceDir)\release\plugins\cs.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="css.dll">
-        <File Source="$(var.SourceDir)\release\plugins\css.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="dods.dll">
-        <File Source="$(var.SourceDir)\release\plugins\dods.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="dys.dll">
-        <File Source="$(var.SourceDir)\release\plugins\dys.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="etqw.dll">
-        <File Source="$(var.SourceDir)\release\plugins\etqw.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="gmod.dll">
-        <File Source="$(var.SourceDir)\release\plugins\gmod.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="gtaiv.dll">
-        <File Source="$(var.SourceDir)\release\plugins\gtaiv.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="gw.dll">
-        <File Source="$(var.SourceDir)\release\plugins\gw.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="hl2dm.dll">
-        <File Source="$(var.SourceDir)\release\plugins\hl2dm.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="insurgency.dll">
-        <File Source="$(var.SourceDir)\release\plugins\insurgency.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="jc2.dll">
-        <File Source="$(var.SourceDir)\release\plugins\jc2.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="l4d.dll">
-        <File Source="$(var.SourceDir)\release\plugins\l4d.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="l4d2.dll">
-        <File Source="$(var.SourceDir)\release\plugins\l4d2.dll" KeyPath="yes" />
-      </Component>
       <Component Id="link.dll">
         <File Source="$(var.SourceDir)\release\plugins\link.dll" KeyPath="yes" />
       </Component>
-      <Component Id="lol.dll">
-        <File Source="$(var.SourceDir)\release\plugins\lol.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="lotro.dll">
-        <File Source="$(var.SourceDir)\release\plugins\lotro.dll" KeyPath="yes" />
-      </Component>
       <Component Id="manual.dll">
         <File Source="$(var.SourceDir)\release\plugins\manual.dll" KeyPath="yes" />
       </Component>
-      <Component Id="sr.dll">
-        <File Source="$(var.SourceDir)\release\plugins\sr.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="sto.dll">
-        <File Source="$(var.SourceDir)\release\plugins\sto.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="tf2.dll">
-        <File Source="$(var.SourceDir)\release\plugins\tf2.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="ut99.dll">
-        <File Source="$(var.SourceDir)\release\plugins\ut99.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="ut2004.dll">
-        <File Source="$(var.SourceDir)\release\plugins\ut2004.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="ut3.dll">
-        <File Source="$(var.SourceDir)\release\plugins\ut3.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="wolfet.dll">
-        <File Source="$(var.SourceDir)\release\plugins\wolfet.dll" KeyPath="yes" />
-      </Component>
-      <Component Id="wow.dll">
-        <File Source="$(var.SourceDir)\release\plugins\wow.dll" KeyPath="yes" />
-      </Component>
+
+      <?if $(sys.BUILDARCH) = x86 ?>
+        <Component Id="aoc.dll">
+          <File Source="$(var.SourceDir)\release\plugins\aoc.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="arma2.dll">
+          <File Source="$(var.SourceDir)\release\plugins\arma2.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="bf1942.dll">
+          <File Source="$(var.SourceDir)\release\plugins\bf1942.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="bf2.dll">
+          <File Source="$(var.SourceDir)\release\plugins\bf2.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="bf2142.dll">
+          <File Source="$(var.SourceDir)\release\plugins\bf2142.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="bf3.dll">
+          <File Source="$(var.SourceDir)\release\plugins\bf3.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="bfbc2.dll">
+          <File Source="$(var.SourceDir)\release\plugins\bfbc2.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="bfheroes.dll">
+          <File Source="$(var.SourceDir)\release\plugins\bfheroes.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="blacklight.dll">
+          <File Source="$(var.SourceDir)\release\plugins\blacklight.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="borderlands.dll">
+          <File Source="$(var.SourceDir)\release\plugins\borderlands.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="borderlands2.dll">
+          <File Source="$(var.SourceDir)\release\plugins\borderlands2.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="breach.dll">
+          <File Source="$(var.SourceDir)\release\plugins\breach.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="cod2.dll">
+          <File Source="$(var.SourceDir)\release\plugins\cod2.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="cod4.dll">
+          <File Source="$(var.SourceDir)\release\plugins\cod4.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="cod5.dll">
+          <File Source="$(var.SourceDir)\release\plugins\cod5.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="codmw2.dll">
+          <File Source="$(var.SourceDir)\release\plugins\codmw2.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="codmw2so.dll">
+          <File Source="$(var.SourceDir)\release\plugins\codmw2so.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="cs.dll">
+          <File Source="$(var.SourceDir)\release\plugins\cs.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="css.dll">
+          <File Source="$(var.SourceDir)\release\plugins\css.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="dods.dll">
+          <File Source="$(var.SourceDir)\release\plugins\dods.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="dys.dll">
+          <File Source="$(var.SourceDir)\release\plugins\dys.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="etqw.dll">
+          <File Source="$(var.SourceDir)\release\plugins\etqw.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="gmod.dll">
+          <File Source="$(var.SourceDir)\release\plugins\gmod.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="gtaiv.dll">
+          <File Source="$(var.SourceDir)\release\plugins\gtaiv.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="gw.dll">
+          <File Source="$(var.SourceDir)\release\plugins\gw.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="hl2dm.dll">
+          <File Source="$(var.SourceDir)\release\plugins\hl2dm.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="insurgency.dll">
+          <File Source="$(var.SourceDir)\release\plugins\insurgency.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="jc2.dll">
+          <File Source="$(var.SourceDir)\release\plugins\jc2.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="l4d.dll">
+          <File Source="$(var.SourceDir)\release\plugins\l4d.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="l4d2.dll">
+          <File Source="$(var.SourceDir)\release\plugins\l4d2.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="lol.dll">
+          <File Source="$(var.SourceDir)\release\plugins\lol.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="lotro.dll">
+          <File Source="$(var.SourceDir)\release\plugins\lotro.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="sr.dll">
+          <File Source="$(var.SourceDir)\release\plugins\sr.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="sto.dll">
+          <File Source="$(var.SourceDir)\release\plugins\sto.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="tf2.dll">
+          <File Source="$(var.SourceDir)\release\plugins\tf2.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="ut99.dll">
+          <File Source="$(var.SourceDir)\release\plugins\ut99.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="ut2004.dll">
+          <File Source="$(var.SourceDir)\release\plugins\ut2004.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="ut3.dll">
+          <File Source="$(var.SourceDir)\release\plugins\ut3.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="wolfet.dll">
+          <File Source="$(var.SourceDir)\release\plugins\wolfet.dll" KeyPath="yes" />
+        </Component>
+        <Component Id="wow.dll">
+          <File Source="$(var.SourceDir)\release\plugins\wow.dll" KeyPath="yes" />
+        </Component>
+      <?endif ?>
     </DirectoryRef>
 
     <ComponentGroup Id="Plugins">
-      <ComponentRef Id="aoc.dll" />
-      <ComponentRef Id="arma2.dll" />
-      <ComponentRef Id="bf1942.dll" />
-      <ComponentRef Id="bf2.dll" />
-      <ComponentRef Id="bf2142.dll" />
-      <ComponentRef Id="bf3.dll" />
-      <ComponentRef Id="bfbc2.dll" />
-      <ComponentRef Id="bfheroes.dll" />
-      <ComponentRef Id="borderlands.dll" />
-      <ComponentRef Id="borderlands2.dll" />
-      <ComponentRef Id="blacklight.dll" />
-      <ComponentRef Id="breach.dll" />
-      <ComponentRef Id="cod2.dll" />
-      <ComponentRef Id="cod4.dll" />
-      <ComponentRef Id="cod5.dll" />
-      <ComponentRef Id="codmw2.dll" />
-      <ComponentRef Id="codmw2so.dll" />
-      <ComponentRef Id="cs.dll" />
-      <ComponentRef Id="css.dll" />
-      <ComponentRef Id="dods.dll" />
-      <ComponentRef Id="dys.dll" />
-      <ComponentRef Id="etqw.dll" />
-      <ComponentRef Id="gmod.dll" />
-      <ComponentRef Id="gtaiv.dll" />
-      <ComponentRef Id="gw.dll" />
-      <ComponentRef Id="hl2dm.dll" />
-      <ComponentRef Id="insurgency.dll" />
-      <ComponentRef Id="jc2.dll" />
-      <ComponentRef Id="l4d.dll" />
-      <ComponentRef Id="l4d2.dll" />
       <ComponentRef Id="link.dll" />
-      <ComponentRef Id="lol.dll" />
-      <ComponentRef Id="lotro.dll" />
       <ComponentRef Id="manual.dll" />
-      <ComponentRef Id="sr.dll" />
-      <ComponentRef Id="sto.dll" />
-      <ComponentRef Id="tf2.dll" />
-      <ComponentRef Id="ut99.dll" />
-      <ComponentRef Id="ut2004.dll" />
-      <ComponentRef Id="ut3.dll" />
-      <ComponentRef Id="wolfet.dll" />
-      <ComponentRef Id="wow.dll" />
+
+      <?if $(sys.BUILDARCH) = x86 ?>
+        <ComponentRef Id="aoc.dll" />
+        <ComponentRef Id="arma2.dll" />
+        <ComponentRef Id="bf1942.dll" />
+        <ComponentRef Id="bf2.dll" />
+        <ComponentRef Id="bf2142.dll" />
+        <ComponentRef Id="bf3.dll" />
+        <ComponentRef Id="bfbc2.dll" />
+        <ComponentRef Id="bfheroes.dll" />
+        <ComponentRef Id="borderlands.dll" />
+        <ComponentRef Id="borderlands2.dll" />
+        <ComponentRef Id="blacklight.dll" />
+        <ComponentRef Id="breach.dll" />
+        <ComponentRef Id="cod2.dll" />
+        <ComponentRef Id="cod4.dll" />
+        <ComponentRef Id="cod5.dll" />
+        <ComponentRef Id="codmw2.dll" />
+        <ComponentRef Id="codmw2so.dll" />
+        <ComponentRef Id="cs.dll" />
+        <ComponentRef Id="css.dll" />
+        <ComponentRef Id="dods.dll" />
+        <ComponentRef Id="dys.dll" />
+        <ComponentRef Id="etqw.dll" />
+        <ComponentRef Id="gmod.dll" />
+        <ComponentRef Id="gtaiv.dll" />
+        <ComponentRef Id="gw.dll" />
+        <ComponentRef Id="hl2dm.dll" />
+        <ComponentRef Id="insurgency.dll" />
+        <ComponentRef Id="jc2.dll" />
+        <ComponentRef Id="l4d.dll" />
+        <ComponentRef Id="l4d2.dll" />
+        <ComponentRef Id="lol.dll" />
+        <ComponentRef Id="lotro.dll" />
+        <ComponentRef Id="sr.dll" />
+        <ComponentRef Id="sto.dll" />
+        <ComponentRef Id="tf2.dll" />
+        <ComponentRef Id="ut99.dll" />
+        <ComponentRef Id="ut2004.dll" />
+        <ComponentRef Id="ut3.dll" />
+        <ComponentRef Id="wolfet.dll" />
+        <ComponentRef Id="wow.dll" />
+      <?endif ?>
     </ComponentGroup>
   </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/installer/Product.wxs b/installer/Product.wxs
index 5ddda25b4..d1d373615 100644
--- a/installer/Product.wxs
+++ b/installer/Product.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <?include "Settings.wxi" ?>
 
-  <Product Id="*" Name="$(var.ProductName) $(var.ProductVersion)" Language="!(loc.LANG)" Version="$(var.ProductVersion)" Manufacturer="$(var.ProductManufacturer)" UpgradeCode="B0EEFCC7-8A9c-4471-AB10-CBD35BE3161D">
+  <Product Id="*" Name="$(var.ProductName) $(var.ProductVersion)" Language="!(loc.LANG)" Version="$(var.ProductVersion)" Manufacturer="$(var.ProductManufacturer)" UpgradeCode="$(var.ProductUpgradeCode)">
     <Package Id="*" InstallerVersion="300" Compressed="yes" Languages="0,1028,1029,1030,1031,1033,1034,1036,1040,1041,1043,1044,1045,1046,1049,1053,1055,2052" />
 
     <Property Id='NSISINSTALL'>
@@ -22,7 +22,7 @@
     </UI>
 
     <Property Id='INSTALLDIR'>
-      <ComponentSearch Id='SearchMumbleComponent' Guid='A08F7909-1116-4AC8-9422-051FA1A1BE19' />
+      <ComponentSearch Id='SearchMumbleComponent' Guid='$(var.MumbleExeGuid)' />
     </Property>
 
     <Condition Message='$(var.ProductName) requires at least Windows XP SP2 or Windows Server 2003 SP1'>
@@ -47,7 +47,7 @@
     <WixVariable Id="WixUIDialogBmp" Value="$(var.SourceDir)\installer\dlgbmp.bmp" />
 
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
+      <Directory Id="$(var.ArchSpecificProgramFilesFolderId)">
         <Directory Id="INSTALLDIR" Name="$(var.ProductName)">
         </Directory>
 
@@ -73,14 +73,14 @@
     <Icon Id="murmur.ico" SourceFile="$(var.SourceDir)\icons\murmur.ico"/>
 
     <DirectoryRef Id="ApplicationProgramsFolder">
-      <Component Id="ApplicationProgramsFolderRemovalComponent" Guid="0AE1745D-FF86-4D61-BAF3-44248D21D263">
+      <Component Id="ApplicationProgramsFolderRemovalComponent" Guid="$(var.ApplicationProgramsFolderRemovalComponentGuid)">
         <RegistryValue Key="Software\Mumble\Uninstall" Root="HKCU" Value="1" Type="integer" KeyPath="yes" />
         <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall" />
       </Component>
     </DirectoryRef>
 
     <DirectoryRef Id="AppDataPluginFolder">
-      <Component Id="NSISUninstall" Guid="3116B7EF-CBA3-4E0B-A2C5-0F0608038905">
+      <Component Id="NSISUninstall" Guid="$(var.NSISUninstallComponentGuid)">
         <Condition>NOT Installed AND NSISINSTALL</Condition>
         <RegistryValue Key="Software\Mumble\Uninstall" Root="HKCU" Value="1" Type="integer" KeyPath="yes" />
         <RemoveFile Id="NSISUninstaller" Property="NSISINSTALL" Name="Uninstall.exe" On="install"/>
diff --git a/installer/Settings.wxi b/installer/Settings.wxi
index c9e7cd8c3..471b6fd0c 100644
--- a/installer/Settings.wxi
+++ b/installer/Settings.wxi
@@ -4,6 +4,23 @@
   <?define ProductManufacturer = "Thorvald Natvig" ?>
   <?define ProductVersion = "1.3.0" ?>
 
+  <?if $(sys.BUILDARCH) = "x86" ?>
+    <?define ProductUpgradeCode = B0EEFCC7-8A9c-4471-AB10-CBD35BE3161D ?>
+    <?define ArchSpecificProgramFilesFolderId = "ProgramFilesFolder" ?>
+  <?elseif $(sys.BUILDARCH) = "x64" ?>
+    <?define ProductUpgradeCode = E028BDFC-3FE2-4BEE-A33B-EB9C80611555 ?>
+    <?define ArchSpecificProgramFilesFolderId = "ProgramFiles64Folder" ?>
+  <?else?>
+    <?error Unsupported build architecture: $(sys.BUILDARCH) ?>
+  <?endif?>
+
+  <?define MumbleExeGuid = A08F7909-1116-4AC8-9422-051FA1A1BE19 ?>
+  <?define LicenseTextGuid = 87C7967B-5E4B-41DD-83F5-A9E9E8AD3B39 ?>
+  <?define ReadMeTextGuid = 15878902-B819-4E77-8C1D-0A915D79660B ?>
+  <?define ApplicationProgramsFolderRemovalComponentGuid = 0AE1745D-FF86-4D61-BAF3-44248D21D263 ?>
+  <?define NSISUninstallComponentGuid = 3116B7EF-CBA3-4E0B-A2C5-0F0608038905 ?>
+
+
   <!-- Enable the StaticBuild option if we detect MUMBLE_PREFIX in the environment -->
   <?ifdef env.MUMBLE_PREFIX ?>
     <?define StaticBuild = true ?>
@@ -23,7 +40,11 @@
   <?endif ?>
   
   <?ifndef env.MumbleDebugToolsDir ?>
-    <?define DebugToolsDir = "C:\Program Files (x86)\Debugging Tools for Windows (x86)" ?>
+    <?if $(sys.BUILDARCH) = "x86" ?>
+      <?define DebugToolsDir = "C:\Program Files (x86)\Debugging Tools for Windows (x86)" ?>
+    <?elseif $(sys.BUILDARCH) = "x64" ?>
+      <?define DebugToolsDir = "C:\Program Files\Debugging Tools for Windows (x64)" ?>
+    <?endif ?>
   <?else ?>
     <?define DebugToolsDir = "$(env.MumbleDebugToolsDir)" ?>
   <?endif ?>
@@ -89,7 +110,11 @@
     <!-- But, if the MumbleNoEmbedVCRedist env var is set, don't embed them anyway. -->
     <?ifndef env.MumbleNoEmbedVCRedist ?>
        <?ifndef env.MumbleRedistDirVC12 ?>
-         <?define RedistDirVC12 = "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT" ?>
+         <?if $(sys.BUILDARCH) = "x86" ?>
+           <?define RedistDirVC12 = "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT" ?>
+         <?elseif $(sys.BUILDARCH) = "x64" ?>
+           <?define RedistDirVC12 = "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT" ?>
+         <?endif ?>
        <?else ?>
          <?define RedistDirVC12 = "$(env.MumbleRedistDirVC12)" ?>
        <?endif ?>
diff --git a/installer/build_installer.pl b/installer/build_installer.pl
index 52d813fee..08ad9f185 100644
--- a/installer/build_installer.pl
+++ b/installer/build_installer.pl
@@ -3,7 +3,13 @@
 use File::Copy;
 
 my @LANG;
+$x64dir = "bin\\x64\\Release";
 $dir = "bin\\Release\\";
+$platform = "Intel";
+if (-d $x64dir) {
+	$dir = $x64dir;
+	$platform = "x64";
+}
 
 opendir($D, "Translations");
 while ($x = readdir($D)) {
@@ -31,4 +37,4 @@ foreach (@LANG) {
 	unlink("$_");
 }
 
-system("msiinfo $dir\\Mumble.msi /p Intel;1033," . join(",", @LANG));
+system("msiinfo $dir\\Mumble.msi /p $platform;1033," . join(",", @LANG));