From 6fa34a625761c76aad4a5800780806dce01f6314 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Fri, 28 May 2021 18:03:32 +1000
Subject: [PATCH] Move font resources to Client.Common

---
 .../BizHawk.Client.Common.csproj                |   1 +
 .../Resources/courier16px.fnt                   |   0
 .../Resources/courier16px_0.png                 | Bin
 .../Resources/fceux.ttf                         | Bin
 .../Resources/gens.ttf                          | Bin
 .../DisplayManager/DisplayManager.cs            |  16 ++++------------
 6 files changed, 5 insertions(+), 12 deletions(-)
 rename src/{BizHawk.Client.EmuHawk => BizHawk.Client.Common}/Resources/courier16px.fnt (100%)
 rename src/{BizHawk.Client.EmuHawk => BizHawk.Client.Common}/Resources/courier16px_0.png (100%)
 rename src/{BizHawk.Client.EmuHawk => BizHawk.Client.Common}/Resources/fceux.ttf (100%)
 rename src/{BizHawk.Client.EmuHawk => BizHawk.Client.Common}/Resources/gens.ttf (100%)

diff --git a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index ae44f5f6a6..ad8a1ec062 100644
--- a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -13,6 +13,7 @@
 		<PackageReference Include="SharpCompress" Version="0.24.0" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
+		<EmbeddedResource Include="Resources/**/*" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="movie/bk2/Bk2Movie.HeaderApi.cs" DependentUpon="Bk2Movie.cs" />
diff --git a/src/BizHawk.Client.EmuHawk/Resources/courier16px.fnt b/src/BizHawk.Client.Common/Resources/courier16px.fnt
similarity index 100%
rename from src/BizHawk.Client.EmuHawk/Resources/courier16px.fnt
rename to src/BizHawk.Client.Common/Resources/courier16px.fnt
diff --git a/src/BizHawk.Client.EmuHawk/Resources/courier16px_0.png b/src/BizHawk.Client.Common/Resources/courier16px_0.png
similarity index 100%
rename from src/BizHawk.Client.EmuHawk/Resources/courier16px_0.png
rename to src/BizHawk.Client.Common/Resources/courier16px_0.png
diff --git a/src/BizHawk.Client.EmuHawk/Resources/fceux.ttf b/src/BizHawk.Client.Common/Resources/fceux.ttf
similarity index 100%
rename from src/BizHawk.Client.EmuHawk/Resources/fceux.ttf
rename to src/BizHawk.Client.Common/Resources/fceux.ttf
diff --git a/src/BizHawk.Client.EmuHawk/Resources/gens.ttf b/src/BizHawk.Client.Common/Resources/gens.ttf
similarity index 100%
rename from src/BizHawk.Client.EmuHawk/Resources/gens.ttf
rename to src/BizHawk.Client.Common/Resources/gens.ttf
diff --git a/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs b/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
index 54414d061f..68164e33fe 100644
--- a/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
+++ b/src/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
@@ -85,21 +85,13 @@ namespace BizHawk.Client.EmuHawk
 				_shaderChainFrugalizers[i] = new RenderTargetFrugalizer(_gl);
 			}
 
-			using (var xml = EmuHawk.ReflectionCache.EmbeddedResourceStream("Resources.courier16px.fnt"))
 			{
-				using var tex = EmuHawk.ReflectionCache.EmbeddedResourceStream("Resources.courier16px_0.png");
+				using var xml = Client.Common.ReflectionCache.EmbeddedResourceStream("Resources.courier16px.fnt");
+				using var tex = Client.Common.ReflectionCache.EmbeddedResourceStream("Resources.courier16px_0.png");
 				_theOneFont = new StringRenderer(_gl, xml, tex);
-			}
-
-			using (var gens =
-				EmuHawk.ReflectionCache.EmbeddedResourceStream("Resources.gens.ttf"))
-			{
+				using var gens = Client.Common.ReflectionCache.EmbeddedResourceStream("Resources.gens.ttf");
 				LoadCustomFont(gens);
-			}
-
-			using (var fceux =
-				EmuHawk.ReflectionCache.EmbeddedResourceStream("Resources.fceux.ttf"))
-			{
+				using var fceux = Client.Common.ReflectionCache.EmbeddedResourceStream("Resources.fceux.ttf");
 				LoadCustomFont(fceux);
 			}