From 6388bf1c77c395791074e24bc5a5a174131b76bd Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 23 Oct 2018 12:47:59 +0100
Subject: [PATCH] Add RGP plugin DLL to installer manifest

---
 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 c10748689..956bbff91 100644
--- a/util/installer/Installer32.wxs
+++ b/util/installer/Installer32.wxs
@@ -175,6 +175,12 @@
                   <File Id='virtualcontextEXE' Name='VirtualContext.exe' DiskId='1' Source='dist/Release32/plugins/amd/isa/VirtualContext.exe' />
                 </Component>
               </Directory>
+              
+              <Directory Id='plugins_amd_rgp' Name='rgp'>
+                <Component Id='rgp_plugin' Guid='A5766AE0-EF2E-4584-B529-3760F476B613'>
+                  <File Id='amdrgpDLL' Name='DevDriverAPI.dll' DiskId='1' Source='dist/Release32/plugins/amd/rgp/DevDriverAPI.dll' KeyPath='yes' />
+                </Component>
+              </Directory>
 
               <Directory Id='plugins_amd_counters' Name='counters'>
                 <Component Id='gpa_plugin' Guid='16CFF53A-CB61-49A1-8FE8-CDBB02DE29A4'>
@@ -322,6 +328,7 @@
         <ComponentRef Id='LICENSE' />
 
         <ComponentRef Id='gcn_plugin' />
+        <ComponentRef Id='rgp_plugin' />
         <ComponentRef Id='gpa_plugin' />
         <ComponentRef Id='android_plugin' />
         <ComponentRef Id='spirv_plugin' />
diff --git a/util/installer/Installer64.wxs b/util/installer/Installer64.wxs
index 87c8ff9fa..0149a2cc9 100644
--- a/util/installer/Installer64.wxs
+++ b/util/installer/Installer64.wxs
@@ -164,6 +164,12 @@
                   <File Id='virtualcontextEXE' Name='VirtualContext.exe' DiskId='1' Source='dist/Release64/plugins/amd/isa/VirtualContext.exe' />
                 </Component>
               </Directory>
+              
+              <Directory Id='plugins_amd_rgp' Name='rgp'>
+                <Component Id='rgp_plugin' Guid='6F6ED705-A22F-4CE7-BC12-86332BC5263D'>
+                  <File Id='amdrgpDLL' Name='DevDriverAPI-x64.dll' DiskId='1' Source='dist/Release64/plugins/amd/rgp/DevDriverAPI-x64.dll' KeyPath='yes' />
+                </Component>
+              </Directory>
 
               <Directory Id='plugins_amd_counters' Name='counters'>
                 <Component Id='gpa_plugin' Win64="yes" Guid='F248EE26-5919-4F9B-8727-6C2CEFA0DC2C'>
@@ -340,6 +346,7 @@
         <ComponentRef Id='LICENSE' />
 
         <ComponentRef Id='gcn_plugin' />
+        <ComponentRef Id='rgp_plugin' />
         <ComponentRef Id='gpa_plugin' />
         <ComponentRef Id='android_plugin' />
         <ComponentRef Id='spirv_plugin' />