mirror of
https://github.com/vcmi/vcmi.git
synced 2025-08-13 19:54:17 +02:00
MSVC compile fixes:
1) Names of compile units need to be unique, renamed the new CLogget.cpp to CNewLogger.cpp. (at least till the old CLogger is gone) 2) Fixes for project files (a few includes were marked as compile items).
This commit is contained in:
@@ -14,7 +14,7 @@ set(lib_SRCS
|
|||||||
filesystem/CFileInputStream.cpp
|
filesystem/CFileInputStream.cpp
|
||||||
filesystem/CCompressedStream.cpp
|
filesystem/CCompressedStream.cpp
|
||||||
logging/CBasicLogConfigurator.cpp
|
logging/CBasicLogConfigurator.cpp
|
||||||
logging/CLogger.cpp
|
logging/CNewLogger.cpp
|
||||||
mapping/CCampaignHandler.cpp
|
mapping/CCampaignHandler.cpp
|
||||||
mapping/CMap.cpp
|
mapping/CMap.cpp
|
||||||
mapping/CMapEditManager.cpp
|
mapping/CMapEditManager.cpp
|
||||||
|
@@ -204,7 +204,7 @@
|
|||||||
<ClCompile Include="RegisterTypes.cpp" />
|
<ClCompile Include="RegisterTypes.cpp" />
|
||||||
<ClCompile Include="rmg\CMapGenOptions.cpp" />
|
<ClCompile Include="rmg\CMapGenOptions.cpp" />
|
||||||
<ClCompile Include="rmg\CMapGenerator.cpp" />
|
<ClCompile Include="rmg\CMapGenerator.cpp" />
|
||||||
<ClCompile Include="logging\CLogger.cpp" />
|
<ClCompile Include="logging\CNewLogger.cpp" />
|
||||||
<ClCompile Include="logging\CBasicLogConfigurator.cpp" />
|
<ClCompile Include="logging\CBasicLogConfigurator.cpp" />
|
||||||
<ClCompile Include="HeroBonus.cpp" />
|
<ClCompile Include="HeroBonus.cpp" />
|
||||||
<ClCompile Include="CBattleCallback.cpp" />
|
<ClCompile Include="CBattleCallback.cpp" />
|
||||||
@@ -274,8 +274,8 @@
|
|||||||
<ClInclude Include="mapping\MapFormatH3M.h" />
|
<ClInclude Include="mapping\MapFormatH3M.h" />
|
||||||
<ClInclude Include="rmg\CMapGenOptions.h" />
|
<ClInclude Include="rmg\CMapGenOptions.h" />
|
||||||
<ClInclude Include="rmg\CMapGenerator.h" />
|
<ClInclude Include="rmg\CMapGenerator.h" />
|
||||||
<ClCompile Include="logging\CLogger.h" />
|
<ClInclude Include="logging\CNewLogger.h" />
|
||||||
<ClCompile Include="logging\CBasicLogConfigurator.h" />
|
<ClInclude Include="logging\CBasicLogConfigurator.h" />
|
||||||
<ClInclude Include="GameConstants.h" />
|
<ClInclude Include="GameConstants.h" />
|
||||||
<ClInclude Include="HeroBonus.h" />
|
<ClInclude Include="HeroBonus.h" />
|
||||||
<ClInclude Include="CBattleCallback.h" />
|
<ClInclude Include="CBattleCallback.h" />
|
||||||
@@ -296,4 +296,4 @@
|
|||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets">
|
<ImportGroup Label="ExtensionTargets">
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
</Project>
|
</Project>
|
@@ -1,5 +1,5 @@
|
|||||||
#include "StdInc.h"
|
#include "StdInc.h"
|
||||||
#include "CLogger.h"
|
#include "CNewLogger.h"
|
||||||
|
|
||||||
const std::string CLoggerDomain::DOMAIN_GLOBAL = "global";
|
const std::string CLoggerDomain::DOMAIN_GLOBAL = "global";
|
||||||
|
|
Reference in New Issue
Block a user