From 9c23d67c30e80a24bd55d0d6c74b51fe00289279 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 18 Sep 2014 19:02:28 +0100 Subject: [PATCH] Pack-in d3dcompiler_47.dll with distribution. Refs #81 --- dist.sh | 4 ++++ installer/Installer32.wxs | 1 + installer/Installer64.wxs | 1 + 3 files changed, 6 insertions(+) diff --git a/dist.sh b/dist.sh index 354f7b81a..310c7ee6e 100644 --- a/dist.sh +++ b/dist.sh @@ -22,6 +22,10 @@ mkdir -p dist/Release{32,64} cp -R x64/Release/* dist/Release64/ cp -R Win32/Release/* dist/Release32/ +# Copy in d3dcompiler from windows kit 8.1 +cp /c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/Redist/D3D/x64/d3dcompiler_47.dll dist/Release64/ +cp /c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/Redist/D3D/x86/d3dcompiler_47.dll dist/Release32/ + # Copy associated files that should be included with the distribution cp LICENSE.md Documentation/*.chm dist/Release64/ cp LICENSE.md Documentation/*.chm dist/Release32/ diff --git a/installer/Installer32.wxs b/installer/Installer32.wxs index 661fec1e3..551c75c39 100644 --- a/installer/Installer32.wxs +++ b/installer/Installer32.wxs @@ -78,6 +78,7 @@ + +