From 4f17362aeb80e5339c58a5d3b0fbaeb88d9e701c Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Mon, 13 Feb 2012 21:47:03 +0000
Subject: Rewritten most of the code for multithreading; still not 100%, but
 getting there. If this commit proves to be too problematic, we can always
 undo it.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@251 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 VC2008/JsonCpp.vcproj   |   8 +--
 VC2008/Lua.vcproj       |   8 +--
 VC2008/MCServer.vcproj  | 126 ++++++++++++++++++++++++++++++++++++++----------
 VC2008/ToLua.vcproj     |   8 +--
 VC2008/WebServer.vcproj |   4 +-
 VC2008/zlib.vcproj      |   8 +--
 6 files changed, 118 insertions(+), 44 deletions(-)

(limited to 'VC2008')

diff --git a/VC2008/JsonCpp.vcproj b/VC2008/JsonCpp.vcproj
index 5c53e1dbf..b17db9b5f 100644
--- a/VC2008/JsonCpp.vcproj
+++ b/VC2008/JsonCpp.vcproj
@@ -18,8 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\JsonCpp"
+			IntermediateDirectory="$(ConfigurationName)\JsonCpp"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -80,8 +80,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\JsonCpp"
+			IntermediateDirectory="$(ConfigurationName)\JsonCpp"
 			ConfigurationType="4"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
diff --git a/VC2008/Lua.vcproj b/VC2008/Lua.vcproj
index 355c6a620..23bf9fdc7 100644
--- a/VC2008/Lua.vcproj
+++ b/VC2008/Lua.vcproj
@@ -18,8 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\Lua"
+			IntermediateDirectory="$(ConfigurationName)\Lua"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -79,8 +79,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\Lua"
+			IntermediateDirectory="$(ConfigurationName)\Lua"
 			ConfigurationType="4"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 4dc9f2aa6..151c589fd 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -205,14 +205,6 @@
 				RelativePath="..\source\cChatColor.h"
 				>
 			</File>
-			<File
-				RelativePath="..\source\cChestEntity.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\source\cChestEntity.h"
-				>
-			</File>
 			<File
 				RelativePath="..\source\cChunk.cpp"
 				>
@@ -379,6 +371,14 @@
 				RelativePath="..\source\cNoise.inc"
 				>
 			</File>
+			<File
+				RelativePath="..\source\cPiston.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\source\cPiston.h"
+				>
+			</File>
 			<File
 				RelativePath="..\source\cPlugin.cpp"
 				>
@@ -511,10 +511,6 @@
 				RelativePath="..\source\Endianness.h"
 				>
 			</File>
-			<File
-				RelativePath="..\source\FileDefine.h"
-				>
-			</File>
 			<File
 				RelativePath="..\source\Globals.cpp"
 				>
@@ -539,6 +535,31 @@
 				RelativePath="..\source\Globals.h"
 				>
 			</File>
+			<File
+				RelativePath="..\source\LeakFinder.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\source\LeakFinder.h"
+				>
+			</File>
 			<File
 				RelativePath="..\source\LuaFunctions.h"
 				>
@@ -555,10 +576,6 @@
 				RelativePath="..\source\Matrix4f.h"
 				>
 			</File>
-			<File
-				RelativePath="..\source\MCSocket.h"
-				>
-			</File>
 			<File
 				RelativePath="..\source\MemoryLeak.h"
 				>
@@ -568,11 +585,28 @@
 				>
 			</File>
 			<File
-				RelativePath="..\source\PacketID.h"
+				RelativePath="..\source\StackWalker.cpp"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\source\ptr_cChunk.h"
+				RelativePath="..\source\StackWalker.h"
 				>
 			</File>
 			<File
@@ -1022,6 +1056,10 @@
 					RelativePath="..\source\packets\cPacket_WindowOpen.h"
 					>
 				</File>
+				<File
+					RelativePath="..\source\PacketID.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Mobs"
@@ -1202,6 +1240,14 @@
 					RelativePath="..\source\cBlockToPickup.h"
 					>
 				</File>
+				<File
+					RelativePath="..\source\cChestEntity.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\source\cChestEntity.h"
+					>
+				</File>
 				<File
 					RelativePath="..\source\cDoors.h"
 					>
@@ -1250,14 +1296,6 @@
 					RelativePath="..\source\cPickup.h"
 					>
 				</File>
-				<File
-					RelativePath="..\source\cPiston.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\source\cPiston.h"
-					>
-				</File>
 				<File
 					RelativePath="..\source\cPlayer.cpp"
 					>
@@ -1489,6 +1527,22 @@
 				<File
 					RelativePath="..\source\Bindings.cpp"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\source\Bindings.h"
@@ -1579,6 +1633,26 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="World storage"
+				>
+				<File
+					RelativePath="..\source\WorldStorage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\source\WorldStorage.h"
+					>
+				</File>
+				<File
+					RelativePath="..\source\WSSCompact.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\source\WSSCompact.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<File
 			RelativePath="..\makefile"
diff --git a/VC2008/ToLua.vcproj b/VC2008/ToLua.vcproj
index 1c89aaee9..5d44fe8a4 100644
--- a/VC2008/ToLua.vcproj
+++ b/VC2008/ToLua.vcproj
@@ -18,8 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\ToLua"
+			IntermediateDirectory="$(ConfigurationName)\ToLua"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -80,8 +80,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\ToLua"
+			IntermediateDirectory="$(ConfigurationName)\ToLua"
 			ConfigurationType="4"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
diff --git a/VC2008/WebServer.vcproj b/VC2008/WebServer.vcproj
index f86f4ba8b..b136c9dee 100644
--- a/VC2008/WebServer.vcproj
+++ b/VC2008/WebServer.vcproj
@@ -18,7 +18,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\WebServer"
 			IntermediateDirectory="$(ConfigurationName)\webserver"
 			ConfigurationType="4"
 			CharacterSet="1"
@@ -80,7 +80,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\WebServer"
 			IntermediateDirectory="$(ConfigurationName)\webserver"
 			ConfigurationType="4"
 			CharacterSet="1"
diff --git a/VC2008/zlib.vcproj b/VC2008/zlib.vcproj
index de7d05def..7d885b222 100644
--- a/VC2008/zlib.vcproj
+++ b/VC2008/zlib.vcproj
@@ -18,8 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\zlib"
+			IntermediateDirectory="$(ConfigurationName)\zlib"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -79,8 +79,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\zlib"
+			IntermediateDirectory="$(ConfigurationName)\zlib"
 			ConfigurationType="4"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
-- 
cgit v1.2.3