diff options
| author | Edward <edm7707@gmail.com> | 2018-07-20 03:25:48 +0300 |
|---|---|---|
| committer | Davide Beatrici <davidebeatrici@gmail.com> | 2018-07-20 05:36:23 +0300 |
| commit | 09204fe66e749ac85b604e78341ba7a87d92f198 (patch) | |
| tree | f01de721978ff896ce4dd5a263b920c4c6178781 /installer | |
| parent | adcf9fea49939372ce98f52a601d0dd08a23fa34 (diff) | |
installer: copy rnnoise.dll
The file copy can be disabled with the MumbleNoRNNoise environment variable.
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/Files.wxs | 6 | ||||
| -rw-r--r-- | installer/Product.wxs | 3 | ||||
| -rw-r--r-- | installer/Settings.wxi | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/installer/Files.wxs b/installer/Files.wxs index 89c18b47c..bacd3eaec 100644 --- a/installer/Files.wxs +++ b/installer/Files.wxs @@ -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" /> diff --git a/installer/Product.wxs b/installer/Product.wxs index 41fc542bf..4e72de706 100644 --- a/installer/Product.wxs +++ b/installer/Product.wxs @@ -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" /> diff --git a/installer/Settings.wxi b/installer/Settings.wxi index 711bfa1de..2f7e526c0 100644 --- a/installer/Settings.wxi +++ b/installer/Settings.wxi @@ -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)" ?> |