From 87f41f4ae266b63b8ce0bbfe1b117fe7e49afd56 Mon Sep 17 00:00:00 2001
From: Benjamin Jemlich <pcgod@users.sourceforge.net>
Date: Fri, 24 Dec 2010 11:14:23 +0100
Subject: [PATCH] Add CELT 0.10.0 DLLs to the installer

---
 installer/Files.wxs   | 9 +++++++++
 installer/Product.wxs | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/installer/Files.wxs b/installer/Files.wxs
index 359472e95..2e3e8262e 100644
--- a/installer/Files.wxs
+++ b/installer/Files.wxs
@@ -36,6 +36,9 @@
       <Component Id="celt0.0.9.0.dll">
         <File Source="$(var.SourceDir)\release\celt0.0.9.0.dll" KeyPath="yes" />
       </Component>
+      <Component Id="celt0.0.10.0.dll">
+        <File Source="$(var.SourceDir)\release\celt0.0.10.0.dll" KeyPath="yes" />
+      </Component>
       <Component Id="speex.dll">
         <File Source="$(var.SourceDir)\release\speex.dll" KeyPath="yes" />
       </Component>
@@ -105,6 +108,9 @@
       <Component Id="celt0.0.9.0.sse.dll">
         <File Source="$(var.SourceDir)\release\celt0.0.9.0.sse.dll" KeyPath="yes" />
       </Component>
+      <Component Id="celt0.0.10.0.sse.dll">
+        <File Source="$(var.SourceDir)\release\celt0.0.10.0.sse.dll" KeyPath="yes" />
+      </Component>
       <?endif ?>
 
       <?ifdef SSE2 ?>
@@ -114,6 +120,9 @@
       <Component Id="celt0.0.9.0.sse2.dll">
         <File Source="$(var.SourceDir)\release\celt0.0.9.0.sse2.dll" KeyPath="yes" />
       </Component>
+      <Component Id="celt0.0.10.0.sse2.dll">
+        <File Source="$(var.SourceDir)\release\celt0.0.10.0.sse2.dll" KeyPath="yes" />
+      </Component>
       <?endif ?>
 
       <?ifdef ProtoBufDir ?>
diff --git a/installer/Product.wxs b/installer/Product.wxs
index 3e0ac9e74..10ca4d4d9 100644
--- a/installer/Product.wxs
+++ b/installer/Product.wxs
@@ -3,7 +3,7 @@
   <?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">
-    <Package Id="*" InstallerVersion="300" Compressed="yes" Languages="0,1033,4,1029,1030,1031,1034,1036,1040,1041,1043,1044,1045,1049,31748" />
+    <Package Id="*" InstallerVersion="300" Compressed="yes" Languages="0,1033,4,1029,1030,1031,1034,1036,1040,1041,1043,1044,1045,1049,1053,31748" />
 
     <Property Id='NSISINSTALL'>
       <RegistrySearch Id='NSISSearch' Win64='no' Root='HKLM' Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Mumble' Type='directory' Name='InstallLocation' />
@@ -141,13 +141,16 @@
         <ComponentGroupRef Id="Plugins"/>
         <ComponentRef Id="celt0.0.7.0.dll" />
         <ComponentRef Id="celt0.0.9.0.dll" />
+        <ComponentRef Id="celt0.0.10.0.dll" />
         <?ifdef SSE ?>
         <ComponentRef Id="celt0.0.7.0.sse.dll" />
         <ComponentRef Id="celt0.0.9.0.sse.dll" />
+        <ComponentRef Id="celt0.0.10.0.sse.dll" />
         <?endif ?>
         <?ifdef SSE2 ?>
         <ComponentRef Id="celt0.0.7.0.sse2.dll" />
         <ComponentRef Id="celt0.0.9.0.sse2.dll" />
+        <ComponentRef Id="celt0.0.10.0.sse2.dll" />
         <?endif ?>
         <ComponentRef Id="mumble.exe" />
         <ComponentRef Id="mumble_ol.dll" />