From 7e18e35f385a76daa8b73ca072cc6641eef3afc6 Mon Sep 17 00:00:00 2001
From: Benjamin Jemlich <pcgod@users.sourceforge.net>
Date: Wed, 11 Aug 2010 01:37:29 +0200
Subject: [PATCH] Use the correct way to add the WIX UI extension

---
 installer/MumbleInstall.wixproj | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/installer/MumbleInstall.wixproj b/installer/MumbleInstall.wixproj
index fbe5d42ab..7f37642ab 100644
--- a/installer/MumbleInstall.wixproj
+++ b/installer/MumbleInstall.wixproj
@@ -15,14 +15,15 @@
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
-    <LinkerAdditionalOptions>-ext WixUIExtension</LinkerAdditionalOptions>
+    <LinkerAdditionalOptions>
+    </LinkerAdditionalOptions>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>
     </DefineConstants>
-    <LinkerAdditionalOptions>-ext WixUIExtension -cc obj -reusecab</LinkerAdditionalOptions>
+    <LinkerAdditionalOptions>-cc obj -reusecab</LinkerAdditionalOptions>
     <VerboseOutput>True</VerboseOutput>
     <SuppressValidation>True</SuppressValidation>
   </PropertyGroup>
@@ -53,6 +54,12 @@
   <ItemGroup>
     <Folder Include="Translations" />
   </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WIX)\bin\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.