From a342fcbe30cccfdbda84c54da3bc4dca6472edf2 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 27 Sep 2024 10:46:25 +0100
Subject: [PATCH] Add dxcompiler.dll to installer

---
 util/installer/Installer32.wxs | 7 +++++++
 util/installer/Installer64.wxs | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/util/installer/Installer32.wxs b/util/installer/Installer32.wxs
index b759397a0..d5c82d348 100644
--- a/util/installer/Installer32.wxs
+++ b/util/installer/Installer32.wxs
@@ -202,6 +202,12 @@
               </Component>
             </Directory>
 
+            <Directory Id='plugins_d3d12' Name='d3d12'>
+              <Component Id='d2d12_plugin' Win64="yes" Guid='383E6D55-F140-44E3-91B5-E98EEAAB28A7'>
+                <File Id='dxcompiler' Name='dxcompiler.dll' DiskId='1' Source='dist/Release64/plugins/d3d12/dxcompiler.dll' KeyPath='yes' />
+              </Component>
+            </Directory>
+
             <Directory Id='plugins_spirv' Name='spirv'>
               <Component Id='spirv_plugin' Guid='749539F5-0AAA-4A26-B8F4-B2ABD1F7754E'>
                 <File Id='spirvcross' Name='spirv-cross.exe' DiskId='1' Source='dist/Release32/plugins/spirv/spirv-cross.exe' KeyPath='yes' />
@@ -369,6 +375,7 @@
         <ComponentRef Id='gpa_plugin' />
         <ComponentRef Id='android_plugin' />
         <ComponentRef Id='spirv_plugin' />
+        <ComponentRef Id='d3d12_plugin' />
 
         <ComponentRef Id='ProgramMenuDir' />
 
diff --git a/util/installer/Installer64.wxs b/util/installer/Installer64.wxs
index a1c761ad9..fedaa1710 100644
--- a/util/installer/Installer64.wxs
+++ b/util/installer/Installer64.wxs
@@ -199,6 +199,12 @@
               </Component>
             </Directory>
 
+            <Directory Id='plugins_d3d12' Name='d3d12'>
+              <Component Id='d2d12_plugin' Win64="yes" Guid='383E6D55-F140-44E3-91B5-E98EEAAB28A7'>
+                <File Id='dxcompiler' Name='dxcompiler.dll' DiskId='1' Source='dist/Release64/plugins/d3d12/dxcompiler.dll' KeyPath='yes' />
+              </Component>
+            </Directory>
+
             <Directory Id='plugins_spirv' Name='spirv'>
               <Component Id='spirv_plugin' Win64="yes" Guid='15566608-0D77-42D2-9B6C-D43698C4C46D'>
                 <File Id='spirvcross' Name='spirv-cross.exe' DiskId='1' Source='dist/Release64/plugins/spirv/spirv-cross.exe' KeyPath='yes' />
@@ -428,6 +434,7 @@
         <ComponentRef Id='gpa_plugin' />
         <ComponentRef Id='android_plugin' />
         <ComponentRef Id='spirv_plugin' />
+        <ComponentRef Id='d3d12_plugin' />
 
         <ComponentRef Id='renderdocX86Bins' />