Skip to content
Permalink
Browse files

installer: rearrange codec components in the installer.

  • Loading branch information...
mkrautz committed May 28, 2015
1 parent 9ee9e8a commit 239b89c7fcb498b053ba1270454f137eb3a67d60
Showing with 23 additions and 22 deletions.
  1. +23 −22 installer/Files.wxs
@@ -44,6 +44,7 @@
<Component Id="mumble_ol_helper_x64.exe">
<File Source="$(var.SourceDir)\release\mumble_ol_helper_x64.exe" KeyPath="yes" />
</Component>

<Component Id="celt0.0.7.0.dll">
<File Source="$(var.SourceDir)\release\celt0.0.7.0.dll" KeyPath="yes" />
</Component>
@@ -56,7 +57,28 @@
<Component Id="opus.dll">
<File Source="$(var.SourceDir)\release\opus.dll" KeyPath="yes" />
</Component>


<?ifdef SSE ?>
<Component Id="celt0.0.7.0.sse.dll">
<File Source="$(var.SourceDir)\release\celt0.0.7.0.sse.dll" KeyPath="yes" />
</Component>
<Component Id="celt0.0.11.0.sse.dll">
<File Source="$(var.SourceDir)\release\celt0.0.11.0.sse.dll" KeyPath="yes" />
</Component>
<?endif ?>

<?ifdef SSE2 ?>
<Component Id="celt0.0.7.0.sse2.dll">
<File Source="$(var.SourceDir)\release\celt0.0.7.0.sse2.dll" KeyPath="yes" />
</Component>
<Component Id="celt0.0.11.0.sse2.dll">
<File Source="$(var.SourceDir)\release\celt0.0.11.0.sse2.dll" KeyPath="yes" />
</Component>
<Component Id="opus.sse2.dll">
<File Source="$(var.SourceDir)\release\opus.sse2.dll" KeyPath="yes" />
</Component>
<?endif ?>

<?ifdef G15 ?>
<Component Id="mumble_g15_helper.exe">
<File Source="$(var.SourceDir)\release\mumble-g15-helper.exe" KeyPath="yes" />
@@ -117,27 +139,6 @@
</Component>
<?endif ?>

<?ifdef SSE ?>
<Component Id="celt0.0.7.0.sse.dll">
<File Source="$(var.SourceDir)\release\celt0.0.7.0.sse.dll" KeyPath="yes" />
</Component>
<Component Id="celt0.0.11.0.sse.dll">
<File Source="$(var.SourceDir)\release\celt0.0.11.0.sse.dll" KeyPath="yes" />
</Component>
<?endif ?>

<?ifdef SSE2 ?>
<Component Id="celt0.0.7.0.sse2.dll">
<File Source="$(var.SourceDir)\release\celt0.0.7.0.sse2.dll" KeyPath="yes" />
</Component>
<Component Id="celt0.0.11.0.sse2.dll">
<File Source="$(var.SourceDir)\release\celt0.0.11.0.sse2.dll" KeyPath="yes" />
</Component>
<Component Id="opus.sse2.dll">
<File Source="$(var.SourceDir)\release\opus.sse2.dll" KeyPath="yes" />
</Component>
<?endif ?>

<?ifdef RedistDirVC12 ?>
<Component Id="msvcp120.dll">
<File Source="$(var.RedistDirVC12)\msvcp120.dll" KeyPath="yes" />

0 comments on commit 239b89c

Please sign in to comment.
You can’t perform that action at this time.