Move cdecl_cast.hpp to xrCore.

OpenXRay · Oct 3, 2015 · 27abe17 · 27abe17
1 parent fd2f57b
commit 27abe17
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 15 deletions.
diff --git a/src/utils/xrAI/xrAI.cpp b/src/utils/xrAI/xrAI.cpp
@@ -26,7 +26,7 @@
 #pragma comment(lib, "xrLCUtil.lib")
 
 #include "utils/xrLCUtil/LevelCompilerLoggerWindow.hpp"
-#include "utils/xrLCUtil/cdecl_cast.hpp"
+#include "xrCore/cdecl_cast.hpp"
 
 LevelCompilerLoggerWindow &Logger = LevelCompilerLoggerWindow();
 

diff --git a/src/utils/xrDO_Light/StdAfx.h b/src/utils/xrDO_Light/StdAfx.h
@@ -35,7 +35,7 @@
 
 #include "utils/xrLCUtil/ILevelCompilerLogger.hpp"
 #include "utils/xrLCUtil/xrThread.hpp"
-#include "utils/xrLCUtil/cdecl_cast.hpp"
+#include "xrCore/cdecl_cast.hpp"
 
 extern ILevelCompilerLogger& Logger;
 extern CThread::LogFunc ProxyMsg;

diff --git a/src/utils/xrDO_Light/xrDO_Light.cpp b/src/utils/xrDO_Light/xrDO_Light.cpp
@@ -3,7 +3,7 @@
 
 #include "utils/xrLC_Light/xrlc_light.h"
 #include "utils/xrLCUtil/LevelCompilerLoggerWindow.hpp"
-#include "utils/xrLCUtil/cdecl_cast.hpp"
+#include "xrCore/cdecl_cast.hpp"
 #include "utils/xrLCUtil/xrLCUtil.hpp"
 //#pragma comment(linker,"/STACK:0x800000,0x400000")
 

diff --git a/src/utils/xrLC/StdAfx.h b/src/utils/xrLC/StdAfx.h
@@ -10,7 +10,7 @@
 
 #include "utils/xrLCUtil/ILevelCompilerLogger.hpp"
 #include "utils/xrLCUtil/xrThread.hpp"
-#include "utils/xrLCUtil/cdecl_cast.hpp"
+#include "xrCore/cdecl_cast.hpp"
 
 extern ILevelCompilerLogger& Logger;
 extern CThread::LogFunc ProxyMsg;

diff --git a/src/utils/xrLCUtil/xrLCUtil.vcxproj b/src/utils/xrLCUtil/xrLCUtil.vcxproj
@@ -186,7 +186,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="cdecl_cast.hpp" />
     <ClInclude Include="ILevelCompilerLogger.hpp" />
     <ClInclude Include="LevelCompilerLoggerConsole.hpp" />
     <ClInclude Include="LevelCompilerLoggerWindow.hpp" />

diff --git a/src/utils/xrLCUtil/xrLCUtil.vcxproj.filters b/src/utils/xrLCUtil/xrLCUtil.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="xrUtil.cpp">
-      <Filter>Kernel</Filter>
-    </ClCompile>
     <ClCompile Include="xrThread.cpp">
       <Filter>Threading</Filter>
     </ClCompile>
@@ -30,11 +27,9 @@
     <ClCompile Include="LevelCompilerLoggerConsole.cpp">
       <Filter>Log</Filter>
     </ClCompile>
+    <ClCompile Include="xrLCUtil.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="xrUtil.hpp">
-      <Filter>Kernel</Filter>
-    </ClInclude>
     <ClInclude Include="xrThread.hpp">
       <Filter>Threading</Filter>
     </ClInclude>
@@ -53,9 +48,7 @@
     <ClInclude Include="LevelCompilerLoggerConsole.hpp">
       <Filter>Log</Filter>
     </ClInclude>
-    <ClInclude Include="cdecl_cast.hpp">
-      <Filter>Kernel</Filter>
-    </ClInclude>
+    <ClInclude Include="xrLCUtil.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resource.rc">

diff --git a/src/utils/xrLC_Light/stdafx.h b/src/utils/xrLC_Light/stdafx.h
@@ -35,7 +35,7 @@
 #include "xrLC_Light.h"
 #include "utils/xrLCUtil/ILevelCompilerLogger.hpp"
 #include "utils/xrLCUtil/xrThread.hpp"
-#include "utils/xrLCUtil/cdecl_cast.hpp"
+#include "xrCore/cdecl_cast.hpp"
 
 extern ILevelCompilerLogger& Logger;
 extern CThread::LogFunc ProxyMsg;

diff --git a/src/utils/xrLCUtil/cdecl_cast.hpp → src/xrCore/cdecl_cast.hpp b/src/utils/xrLCUtil/cdecl_cast.hpp → src/xrCore/cdecl_cast.hpp
diff --git a/src/xrCore/xrCore.vcxproj b/src/xrCore/xrCore.vcxproj
@@ -410,6 +410,7 @@
     <ClInclude Include="blackbox\WarningsOn.h" />
     <ClInclude Include="buffer_vector.h" />
     <ClInclude Include="buffer_vector_inline.h" />
+    <ClInclude Include="cdecl_cast.hpp" />
     <ClInclude Include="clsid.h" />
     <ClInclude Include="Coder.hpp" />
     <ClInclude Include="compression_ppmd_stream.h" />

diff --git a/src/xrCore/xrCore.vcxproj.filters b/src/xrCore/xrCore.vcxproj.filters
@@ -667,6 +667,9 @@
     <ClInclude Include="..\common\_d3d_extensions.h">
       <Filter>Kernel\Common</Filter>
     </ClInclude>
+    <ClInclude Include="cdecl_cast.hpp">
+      <Filter>Kernel</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="xrCore.rc">