#5231: Move MapFormatManager to core module

codereader · May 3, 2020 · 6df8e1d · 6df8e1d
1 parent 30f772c
commit 6df8e1d
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -424,7 +424,6 @@ darkradiant_SOURCES = main.cpp \
                       map/AutoSaver.cpp \
                       map/StartupMapLoader.cpp \
                       map/MapResourceManager.cpp \
-                      map/MapFormatManager.cpp \
 					  map/AasFileManager.cpp \
 					  map/RenderableAasFile.cpp \
                       clipper/ClipPoint.cpp \

diff --git a/radiantcore/Makefile.am b/radiantcore/Makefile.am
@@ -39,6 +39,7 @@ libradiantcore_la_SOURCES = Radiant.cpp \
                 log/LogStreamBuf.cpp \
                 log/LogWriter.cpp \
                 log/StringLogDevice.cpp \
+                map/format/MapFormatManager.cpp \
                 modulesystem/ModuleLoader.cpp \
                 modulesystem/ModuleRegistry.cpp \
                 scenegraph/SceneGraph.cpp \

diff --git a/radiant/map/MapFormatManager.cpp → radiantcore/map/format/MapFormatManager.cpp b/radiant/map/MapFormatManager.cpp → radiantcore/map/format/MapFormatManager.cpp
diff --git a/radiant/map/MapFormatManager.h → radiantcore/map/format/MapFormatManager.h b/radiant/map/MapFormatManager.h → radiantcore/map/format/MapFormatManager.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -852,7 +852,6 @@
     <ClCompile Include="..\..\radiant\map\FindMapElements.cpp" />
     <ClCompile Include="..\..\radiant\map\Map.cpp" />
     <ClCompile Include="..\..\radiant\map\MapFileManager.cpp" />
-    <ClCompile Include="..\..\radiant\map\MapFormatManager.cpp" />
     <ClCompile Include="..\..\radiant\map\MapPosition.cpp" />
     <ClCompile Include="..\..\radiant\map\MapPositionManager.cpp" />
     <ClCompile Include="..\..\radiant\map\MapResource.cpp" />
@@ -1303,7 +1302,6 @@
     <ClInclude Include="..\..\radiant\map\FindMapElements.h" />
     <ClInclude Include="..\..\radiant\map\Map.h" />
     <ClInclude Include="..\..\radiant\map\MapFileManager.h" />
-    <ClInclude Include="..\..\radiant\map\MapFormatManager.h" />
     <ClInclude Include="..\..\radiant\map\MapPosition.h" />
     <ClInclude Include="..\..\radiant\map\MapPositionManager.h" />
     <ClInclude Include="..\..\radiant\map\MapResource.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -397,9 +397,6 @@
     <ClCompile Include="..\..\radiant\map\MapFileManager.cpp">
       <Filter>src\map</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\map\MapFormatManager.cpp">
-      <Filter>src\map</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\map\MapPosition.cpp">
       <Filter>src\map</Filter>
     </ClCompile>
@@ -1641,9 +1638,6 @@
     <ClInclude Include="..\..\radiant\map\MapFileManager.h">
       <Filter>src\map</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\map\MapFormatManager.h">
-      <Filter>src\map</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\map\MapPosition.h">
       <Filter>src\map</Filter>
     </ClInclude>

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -19,6 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\radiantcore\map\format\MapFormatManager.cpp" />
     <ClCompile Include="..\..\radiantcore\Radiant.cpp" />
     <ClCompile Include="..\..\radiantcore\commandsystem\CommandSystem.cpp" />
     <ClCompile Include="..\..\radiantcore\log\COutRedirector.cpp" />
@@ -46,6 +47,7 @@
     <ClCompile Include="..\..\radiantcore\xmlregistry\XMLRegistry.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\radiantcore\map\format\MapFormatManager.h" />
     <ClInclude Include="..\..\radiantcore\Radiant.h" />
     <ClInclude Include="..\..\radiantcore\commandsystem\CaseInsensitiveCompare.h" />
     <ClInclude Include="..\..\radiantcore\commandsystem\Command.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -29,6 +29,12 @@
     <Filter Include="src\scenegraph">
       <UniqueIdentifier>{51a3447e-6021-4fc5-8c05-20531489b2a6}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\map">
+      <UniqueIdentifier>{899ea81c-34a8-4c34-bd28-54a2699f1a4f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\map\format">
+      <UniqueIdentifier>{6492e1c1-fe5d-43a5-b408-674741ae3c92}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiantcore\modulesystem\ModuleLoader.cpp">
@@ -106,6 +112,9 @@
     <ClCompile Include="..\..\radiantcore\scenegraph\SceneGraphFactory.cpp">
       <Filter>src\scenegraph</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\map\format\MapFormatManager.cpp">
+      <Filter>src\map\format</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -252,5 +261,8 @@
     <ClInclude Include="..\..\radiantcore\scenegraph\SceneGraphFactory.h">
       <Filter>src\scenegraph</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\map\format\MapFormatManager.h">
+      <Filter>src\map\format</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>