#5231: Move CounterManager to core binary

codereader · May 25, 2020 · d6ce954 · d6ce954
1 parent f9b0ce8
commit d6ce954
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -270,7 +270,6 @@ darkradiant_SOURCES = main.cpp \
                       map/algorithm/MapImporter.cpp \
                       map/algorithm/Import.cpp \
                       map/algorithm/Export.cpp \
-                      map/CounterManager.cpp \
                       map/RegionManager.cpp \
                       map/PointFile.cpp \
                       map/MapPositionManager.cpp \

diff --git a/radiantcore/Makefile.am b/radiantcore/Makefile.am
@@ -114,6 +114,7 @@ libradiantcore_la_SOURCES = Radiant.cpp \
                 map/namespace/ComplexName.cpp \
                 map/namespace/Namespace.cpp \
                 map/namespace/NamespaceFactory.cpp \
+                map/CounterManager.cpp \
                 model/md5/MD5Skeleton.cpp \
                 model/md5/MD5Module.cpp \
                 model/md5/MD5Model.cpp \

diff --git a/radiant/map/CounterManager.cpp → radiantcore/map/CounterManager.cpp b/radiant/map/CounterManager.cpp → radiantcore/map/CounterManager.cpp
diff --git a/radiant/map/CounterManager.h → radiantcore/map/CounterManager.h b/radiant/map/CounterManager.h → radiantcore/map/CounterManager.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -322,7 +322,6 @@
     <ClCompile Include="..\..\radiant\clipper\Clipper.cpp" />
     <ClCompile Include="..\..\radiant\clipper\ClipPoint.cpp" />
     <ClCompile Include="..\..\radiant\map\AutoSaver.cpp" />
-    <ClCompile Include="..\..\radiant\map\CounterManager.cpp" />
     <ClCompile Include="..\..\radiant\map\FindMapElements.cpp" />
     <ClCompile Include="..\..\radiant\map\Map.cpp" />
     <ClCompile Include="..\..\radiant\map\MapFileManager.cpp" />
@@ -610,7 +609,6 @@
     <ClInclude Include="..\..\radiant\clipper\Clipper.h" />
     <ClInclude Include="..\..\radiant\clipper\ClipPoint.h" />
     <ClInclude Include="..\..\radiant\map\AutoSaver.h" />
-    <ClInclude Include="..\..\radiant\map\CounterManager.h" />
     <ClInclude Include="..\..\radiant\map\EntityBreakdown.h" />
     <ClInclude Include="..\..\radiant\map\FindMapElements.h" />
     <ClInclude Include="..\..\radiant\map\Map.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -277,9 +277,6 @@
     <ClCompile Include="..\..\radiant\map\AutoSaver.cpp">
       <Filter>src\map</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\map\CounterManager.cpp">
-      <Filter>src\map</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\map\FindMapElements.cpp">
       <Filter>src\map</Filter>
     </ClCompile>
@@ -1059,9 +1056,6 @@
     <ClInclude Include="..\..\radiant\map\AutoSaver.h">
       <Filter>src\map</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\map\CounterManager.h">
-      <Filter>src\map</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\map\EntityBreakdown.h">
       <Filter>src\map</Filter>
     </ClInclude>

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -74,6 +74,7 @@
     <ClCompile Include="..\..\radiantcore\layers\LayerManager.cpp" />
     <ClCompile Include="..\..\radiantcore\layers\LayerModule.cpp" />
     <ClCompile Include="..\..\radiantcore\map\algorithm\Models.cpp" />
+    <ClCompile Include="..\..\radiantcore\map\CounterManager.cpp" />
     <ClCompile Include="..\..\radiantcore\map\format\Doom3MapFormat.cpp" />
     <ClCompile Include="..\..\radiantcore\map\format\Doom3MapReader.cpp" />
     <ClCompile Include="..\..\radiantcore\map\format\Doom3MapWriter.cpp" />
@@ -673,6 +674,7 @@
     <ClInclude Include="..\..\radiantcore\layers\RemoveFromLayerWalker.h" />
     <ClInclude Include="..\..\radiantcore\layers\SetLayerSelectedWalker.h" />
     <ClInclude Include="..\..\radiantcore\map\algorithm\Models.h" />
+    <ClInclude Include="..\..\radiantcore\map\CounterManager.h" />
     <ClInclude Include="..\..\radiantcore\map\format\Doom3MapFormat.h" />
     <ClInclude Include="..\..\radiantcore\map\format\Doom3MapReader.h" />
     <ClInclude Include="..\..\radiantcore\map\format\Doom3MapWriter.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -676,6 +676,9 @@
     <ClCompile Include="..\..\radiantcore\model\export\WavefrontExporter.cpp">
       <Filter>src\model\export</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\map\CounterManager.cpp">
+      <Filter>src\map</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -1365,5 +1368,8 @@
     <ClInclude Include="..\..\radiantcore\model\export\WavefrontExporter.h">
       <Filter>src\model\export</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\map\CounterManager.h">
+      <Filter>src\map</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>