#994: Adjust VC++ projects

codereader · Feb 12, 2021 · d82be95 · d82be95
1 parent f2ac15d
commit d82be95
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -43,18 +43,17 @@
     <ClCompile Include="..\..\radiantcore\eclass\EClassColourManager.cpp" />
     <ClCompile Include="..\..\radiantcore\eclass\EClassManager.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\AngleKey.cpp" />
+    <ClCompile Include="..\..\radiantcore\entity\AttachmentData.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\curve\Curve.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\curve\CurveCatmullRom.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\curve\CurveEditInstance.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\curve\CurveNURBS.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\Doom3Entity.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\doom3group\Doom3Group.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\doom3group\Doom3GroupNode.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\eclassmodel\EclassModelNode.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\EntityModule.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\EntityNode.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\EntitySettings.cpp" />
-    <ClCompile Include="..\..\radiantcore\entity\generic\GenericEntity.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\generic\GenericEntityNode.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\KeyValue.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\KeyValueObserver.cpp" />
@@ -67,6 +66,7 @@
     <ClCompile Include="..\..\radiantcore\entity\RotationKey.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\RotationMatrix.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\ShaderParms.cpp" />
+    <ClCompile Include="..\..\radiantcore\entity\SpawnArgs.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\speaker\SpeakerNode.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\speaker\SpeakerRenderables.cpp" />
     <ClCompile Include="..\..\radiantcore\entity\target\TargetableNode.cpp" />
@@ -727,21 +727,20 @@
     <ClInclude Include="..\..\radiantcore\eclass\EClassManager.h" />
     <ClInclude Include="..\..\radiantcore\entity\algorithm\Speaker.h" />
     <ClInclude Include="..\..\radiantcore\entity\AngleKey.h" />
+    <ClInclude Include="..\..\radiantcore\entity\AttachmentData.h" />
     <ClInclude Include="..\..\radiantcore\entity\ColourKey.h" />
     <ClInclude Include="..\..\radiantcore\entity\curve\Curve.h" />
     <ClInclude Include="..\..\radiantcore\entity\curve\CurveCatmullRom.h" />
     <ClInclude Include="..\..\radiantcore\entity\curve\CurveControlPointFunctors.h" />
     <ClInclude Include="..\..\radiantcore\entity\curve\CurveEditInstance.h" />
     <ClInclude Include="..\..\radiantcore\entity\curve\CurveNURBS.h" />
     <ClInclude Include="..\..\radiantcore\entity\curve\RenderableCurve.h" />
-    <ClInclude Include="..\..\radiantcore\entity\Doom3Entity.h" />
     <ClInclude Include="..\..\radiantcore\entity\doom3group\Doom3Group.h" />
     <ClInclude Include="..\..\radiantcore\entity\doom3group\Doom3GroupNode.h" />
     <ClInclude Include="..\..\radiantcore\entity\eclassmodel\EclassModelNode.h" />
     <ClInclude Include="..\..\radiantcore\entity\EntityModule.h" />
     <ClInclude Include="..\..\radiantcore\entity\EntityNode.h" />
     <ClInclude Include="..\..\radiantcore\entity\EntitySettings.h" />
-    <ClInclude Include="..\..\radiantcore\entity\generic\GenericEntity.h" />
     <ClInclude Include="..\..\radiantcore\entity\generic\GenericEntityNode.h" />
     <ClInclude Include="..\..\radiantcore\entity\generic\RenderableArrow.h" />
     <ClInclude Include="..\..\radiantcore\entity\KeyObserverDelegate.h" />
@@ -762,6 +761,7 @@
     <ClInclude Include="..\..\radiantcore\entity\RotationKey.h" />
     <ClInclude Include="..\..\radiantcore\entity\RotationMatrix.h" />
     <ClInclude Include="..\..\radiantcore\entity\ShaderParms.h" />
+    <ClInclude Include="..\..\radiantcore\entity\SpawnArgs.h" />
     <ClInclude Include="..\..\radiantcore\entity\speaker\SpeakerNode.h" />
     <ClInclude Include="..\..\radiantcore\entity\speaker\SpeakerRenderables.h" />
     <ClInclude Include="..\..\radiantcore\entity\target\RenderableTargetLines.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -388,9 +388,6 @@
     <ClCompile Include="..\..\radiantcore\entity\AngleKey.cpp">
       <Filter>src\entity</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiantcore\entity\Doom3Entity.cpp">
-      <Filter>src\entity</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiantcore\entity\EntityModule.cpp">
       <Filter>src\entity</Filter>
     </ClCompile>
@@ -433,9 +430,6 @@
     <ClCompile Include="..\..\radiantcore\entity\light\Renderables.cpp">
       <Filter>src\entity\light</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiantcore\entity\generic\GenericEntity.cpp">
-      <Filter>src\entity\generic</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiantcore\entity\generic\GenericEntityNode.cpp">
       <Filter>src\entity\generic</Filter>
     </ClCompile>
@@ -1018,6 +1012,12 @@
     <ClCompile Include="..\..\radiantcore\decl\FavouritesManager.cpp">
       <Filter>src\decl</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\entity\SpawnArgs.cpp">
+      <Filter>src\entity</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiantcore\entity\AttachmentData.cpp">
+      <Filter>src\entity</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">
@@ -1320,9 +1320,6 @@
     <ClInclude Include="..\..\radiantcore\entity\ColourKey.h">
       <Filter>src\entity</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiantcore\entity\Doom3Entity.h">
-      <Filter>src\entity</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiantcore\entity\EntityModule.h">
       <Filter>src\entity</Filter>
     </ClInclude>
@@ -1389,9 +1386,6 @@
     <ClInclude Include="..\..\radiantcore\entity\light\RenderableVertices.h">
       <Filter>src\entity\light</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiantcore\entity\generic\GenericEntity.h">
-      <Filter>src\entity\generic</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiantcore\entity\generic\GenericEntityNode.h">
       <Filter>src\entity\generic</Filter>
     </ClInclude>
@@ -2079,5 +2073,11 @@
     <ClInclude Include="..\..\radiantcore\entity\algorithm\Speaker.h">
       <Filter>src\entity\algorithm</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiantcore\entity\SpawnArgs.h">
+      <Filter>src\entity</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiantcore\entity\AttachmentData.h">
+      <Filter>src\entity</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/tools/msvc/Tests/Tests.vcxproj b/tools/msvc/Tests/Tests.vcxproj
@@ -71,6 +71,7 @@
     <ClCompile Include="..\..\..\test\Camera.cpp" />
     <ClCompile Include="..\..\..\test\ColourSchemes.cpp" />
     <ClCompile Include="..\..\..\test\CSG.cpp" />
+    <ClCompile Include="..\..\..\test\Entity.cpp" />
     <ClCompile Include="..\..\..\test\Face.cpp" />
     <ClCompile Include="..\..\..\test\FacePlane.cpp" />
     <ClCompile Include="..\..\..\test\Favourites.cpp" />

diff --git a/tools/msvc/Tests/Tests.vcxproj.filters b/tools/msvc/Tests/Tests.vcxproj.filters
@@ -38,6 +38,7 @@
     <ClCompile Include="..\..\..\test\Favourites.cpp" />
     <ClCompile Include="..\..\..\test\Prefabs.cpp" />
     <ClCompile Include="..\..\..\test\Parsing.cpp" />
+    <ClCompile Include="..\..\..\test\Entity.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\test\HeadlessOpenGLContext.h" />