Merge remote-tracking branch 'origin/master'

k6dsp · Sep 10, 2012 · 9e59bf8 · 9e59bf8
2 parents c401166 + 898ce6f
commit 9e59bf8
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 36 deletions.
diff --git a/Base/Base.h b/Base/Base.h
@@ -29,9 +29,6 @@
 #include "Time.h"
 
 
-#pragma comment(lib, "Base")
-
-
 //===================================
 // MIT License
 //

diff --git a/Lib/SrvLib/stdafx.h b/Lib/SrvLib/stdafx.h
@@ -22,6 +22,7 @@
 #include <shlwapi.h>
 #include <process.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <malloc.h>
 #include <stdlib.h>
 #include <winbase.h>

diff --git a/Test/List/List.cpp b/Test/List/List.cpp
@@ -264,7 +264,9 @@ int _tmain(int argc, _TCHAR* argv[]) {
 
     // Test lists
     {
+        #ifdef _DEBUG
         _CrtMemState before, after, delta;
+        #endif
         _CrtMemCheckpoint(&before);
         ListTest::TestList();
         ListTest::TestRandom();
@@ -279,7 +281,9 @@ int _tmain(int argc, _TCHAR* argv[]) {
 
     // Test hashes
     {
+        #ifdef _DEBUG
         _CrtMemState before, after, delta;
+        #endif
         _CrtMemCheckpoint(&before);
         HashTest::TestHash();
         HashTest::TestRandom();

diff --git a/Test/List/List.sln b/Test/List/List.sln
@@ -1,10 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "List", "List.vcxproj", "{0AA2B74E-A1CF-4CC3-B1BC-5BA13DCC9645}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2E31A4E1-59F9-47ED-AC3B-C6A30E17C7B2} = {2E31A4E1-59F9-47ED-AC3B-C6A30E17C7B2}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "List", "List.vcxproj", "{E076C6AF-49DB-4E13-92F1-02A38D94ABAD}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Base", "..\..\Base\Base.vcxproj", "{2E31A4E1-59F9-47ED-AC3B-C6A30E17C7B2}"
 EndProject
@@ -14,10 +11,10 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0AA2B74E-A1CF-4CC3-B1BC-5BA13DCC9645}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0AA2B74E-A1CF-4CC3-B1BC-5BA13DCC9645}.Debug|Win32.Build.0 = Debug|Win32
-		{0AA2B74E-A1CF-4CC3-B1BC-5BA13DCC9645}.Release|Win32.ActiveCfg = Release|Win32
-		{0AA2B74E-A1CF-4CC3-B1BC-5BA13DCC9645}.Release|Win32.Build.0 = Release|Win32
+		{E076C6AF-49DB-4E13-92F1-02A38D94ABAD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E076C6AF-49DB-4E13-92F1-02A38D94ABAD}.Debug|Win32.Build.0 = Debug|Win32
+		{E076C6AF-49DB-4E13-92F1-02A38D94ABAD}.Release|Win32.ActiveCfg = Release|Win32
+		{E076C6AF-49DB-4E13-92F1-02A38D94ABAD}.Release|Win32.Build.0 = Release|Win32
 		{2E31A4E1-59F9-47ED-AC3B-C6A30E17C7B2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2E31A4E1-59F9-47ED-AC3B-C6A30E17C7B2}.Debug|Win32.Build.0 = Debug|Win32
 		{2E31A4E1-59F9-47ED-AC3B-C6A30E17C7B2}.Release|Win32.ActiveCfg = Release|Win32

diff --git a/Test/List/List.vcxproj b/Test/List/List.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{0AA2B74E-A1CF-4CC3-B1BC-5BA13DCC9645}</ProjectGuid>
+    <ProjectGuid>{E076C6AF-49DB-4E13-92F1-02A38D94ABAD}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>List</RootNamespace>
   </PropertyGroup>
@@ -49,12 +49,10 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\Base</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -65,16 +63,17 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\Base</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="ReadMe.txt" />
+  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
@@ -86,6 +85,11 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Base\Base.vcxproj">
+      <Project>{2e31a4e1-59f9-47ed-ac3b-c6a30e17c7b2}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/Test/List/stdafx.h b/Test/List/stdafx.h
@@ -19,4 +19,4 @@
 #include <stddef.h>
 #include <crtdbg.h>
 
-#include <Base.h>
+#include "../../Base/Base.h"
diff --git a/Test/Service/Service.sln b/Test/Service/Service.sln
@@ -1,11 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Service", "Service.vcxproj", "{36485E0F-FCC5-4EDB-B024-90E612917A13}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7902CF80-F1D1-4066-890F-E02692454A89} = {7902CF80-F1D1-4066-890F-E02692454A89}
-		{2E31A4E1-59F9-47ED-AC3B-C6A30E17C7B2} = {2E31A4E1-59F9-47ED-AC3B-C6A30E17C7B2}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Service", "Service.vcxproj", "{7A017E47-91B5-4227-A84B-93948E6AA178}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Base", "..\..\Base\Base.vcxproj", "{2E31A4E1-59F9-47ED-AC3B-C6A30E17C7B2}"
 EndProject
@@ -17,10 +13,10 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{36485E0F-FCC5-4EDB-B024-90E612917A13}.Debug|Win32.ActiveCfg = Debug|Win32
-		{36485E0F-FCC5-4EDB-B024-90E612917A13}.Debug|Win32.Build.0 = Debug|Win32
-		{36485E0F-FCC5-4EDB-B024-90E612917A13}.Release|Win32.ActiveCfg = Release|Win32
-		{36485E0F-FCC5-4EDB-B024-90E612917A13}.Release|Win32.Build.0 = Release|Win32
+		{7A017E47-91B5-4227-A84B-93948E6AA178}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7A017E47-91B5-4227-A84B-93948E6AA178}.Debug|Win32.Build.0 = Debug|Win32
+		{7A017E47-91B5-4227-A84B-93948E6AA178}.Release|Win32.ActiveCfg = Release|Win32
+		{7A017E47-91B5-4227-A84B-93948E6AA178}.Release|Win32.Build.0 = Release|Win32
 		{2E31A4E1-59F9-47ED-AC3B-C6A30E17C7B2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2E31A4E1-59F9-47ED-AC3B-C6A30E17C7B2}.Debug|Win32.Build.0 = Debug|Win32
 		{2E31A4E1-59F9-47ED-AC3B-C6A30E17C7B2}.Release|Win32.ActiveCfg = Release|Win32

diff --git a/Test/Service/Service.vcxproj b/Test/Service/Service.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{36485E0F-FCC5-4EDB-B024-90E612917A13}</ProjectGuid>
+    <ProjectGuid>{7A017E47-91B5-4227-A84B-93948E6AA178}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Service</RootNamespace>
   </PropertyGroup>
@@ -49,12 +49,10 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -65,19 +63,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../..</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
@@ -89,6 +82,14 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Base\Base.vcxproj">
+      <Project>{2e31a4e1-59f9-47ed-ac3b-c6a30e17c7b2}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Lib\SrvLib\SrvLib.vcxproj">
+      <Project>{7902cf80-f1d1-4066-890f-e02692454a89}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/Test/Service/stdafx.h b/Test/Service/stdafx.h
@@ -22,6 +22,7 @@
 #include <shlwapi.h>
 #include <process.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <malloc.h>
 #include <stdlib.h>
 #include <winbase.h>
@@ -30,5 +31,5 @@
 
 
 // Project includes
-#include <Base/Base.h>
-#include <Lib/SrvLib/SrvLib.h>
+#include "../../Base/Base.h"
+#include "../../Lib/SrvLib/SrvLib.h"