Skip to content
Permalink
Browse files

installer: distribute D3DCompiler_43.dll for our Windows x86 builds.

  • Loading branch information...
mkrautz committed Dec 31, 2014
1 parent a88b316 commit 29525cba2683f213297ceb560043eab968dda96e
Showing with 31 additions and 14 deletions.
  1. +14 −13 installer/Files.wxs
  2. +5 −1 installer/Product.wxs
  3. +12 −0 installer/Settings.wxi
@@ -139,20 +139,21 @@
<?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" />
<?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>
<?endif ?>
</DirectoryRef>
</Fragment>
@@ -137,7 +137,11 @@
<?endif ?>

<?ifdef D3DCompilerDLL ?>
<ComponentRef Id="d3dcompiler_47.dll" />
<?if $(sys.BUILDARCH) = "x86" ?>
<ComponentRef Id="d3dcompiler_43.dll" />
<?elseif $(sys.BUILDARCH) = "x64" ?>
<ComponentRef Id="d3dcompiler_47.dll" />
<?endif ?>
<?endif ?>
</ComponentGroup>

@@ -126,6 +126,18 @@

<?define Win81SDKDir = "C:\Program Files (x86)\Windows Kits\8.1" ?>

<!--
System32x86Dir is the system's System32 directory
that contains x86 binaries.
For 32-bit Windows, it's System32.
For 64-bit Windows, it's SysWOW64.
-->
<?ifdef env.ProgramFiles(x86) ?>
<?define System32x86Dir = "$(env.SystemRoot)\SysWOW64" ?>
<?else ?>
<?define System32x86Dir = "$(env.SystemRoot)\System32" ?>
<?endif ?>

<!-- Environment flags to disable features. Value doesn't matter -->
<?ifdef env.MumbleSSE ?>
<?define SSE = true ?>

0 comments on commit 29525cb

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