Remove some unneeded files in xrAICore and dependencies in xrEngine a…

…nd xrPhysics.
OpenXRay · Dec 28, 2017 · 3ffff30 · 3ffff30
1 parent c12c002
commit 3ffff30
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 78 deletions.
diff --git a/src/xrAICore/AISpaceBase.hpp b/src/xrAICore/AISpaceBase.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "xrAICore/xrAICore.hpp"
+
 #include "xrCore/xrCore.h"
 
 class CGameGraph;

diff --git a/src/xrAICore/Components/script_world_property_script.cpp b/src/xrAICore/Components/script_world_property_script.cpp
@@ -6,7 +6,7 @@
 //	Description : Script world property script export
 ////////////////////////////////////////////////////////////////////////////
 
-#include "ScriptPCH.hpp"
+#include "PCH.hpp"
 #include "script_world_property.h"
 #include "operator_abstract.h"
 #include "xrScriptEngine/ScriptExporter.hpp"

diff --git a/src/xrAICore/Components/script_world_state_script.cpp b/src/xrAICore/Components/script_world_state_script.cpp
@@ -6,7 +6,7 @@
 //	Description : Script world state script export
 ////////////////////////////////////////////////////////////////////////////
 
-#include "ScriptPCH.hpp"
+#include "PCH.hpp"
 #include "script_world_state.h"
 #include "condition_state.h"
 #include "xrScriptEngine/ScriptExporter.hpp"

diff --git a/src/xrAICore/Navigation/PatrolPath/patrol_path.h b/src/xrAICore/Navigation/PatrolPath/patrol_path.h
@@ -7,7 +7,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
-#include "xrAICore/xrAICore.hpp"
+
 #include "xrAICore/Navigation/graph_abstract.h"
 #include "xrAICore/Navigation/PatrolPath/patrol_point.h"
 

diff --git a/src/xrAICore/Navigation/PatrolPath/patrol_path_params.h b/src/xrAICore/Navigation/PatrolPath/patrol_path_params.h
@@ -7,7 +7,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
-#include "xrAICore/xrAICore.hpp"
+
 #include "xrAICore/Navigation/game_graph_space.h"
 #include "xrAICore/Navigation/PatrolPath/patrol_path.h"
 

diff --git a/src/xrAICore/Navigation/PatrolPath/patrol_path_params_script.cpp b/src/xrAICore/Navigation/PatrolPath/patrol_path_params_script.cpp
@@ -6,7 +6,7 @@
 //	Description : Patrol path parameters class script export
 ////////////////////////////////////////////////////////////////////////////
 
-#include "ScriptPCH.hpp"
+#include "PCH.hpp"
 #include "patrol_path_params.h"
 #include "xrScriptEngine/ScriptExporter.hpp"
 #include "xrScriptEngine/DebugMacros.hpp" // for THROW3 // XXX: move debug macros to xrCore

diff --git a/src/xrAICore/Navigation/PatrolPath/patrol_path_storage.h b/src/xrAICore/Navigation/PatrolPath/patrol_path_storage.h
@@ -13,7 +13,6 @@ class CLevelGraph;
 class CGameLevelCrossTable;
 class CGameGraph;
 
-#include "xrAICore/xrAICore.hpp"
 #include "Common/object_interfaces.h"
 #include "xrCore/Containers/AssociativeVector.hpp"
 #include "xrScriptEngine/DebugMacros.hpp"

diff --git a/src/xrAICore/Navigation/PatrolPath/patrol_point.h b/src/xrAICore/Navigation/PatrolPath/patrol_point.h
@@ -13,7 +13,6 @@ class CLevelGraph;
 class CGameLevelCrossTable;
 class CGameGraph;
 
-#include "xrAICore/xrAICore.hpp"
 #include "Common/object_interfaces.h"
 #include "xrAICore/Navigation/game_graph_space.h"
 

diff --git a/src/xrAICore/Navigation/game_graph.h b/src/xrAICore/Navigation/game_graph.h
@@ -7,7 +7,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
-#include "xrAICore/xrAICore.hpp"
+
 #include "xrAICore/Navigation/game_graph_space.h"
 #include "xrAICore/Navigation/game_level_cross_table.h"
 

diff --git a/src/xrAICore/Navigation/level_graph.h b/src/xrAICore/Navigation/level_graph.h
@@ -7,7 +7,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #pragma once
-#include "xrAICore/xrAICore.hpp"
+
 #include "Common/LevelStructure.hpp"
 #include "xrAICore/Navigation/level_graph_space.h"
 #include "xrAICore/Navigation/game_graph_space.h"

