From f0913d0d6a7408a34e91d60b462e354147b99b31 Mon Sep 17 00:00:00 2001
From: elasota <ejlasota@gmail.com>
Date: Sun, 7 Mar 2021 05:34:01 -0500
Subject: [PATCH] Add MergeGPF to installer project

---
 Aerofoil.sln                                            | 1 +
 ReleasePackageInstaller/Product.wxs                     | 4 ++++
 ReleasePackageInstaller/ReleasePackageInstaller.wixproj | 8 ++++++++
 3 files changed, 13 insertions(+)

diff --git a/Aerofoil.sln b/Aerofoil.sln
index 01d3c32..6d90b16 100644
--- a/Aerofoil.sln
+++ b/Aerofoil.sln
@@ -48,6 +48,7 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ReleasePackageInstaller", "
 		{7EFF1E21-C375-45EA-A069-4E2232C8A72B} = {7EFF1E21-C375-45EA-A069-4E2232C8A72B}
 		{B852D549-4020-4477-8BFB-E199FF78B047} = {B852D549-4020-4477-8BFB-E199FF78B047}
 		{2FF15659-5C72-48B8-B55B-3C658E4125B5} = {2FF15659-5C72-48B8-B55B-3C658E4125B5}
+		{36DAF5FA-6ADB-4F20-9810-1610DE0AE653} = {36DAF5FA-6ADB-4F20-9810-1610DE0AE653}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsUnicodeToolShim", "WindowsUnicodeToolShim\WindowsUnicodeToolShim.vcxproj", "{15009625-1120-405E-8BBA-69A16CD6713D}"
diff --git a/ReleasePackageInstaller/Product.wxs b/ReleasePackageInstaller/Product.wxs
index 871a8db..b29c992 100644
--- a/ReleasePackageInstaller/Product.wxs
+++ b/ReleasePackageInstaller/Product.wxs
@@ -111,6 +111,9 @@
       <Component Id="unpacktool.exe" Guid="*">
         <File Id="unpacktool.exe" Source="$(var.unpacktool.TargetPath)" KeyPath="yes" Checksum="yes"/>
       </Component>
+      <Component Id="MergeGPF.exe" Guid="*">
+        <File Id="MergeGPF.exe" Source="$(var.MergeGPF.TargetPath)" KeyPath="yes" Checksum="yes"/>
+      </Component>
     </DirectoryRef>
 
     <DirectoryRef Id="AEROFOILDOCUMENTATIONDIR">
@@ -183,6 +186,7 @@
         <ComponentRef Id="hqx2gp.exe" />
         <ComponentRef Id="MakeTimestamp.exe" />
         <ComponentRef Id="unpacktool.exe" />
+        <ComponentRef Id="MergeGPF.exe" />
       </Feature>
     </Feature>
 
diff --git a/ReleasePackageInstaller/ReleasePackageInstaller.wixproj b/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
index 3416747..cae9376 100644
--- a/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
+++ b/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
@@ -136,6 +136,14 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
+    <ProjectReference Include="..\MergeGPF\MergeGPF.vcxproj">
+      <Name>MergeGPF</Name>
+      <Project>{36daf5fa-6adb-4f20-9810-1610de0ae653}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\unpacktool\unpacktool.vcxproj">
       <Name>unpacktool</Name>
       <Project>{a778d062-de76-49f6-8d05-eb26852dd605}</Project>