From 390a355c57d152065940809914f0491c00a940e0 Mon Sep 17 00:00:00 2001
From: martin <martin>
Date: Tue, 21 Dec 2010 18:15:07 +0000
Subject: [PATCH] Added "phonon_backend" and "phonon_backend" dirs

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2265 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 ground/packaging/winx86/OpenPilot.wxs |  1 +
 ground/packaging/winx86/bin.wxi       | 55 +++++++++++++++------------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/ground/packaging/winx86/OpenPilot.wxs b/ground/packaging/winx86/OpenPilot.wxs
index 6d51638ca..992a3fcf6 100644
--- a/ground/packaging/winx86/OpenPilot.wxs
+++ b/ground/packaging/winx86/OpenPilot.wxs
@@ -134,6 +134,7 @@
             <ComponentRef Id="qmng4.dll" />
             <ComponentRef Id="qsvg4.dll" />
             <ComponentRef Id="qsvgicon4.dll" />
+            <ComponentRef Id="phonon_ds94.dll" />
             <ComponentRef Id="QtConcurrent.dll" />
             <ComponentRef Id="QtCore4.dll" />
             <ComponentRef Id="QtGui4.dll" />
diff --git a/ground/packaging/winx86/bin.wxi b/ground/packaging/winx86/bin.wxi
index 4914b6711..36cf054ef 100644
--- a/ground/packaging/winx86/bin.wxi
+++ b/ground/packaging/winx86/bin.wxi
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Include>
-
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Component Id="Aggregation.dll" DiskId="1" Guid="B460AF0D-717A-4167-868C-BDF0DF432CB8">
     <File Id="Aggregation.dll" Name="Aggregation.dll" Source="..\..\bin\Aggregation.dll" />
   </Component>
@@ -31,24 +29,6 @@
   <Component Id="QExtSerialPort.dll" DiskId="1" Guid="04FA7063-4FE6-48E9-AE09-E08AE1C6941F">
     <File Id="QExtSerialPort.dll" Name="QExtSerialPort.dll" Source="..\..\bin\QExtSerialPort.dll" />
   </Component>
-  <Component Id="qgif4.dll" DiskId="1" Guid="3AAB8604-A6DB-4705-B65E-5713843B886E">
-    <File Id="qgif4.dll" Name="qgif4.dll" Source="..\..\bin\qgif4.dll" />
-  </Component>
-  <Component Id="qico4.dll" DiskId="1" Guid="B6EF1C6B-1E58-4127-9511-4B26CC5AA3A8">
-    <File Id="qico4.dll" Name="qico4.dll" Source="..\..\bin\qico4.dll" />
-  </Component>
-  <Component Id="qjpeg4.dll" DiskId="1" Guid="0B4335EB-AF5D-40BC-B9DB-C49E711B1754">
-    <File Id="qjpeg4.dll" Name="qjpeg4.dll" Source="..\..\bin\qjpeg4.dll" />
-  </Component>
-  <Component Id="qmng4.dll" DiskId="1" Guid="5FFED681-3F4D-4D3D-8A93-32E60CCA656D">
-    <File Id="qmng4.dll" Name="qmng4.dll" Source="..\..\bin\qmng4.dll" />
-  </Component>
-  <Component Id="qsvg4.dll" DiskId="1" Guid="22C8BDAF-B1AC-435C-930E-BDCCAB5EE7F7">
-    <File Id="qsvg4.dll" Name="qsvg4.dll" Source="..\..\bin\qsvg4.dll" />
-  </Component>
-  <Component Id="qsvgicon4.dll" DiskId="1" Guid="AB7E00D8-ADD2-4AE0-B778-A828211273FF">
-    <File Id="qsvgicon4.dll" Name="qsvgicon4.dll" Source="..\..\bin\qsvgicon4.dll" />
-  </Component>
   <Component Id="QtConcurrent.dll" DiskId="1" Guid="DA887E82-83C6-4304-A5FB-1DC2B8227FC4">
     <File Id="QtConcurrent.dll" Name="QtConcurrent.dll" Source="..\..\bin\QtConcurrent.dll" />
   </Component>
