#5231: Move FontManager to core binary

codereader · May 19, 2020 · 3c23271 · 3c23271
1 parent 7640185
commit 3c23271
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 43 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -70,10 +70,6 @@ darkradiant_SOURCES = main.cpp \
                       eventmanager/Statement.cpp \
                       eventmanager/Toggle.cpp \
                       eventmanager/WidgetToggle.cpp \
-                      fonts/FontLoader.cpp \
-                      fonts/GlyphInfo.cpp \
-                      fonts/GlyphSet.cpp \
-                      fonts/FontManager.cpp \
                       map/MapModules.cpp \
                       map/format/Quake3MapFormat.cpp \
                       map/format/Quake4MapFormat.cpp \

diff --git a/radiantcore/Makefile.am b/radiantcore/Makefile.am
@@ -71,6 +71,10 @@ libradiantcore_la_SOURCES = Radiant.cpp \
                 filters/BasicFilterSystem.cpp \
                 filters/XMLFilter.cpp \
                 filters/XmlFilterEventAdapter.cpp \
+                fonts/FontLoader.cpp \
+                fonts/GlyphInfo.cpp \
+                fonts/GlyphSet.cpp \
+                fonts/FontManager.cpp \
                 grid/GridManager.cpp \
                 imagefile/dds.cpp \
                 imagefile/ddslib.cpp \

diff --git a/radiant/fonts/FontInfo.h → radiantcore/fonts/FontInfo.h b/radiant/fonts/FontInfo.h → radiantcore/fonts/FontInfo.h
diff --git a/radiant/fonts/FontLoader.cpp → radiantcore/fonts/FontLoader.cpp b/radiant/fonts/FontLoader.cpp → radiantcore/fonts/FontLoader.cpp
diff --git a/radiant/fonts/FontLoader.h → radiantcore/fonts/FontLoader.h b/radiant/fonts/FontLoader.h → radiantcore/fonts/FontLoader.h
diff --git a/radiant/fonts/FontManager.cpp → radiantcore/fonts/FontManager.cpp b/radiant/fonts/FontManager.cpp → radiantcore/fonts/FontManager.cpp
diff --git a/radiant/fonts/FontManager.h → radiantcore/fonts/FontManager.h b/radiant/fonts/FontManager.h → radiantcore/fonts/FontManager.h
diff --git a/radiant/fonts/GlyphInfo.cpp → radiantcore/fonts/GlyphInfo.cpp b/radiant/fonts/GlyphInfo.cpp → radiantcore/fonts/GlyphInfo.cpp
diff --git a/radiant/fonts/GlyphInfo.h → radiantcore/fonts/GlyphInfo.h b/radiant/fonts/GlyphInfo.h → radiantcore/fonts/GlyphInfo.h
diff --git a/radiant/fonts/GlyphSet.cpp → radiantcore/fonts/GlyphSet.cpp b/radiant/fonts/GlyphSet.cpp → radiantcore/fonts/GlyphSet.cpp
diff --git a/radiant/fonts/GlyphSet.h → radiantcore/fonts/GlyphSet.h b/radiant/fonts/GlyphSet.h → radiantcore/fonts/GlyphSet.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -204,10 +204,6 @@
     <ClCompile Include="..\..\radiant\eventmanager\Statement.cpp" />
     <ClCompile Include="..\..\radiant\eventmanager\Toggle.cpp" />
     <ClCompile Include="..\..\radiant\eventmanager\WidgetToggle.cpp" />
-    <ClCompile Include="..\..\radiant\fonts\FontLoader.cpp" />
-    <ClCompile Include="..\..\radiant\fonts\FontManager.cpp" />
-    <ClCompile Include="..\..\radiant\fonts\GlyphInfo.cpp" />
-    <ClCompile Include="..\..\radiant\fonts\GlyphSet.cpp" />
     <ClCompile Include="..\..\radiant\layers\LayerInfoFileModule.cpp" />
     <ClCompile Include="..\..\radiant\layers\LayerManager.cpp" />
     <ClCompile Include="..\..\radiant\layers\LayerModule.cpp" />
@@ -927,11 +923,6 @@
     <ClInclude Include="..\..\radiant\eventmanager\Statement.h" />
     <ClInclude Include="..\..\radiant\eventmanager\Toggle.h" />
     <ClInclude Include="..\..\radiant\eventmanager\WidgetToggle.h" />
-    <ClInclude Include="..\..\radiant\fonts\FontInfo.h" />
-    <ClInclude Include="..\..\radiant\fonts\FontLoader.h" />
-    <ClInclude Include="..\..\radiant\fonts\FontManager.h" />
-    <ClInclude Include="..\..\radiant\fonts\GlyphInfo.h" />
-    <ClInclude Include="..\..\radiant\fonts\GlyphSet.h" />
     <ClInclude Include="..\..\radiant\layers\LayerInfoFileModule.h" />
     <ClInclude Include="..\..\radiant\layers\LayerManager.h" />
     <ClInclude Include="..\..\radiant\layers\LayerUsageBreakdown.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -209,9 +209,6 @@
     <Filter Include="src\md5model">
       <UniqueIdentifier>{9ece5d35-1ea4-4651-aa2c-b8a9c80b62da}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\fonts">
