Browse Source

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).

Michał W. Urbańczyk 12 years ago
parent
commit
f42cfa6f43
4 changed files with 6 additions and 6 deletions
  1. 1 1
      lib/CMakeLists.txt
  2. 4 4
      lib/VCMI_lib.vcxproj
  3. 1 1
      lib/logging/CNewLogger.cpp
  4. 0 0
      lib/logging/CNewLogger.h

+ 1 - 1
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

+ 4 - 4
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>

+ 1 - 1
lib/logging/CLogger.cpp → lib/logging/CNewLogger.cpp

@@ -1,5 +1,5 @@
 #include "StdInc.h"
-#include "CLogger.h"
+#include "CNewLogger.h"
 
 const std::string CLoggerDomain::DOMAIN_GLOBAL = "global";
 

+ 0 - 0
lib/logging/CLogger.h → lib/logging/CNewLogger.h