Delete unused/duplicated sources.

OpenXRay · Oct 2, 2015 · d545781 · d545781
1 parent 1507443
commit d545781
Show file tree

Hide file tree

Showing 28 changed files with 22 additions and 380 deletions.
diff --git a/src/Include/FSMacros.hpp → src/common/FSMacros.hpp b/src/Include/FSMacros.hpp → src/common/FSMacros.hpp
diff --git a/src/common/Util.hpp b/src/common/Util.hpp
@@ -5,3 +5,20 @@
     inline TEnum operator&(TEnum a, TEnum b) { return (TEnum)((TBaseType)a & (TBaseType)b); } \
     inline TEnum& operator|=(TEnum& a, TEnum b) { return a = a | b; } \
     inline TEnum& operator&=(TEnum& a, TEnum b) { return a = a & b; }
+
+#define _RELEASE(x) \
+{ \
+    if ((x)) \
+    { \
+        (x)->Release(); \
+        (x) = nullptr; \
+    } \
+}
+#define _SHOW_REF(msg, x) \
+{ \
+    if ((x)) \
+    { \
+        (x)->AddRef(); \
+        Log(msg, u32((x)->Release())); \
+    } \
+}
diff --git a/src/utils/xrAI/StdAfx.h b/src/utils/xrAI/StdAfx.h
@@ -19,7 +19,6 @@
 #define ECORE_API
 #define XR_EPROPS_API
 #include "xrCore/clsid.h"
-#include "defines.h"
 #include "xrCDB/xrCDB.h"
 #include "Common/_d3d_extensions.h"
 

diff --git a/src/utils/xrAI/cl_collector.cpp b/src/utils/xrAI/cl_collector.cpp
diff --git a/src/utils/xrAI/cl_collector.h b/src/utils/xrAI/cl_collector.h
diff --git a/src/utils/xrAI/defines.h b/src/utils/xrAI/defines.h
diff --git a/src/utils/xrAI/light.h b/src/utils/xrAI/light.h
diff --git a/src/utils/xrAI/std_classes.h b/src/utils/xrAI/std_classes.h
diff --git a/src/utils/xrAI/xrAI.vcxproj b/src/utils/xrAI/xrAI.vcxproj
@@ -243,7 +243,6 @@
     <ClCompile Include="..\..\xrServerEntities\xrServer_Object_Base.cpp" />
     <ClCompile Include="alife_artefact_order.cpp" />
     <ClCompile Include="buffer_vector.cpp" />
-    <ClCompile Include="cl_collector.cpp" />
     <ClCompile Include="compiler.cpp">
       <AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">AssemblyAndSourceCode</AssemblerOutput>
       <AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AssemblyAndSourceCode</AssemblerOutput>
@@ -347,7 +346,6 @@
     <ClInclude Include="builder_allocator_constructor_inline.h" />
     <ClInclude Include="ChooseTypes.h" />
     <ClInclude Include="client_id.h" />
-    <ClInclude Include="cl_collector.h" />
     <ClInclude Include="communicate.h" />
     <ClInclude Include="compiler.h" />
     <ClInclude Include="cover_point.h" />
@@ -361,14 +359,12 @@
     <ClInclude Include="data_storage_double_linked_list_inline.h" />
     <ClInclude Include="data_storage_single_linked_list.h" />
     <ClInclude Include="data_storage_single_linked_list_inline.h" />
-    <ClInclude Include="defines.h" />
     <ClInclude Include="dijkstra.h" />
     <ClInclude Include="dijkstra_inline.h" />
     <ClInclude Include="edge_path.h" />
     <ClInclude Include="edge_path_inline.h" />
     <ClInclude Include="ETextureParams.h" />
     <ClInclude Include="factory_api.h" />
-    <ClInclude Include="FTimer.h" />
     <ClInclude Include="game_graph.h" />
     <ClInclude Include="game_graph_builder.h" />
     <ClInclude Include="game_graph_builder_inline.h" />
@@ -396,7 +392,6 @@
     <ClInclude Include="level_graph_vertex_inline.h" />
     <ClInclude Include="level_spawn_constructor.h" />
     <ClInclude Include="level_spawn_constructor_inline.h" />
-    <ClInclude Include="light.h" />
     <ClInclude Include="manager_builder_allocator_constructor.h" />
     <ClInclude Include="manager_builder_allocator_constructor_inline.h" />
     <ClInclude Include="motion_simulator.h" />
@@ -444,7 +439,6 @@
     <ClInclude Include="spawn_constructor_space.h" />
     <ClInclude Include="spawn_patcher.h" />
     <ClInclude Include="StdAfx.h" />
-    <ClInclude Include="std_classes.h" />
     <ClInclude Include="vertex_allocator_fixed.h" />
     <ClInclude Include="vertex_allocator_fixed_inline.h" />
     <ClInclude Include="vertex_manager_fixed.h" />

