Skip to content
Permalink
Browse files

Merge PR #3481: installer: copy rnnoise.dll

  • Loading branch information...
davidebeatrici committed Jul 21, 2018
2 parents adcf9fe + 09204fe commit 7c08da0b3fcfe6a6a78f42fe58dc7f34ce2f944c
Showing with 13 additions and 0 deletions.
  1. +6 −0 installer/Files.wxs
  2. +3 −0 installer/Product.wxs
  3. +4 −0 installer/Settings.wxi
@@ -66,6 +66,12 @@
</Component>
<?endif ?>

<?ifdef RNN ?>
<Component Id="rnnoise.dll">
<File Source="$(var.SourceDir)\release\rnnoise.dll" KeyPath="yes" />
</Component>
<?endif ?>

<?ifdef RedistDirVC14 ?>
<Component Id="msvcp140.dll">
<File Source="$(var.RedistDirVC14)\msvcp140.dll" KeyPath="yes" />
@@ -131,6 +131,9 @@
<?ifdef G15 ?>
<ComponentRef Id="mumble_g15_helper.exe" />
<?endif ?>
<?ifdef RNN ?>
<ComponentRef Id="rnnoise.dll" />
<?endif ?>

<?ifdef RedistDirVC14 ?>
<ComponentRef Id="msvcp140.dll" />
@@ -129,6 +129,10 @@
<?ifndef env.MumbleNoG15 ?>
<?define G15 = true ?>
<?endif ?>

<?ifndef env.MumbleNoRNNoise ?>
<?define RNN = true ?>
<?endif ?>

<?ifdef env.MumbleVersionSubDir ?>
<?define VersionSubDir = "$(env.MumbleVersionSubDir)" ?>

0 comments on commit 7c08da0

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