diff --git a/src/utils/xrAI/xrAI.cpp b/src/utils/xrAI/xrAI.cpp index 90f679c0c12..0a1cd7ff9a3 100644 --- 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 index 519d43e3e41..2035850d517 100644 --- 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 index c0d6f8114b8..63393c97cc1 100644 --- 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 index 5f94823d6d6..964d1343c41 100644 --- 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 index cef18c3f130..dfaca7f0036 100644 --- a/src/utils/xrLCUtil/xrLCUtil.vcxproj +++ b/src/utils/xrLCUtil/xrLCUtil.vcxproj @@ -186,7 +186,6 @@ - diff --git a/src/utils/xrLCUtil/xrLCUtil.vcxproj.filters b/src/utils/xrLCUtil/xrLCUtil.vcxproj.filters index 01d2f44d97e..98791447785 100644 --- a/src/utils/xrLCUtil/xrLCUtil.vcxproj.filters +++ b/src/utils/xrLCUtil/xrLCUtil.vcxproj.filters @@ -15,9 +15,6 @@ - - Kernel - Threading @@ -30,11 +27,9 @@ Log + - - Kernel - Threading @@ -53,9 +48,7 @@ Log - - Kernel - + diff --git a/src/utils/xrLC_Light/stdafx.h b/src/utils/xrLC_Light/stdafx.h index cd2b061fac8..c6a71372365 100644 --- 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 b/src/xrCore/cdecl_cast.hpp similarity index 100% rename from src/utils/xrLCUtil/cdecl_cast.hpp rename to src/xrCore/cdecl_cast.hpp diff --git a/src/xrCore/xrCore.vcxproj b/src/xrCore/xrCore.vcxproj index 0016c4ac6fc..fd2736560fc 100644 --- a/src/xrCore/xrCore.vcxproj +++ b/src/xrCore/xrCore.vcxproj @@ -410,6 +410,7 @@ + diff --git a/src/xrCore/xrCore.vcxproj.filters b/src/xrCore/xrCore.vcxproj.filters index b2187936371..3d238dcecae 100644 --- a/src/xrCore/xrCore.vcxproj.filters +++ b/src/xrCore/xrCore.vcxproj.filters @@ -667,6 +667,9 @@ Kernel\Common + + Kernel +