diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2014-12-31 01:32:24 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2014-12-31 01:32:24 +0300 |
| commit | a88b31620d11c5242970a2bc187d14d36d985da4 (patch) | |
| tree | 812246687f475001496d5c6901404366c130409b /installer | |
| parent | 9345abed4e6bbc630f28318f70c260b9bea94aef (diff) | |
installer: distribute D3DCompiler_47.dll for our Windows x64 builds.
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/Files.wxs | 17 | ||||
| -rw-r--r-- | installer/Product.wxs | 4 | ||||
| -rw-r--r-- | installer/Settings.wxi | 5 |
3 files changed, 26 insertions, 0 deletions
diff --git a/installer/Files.wxs b/installer/Files.wxs index b1d888355..66d62f258 100644 --- a/installer/Files.wxs +++ b/installer/Files.wxs @@ -137,6 +137,23 @@ <File Source="$(var.RedistDirVC12)\msvcr120.dll" KeyPath="yes" /> </Component> <?endif ?> + + <?ifdef D3DCompilerDLL ?> + <Component Id="d3dcompiler_47.dll"> + <!-- + For x64, we use the Windows 8 SDK, which requires us to + redistribute d3dcompiler_47.dll ourselves. (For our non- + Windows 8.1 users.) + + For x86, we expect that people have the DirectX 9 + redist package installed, which provides d3dcompiler_43.dll, + which is the version we use there. + --> + <?if $(sys.BUILDARCH) = "x64" ?> + <File Source="$(var.Win81SDKDir)\Redist\D3D\x64\d3dcompiler_47.dll" KeyPath="yes" /> + <?endif ?> + </Component> + <?endif ?> </DirectoryRef> </Fragment> diff --git a/installer/Product.wxs b/installer/Product.wxs index af6bea878..b1ee7478b 100644 --- a/installer/Product.wxs +++ b/installer/Product.wxs @@ -135,6 +135,10 @@ <ComponentRef Id="msvcp120.dll" /> <ComponentRef Id="msvcr120.dll" /> <?endif ?> + + <?ifdef D3DCompilerDLL ?> + <ComponentRef Id="d3dcompiler_47.dll" /> + <?endif ?> </ComponentGroup> <Feature Id="Mumble" Title="!(loc.MUMBLE_SEC_MUMBLE)" Description="!(loc.DESC_SectionMumble)" Level="1" AllowAdvertise="no" ConfigurableDirectory="INSTALLDIR" Display="expand"> diff --git a/installer/Settings.wxi b/installer/Settings.wxi index 620d75e96..4e888e0a5 100644 --- a/installer/Settings.wxi +++ b/installer/Settings.wxi @@ -124,6 +124,8 @@ <?endif ?> <?endif ?> + <?define Win81SDKDir = "C:\Program Files (x86)\Windows Kits\8.1" ?> + <!-- Environment flags to disable features. Value doesn't matter --> <?ifdef env.MumbleSSE ?> <?define SSE = true ?> @@ -137,5 +139,8 @@ <?define G15 = true ?> <?endif ?> + <?ifndef env.MumbleNoD3DCompilerDLL ?> + <?define D3DCompilerDLL = true ?> + <?endif ?> </Include> |