From 7842e721e5ff12506f15dba7e9f6eafd0637a73e Mon Sep 17 00:00:00 2001
From: elasota <ejlasota@gmail.com>
Date: Wed, 7 Apr 2021 10:52:18 -0400
Subject: [PATCH] Remove Resources dir from Windows release

---
 Aerofoil/GpFileSystem_Win32.cpp                      |  3 +--
 MakeRelease.bat                                      |  2 --
 ReleasePackageInstaller/Product.wxs                  | 12 ++----------
 .../ReleasePackageInstaller.wixproj                  | 10 ----------
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/Aerofoil/GpFileSystem_Win32.cpp b/Aerofoil/GpFileSystem_Win32.cpp
index 9f1db51..5cdb345 100644
--- a/Aerofoil/GpFileSystem_Win32.cpp
+++ b/Aerofoil/GpFileSystem_Win32.cpp
@@ -158,7 +158,7 @@ GpFileSystem_Win32::GpFileSystem_Win32()
 			continue;
 		}
 
-		if (wcscat_s(m_executablePath, L"Resources"))
+		if (wcscat_s(m_executablePath, L"Packaged"))
 		{
 			currentPathLength = 0;
 			break;
@@ -177,7 +177,6 @@ GpFileSystem_Win32::GpFileSystem_Win32()
 	{
 		m_packagedDir = std::wstring(m_executablePath) + L"Packaged\\";
 		m_housesDir = std::wstring(m_executablePath) + L"Packaged\\Houses\\";
-		m_resourcesDir = std::wstring(m_executablePath) + L"Resources\\";
 	}
 }
 
diff --git a/MakeRelease.bat b/MakeRelease.bat
index 3cb6d85..b168650 100644
--- a/MakeRelease.bat
+++ b/MakeRelease.bat
@@ -29,9 +29,7 @@ mkdir ReleasePkg\PDBs
 copy /Y x64\Release\Aerofoil.pdb ReleasePkg\PDBs
 copy /Y x64\Release\GpAudioDriver_XAudio2.pdb ReleasePkg\PDBs
 copy /Y x64\Release\GpDisplayDriver_D3D11.pdb ReleasePkg\PDBs
-copy /Y x64\Release\GpFontHandler_FreeType2.pdb ReleasePkg\PDBs
 copy /Y x64\Release\GpInputDriver_XInput.pdb ReleasePkg\PDBs
-copy /Y x64\Release\FreeType.pdb ReleasePkg\PDBs
 copy /Y x64\Release\GpApp.pdb ReleasePkg\PDBs
 
 copy /Y x64\Release\flattenmov.pdb ReleasePkg\PDBs
diff --git a/ReleasePackageInstaller/Product.wxs b/ReleasePackageInstaller/Product.wxs
index 8d7a1fb..c97cfad 100644
--- a/ReleasePackageInstaller/Product.wxs
+++ b/ReleasePackageInstaller/Product.wxs
@@ -56,9 +56,6 @@
       <Component Id="Aerofoil.exe" Guid="*">
         <File Id="Aerofoil.exe" Source="$(var.Aerofoil.TargetPath)" KeyPath="yes" Checksum="yes" />
       </Component>
-      <Component Id="FreeType.dll" Guid="*">
-        <File Id="FreeType.dll" Source="$(var.FreeType.TargetPath)" KeyPath="yes" Checksum="yes"/>
-      </Component>
       <Component Id="GpApp.dll" Guid="*">
         <File Id="GpApp.dll" Source="$(var.GpApp.TargetPath)" KeyPath="yes" Checksum="yes"/>
       </Component>
@@ -74,9 +71,6 @@
       <Component Id="GpInputDriver_XInput.dll" Guid="*">
         <File Id="GpInputDriver_XInput.dll" Source="$(var.GpInputDriver_XInput.TargetPath)" KeyPath="yes" Checksum="yes"/>
       </Component>
-      <Component Id="GpFontHandler_FreeType2.dll" Guid="*">
-        <File Id="GpFontHandler_FreeType2.dll" Source="$(var.GpFontHandler_FreeType2.TargetPath)" KeyPath="yes" Checksum="yes"/>
-      </Component>
     </DirectoryRef>
 
     <DirectoryRef Id="AEROFOILPACKAGEDDIR">
@@ -155,21 +149,19 @@
 
     <Feature Id="AerofoilApplicationFeature" Title="Glider PRO Game Data" Level="1" Display="expand" ConfigurableDirectory="AEROFOILPRODUCTDIR" Description="!(loc.AerofoilApplicationFeatureDescription)">
       <ComponentRef Id="Aerofoil.exe" />
-      <ComponentRef Id="FreeType.dll" />
       <ComponentRef Id="GpApp.dll" />
       <ComponentRef Id="GpAudioDriver_XAudio2.dll" />
       <ComponentRef Id="xaudio2_9redist.dll" />
       <ComponentRef Id="GpDisplayDriver_D3D11.dll" />
       <ComponentRef Id="GpInputDriver_XInput.dll" />
-      <ComponentRef Id="GpFontHandler_FreeType2.dll" />
       
       <ComponentRef Id="ApplicationResources" />
+      <ComponentRef Id="Fonts" />
 
       <ComponentRef Id="readme.txt" />
 
       <ComponentGroupRef Id="DefaultHousesComponentGroup"/>
-      
-      <ComponentGroupRef Id="ResourcesComponentGroup"/>
+
       <ComponentGroupRef Id="LooseDocumentationComponentGroup"/>
 
       <ComponentRef Id="StartMenuShortcuts" />
diff --git a/ReleasePackageInstaller/ReleasePackageInstaller.wixproj b/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
index cae9376..f88e136 100644
--- a/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
+++ b/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
@@ -176,7 +176,6 @@
   </Target>
   <PropertyGroup>
     <DefineConstants>
-ResourcesDataDir=$(SolutionDir)\Resources;
 DocumentationDataDir=$(SolutionDir)\Documentation;
 HousesDataDir=$(SolutionDir)\Packaged\Houses;
 PackagedDataDir=$(SolutionDir)\Packaged;
@@ -184,15 +183,6 @@ PackagedDataDir=$(SolutionDir)\Packaged;
   </PropertyGroup>
   <Target Name="BeforeBuild">
     <ItemGroup>
-      <HarvestDirectory Include="$(SolutionDir)\Resources">
-        <DirectoryRefId>AEROFOILRESOURCESDIR</DirectoryRefId>
-        <SuppressRootDirectory>true</SuppressRootDirectory>
-        <SuppressCom>true</SuppressCom>
-        <SuppressRegistry>true</SuppressRegistry>
-        <ComponentGroupName>ResourcesComponentGroup</ComponentGroupName>
-        <AutogenerateGuids>true</AutogenerateGuids>
-        <PreprocessorVariable>var.ResourcesDataDir</PreprocessorVariable>
-      </HarvestDirectory>
       <HarvestDirectory Include="$(SolutionDir)\InstallerPackages\DefaultHouses">
         <DirectoryRefId>AEROFOILHOUSESDIR</DirectoryRefId>
         <SuppressRootDirectory>true</SuppressRootDirectory>