From f42cfa6f43352b170f6e4f42c206997095b28888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20W=2E=20Urba=C5=84czyk?= <mwu-tow@gazeta.pl>
Date: Thu, 11 Apr 2013 01:05:51 +0000
Subject: [PATCH] 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).

---
 lib/CMakeLists.txt                          | 2 +-
 lib/VCMI_lib.vcxproj                        | 8 ++++----
 lib/logging/{CLogger.cpp => CNewLogger.cpp} | 2 +-
 lib/logging/{CLogger.h => CNewLogger.h}     | 0
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename lib/logging/{CLogger.cpp => CNewLogger.cpp} (99%)
 rename lib/logging/{CLogger.h => CNewLogger.h} (100%)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 8ebc020ba..48c64f81f 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -14,7 +14,7 @@ set(lib_SRCS
 		filesystem/CFileInputStream.cpp
 		filesystem/CCompressedStream.cpp
 		logging/CBasicLogConfigurator.cpp
-		logging/CLogger.cpp
+		logging/CNewLogger.cpp
 		mapping/CCampaignHandler.cpp
 		mapping/CMap.cpp
 		mapping/CMapEditManager.cpp
diff --git a/lib/VCMI_lib.vcxproj b/lib/VCMI_lib.vcxproj
index e3cd362db..ec648397d 100644
--- a/lib/VCMI_lib.vcxproj
+++ b/lib/VCMI_lib.vcxproj
@@ -204,7 +204,7 @@
     <ClCompile Include="RegisterTypes.cpp" />
     <ClCompile Include="rmg\CMapGenOptions.cpp" />
     <ClCompile Include="rmg\CMapGenerator.cpp" />
-    <ClCompile Include="logging\CLogger.cpp" />
+    <ClCompile Include="logging\CNewLogger.cpp" />
     <ClCompile Include="logging\CBasicLogConfigurator.cpp" />
     <ClCompile Include="HeroBonus.cpp" />
     <ClCompile Include="CBattleCallback.cpp" />
@@ -274,8 +274,8 @@
     <ClInclude Include="mapping\MapFormatH3M.h" />
     <ClInclude Include="rmg\CMapGenOptions.h" />
     <ClInclude Include="rmg\CMapGenerator.h" />
-    <ClCompile Include="logging\CLogger.h" />
-    <ClCompile Include="logging\CBasicLogConfigurator.h" />
+    <ClInclude Include="logging\CNewLogger.h" />
+    <ClInclude Include="logging\CBasicLogConfigurator.h" />
     <ClInclude Include="GameConstants.h" />
     <ClInclude Include="HeroBonus.h" />
     <ClInclude Include="CBattleCallback.h" />
@@ -296,4 +296,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/lib/logging/CLogger.cpp b/lib/logging/CNewLogger.cpp
similarity index 99%
rename from lib/logging/CLogger.cpp
rename to lib/logging/CNewLogger.cpp
index 29580e90d..3c0ab082e 100644
--- a/lib/logging/CLogger.cpp
+++ b/lib/logging/CNewLogger.cpp
@@ -1,5 +1,5 @@
 #include "StdInc.h"
-#include "CLogger.h"
+#include "CNewLogger.h"
 
 const std::string CLoggerDomain::DOMAIN_GLOBAL = "global";
 
diff --git a/lib/logging/CLogger.h b/lib/logging/CNewLogger.h
similarity index 100%
rename from lib/logging/CLogger.h
rename to lib/logging/CNewLogger.h