-      <UniqueIdentifier>{a921dcd3-1518-490e-baf1-4b75bdd130c7}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\map\format">
       <UniqueIdentifier>{a33db67b-1632-47ad-9368-04d014d7d730}</UniqueIdentifier>
     </Filter>
@@ -1042,18 +1039,6 @@
     <ClCompile Include="..\..\radiant\md5model\plugin.cpp">
       <Filter>src\md5model</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\fonts\FontLoader.cpp">
-      <Filter>src\fonts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\fonts\FontManager.cpp">
-      <Filter>src\fonts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\fonts\GlyphInfo.cpp">
-      <Filter>src\fonts</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\fonts\GlyphSet.cpp">
-      <Filter>src\fonts</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\Documentation.cpp">
       <Filter>src\ui</Filter>
     </ClCompile>
@@ -2142,21 +2127,6 @@
     <ClInclude Include="..\..\radiant\md5model\RenderableMD5Skeleton.h">
       <Filter>src\md5model</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\fonts\FontInfo.h">
-      <Filter>src\fonts</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\fonts\FontLoader.h">
-      <Filter>src\fonts</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\fonts\FontManager.h">
-      <Filter>src\fonts</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\fonts\GlyphInfo.h">
-      <Filter>src\fonts</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\fonts\GlyphSet.h">
-      <Filter>src\fonts</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\ui\Documentation.h">
       <Filter>src\ui</Filter>
     </ClInclude>

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -57,6 +57,10 @@
     <ClCompile Include="..\..\radiantcore\filters\BasicFilterSystem.cpp" />
     <ClCompile Include="..\..\radiantcore\filters\XMLFilter.cpp" />
     <ClCompile Include="..\..\radiantcore\filters\XmlFilterEventAdapter.cpp" />
+    <ClCompile Include="..\..\radiantcore\fonts\FontLoader.cpp" />
+    <ClCompile Include="..\..\radiantcore\fonts\FontManager.cpp" />
+    <ClCompile Include="..\..\radiantcore\fonts\GlyphInfo.cpp" />
+    <ClCompile Include="..\..\radiantcore\fonts\GlyphSet.cpp" />
     <ClCompile Include="..\..\radiantcore\grid\GridManager.cpp" />
     <ClCompile Include="..\..\radiantcore\imagefile\dds.cpp" />
     <ClCompile Include="..\..\radiantcore\imagefile\DDSImage.cpp" />
@@ -194,6 +198,11 @@
     <ClInclude Include="..\..\radiantcore\filters\SetObjectSelectionByFilterWalker.h" />
     <ClInclude Include="..\..\radiantcore\filters\XMLFilter.h" />
     <ClInclude Include="..\..\radiantcore\filters\XmlFilterEventAdapter.h" />
+    <ClInclude Include="..\..\radiantcore\fonts\FontInfo.h" />
+    <ClInclude Include="..\..\radiantcore\fonts\FontLoader.h" />
+    <ClInclude Include="..\..\radiantcore\fonts\FontManager.h" />
+    <ClInclude Include="..\..\radiantcore\fonts\GlyphInfo.h" />
+    <ClInclude Include="..\..\radiantcore\fonts\GlyphSet.h" />
     <ClInclude Include="..\..\radiantcore\grid\GridItem.h" />
     <ClInclude Include="..\..\radiantcore\grid\GridManager.h" />
     <ClInclude Include="..\..\radiantcore\imagefile\dds.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -110,6 +110,9 @@
     <Filter Include="src\particles">
       <UniqueIdentifier>{eda86d46-9b16-4fa4-b6cb-f302f83d0f07}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\fonts">
+      <UniqueIdentifier>{b941367d-6eda-43b5-8d6d-ed46974b796c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiantcore\modulesystem\ModuleLoader.cpp">
@@ -451,6 +454,18 @@
     <ClCompile Include="..\..\radiantcore\particles\ParticleParameter.cpp">
       <Filter>src\particles</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\fonts\FontLoader.cpp">
+      <Filter>src\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\fonts\FontManager.cpp">
+      <Filter>src\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\fonts\GlyphInfo.cpp">
+      <Filter>src\fonts</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\fonts\GlyphSet.cpp">
+      <Filter>src\fonts</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -966,5 +981,20 @@
     <ClInclude Include="..\..\radiantcore\particles\ParticleRenderInfo.h">
       <Filter>src\particles</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\fonts\FontInfo.h">
+      <Filter>src\fonts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\fonts\FontLoader.h">
+      <Filter>src\fonts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\fonts\FontManager.h">
+      <Filter>src\fonts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\fonts\GlyphInfo.h">
+      <Filter>src\fonts</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\fonts\GlyphSet.h">
+      <Filter>src\fonts</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>