From 4a5299e66e0ab99a305d9cf5150d0751fd73099b Mon Sep 17 00:00:00 2001
From: LunaMoo <luna2moo@gmail.com>
Date: Sun, 14 Nov 2021 22:07:57 +0100
Subject: [PATCH] Try to fix UWP build.

---
 UWP/UWP.vcxproj                | 13 ++++++++++---
 UWP/UWP.vcxproj.filters        | 12 +++++++++---
 Windows/PPSSPP.vcxproj         |  2 ++
 Windows/PPSSPP.vcxproj.filters |  6 ++++++
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/UWP/UWP.vcxproj b/UWP/UWP.vcxproj
index 65c07e1f90a3..382492a65f08 100644
--- a/UWP/UWP.vcxproj
+++ b/UWP/UWP.vcxproj
@@ -596,10 +596,17 @@
       <DeploymentContent>true</DeploymentContent>
       <FileType>Document</FileType>
     </Image>
-    <None Include="..\assets\ppge_atlas.meta">
+    <Image Include="Content\font_atlas_luna.zim">
+      <DeploymentContent>true</DeploymentContent>
+      <FileType>Document</FileType>
+    </Image>
+    <None Include="..\assets\ppge_atlas_luna.meta">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\assets\ui_atlas_luna.meta">
       <DeploymentContent>true</DeploymentContent>
     </None>
-    <None Include="..\assets\ui_atlas.meta">
+    <None Include="..\assets\font_atlas_luna.meta">
       <DeploymentContent>true</DeploymentContent>
     </None>
     <None Include="Content\compat.ini">
@@ -1437,7 +1444,7 @@
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</DeploymentContent>
       <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</DeploymentContent>
     </None>
-    <None Include="Content\ppge_atlas.zim">
+    <None Include="Content\ppge_atlas_luna.zim">
       <DeploymentContent>true</DeploymentContent>
     </None>
     <None Include="Content\shaders\4xhqglsl.fsh">
diff --git a/UWP/UWP.vcxproj.filters b/UWP/UWP.vcxproj.filters
index ef83c5bf528e..196c0e64b4ba 100644
--- a/UWP/UWP.vcxproj.filters
+++ b/UWP/UWP.vcxproj.filters
@@ -97,6 +97,9 @@
     <Image Include="Content\ui_atlas_luna.zim">
       <Filter>Content</Filter>
     </Image>
+    <Image Include="Content\font_atlas_luna.zim">
+      <Filter>Content</Filter>
+    </Image>
     <Image Include="AssetsGold\StoreLogo.scale-100.png">
       <Filter>Assets</Filter>
     </Image>
@@ -115,7 +118,7 @@
     <None Include="Content\langregion.ini">
       <Filter>Content</Filter>
     </None>
-    <None Include="Content\ppge_atlas.zim">
+    <None Include="Content\ppge_atlas_luna.zim">
       <Filter>Content</Filter>
     </None>
     <None Include="PPSSPP_UWP_TemporaryKey.pfx" />
@@ -353,10 +356,13 @@
     <None Include="Content\shaders\videoAA.fsh">
       <Filter>Content\shaders</Filter>
     </None>
-    <None Include="..\assets\ppge_atlas.meta">
+    <None Include="..\assets\ppge_atlas_luna.meta">
+      <Filter>Content</Filter>
+    </None>
+    <None Include="..\assets\ui_atlas_luna.meta">
       <Filter>Content</Filter>
     </None>
-    <None Include="..\assets\ui_atlas.meta">
+    <None Include="..\assets\font_atlas_luna.meta">
       <Filter>Content</Filter>
     </None>
   </ItemGroup>
diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj
index efd527946663..cf90c3e5dc88 100644
--- a/Windows/PPSSPP.vcxproj
+++ b/Windows/PPSSPP.vcxproj
@@ -1501,9 +1501,11 @@
     <None Include="..\assets\knownfuncs.ini" />
     <None Include="..\assets\langregion.ini" />
     <None Include="..\atlasscript.txt" />
+    <None Include="..\atlasfontscript.txt" />
     <None Include="..\b.sh" />
     <None Include="..\build.gradle" />
     <None Include="..\buildatlas.sh" />
+    <None Include="..\buildfontatlas.sh" />
     <None Include="..\build_ppgeatlas.sh" />
     <None Include="..\CMakeLists.txt" />
     <None Include="..\copyrelease.sh" />
diff --git a/Windows/PPSSPP.vcxproj.filters b/Windows/PPSSPP.vcxproj.filters
index 3179c6effe79..a8271b38ca50 100644
--- a/Windows/PPSSPP.vcxproj.filters
+++ b/Windows/PPSSPP.vcxproj.filters
@@ -614,6 +614,9 @@
     <None Include="..\atlasscript.txt">
       <Filter>Build</Filter>
     </None>
+    <None Include="..\atlasfontscript.txt">
+      <Filter>Build</Filter>
+    </None>
     <None Include="..\b.sh">
       <Filter>Build</Filter>
     </None>
@@ -623,6 +626,9 @@
     <None Include="..\buildatlas.sh">
       <Filter>Build</Filter>
     </None>
+    <None Include="..\buildfontatlas.sh">
+      <Filter>Build</Filter>
+    </None>
     <None Include="..\build.gradle">
       <Filter>Build</Filter>
     </None>