diff --git a/src/utils/xrAI/xrAI.vcxproj.filters b/src/utils/xrAI/xrAI.vcxproj.filters
@@ -13,12 +13,6 @@
     <Filter Include="Compiler\Kernel">
       <UniqueIdentifier>{d7047094-b5bb-4398-830d-7f17b82d8030}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Compiler\Kernel\Generic">
-      <UniqueIdentifier>{a4c402e3-d51e-4459-a697-a90c8a83326c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Compiler\Kernel\Generic\CDB">
-      <UniqueIdentifier>{603dd521-961a-4462-88bc-e692a9417ddc}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Compiler\Kernel\Random32">
       <UniqueIdentifier>{1e4ce8af-06dd-4be3-877a-082bbb1fac8a}</UniqueIdentifier>
     </Filter>
@@ -273,9 +267,6 @@
     <ClCompile Include="xrAI.cpp">
       <Filter>Compiler\Kernel</Filter>
     </ClCompile>
-    <ClCompile Include="cl_collector.cpp">
-      <Filter>Compiler\Kernel\Generic\CDB</Filter>
-    </ClCompile>
     <ClCompile Include="random32.cpp">
       <Filter>Compiler\Kernel\Random32</Filter>
     </ClCompile>
@@ -410,9 +401,6 @@
     <ClInclude Include="communicate.h">
       <Filter>Compiler\Kernel</Filter>
     </ClInclude>
-    <ClInclude Include="defines.h">
-      <Filter>Compiler\Kernel</Filter>
-    </ClInclude>
     <ClInclude Include="factory_api.h">
       <Filter>Compiler\Kernel</Filter>
     </ClInclude>
@@ -425,18 +413,6 @@
     <ClInclude Include="xrShaderTypes.h">
       <Filter>Compiler\Kernel</Filter>
     </ClInclude>
-    <ClInclude Include="FTimer.h">
-      <Filter>Compiler\Kernel\Generic</Filter>
-    </ClInclude>
-    <ClInclude Include="light.h">
-      <Filter>Compiler\Kernel\Generic</Filter>
-    </ClInclude>
-    <ClInclude Include="std_classes.h">
-      <Filter>Compiler\Kernel\Generic</Filter>
-    </ClInclude>
-    <ClInclude Include="cl_collector.h">
-      <Filter>Compiler\Kernel\Generic\CDB</Filter>
-    </ClInclude>
     <ClInclude Include="random32.h">
       <Filter>Compiler\Kernel\Random32</Filter>
     </ClInclude>

diff --git a/src/utils/xrAI/xrCrossTable.cpp b/src/utils/xrAI/xrCrossTable.cpp
@@ -7,7 +7,6 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
-#include "defines.h"
 #include "xrCrossTable.h"
 
 LPCSTR GAME_LEVEL_GRAPH = "level.graph";

diff --git a/src/utils/xrDO_Light/StdAfx.h b/src/utils/xrDO_Light/StdAfx.h
@@ -19,7 +19,6 @@
 #define ECORE_API
 #define XR_EPROPS_API
 #include "xrCore/clsid.h"
-#include "defines.h"
 #include "xrCDB/xrCDB.h"
 #include "Common/_d3d_extensions.h"
 

diff --git a/src/utils/xrDO_Light/defines.h b/src/utils/xrDO_Light/defines.h
diff --git a/src/utils/xrDO_Light/std_classes.h b/src/utils/xrDO_Light/std_classes.h
diff --git a/src/utils/xrDO_Light/xrDO_Light.vcxproj b/src/utils/xrDO_Light/xrDO_Light.vcxproj
@@ -212,9 +212,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="defines.h" />
     <ClInclude Include="StdAfx.h" />
-    <ClInclude Include="std_classes.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="StdAfx.cpp">

diff --git a/src/utils/xrDO_Light/xrDO_Light.vcxproj.filters b/src/utils/xrDO_Light/xrDO_Light.vcxproj.filters
@@ -4,23 +4,11 @@
     <Filter Include="Kernel">
       <UniqueIdentifier>{b29b8dd4-9ba8-4204-a99d-bdf18bdb8b47}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Kernel\Generic">
-      <UniqueIdentifier>{52b2e43c-206f-4587-88fb-7eb7c9c3ec68}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Kernel\CDB">
-      <UniqueIdentifier>{cb3862d8-630a-4488-a806-7327a1fdb68d}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="defines.h">
-      <Filter>Kernel</Filter>
-    </ClInclude>
     <ClInclude Include="StdAfx.h">
       <Filter>Kernel</Filter>
     </ClInclude>
-    <ClInclude Include="std_classes.h">
-      <Filter>Kernel\Generic</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="StdAfx.cpp">

diff --git a/src/utils/xrLC/StdAfx.h b/src/utils/xrLC/StdAfx.h
@@ -7,7 +7,7 @@
 #define ECORE_API				// fake, to enable sharing with editors
 #define XR_EPROPS_API
 #include "xrCore/clsid.h"
-#include "defines.h"
+
 #include "utils/xrLCUtil/ILevelCompilerLogger.hpp"
 #include "utils/xrLCUtil/xrThread.hpp"
 #include "utils/xrLCUtil/cdecl_cast.hpp"