diff --git a/src/xrAICore/ScriptPCH.cpp b/src/xrAICore/ScriptPCH.cpp
diff --git a/src/xrAICore/ScriptPCH.hpp b/src/xrAICore/ScriptPCH.hpp
diff --git a/src/xrAICore/xrAICore.cpp b/src/xrAICore/xrAICore.cpp
diff --git a/src/xrAICore/xrAICore.hpp b/src/xrAICore/xrAICore.hpp
diff --git a/src/xrAICore/xrAICore.vcxproj b/src/xrAICore/xrAICore.vcxproj
@@ -126,15 +126,13 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;XRAICORE_EXPORTS;XRGAME_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
       <PrecompiledHeaderFile>PCH.hpp</PrecompiledHeaderFile>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;XRAICORE_EXPORTS;XRGAME_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
       <PrecompiledHeaderFile>PCH.hpp</PrecompiledHeaderFile>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -245,40 +243,17 @@
     <ClInclude Include="Navigation\vertex_path.h" />
     <ClInclude Include="Navigation\vertex_path_inline.h" />
     <ClInclude Include="PCH.hpp" />
-    <ClInclude Include="ScriptPCH.hpp" />
-    <ClInclude Include="xrAICore.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AISpaceBase.cpp" />
-    <ClCompile Include="Components\script_world_property_script.cpp">
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ScriptPCH.hpp</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="Components\script_world_state_script.cpp">
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ScriptPCH.hpp</PrecompiledHeaderFile>
-    </ClCompile>
+    <ClCompile Include="Components\script_world_property_script.cpp" />
+    <ClCompile Include="Components\script_world_state_script.cpp" />
     <ClCompile Include="Navigation\game_graph_script.cpp" />
     <ClCompile Include="Navigation\level_graph.cpp" />
     <ClCompile Include="Navigation\level_graph_vertex.cpp" />
     <ClCompile Include="Navigation\PatrolPath\patrol_path.cpp" />
     <ClCompile Include="Navigation\PatrolPath\patrol_path_params.cpp" />
-    <ClCompile Include="Navigation\PatrolPath\patrol_path_params_script.cpp">
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ScriptPCH.hpp</PrecompiledHeaderFile>
-    </ClCompile>
+    <ClCompile Include="Navigation\PatrolPath\patrol_path_params_script.cpp" />
     <ClCompile Include="Navigation\PatrolPath\patrol_path_storage.cpp" />
     <ClCompile Include="Navigation\PatrolPath\patrol_point.cpp" />
     <ClCompile Include="PCH.cpp">
@@ -291,21 +266,6 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">PCH.hpp</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">PCH.hpp</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="ScriptPCH.cpp">
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ScriptPCH.hpp</PrecompiledHeaderFile>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="xrAICore.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/src/xrAICore/xrAICore.vcxproj.filters b/src/xrAICore/xrAICore.vcxproj.filters
@@ -111,9 +111,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="xrAICore.hpp">
-      <Filter>Kernel</Filter>
-    </ClInclude>
     <ClInclude Include="Navigation\game_graph.h">
       <Filter>AI\Navigation\GameGraph</Filter>
     </ClInclude>
@@ -366,9 +363,6 @@
     <ClInclude Include="Components\condition_state_inline.h">
       <Filter>AI\Components\ProblemSolver\ConditionState</Filter>
     </ClInclude>
-    <ClInclude Include="ScriptPCH.hpp">
-      <Filter>Kernel</Filter>
-    </ClInclude>
     <ClInclude Include="Components\problem_solver_inline.h">
       <Filter>AI\Components\ProblemSolver</Filter>
     </ClInclude>
@@ -377,9 +371,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="xrAICore.cpp">
-      <Filter>Kernel</Filter>
-    </ClCompile>
     <ClCompile Include="Navigation\game_graph_script.cpp">
       <Filter>AI\Navigation\GameGraph</Filter>
     </ClCompile>
@@ -413,9 +404,6 @@
     <ClCompile Include="Components\script_world_property_script.cpp">
       <Filter>AI\Components\ProblemSolver\OperatorCondition\ScriptWorldProperty</Filter>
     </ClCompile>
-    <ClCompile Include="ScriptPCH.cpp">
-      <Filter>Kernel</Filter>
-    </ClCompile>
     <ClCompile Include="AISpaceBase.cpp">
       <Filter>AI</Filter>
     </ClCompile>

diff --git a/src/xrEngine/xrEngine.vcxproj b/src/xrEngine/xrEngine.vcxproj
@@ -707,9 +707,6 @@
     <ProjectReference Include="$(SolutionDir)utils\xrMiscMath\xrMiscMath.vcxproj">
       <Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)xrAICore\xrAICore.vcxproj">
-      <Project>{5cb057d8-4464-40a6-af10-c26b826d1d90}</Project>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)xrCDB\xrCDB.vcxproj">
       <Project>{a19b1df2-82ec-4364-8bdf-85d13a1c89b5}</Project>
     </ProjectReference>

diff --git a/src/xrPhysics/xrPhysics.vcxproj b/src/xrPhysics/xrPhysics.vcxproj
@@ -311,9 +311,6 @@
     <ProjectReference Include="$(SolutionDir)utils\xrMiscMath\xrMiscMath.vcxproj">
       <Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)xrAICore\xrAICore.vcxproj">
-      <Project>{5cb057d8-4464-40a6-af10-c26b826d1d90}</Project>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
       <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
     </ProjectReference>