From b7c69bd82393ee6013f1fbf3dcf285c6c96c8735 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 28 Feb 2018 17:28:09 +0000
Subject: [PATCH] Include GPA plugin support files in installer

---
 scripts/installer/Installer32.wxs | 12 ++++++++++++
 scripts/installer/Installer64.wxs | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/scripts/installer/Installer32.wxs b/scripts/installer/Installer32.wxs
index 01db3a88a..d0d478d2d 100644
--- a/scripts/installer/Installer32.wxs
+++ b/scripts/installer/Installer32.wxs
@@ -173,6 +173,17 @@
                   <File Id='virtualcontextEXE' Name='VirtualContext.exe' DiskId='1' Source='dist/Release32/plugins/amd/isa/VirtualContext.exe' />
                 </Component>
               </Directory>
+
+              <Directory Id='plugins_amd_counters' Name='counters'>
+                <Component Id='gpa_plugin' Guid='16CFF53A-CB61-49A1-8FE8-CDBB02DE29A4'>
+                  <File Id='GPUPerfAPICounters' Name='GPUPerfAPICounters.dll' DiskId='1' Source='dist/Release32/plugins/amd/counters/GPUPerfAPICounters.dll' KeyPath='yes' />
+                  <File Id='GPUPerfAPIDX11' Name='GPUPerfAPIDX11.dll' DiskId='1' Source='dist/Release32/plugins/amd/counters/GPUPerfAPIDX11.dll' />
+                  <File Id='GPUPerfAPIDX12' Name='GPUPerfAPIDX12.dll' DiskId='1' Source='dist/Release32/plugins/amd/counters/GPUPerfAPIDX12.dll' />
+                  <File Id='GPUPerfAPIDXGetAMDDeviceInfo' Name='GPUPerfAPIDXGetAMDDeviceInfo.dll' DiskId='1' Source='dist/Release32/plugins/amd/counters/GPUPerfAPIDXGetAMDDeviceInfo.dll' />
+                  <File Id='GPUPerfAPIGL' Name='GPUPerfAPIGL.dll' DiskId='1' Source='dist/Release32/plugins/amd/counters/GPUPerfAPIGL.dll' />
+                  <File Id='GPUPerfAPIVK' Name='GPUPerfAPIVK.dll' DiskId='1' Source='dist/Release32/plugins/amd/counters/GPUPerfAPIVK.dll' />
+                </Component>
+              </Directory>
             </Directory>
 
             <Directory Id='plugins_android' Name='android'>
@@ -309,6 +320,7 @@
         <ComponentRef Id='LICENSE' />
 
         <ComponentRef Id='gcn_plugin' />
+        <ComponentRef Id='gpa_plugin' />
         <ComponentRef Id='android_plugin' />
         <ComponentRef Id='spirv_plugin' />
 
diff --git a/scripts/installer/Installer64.wxs b/scripts/installer/Installer64.wxs
index 0d5098add..63b3c3c98 100644
--- a/scripts/installer/Installer64.wxs
+++ b/scripts/installer/Installer64.wxs
@@ -162,6 +162,17 @@
                   <File Id='virtualcontextEXE' Name='VirtualContext.exe' DiskId='1' Source='dist/Release64/plugins/amd/isa/VirtualContext.exe' />
                 </Component>
               </Directory>
+
+              <Directory Id='plugins_amd_counters' Name='counters'>
+                <Component Id='gpa_plugin' Win64="yes" Guid='F248EE26-5919-4F9B-8727-6C2CEFA0DC2C'>
+                  <File Id='GPUPerfAPICountersx64' Name='GPUPerfAPICounters-x64.dll' DiskId='1' Source='dist/Release64/plugins/amd/counters/GPUPerfAPICounters-x64.dll' KeyPath='yes' />
+                  <File Id='GPUPerfAPIDX11x64' Name='GPUPerfAPIDX11-x64.dll' DiskId='1' Source='dist/Release64/plugins/amd/counters/GPUPerfAPIDX11-x64.dll' />
+                  <File Id='GPUPerfAPIDX12x64' Name='GPUPerfAPIDX12-x64.dll' DiskId='1' Source='dist/Release64/plugins/amd/counters/GPUPerfAPIDX12-x64.dll' />
+                  <File Id='GPUPerfAPIDXGetAMDDeviceInfox64' Name='GPUPerfAPIDXGetAMDDeviceInfo-x64.dll' DiskId='1' Source='dist/Release64/plugins/amd/counters/GPUPerfAPIDXGetAMDDeviceInfo-x64.dll' />
+                  <File Id='GPUPerfAPIGLx64' Name='GPUPerfAPIGL-x64.dll' DiskId='1' Source='dist/Release64/plugins/amd/counters/GPUPerfAPIGL-x64.dll' />
+                  <File Id='GPUPerfAPIVKx64' Name='GPUPerfAPIVK-x64.dll' DiskId='1' Source='dist/Release64/plugins/amd/counters/GPUPerfAPIVK-x64.dll' />
+                </Component>
+              </Directory>
             </Directory>
 
             <Directory Id='plugins_android' Name='android'>
@@ -327,6 +338,7 @@
         <ComponentRef Id='LICENSE' />
 
         <ComponentRef Id='gcn_plugin' />
+        <ComponentRef Id='gpa_plugin' />
         <ComponentRef Id='android_plugin' />
         <ComponentRef Id='spirv_plugin' />