Updated MSVC project files. (refs #3)

9 files changed, 61 insertions, 17 deletions

diff --git a/infrastructure/msvc/2003/bbackupctl.vcproj b/infrastructure/msvc/2003/bbackupctl.vcproj
index b46d99f7..b2249ff8 100644
--- a/infrastructure/msvc/2003/bbackupctl.vcproj
+++ b/infrastructure/msvc/2003/bbackupctl.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=""$(ProjectDir)..\..\..\..\db-4.2.52.NC\build_win32";"$(ProjectDir)..\..\..\lib\backupclient";"$(ProjectDir)..\..\..\lib\server";"$(ProjectDir)..\..\..\lib\crypto";"$(ProjectDir)..\..\..\..\openssl\include";"$(ProjectDir)..\..\..\lib\compress";"$(ProjectDir)..\..\..\..\zlib\include";"$(ProjectDir)..\..\..\lib\win32";"$(ProjectDir)..\..\..\lib\common\""

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;NDEBUG "

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -149,6 +149,9 @@
 			Name="Resource Files"

 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

+			<File

+				RelativePath="..\..\..\lib\win32\messages.rc">

+			</File>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/infrastructure/msvc/2003/bbackupd.vcproj b/infrastructure/msvc/2003/bbackupd.vcproj
index 4ca3470e..8e680956 100644
--- a/infrastructure/msvc/2003/bbackupd.vcproj
+++ b/infrastructure/msvc/2003/bbackupd.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\db-4.2.52.NC\build_win32&quot;;&quot;$(SolutionDir)..\..\..\..\boost_1_31_0&quot;;&quot;$(SolutionDir)..\..\..\..\openssl\include&quot;;&quot;$(SolutionDir)..\..\..\..\zlib\include&quot;;&quot;$(SolutionDir)..\..\..\lib\backupclient&quot;;&quot;$(SolutionDir)..\..\..\lib\server&quot;;&quot;$(SolutionDir)..\..\..\lib\crypto&quot;;&quot;$(SolutionDir)..\..\..\lib\compress&quot;;&quot;$(SolutionDir)..\..\..\lib\win32&quot;;&quot;$(SolutionDir)..\..\..\lib\common\&quot;"

-				PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"

+				PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;NDEBUG "

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -200,6 +200,9 @@
 			Name="Resource Files"

 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

+			<File

+				RelativePath="..\..\..\lib\win32\messages.rc">

+			</File>

 		</Filter>

 		<File

 			RelativePath="..\..\..\ReadMe.txt">

diff --git a/infrastructure/msvc/2003/boxbackup.sln b/infrastructure/msvc/2003/boxbackup.sln
index ede6faa1..d9a28041 100644
--- a/infrastructure/msvc/2003/boxbackup.sln
+++ b/infrastructure/msvc/2003/boxbackup.sln
@@ -1,7 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 8.00

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boxquery", "boxquery.vcproj", "{FE9EC666-4B3A-4370-B3D4-DEBD4A21F36E}"

 	ProjectSection(ProjectDependencies) = postProject

-		{98598F62-FEA7-4134-AA29-0AD2315A214F} = {98598F62-FEA7-4134-AA29-0AD2315A214F}

 		{A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}

 	EndProjectSection

 EndProject

@@ -11,7 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupd", "bbackupd.vcproj", "{22D325FB-9131-4BD6-B390-968F0491D687}"

 	ProjectSection(ProjectDependencies) = postProject

-		{98598F62-FEA7-4134-AA29-0AD2315A214F} = {98598F62-FEA7-4134-AA29-0AD2315A214F}

 		{A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}

 	EndProjectSection

 EndProject

@@ -25,10 +23,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbackupctl", "bbackupctl.vc
 		{A089CEE6-EBF0-4232-A0C0-74850A8127A6} = {A089CEE6-EBF0-4232-A0C0-74850A8127A6}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost_regex", "lib\win32\boost_regex.vcproj", "{98598F62-FEA7-4134-AA29-0AD2315A214F}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

 Global

 	GlobalSection(SolutionConfiguration) = preSolution

 		Debug = Debug

@@ -55,10 +49,6 @@ Global
 		{9FD51412-E945-4457-A17A-CA3C505CF431}.Debug.Build.0 = Debug|Win32

 		{9FD51412-E945-4457-A17A-CA3C505CF431}.Release.ActiveCfg = Release|Win32

 		{9FD51412-E945-4457-A17A-CA3C505CF431}.Release.Build.0 = Release|Win32

-		{98598F62-FEA7-4134-AA29-0AD2315A214F}.Debug.ActiveCfg = Debug|Win32

-		{98598F62-FEA7-4134-AA29-0AD2315A214F}.Debug.Build.0 = Debug|Win32

-		{98598F62-FEA7-4134-AA29-0AD2315A214F}.Release.ActiveCfg = Release|Win32

-		{98598F62-FEA7-4134-AA29-0AD2315A214F}.Release.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 	EndGlobalSection

diff --git a/infrastructure/msvc/2003/boxquery.vcproj b/infrastructure/msvc/2003/boxquery.vcproj
index a2962c22..8d8cf20c 100644
--- a/infrastructure/msvc/2003/boxquery.vcproj
+++ b/infrastructure/msvc/2003/boxquery.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\include&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;;&quot;$(SolutionDir)..\..\..\..\boost_1_31_0&quot;"

-				PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING"

+				PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_CONSOLE;PLATFORM_DISABLE_MEM_LEAK_TESTING;NDEBUG "

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -161,6 +161,9 @@
 			Name="Resource Files"

 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

+			<File

+				RelativePath="..\..\..\lib\win32\messages.rc">

+			</File>

 		</Filter>

 		<File

 			RelativePath="..\..\..\ReadMe.txt">

diff --git a/infrastructure/msvc/2003/common.vcproj b/infrastructure/msvc/2003/common.vcproj
index 553aaf1a..ab73a8fb 100644
--- a/infrastructure/msvc/2003/common.vcproj
+++ b/infrastructure/msvc/2003/common.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\..\lib\backupclient&quot;;&quot;$(ProjectDir)..\..\..\lib\server&quot;;&quot;$(ProjectDir)..\..\..\lib\crypto&quot;;&quot;$(ProjectDir)..\..\..\..\openssl\include&quot;;&quot;$(ProjectDir)..\..\..\lib\compress&quot;;&quot;$(ProjectDir)..\..\..\..\zlib\include&quot;;&quot;$(ProjectDir)..\..\..\lib\win32&quot;;&quot;$(ProjectDir)..\..\..\lib\common\&quot;;&quot;$(SolutionDir)..\..\..\..\boost_1_31_0\&quot;"

-				PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING"

+				PreprocessorDefinitions="BOOST_REGEX_NO_LIB;WIN32;_DEBUG;_LIB;PLATFORM_DISABLE_MEM_LEAK_TESTING;NDEBUG "

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -287,6 +287,9 @@
 					<File

 						RelativePath="..\..\..\lib\win32\emu.cpp">

 					</File>

+					<File

+						RelativePath="..\..\..\lib\win32\getopt_long.cxx">

+					</File>

 				</Filter>

 				<Filter

 					Name="server"

@@ -327,6 +330,10 @@
 					<File

 						RelativePath="..\..\..\lib\server\TLSContext.cpp">

 					</File>

+					<File

+						RelativePath="..\..\..\lib\server\WinNamedPipeStream.cpp">

+					</File>

+

 				</Filter>

 			</Filter>

 		</Filter>

@@ -476,6 +483,9 @@
 					<File

 						RelativePath="..\..\..\lib\common\WaitForEvent.h">

 					</File>

+					<File

+						RelativePath="..\..\..\lib\common\BoxVersion.h">

+					</File>

 				</Filter>

 				<Filter

 					Name="backupclient"

@@ -569,6 +579,12 @@
 					<File

 						RelativePath="..\..\..\lib\win32\emu.h">

 					</File>

+					<File

+						RelativePath="..\..\..\lib\win32\getopt.h">

+					</File>

+					<File

+						RelativePath="..\..\..\lib\win32\WinNamedPipeStream.h">

+					</File>

 				</Filter>

 				<Filter

 					Name="server"

@@ -621,6 +637,9 @@
 					<File

 						RelativePath="..\..\..\lib\server\TLSContext.h">

 					</File>

+					<File

+						RelativePath="..\..\..\lib\server\WinNamedPipeStream.h">

+					</File>

 				</Filter>

 			</Filter>

 		</Filter>

diff --git a/infrastructure/msvc/2005/bbackupctl.vcproj b/infrastructure/msvc/2005/bbackupctl.vcproj
index 3da10702..c9507b17 100644
--- a/infrastructure/msvc/2005/bbackupctl.vcproj
+++ b/infrastructure/msvc/2005/bbackupctl.vcproj
@@ -210,6 +210,10 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

 			>

+			<File

+				RelativePath="..\..\..\lib\win32\messages.rc"

+				>

+			</File>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/infrastructure/msvc/2005/bbackupd.vcproj b/infrastructure/msvc/2005/bbackupd.vcproj
index dbcf89d3..0f2828e0 100644
--- a/infrastructure/msvc/2005/bbackupd.vcproj
+++ b/infrastructure/msvc/2005/bbackupd.vcproj
@@ -275,6 +275,10 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

 			>

+			<File

+				RelativePath="..\..\..\lib\win32\messages.rc"

+				>

+			</File>

 		</Filter>

 		<File

 			RelativePath="..\..\..\ReadMe.txt"

diff --git a/infrastructure/msvc/2005/boxquery.vcproj b/infrastructure/msvc/2005/boxquery.vcproj
index 414399cd..09a7fa6b 100644
--- a/infrastructure/msvc/2005/boxquery.vcproj
+++ b/infrastructure/msvc/2005/boxquery.vcproj
@@ -231,6 +231,10 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

 			>

+			<File

+				RelativePath="..\..\..\lib\win32\messages.rc"

+				>

+			</File>

 		</Filter>

 		<File

 			RelativePath="..\..\..\ReadMe.txt"

diff --git a/infrastructure/msvc/2005/common.vcproj b/infrastructure/msvc/2005/common.vcproj
index 127d2617..f34ad549 100644
--- a/infrastructure/msvc/2005/common.vcproj
+++ b/infrastructure/msvc/2005/common.vcproj
@@ -25,6 +25,8 @@
 			>

 			<Tool

 				Name="VCPreBuildEventTool"

+				Description="Determining Version Number"

+				CommandLine="perl $(InputDir)..\getversion.pl"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -394,7 +396,7 @@
 						>

 					</File>

 					<File

-						RelativePath="..\..\..\lib\win32\WinNamedPipeStream.cpp"

+						RelativePath="..\..\..\lib\win32\getopt_long.cxx"

 						>

 					</File>

 				</Filter>

@@ -449,6 +451,10 @@
 						RelativePath="..\..\..\lib\server\TLSContext.cpp"

 						>

 					</File>

+					<File

+						RelativePath="..\..\..\lib\server\WinNamedPipeStream.cpp"

+						>

+					</File>

 				</Filter>

 			</Filter>

 		</Filter>

@@ -504,7 +510,7 @@
 						>

 					</File>

 					<File

-						RelativePath="..\..\..\lib\common\BoxConfig.h"

+						RelativePath="..\..\..\lib\common\BoxConfig-MSVC.h"

 						>

 					</File>

 					<File

@@ -532,6 +538,10 @@
 						>

 					</File>

 					<File

+						RelativePath="..\..\..\lib\common\BoxVersion.h"

+						>

+					</File>

+					<File

 						RelativePath="..\..\..\lib\common\CollectInBufferStream.h"

 						>

 					</File>

@@ -764,7 +774,7 @@
 						>

 					</File>

 					<File

-						RelativePath="..\..\..\lib\win32\WinNamedPipeStream.h"

+						RelativePath="..\..\..\lib\win32\getopt.h"

 						>

 					</File>

 				</Filter>

@@ -835,6 +845,10 @@
 						RelativePath="..\..\..\lib\server\TLSContext.h"

 						>

 					</File>

+					<File

+						RelativePath="..\..\..\lib\server\WinNamedPipeStream.h"

+						>

+					</File>

 				</Filter>

 			</Filter>

 		</Filter>