Skip to content
Permalink
Browse files

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.
  • Loading branch information...
mkrautz committed Apr 23, 2015
1 parent 445cdf0 commit 0128e7ddab68ab1792a6c2d98a2b0a40932d7ab9
Showing with 8 additions and 20 deletions.
  1. +6 −15 installer/Files.wxs
  2. +2 −5 installer/Product.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>
@@ -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>

0 comments on commit 0128e7d

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