@@ -58,9 +38,6 @@
   <Component Id="QtGui4.dll" DiskId="1" Guid="63DBAE46-9E3D-4D85-B55B-B93F7A74A124">
     <File Id="QtGui4.dll" Name="QtGui4.dll" Source="..\..\bin\QtGui4.dll" />
   </Component>
-  <Component Id="qtiff4.dll" DiskId="1" Guid="AE6AF17B-9006-486D-AB37-B30105A9C52F">
-    <File Id="qtiff4.dll" Name="qtiff4.dll" Source="..\..\bin\qtiff4.dll" />
-  </Component>
   <Component Id="QtNetwork4.dll" DiskId="1" Guid="7A137591-24FA-48C0-BDF9-FE40AEEB89FD">
     <File Id="QtNetwork4.dll" Name="QtNetwork4.dll" Source="..\..\bin\QtNetwork4.dll" />
   </Component>
@@ -102,5 +79,35 @@
       <File Id="qsqlite4.dll" Name="qsqlite4.dll" Source="..\..\bin\sqldrivers\qsqlite4.dll" />
     </Component>
   </Directory>
+  <Directory Id="imageformats" Name="imageformats">
+    <Component Id="qgif4.dll" DiskId="1" Guid="3AAB8604-A6DB-4705-B65E-5713843B886E">
+      <File Id="qgif4.dll" Name="qgif4.dll" Source="..\..\bin\qgif4.dll" />
+    </Component>
+    <Component Id="qico4.dll" DiskId="1" Guid="B6EF1C6B-1E58-4127-9511-4B26CC5AA3A8">
+      <File Id="qico4.dll" Name="qico4.dll" Source="..\..\bin\qico4.dll" />
+    </Component>
+    <Component Id="qjpeg4.dll" DiskId="1" Guid="0B4335EB-AF5D-40BC-B9DB-C49E711B1754">
+      <File Id="qjpeg4.dll" Name="qjpeg4.dll" Source="..\..\bin\qjpeg4.dll" />
+    </Component>
+    <Component Id="qmng4.dll" DiskId="1" Guid="5FFED681-3F4D-4D3D-8A93-32E60CCA656D">
+      <File Id="qmng4.dll" Name="qmng4.dll" Source="..\..\bin\qmng4.dll" />
+    </Component>
+    <Component Id="qsvg4.dll" DiskId="1" Guid="22C8BDAF-B1AC-435C-930E-BDCCAB5EE7F7">
+      <File Id="qsvg4.dll" Name="qsvg4.dll" Source="..\..\bin\qsvg4.dll" />
+    </Component>
+    <Component Id="qtiff4.dll" DiskId="1" Guid="AE6AF17B-9006-486D-AB37-B30105A9C52F">
+      <File Id="qtiff4.dll" Name="qtiff4.dll" Source="..\..\bin\qtiff4.dll" />
+    </Component>
+  </Directory>
+  <Directory Id="iconengines" Name="iconengines">
+    <Component Id="qsvgicon4.dll" DiskId="1" Guid="AB7E00D8-ADD2-4AE0-B778-A828211273FF">
+      <File Id="qsvgicon4.dll" Name="qsvgicon4.dll" Source="..\..\bin\qsvgicon4.dll" />
+    </Component>
+  </Directory>
+  <Directory Id="phonon_backend" Name="phonon_backend">
+    <Component Id="phonon_ds94.dll" DiskId="1" Guid="7EDA779F-AAA9-4817-9813-4184025E660C">
+      <File Id="phonon_ds94.dll" Name="phonon_ds94.dll" Source="..\..\bin\phonon_ds94.dll" />
+    </Component>
+  </Directory>
 
 </Include>
\ No newline at end of file