diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2015-04-23 18:55:54 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2015-04-23 18:55:56 +0300 |
| commit | 0128e7ddab68ab1792a6c2d98a2b0a40932d7ab9 (patch) | |
| tree | c5a7455e05c4370716102c1a884ed641598303b0 /installer | |
| parent | 445cdf0e10c713d801aa661f50a296da6a5100ed (diff) | |
installer: include both x86 and x64 variants of D3DCompiler_XX.dll.
This is only possible for now because x86 uses the D3DCompiler_43.dll
and x64 uses the D3DCompiler_47.dll.
If we need both to use the same version, we'll need a more complex
directory structure.
But let's tackle that then.
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/Files.wxs | 21 | ||||
| -rw-r--r-- | installer/Product.wxs | 7 |
2 files changed, 8 insertions, 20 deletions
diff --git a/installer/Files.wxs b/installer/Files.wxs index c1affa06c..9382b2a24 100644 --- a/installer/Files.wxs +++ b/installer/Files.wxs @@ -148,21 +148,12 @@ <?endif ?> <?ifdef D3DCompilerDLL ?> - <?if $(sys.BUILDARCH) = "x86" ?> - <Component Id="d3dcompiler_43.dll"> - <!-- - The DirectX SDK (June 2010) only provides d3dcompiler_43.dll in CAB - files in the SDK directory. However, it's also installed to the - System32 dir. It's not particularly elegant, but we'll lift it from - there. It will be there on systems with the SDK installed. - --> - <File Source="$(var.System32x86Dir)\d3dcompiler_43.dll" KeyPath="yes" /> - </Component> - <?elseif $(sys.BUILDARCH) = "x64" ?> - <Component Id="d3dcompiler_47.dll"> - <File Source="$(var.Win81SDKDir)\Redist\D3D\x64\d3dcompiler_47.dll" KeyPath="yes" /> - </Component> - <?endif ?> + <Component Id="d3dcompiler_43.dll"> + <File Source="$(var.System32x86Dir)\d3dcompiler_43.dll" KeyPath="yes" /> + </Component> + <Component Id="d3dcompiler_47.dll"> + <File Source="$(var.Win81SDKDir)\Redist\D3D\x64\d3dcompiler_47.dll" KeyPath="yes" /> + </Component> <?endif ?> </DirectoryRef> </Fragment> diff --git a/installer/Product.wxs b/installer/Product.wxs index 4d73e3170..d6ec525ce 100644 --- a/installer/Product.wxs +++ b/installer/Product.wxs @@ -137,11 +137,8 @@ <?endif ?> <?ifdef D3DCompilerDLL ?> - <?if $(sys.BUILDARCH) = "x86" ?> - <ComponentRef Id="d3dcompiler_43.dll" /> - <?elseif $(sys.BUILDARCH) = "x64" ?> - <ComponentRef Id="d3dcompiler_47.dll" /> - <?endif ?> + <ComponentRef Id="d3dcompiler_43.dll" /> + <ComponentRef Id="d3dcompiler_47.dll" /> <?endif ?> </ComponentGroup> |