Client, common build as DLLs; broker now a lib linked with qpidbroker.exe

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-1673@748954 13f79535-47bb-0310-9956-ffa450edef68
author: Stephen D. Huston <shuston@apache.org> 2009-03-01 03:11:03 +0000
committer: Stephen D. Huston <shuston@apache.org> 2009-03-01 03:11:03 +0000
commit: 64c2e417822c43a74de38a0f702ace5e95a2459f (patch)
tree: fa782ceca9131b69c62bde19de1f3aa8d8b6518d
parent: 03f8b9d26654cacbb845498148659d291e209a1e (diff)
download: qpid-python-64c2e417822c43a74de38a0f702ace5e95a2459f.tar.gz
5 files changed, 1196 insertions, 1240 deletions
diff --git a/qpid/cpp/src/broker.vcproj b/qpid/cpp/src/broker.vcproj
index 7a7bf337a8..138d44c12b 100644
--- a/qpid/cpp/src/broker.vcproj
+++ b/qpid/cpp/src/broker.vcproj
@@ -24,7 +24,7 @@
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="broker"
-	ProjectGUID="{09613D48-FECA-1BAD-9D20-8C374564ADCF}"
+	ProjectGUID="{09613D48-FECA-1BAD-9D20-8C378F43FDD9}"
 	RootNamespace="broker"
 	Keyword="Win32Proj"
 	SignManifests="true"
@@ -42,9 +42,9 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Static_Debug"
+			OutputDirectory="."
 			IntermediateDirectory="Static_Debug\broker\I386"
-			ConfigurationType="1"
+			ConfigurationType="4"
 			CharacterSet="0"
 
 			>
@@ -72,11 +72,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
-                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"
+                                PreprocessorDefinitions="QPID_BROKER_STATIC;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -90,21 +90,14 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="qpidcommonsd.lib ws2_32.lib secur32.lib rpcrt4.lib"
-				OutputFile="$(OutDir)\qpidbroker.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\qpidbrokersd.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -124,9 +117,9 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Static_Release"
+			OutputDirectory="."
 			IntermediateDirectory="Static_Release\broker\I386"
-			ConfigurationType="1"
+			ConfigurationType="4"
 			CharacterSet="0"
 
 			>
@@ -154,8 +147,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
-                                PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"
+                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
 				WarningLevel="3"
@@ -175,17 +168,8 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="qpidcommons.lib ws2_32.lib secur32.lib rpcrt4.lib"
-				OutputFile="$(OutDir)\qpidbroker.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\qpidbrokers.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -205,9 +189,9 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="Static_Debug"
+			OutputDirectory="."
 			IntermediateDirectory="Static_Debug\broker\AMD64"
-			ConfigurationType="1"
+			ConfigurationType="4"
 			CharacterSet="0"
 
 			>
@@ -235,8 +219,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
-                                PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"
+                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -259,16 +243,8 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="qpidcommonsd.lib ws2_32.lib secur32.lib rpcrt4.lib"
-				OutputFile="$(OutDir)\qpidbroker.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\qpidbrokersd.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -288,9 +264,9 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="Static_Release"
+			OutputDirectory="."
 			IntermediateDirectory="Static_Release\broker\AMD64"
-			ConfigurationType="1"
+			ConfigurationType="4"
 			CharacterSet="0"
 
 			>
@@ -318,8 +294,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
-                                PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"
+                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
 				WarningLevel="3"
@@ -339,18 +315,8 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/machine:AMD64"
-				AdditionalDependencies="qpidcommons.lib ws2_32.lib secur32.lib rpcrt4.lib"
-				OutputFile="$(OutDir)\qpidbroker.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\qpidbrokers.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -909,12 +875,6 @@
 			<File
 				RelativePath="qpid\sys\TCPIOPlugin.cpp">
 			</File>
-			<File
-				RelativePath="qpidd.cpp">
-			</File>
-			<File
-				RelativePath="windows\QpiddBroker.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -1306,9 +1266,6 @@
 			<File
 				RelativePath="qpid\management\ManagementObject.h">
 			</File>
-			<File
-				RelativePath="qpidd.h">
-			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/qpid/cpp/src/client.vcproj b/qpid/cpp/src/client.vcproj
index e724e04d98..ad8584ee3e 100644
--- a/qpid/cpp/src/client.vcproj
+++ b/qpid/cpp/src/client.vcproj
@@ -24,7 +24,7 @@
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="client"
-	ProjectGUID="{6961DBA3-FECA-1BAD-F396-8C394564ADCF}"
+	ProjectGUID="{6961DBA3-FECA-1BAD-F396-8C398F43FDD9}"
 	RootNamespace="client"
 	Keyword="Win32Proj"
 	SignManifests="true"
@@ -43,8 +43,8 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="."
-			IntermediateDirectory="Static_Debug\client\I386"
-			ConfigurationType="4"
+			IntermediateDirectory="Debug\client\I386"
+			ConfigurationType="2"
 			CharacterSet="0"
 
 			>
@@ -73,10 +73,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
-                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;CONF_FILE=\&quot;qpidc.conf\&quot;;MODULE_DIR=\&quot;.\&quot;;NOMINMAX;WIN32_LEAN_AND_MEAN"
+                                PreprocessorDefinitions="CLIENT_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;CONF_FILE=\&quot;qpidc.conf\&quot;;MODULE_DIR=\&quot;.\&quot;;NOMINMAX;WIN32_LEAN_AND_MEAN"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -96,8 +96,16 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\qpidclientsd.lib"
+				Name="VCLinkerTool"
+				AdditionalDependencies="qpidcommond.lib"
+				OutputFile="$(OutDir)\qpidclientd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary=".\qpidclientd.lib"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -118,8 +126,8 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="."
-			IntermediateDirectory="Static_Release\client\I386"
-			ConfigurationType="4"
+			IntermediateDirectory="Release\client\I386"
+			ConfigurationType="2"
 			CharacterSet="0"
 
 			>
@@ -148,8 +156,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
-                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;CONF_FILE=\&quot;qpidc.conf\&quot;;MODULE_DIR=\&quot;.\&quot;;NOMINMAX;WIN32_LEAN_AND_MEAN"
-				RuntimeLibrary="0"
+                                PreprocessorDefinitions="CLIENT_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;CONF_FILE=\&quot;qpidc.conf\&quot;;MODULE_DIR=\&quot;.\&quot;;NOMINMAX;WIN32_LEAN_AND_MEAN"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -168,8 +176,18 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\qpidclients.lib"
+				Name="VCLinkerTool"
+				AdditionalDependencies="qpidcommon.lib"
+				OutputFile="$(OutDir)\qpidclient.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary=".\qpidclient.lib"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -190,8 +208,8 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="."
-			IntermediateDirectory="Static_Debug\client\AMD64"
-			ConfigurationType="4"
+			IntermediateDirectory="Debug\client\AMD64"
+			ConfigurationType="2"
 			CharacterSet="0"
 
 			>
@@ -220,10 +238,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
-                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;CONF_FILE=\&quot;qpidc.conf\&quot;;MODULE_DIR=\&quot;.\&quot;;NOMINMAX;WIN32_LEAN_AND_MEAN"
+                                PreprocessorDefinitions="CLIENT_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;CONF_FILE=\&quot;qpidc.conf\&quot;;MODULE_DIR=\&quot;.\&quot;;NOMINMAX;WIN32_LEAN_AND_MEAN"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -243,8 +261,17 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\qpidclientsd.lib"
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="qpidcommond.lib"
+				OutputFile="$(OutDir)\qpidclientd.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary=".\qpidclientd.lib"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -265,8 +292,8 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="."
-			IntermediateDirectory="Static_Release\client\AMD64"
-			ConfigurationType="4"
+			IntermediateDirectory="Release\client\AMD64"
+			ConfigurationType="2"
 			CharacterSet="0"
 
 			>
@@ -295,8 +322,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
-                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;CONF_FILE=\&quot;qpidc.conf\&quot;;MODULE_DIR=\&quot;.\&quot;;NOMINMAX;WIN32_LEAN_AND_MEAN"
-				RuntimeLibrary="0"
+                                PreprocessorDefinitions="CLIENT_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;CONF_FILE=\&quot;qpidc.conf\&quot;;MODULE_DIR=\&quot;.\&quot;;NOMINMAX;WIN32_LEAN_AND_MEAN"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -315,8 +342,19 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\qpidclients.lib"
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="qpidcommon.lib"
+				OutputFile="$(OutDir)\qpidclient.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary=".\qpidclient.lib"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/qpid/cpp/src/common.vcproj b/qpid/cpp/src/common.vcproj
index c074afad53..31cb493bd1 100644
--- a/qpid/cpp/src/common.vcproj
+++ b/qpid/cpp/src/common.vcproj
@@ -1,12 +1,33 @@
 <?xml version="1.0" encoding="Windows-1252"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="common"
-	ProjectGUID="{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}"
+	ProjectGUID="{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}"
 	RootNamespace="common"
 	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
+	SignManifests="true"
 	>
 	<Platforms>
 		<Platform
@@ -22,9 +43,10 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="."
-			IntermediateDirectory="Static_Debug\common\I386"
-			ConfigurationType="4"
+			IntermediateDirectory="Debug\common\I386"
+			ConfigurationType="2"
 			CharacterSet="0"
+
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -51,10 +73,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+                                PreprocessorDefinitions="COMMON_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -74,8 +96,16 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\qpidcommonsd.lib"
+				Name="VCLinkerTool"
+				AdditionalDependencies=" ws2_32.lib rpcrt4.lib"
+				OutputFile="$(OutDir)\qpidcommond.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary=".\qpidcommond.lib"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -94,11 +124,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Release|Win32"
 			OutputDirectory="."
-			IntermediateDirectory="Static_Debug\common\AMD64"
-			ConfigurationType="4"
+			IntermediateDirectory="Release\common\I386"
+			ConfigurationType="2"
 			CharacterSet="0"
+
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -123,16 +154,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+                                PreprocessorDefinitions="COMMON_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
 				DisableSpecificWarnings="4244;4800;4355"
 			/>
 			<Tool
@@ -140,7 +168,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_WIN64"
+				PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
 				Culture="1033"
 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
 			/>
@@ -148,8 +176,18 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\qpidcommonsd.lib"
+				Name="VCLinkerTool"
+				AdditionalDependencies=" ws2_32.lib rpcrt4.lib"
+				OutputFile="$(OutDir)\qpidcommon.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary=".\qpidcommon.lib"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -168,11 +206,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|x64"
 			OutputDirectory="."
-			IntermediateDirectory="Static_Release\common\I386"
-			ConfigurationType="4"
+			IntermediateDirectory="Debug\common\AMD64"
+			ConfigurationType="2"
 			CharacterSet="0"
+
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -197,13 +236,16 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
-				RuntimeLibrary="0"
+                                PreprocessorDefinitions="COMMON_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
 				DisableSpecificWarnings="4244;4800;4355"
 			/>
 			<Tool
@@ -211,7 +253,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="_DEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS;_WIN64"
 				Culture="1033"
 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
 			/>
@@ -219,8 +261,17 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\qpidcommons.lib"
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies=" ws2_32.lib rpcrt4.lib"
+				OutputFile="$(OutDir)\qpidcommond.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary=".\qpidcommond.lib"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -241,9 +292,10 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="."
-			IntermediateDirectory="Static_Release\common\AMD64"
-			ConfigurationType="4"
+			IntermediateDirectory="Release\common\AMD64"
+			ConfigurationType="2"
 			CharacterSet="0"
+
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -270,8 +322,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
-				RuntimeLibrary="0"
+                                PreprocessorDefinitions="COMMON_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -290,8 +342,19 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\qpidcommons.lib"
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies=" ws2_32.lib rpcrt4.lib"
+				OutputFile="$(OutDir)\qpidcommon.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary=".\qpidcommon.lib"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -315,2048 +378,1537 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;cxx;cc;C;c"
-			>
+			Filter="cpp;cxx;cc;C;c">
 			<File
-				RelativePath="qpid\framing\AccumulatedAck.cpp"
-				>
+				RelativePath="gen\qpid\framing\AllInvoker.cpp">
 			</File>
 			<File
-				RelativePath="qpid\Address.cpp"
-				>
+				RelativePath="gen\qpid\framing\AMQP_AllProxy.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\AggregateOutput.cpp"
-				>
+				RelativePath="gen\qpid\framing\AMQP_ClientProxy.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\AllInvoker.cpp"
-				>
+				RelativePath="gen\qpid\framing\AMQP_ServerProxy.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClientInvoker.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQContentBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConfigChangeBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQFrame.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionAccumulatedAckBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQHeaderBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionConsumerStateBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQHeartbeatBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionDeliverCloseBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQMethodBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionDeliverDoOutputBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\AMQP_AllProxy.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionDeliveryRecordBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\AMQP_ClientProxy.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionExchangeBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQP_HighestVersion.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionMembershipBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\AMQP_ServerProxy.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionQueueBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\Array.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionQueuePositionBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\assert.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionSessionStateBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\assert.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionShadowReadyBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\AsynchIO.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionTxAcceptBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\AsynchIOHandler.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionTxDequeueBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\BodyHandler.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionTxEndBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\Buffer.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionTxEnqueueBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClientInvoker.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionTxPublishBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConfigChangeBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionTxStartBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionAccumulatedAckBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterMessageExpiredBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionConsumerStateBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterReadyBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionDeliverCloseBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterShutdownBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionDeliverDoOutputBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterUpdateOfferBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionDeliveryRecordBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ClusterUpdateRequestBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionExchangeBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ConnectionCloseBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionMembershipBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ConnectionCloseOkBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionQueueBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ConnectionHeartbeatBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionQueuePositionBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ConnectionOpenBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionSessionStateBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ConnectionOpenOkBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionShadowReadyBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ConnectionRedirectBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionTxAcceptBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ConnectionSecureBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionTxDequeueBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ConnectionSecureOkBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionTxEndBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ConnectionStartBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionTxEnqueueBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ConnectionStartOkBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionTxPublishBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ConnectionTuneBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionTxStartBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ConnectionTuneOkBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterMessageExpiredBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\DeliveryProperties.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterReadyBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\DtxCommitBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterShutdownBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\DtxEndBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterUpdateOfferBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\DtxForgetBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterUpdateRequestBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\DtxGetTimeoutBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionCloseBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\DtxGetTimeoutResult.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionCloseOkBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\DtxPrepareBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionHeartbeatBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\DtxRecoverBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionOpenBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\DtxRecoverResult.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionOpenOkBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\DtxRollbackBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionRedirectBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\DtxSelectBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionSecureBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\DtxSetTimeoutBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionSecureOkBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\DtxStartBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionStartBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ExchangeBindBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionStartOkBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ExchangeBoundBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionTuneBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ExchangeBoundResult.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionTuneOkBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ExchangeDeclareBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\DataDir.cpp"
-				>
+				RelativePath="gen\qpid\framing\ExchangeDeleteBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DeliveryProperties.cpp"
-				>
+				RelativePath="gen\qpid\framing\ExchangeQueryBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\Dispatcher.cpp"
-				>
+				RelativePath="gen\qpid\framing\ExchangeQueryResult.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxCommitBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ExchangeUnbindBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxEndBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ExecutionExceptionBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxForgetBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ExecutionResultBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxGetTimeoutBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\ExecutionSyncBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxGetTimeoutResult.cpp"
-				>
+				RelativePath="gen\qpid\framing\FileAckBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxPrepareBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\FileCancelBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxRecoverBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\FileConsumeBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxRecoverResult.cpp"
-				>
+				RelativePath="gen\qpid\framing\FileConsumeOkBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxRollbackBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\FileDeliverBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxSelectBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\FileOpenBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxSetTimeoutBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\FileOpenOkBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxStartBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\FileProperties.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\Endian.cpp"
-				>
+				RelativePath="gen\qpid\framing\FilePublishBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\Exception.cpp"
-				>
+				RelativePath="gen\qpid\framing\FileQosBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeBindBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\FileQosOkBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeBoundBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\FileRejectBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeBoundResult.cpp"
-				>
+				RelativePath="gen\qpid\framing\FileReturnBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeDeclareBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\FileStageBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeDeleteBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\FragmentProperties.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeQueryBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\Header.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeQueryResult.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageAcceptBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeUnbindBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageAcquireBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExecutionExceptionBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageAcquireResult.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExecutionResultBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageCancelBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExecutionSyncBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageFlowBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\FieldTable.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageFlushBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\FieldValue.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageProperties.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileAckBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageRejectBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileCancelBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageReleaseBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileConsumeBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageResumeBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileConsumeOkBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageResumeResult.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileDeliverBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageSetFlowModeBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileOpenBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageStopBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileOpenOkBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageSubscribeBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileProperties.cpp"
-				>
+				RelativePath="gen\qpid\framing\MessageTransferBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FilePublishBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\MethodBodyDefaultVisitor.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileQosBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\MethodBodyFactory.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileQosOkBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\QueueDeclareBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileRejectBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\QueueDeleteBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileReturnBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\QueuePurgeBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileStageBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\QueueQueryBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\FileSysDir.cpp"
-				>
+				RelativePath="gen\qpid\framing\QueueQueryResult.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FragmentProperties.cpp"
-				>
+				RelativePath="gen\qpid\framing\reply_exceptions.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\FrameDecoder.cpp"
-				>
+				RelativePath="gen\qpid\framing\ReplyTo.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\FrameSet.cpp"
-				>
+				RelativePath="gen\qpid\framing\ServerInvoker.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\Header.cpp"
-				>
+				RelativePath="gen\qpid\framing\SessionAttachBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\IocpPoller.cpp"
-				>
+				RelativePath="gen\qpid\framing\SessionAttachedBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\IOHandle.cpp"
-				>
+				RelativePath="gen\qpid\framing\SessionCommandPointBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\LatencyMetric.cpp"
-				>
+				RelativePath="gen\qpid\framing\SessionCompletedBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\LockFile.cpp"
-				>
+				RelativePath="gen\qpid\framing\SessionConfirmedBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\log\Logger.cpp"
-				>
+				RelativePath="gen\qpid\framing\SessionDetachBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\management\Manageable.cpp"
-				>
+				RelativePath="gen\qpid\framing\SessionDetachedBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\management\ManagementObject.cpp"
-				>
+				RelativePath="gen\qpid\framing\SessionExpectedBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageAcceptBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\SessionFlushBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageAcquireBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\SessionGapBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageAcquireResult.cpp"
-				>
+				RelativePath="gen\qpid\framing\SessionKnownCompletedBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageCancelBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\SessionRequestTimeoutBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageFlowBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\SessionTimeoutBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageFlushBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\StreamCancelBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageProperties.cpp"
-				>
+				RelativePath="gen\qpid\framing\StreamConsumeBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageRejectBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\StreamConsumeOkBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageReleaseBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\StreamDeliverBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageResumeBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\StreamProperties.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageResumeResult.cpp"
-				>
+				RelativePath="gen\qpid\framing\StreamPublishBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageSetFlowModeBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\StreamQosBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageStopBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\StreamQosOkBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageSubscribeBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\StreamReturnBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageTransferBody.cpp"
-				>
+				RelativePath="gen\qpid\framing\TxCommitBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MethodBodyDefaultVisitor.cpp"
-				>
+				RelativePath="gen\qpid\framing\TxRollbackBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MethodBodyFactory.cpp"
-				>
+				RelativePath="gen\qpid\framing\TxSelectBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\Modules.cpp"
-				>
+				RelativePath="gen\qpid\framing\TypeCode.cpp">
 			</File>
 			<File
-				RelativePath="qpid\Options.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)2.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)2.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)2.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)2.obj"
-					/>
-				</FileConfiguration>
+				RelativePath="gen\qpid\framing\XaResult.cpp">
 			</File>
 			<File
-				RelativePath="qpid\log\Options.cpp"
-				>
+				RelativePath="gen\qpid\framing\Xid.cpp">
 			</File>
 			<File
-				RelativePath="qpid\log\OstreamOutput.cpp"
-				>
+				RelativePath="qpid\Address.cpp">
 			</File>
 			<File
-				RelativePath="qpid\Plugin.cpp"
-				>
+				RelativePath="qpid\amqp_0_10\SessionHandler.cpp">
 			</File>
 			<File
-				RelativePath="qpid\pointer_to_other.h"
-				>
+				RelativePath="qpid\amqp_0_10\SessionHandler.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\PollableCondition.cpp"
-				>
+				RelativePath="qpid\assert.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\ProtocolInitiation.cpp"
-				>
+				RelativePath="qpid\assert.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\ProtocolVersion.cpp"
-				>
+				RelativePath="qpid\DataDir.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\Proxy.cpp"
-				>
+				RelativePath="qpid\Exception.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\QueueDeclareBody.cpp"
-				>
+				RelativePath="qpid\framing\AccumulatedAck.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\QueueDeleteBody.cpp"
-				>
+				RelativePath="qpid\framing\AMQBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\QueuePurgeBody.cpp"
-				>
+				RelativePath="qpid\framing\AMQContentBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\QueueQueryBody.cpp"
-				>
+				RelativePath="qpid\framing\AMQFrame.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\QueueQueryResult.cpp"
-				>
+				RelativePath="qpid\framing\AMQHeaderBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\RefCountedBuffer.cpp"
-				>
+				RelativePath="qpid\framing\AMQHeartbeatBody.cpp">
 			</File>
 			<File
-				RelativePath="qpid\RefCountedBuffer.h"
-				>
+				RelativePath="qpid\framing\AMQMethodBody.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\reply_exceptions.cpp"
-				>
+				RelativePath="qpid\framing\AMQP_HighestVersion.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ReplyTo.cpp"
-				>
+				RelativePath="qpid\framing\Array.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\Runnable.cpp"
-				>
+				RelativePath="qpid\framing\BodyHandler.cpp">
 			</File>
 			<File
-				RelativePath="qpid\log\Selector.cpp"
-				>
+				RelativePath="qpid\framing\Buffer.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\SendContent.cpp"
-				>
+				RelativePath="qpid\framing\Endian.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\SequenceNumber.cpp"
-				>
+				RelativePath="qpid\framing\FieldTable.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\SequenceNumberSet.cpp"
-				>
+				RelativePath="qpid\framing\FieldValue.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\SequenceSet.cpp"
-				>
+				RelativePath="qpid\framing\FrameDecoder.cpp">
 			</File>
 			<File
-				RelativePath="qpid\Serializer.h"
-				>
+				RelativePath="qpid\framing\FrameSet.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ServerInvoker.cpp"
-				>
+				RelativePath="qpid\framing\ProtocolInitiation.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionAttachBody.cpp"
-				>
+				RelativePath="qpid\framing\ProtocolVersion.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionAttachedBody.cpp"
-				>
+				RelativePath="qpid\framing\Proxy.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionCommandPointBody.cpp"
-				>
+				RelativePath="qpid\framing\SendContent.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionCompletedBody.cpp"
-				>
+				RelativePath="qpid\framing\SequenceNumber.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionConfirmedBody.cpp"
-				>
+				RelativePath="qpid\framing\SequenceNumberSet.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionDetachBody.cpp"
-				>
+				RelativePath="qpid\framing\SequenceSet.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionDetachedBody.cpp"
-				>
+				RelativePath="qpid\framing\TransferContent.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionExpectedBody.cpp"
-				>
+				RelativePath="qpid\framing\Uuid.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionFlushBody.cpp"
-				>
+				RelativePath="qpid\log\Logger.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionGapBody.cpp"
-				>
+				RelativePath="qpid\log\Options.cpp">
 			</File>
 			<File
-				RelativePath="qpid\amqp_0_10\SessionHandler.cpp"
-				>
+				RelativePath="qpid\log\OstreamOutput.cpp">
 			</File>
 			<File
-				RelativePath="qpid\amqp_0_10\SessionHandler.h"
-				>
+				RelativePath="qpid\log\Selector.cpp">
 			</File>
 			<File
-				RelativePath="qpid\SessionId.cpp"
-				>
+				RelativePath="qpid\log\Statement.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionKnownCompletedBody.cpp"
-				>
+				RelativePath="qpid\log\windows\SinkOptions.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionRequestTimeoutBody.cpp"
-				>
+				RelativePath="qpid\management\Manageable.cpp">
 			</File>
 			<File
-				RelativePath="qpid\SessionState.cpp"
-				>
+				RelativePath="qpid\management\ManagementObject.cpp">
 			</File>
 			<File
-				RelativePath="qpid\SessionState.h"
-				>
+				RelativePath="qpid\Modules.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionTimeoutBody.cpp"
-				>
+				RelativePath="qpid\Options.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)2.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)2.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)2.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)2.obj"/>
+					</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\Shlib.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)2.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)2.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)2.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)2.obj"
-					/>
-				</FileConfiguration>
+				RelativePath="qpid\Plugin.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\Shlib.cpp"
-				>
+				RelativePath="qpid\pointer_to_other.h">
 			</File>
 			<File
-				RelativePath="qpid\log\windows\SinkOptions.cpp"
-				>
+				RelativePath="qpid\RefCountedBuffer.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\Socket.cpp"
-				>
+				RelativePath="qpid\RefCountedBuffer.h">
 			</File>
 			<File
-				RelativePath="qpid\log\Statement.cpp"
-				>
+				RelativePath="qpid\Serializer.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamCancelBody.cpp"
-				>
+				RelativePath="qpid\SessionId.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamConsumeBody.cpp"
-				>
+				RelativePath="qpid\SessionState.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamConsumeOkBody.cpp"
-				>
+				RelativePath="qpid\SessionState.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamDeliverBody.cpp"
-				>
+				RelativePath="qpid\StringUtils.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamProperties.cpp"
-				>
+				RelativePath="qpid\sys\AggregateOutput.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamPublishBody.cpp"
-				>
+				RelativePath="qpid\sys\AsynchIOHandler.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamQosBody.cpp"
-				>
+				RelativePath="qpid\sys\Dispatcher.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamQosOkBody.cpp"
-				>
+				RelativePath="qpid\sys\LatencyMetric.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamReturnBody.cpp"
-				>
+				RelativePath="qpid\sys\Runnable.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\StrError.cpp"
-				>
+				RelativePath="qpid\sys\Shlib.cpp">
 			</File>
 			<File
-				RelativePath="qpid\StringUtils.cpp"
-				>
+				RelativePath="qpid\sys\Timer.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\SystemInfo.cpp"
-				>
+				RelativePath="qpid\sys\windows\AsynchIO.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\Thread.cpp"
-				>
+				RelativePath="qpid\sys\windows\FileSysDir.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\Time.cpp"
-				>
+				RelativePath="qpid\sys\windows\IocpPoller.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\Timer.cpp"
-				>
+				RelativePath="qpid\sys\windows\IOHandle.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\TransferContent.cpp"
-				>
+				RelativePath="qpid\sys\windows\LockFile.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\TxCommitBody.cpp"
-				>
+				RelativePath="qpid\sys\windows\PollableCondition.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\TxRollbackBody.cpp"
-				>
+				RelativePath="qpid\sys\windows\Shlib.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)2.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)2.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)2.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)2.obj"/>
+					</FileConfiguration>
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\TxSelectBody.cpp"
-				>
+				RelativePath="qpid\sys\windows\Socket.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\TypeCode.cpp"
-				>
+				RelativePath="qpid\sys\windows\StrError.cpp">
 			</File>
 			<File
-				RelativePath="qpid\Url.cpp"
-				>
+				RelativePath="qpid\sys\windows\SystemInfo.cpp">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\uuid.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)2.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)2.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)2.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)2.obj"
-					/>
-				</FileConfiguration>
+				RelativePath="qpid\sys\windows\Thread.cpp">
 			</File>
 			<File
-				RelativePath="qpid\framing\Uuid.cpp"
-				>
+				RelativePath="qpid\sys\windows\Time.cpp">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\XaResult.cpp"
-				>
+				RelativePath="qpid\sys\windows\uuid.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)2.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)2.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)2.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\$(InputName)2.obj"/>
+					</FileConfiguration>
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\Xid.cpp"
-				>
+				RelativePath="qpid\Url.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hh"
-			>
+			Filter="h;hpp;hxx;hh">
 			<File
-				RelativePath="qpid\framing\AccumulatedAck.h"
-				>
+				RelativePath="gen\qpid\framing\all_method_bodies.h">
 			</File>
 			<File
-				RelativePath="qpid\Address.h"
-				>
+				RelativePath="gen\qpid\framing\AllInvoker.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\AggregateOutput.h"
-				>
+				RelativePath="gen\qpid\framing\AMQP_AllOperations.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\all_method_bodies.h"
-				>
+				RelativePath="gen\qpid\framing\AMQP_AllProxy.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\AllInvoker.h"
-				>
+				RelativePath="gen\qpid\framing\AMQP_ClientOperations.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQBody.h"
-				>
+				RelativePath="gen\qpid\framing\AMQP_ClientProxy.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQCommandControlBody.h"
-				>
+				RelativePath="gen\qpid\framing\AMQP_ServerOperations.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQContentBody.h"
-				>
+				RelativePath="gen\qpid\framing\AMQP_ServerProxy.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQDataBlock.h"
-				>
+				RelativePath="gen\qpid\framing\amqp_structs.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQFrame.h"
-				>
+				RelativePath="gen\qpid\framing\ClientInvoker.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQHeaderBody.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConfigChangeBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQHeartbeatBody.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionAccumulatedAckBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQMethodBody.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionConsumerStateBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\AMQP_AllOperations.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionDeliverCloseBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\AMQP_AllProxy.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionDeliverDoOutputBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\AMQP_ClientOperations.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionDeliveryRecordBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\AMQP_ClientProxy.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionExchangeBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\amqp_framing.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionMembershipBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\AMQP_HighestVersion.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionQueueBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\AMQP_ServerOperations.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionQueuePositionBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\AMQP_ServerProxy.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionSessionStateBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\amqp_structs.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionShadowReadyBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\amqp_types.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionTxAcceptBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\amqp_types_full.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionTxDequeueBody.h">
 			</File>
 			<File
-				RelativePath="qpid\amqp_0_10\apply.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionTxEndBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\Array.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionTxEnqueueBody.h">
 			</File>
 			<File
-				RelativePath="qpid\assert.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionTxPublishBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\AsynchIO.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterConnectionTxStartBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\AsynchIOHandler.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterMessageExpiredBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\AsynchIoResult.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterReadyBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\AtomicCount.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterShutdownBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\AtomicValue.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterUpdateOfferBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\BlockingQueue.h"
-				>
+				RelativePath="gen\qpid\framing\ClusterUpdateRequestBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\BodyFactory.h"
-				>
+				RelativePath="gen\qpid\framing\ConnectionCloseBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\BodyHandler.h"
-				>
+				RelativePath="gen\qpid\framing\ConnectionCloseOkBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\Buffer.h"
-				>
+				RelativePath="gen\qpid\framing\ConnectionHeartbeatBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\ChannelHandler.h"
-				>
+				RelativePath="gen\qpid\framing\ConnectionOpenBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\check.h"
-				>
+				RelativePath="gen\qpid\framing\ConnectionOpenOkBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClientInvoker.h"
-				>
+				RelativePath="gen\qpid\framing\ConnectionRedirectBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConfigChangeBody.h"
-				>
+				RelativePath="gen\qpid\framing\ConnectionSecureBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionAccumulatedAckBody.h"
-				>
+				RelativePath="gen\qpid\framing\ConnectionSecureOkBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionConsumerStateBody.h"
-				>
+				RelativePath="gen\qpid\framing\ConnectionStartBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionDeliverCloseBody.h"
-				>
+				RelativePath="gen\qpid\framing\ConnectionStartOkBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionDeliverDoOutputBody.h"
-				>
+				RelativePath="gen\qpid\framing\ConnectionTuneBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionDeliveryRecordBody.h"
-				>
+				RelativePath="gen\qpid\framing\ConnectionTuneOkBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionExchangeBody.h"
-				>
+				RelativePath="gen\qpid\framing\constants.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionMembershipBody.h"
-				>
+				RelativePath="gen\qpid\framing\DeliveryProperties.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionQueueBody.h"
-				>
+				RelativePath="gen\qpid\framing\DtxCommitBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionQueuePositionBody.h"
-				>
+				RelativePath="gen\qpid\framing\DtxEndBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionSessionStateBody.h"
-				>
+				RelativePath="gen\qpid\framing\DtxForgetBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionShadowReadyBody.h"
-				>
+				RelativePath="gen\qpid\framing\DtxGetTimeoutBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionTxAcceptBody.h"
-				>
+				RelativePath="gen\qpid\framing\DtxGetTimeoutResult.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionTxDequeueBody.h"
-				>
+				RelativePath="gen\qpid\framing\DtxPrepareBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionTxEndBody.h"
-				>
+				RelativePath="gen\qpid\framing\DtxRecoverBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionTxEnqueueBody.h"
-				>
+				RelativePath="gen\qpid\framing\DtxRecoverResult.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionTxPublishBody.h"
-				>
+				RelativePath="gen\qpid\framing\DtxRollbackBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterConnectionTxStartBody.h"
-				>
+				RelativePath="gen\qpid\framing\DtxSelectBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterMessageExpiredBody.h"
-				>
+				RelativePath="gen\qpid\framing\DtxSetTimeoutBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterReadyBody.h"
-				>
+				RelativePath="gen\qpid\framing\DtxStartBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterShutdownBody.h"
-				>
+				RelativePath="gen\qpid\framing\enum.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterUpdateOfferBody.h"
-				>
+				RelativePath="gen\qpid\framing\ExchangeBindBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ClusterUpdateRequestBody.h"
-				>
+				RelativePath="gen\qpid\framing\ExchangeBoundBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Codec.h"
-				>
+				RelativePath="gen\qpid\framing\ExchangeBoundResult.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\Condition.h"
-				>
+				RelativePath="gen\qpid\framing\ExchangeDeclareBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Condition.h"
-				>
+				RelativePath="gen\qpid\framing\ExchangeDeleteBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionCloseBody.h"
-				>
+				RelativePath="gen\qpid\framing\ExchangeQueryBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionCloseOkBody.h"
-				>
+				RelativePath="gen\qpid\framing\ExchangeQueryResult.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\ConnectionCodec.h"
-				>
+				RelativePath="gen\qpid\framing\ExchangeUnbindBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionHeartbeatBody.h"
-				>
+				RelativePath="gen\qpid\framing\ExecutionExceptionBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\ConnectionInputHandler.h"
-				>
+				RelativePath="gen\qpid\framing\ExecutionResultBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\ConnectionInputHandlerFactory.h"
-				>
+				RelativePath="gen\qpid\framing\ExecutionSyncBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionOpenBody.h"
-				>
+				RelativePath="gen\qpid\framing\FileAckBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionOpenOkBody.h"
-				>
+				RelativePath="gen\qpid\framing\FileCancelBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\ConnectionOutputHandler.h"
-				>
+				RelativePath="gen\qpid\framing\FileConsumeBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\ConnectionOutputHandlerPtr.h"
-				>
+				RelativePath="gen\qpid\framing\FileConsumeOkBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionRedirectBody.h"
-				>
+				RelativePath="gen\qpid\framing\FileDeliverBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionSecureBody.h"
-				>
+				RelativePath="gen\qpid\framing\FileOpenBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionSecureOkBody.h"
-				>
+				RelativePath="gen\qpid\framing\FileOpenOkBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionStartBody.h"
-				>
+				RelativePath="gen\qpid\framing\FileProperties.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionStartOkBody.h"
-				>
+				RelativePath="gen\qpid\framing\FilePublishBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionTuneBody.h"
-				>
+				RelativePath="gen\qpid\framing\FileQosBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ConnectionTuneOkBody.h"
-				>
+				RelativePath="gen\qpid\framing\FileQosOkBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\constants.h"
-				>
+				RelativePath="gen\qpid\framing\FileRejectBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\CopyOnWriteArray.h"
-				>
+				RelativePath="gen\qpid\framing\FileReturnBody.h">
 			</File>
 			<File
-				RelativePath="qpid\DataDir.h"
-				>
+				RelativePath="gen\qpid\framing\FileStageBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\DeletionManager.h"
-				>
+				RelativePath="gen\qpid\framing\FragmentProperties.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DeliveryProperties.h"
-				>
+				RelativePath="gen\qpid\framing\frame_body_lists.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Dispatcher.h"
-				>
+				RelativePath="gen\qpid\framing\Header.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxCommitBody.h"
-				>
+				RelativePath="gen\qpid\framing\MessageAcceptBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxEndBody.h"
-				>
+				RelativePath="gen\qpid\framing\MessageAcquireBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxForgetBody.h"
-				>
+				RelativePath="gen\qpid\framing\MessageAcquireResult.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxGetTimeoutBody.h"
-				>
+				RelativePath="gen\qpid\framing\MessageCancelBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxGetTimeoutResult.h"
-				>
+				RelativePath="gen\qpid\framing\MessageFlowBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxPrepareBody.h"
-				>
+				RelativePath="gen\qpid\framing\MessageFlushBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxRecoverBody.h"
-				>
+				RelativePath="gen\qpid\framing\MessageProperties.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxRecoverResult.h"
-				>
+				RelativePath="gen\qpid\framing\MessageRejectBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxRollbackBody.h"
-				>
+				RelativePath="gen\qpid\framing\MessageReleaseBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxSelectBody.h"
-				>
+				RelativePath="gen\qpid\framing\MessageResumeBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxSetTimeoutBody.h"
-				>
+				RelativePath="gen\qpid\framing\MessageResumeResult.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\DtxStartBody.h"
-				>
+				RelativePath="gen\qpid\framing\MessageSetFlowModeBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\Endian.h"
-				>
+				RelativePath="gen\qpid\framing\MessageStopBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\enum.h"
-				>
+				RelativePath="gen\qpid\framing\MessageSubscribeBody.h">
 			</File>
 			<File
-				RelativePath="qpid\amqp_0_10\Exception.h"
-				>
+				RelativePath="gen\qpid\framing\MessageTransferBody.h">
 			</File>
 			<File
-				RelativePath="qpid\Exception.h"
-				>
+				RelativePath="gen\qpid\framing\MethodBodyConstVisitor.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\ExceptionHolder.h"
-				>
+				RelativePath="gen\qpid\framing\MethodBodyDefaultVisitor.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeBindBody.h"
-				>
+				RelativePath="gen\qpid\framing\QueueDeclareBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeBoundBody.h"
-				>
+				RelativePath="gen\qpid\framing\QueueDeleteBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeBoundResult.h"
-				>
+				RelativePath="gen\qpid\framing\QueuePurgeBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeDeclareBody.h"
-				>
+				RelativePath="gen\qpid\framing\QueueQueryBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeDeleteBody.h"
-				>
+				RelativePath="gen\qpid\framing\QueueQueryResult.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeQueryBody.h"
-				>
+				RelativePath="gen\qpid\framing\reply_exceptions.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeQueryResult.h"
-				>
+				RelativePath="gen\qpid\framing\ReplyTo.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExchangeUnbindBody.h"
-				>
+				RelativePath="gen\qpid\framing\ServerInvoker.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExecutionExceptionBody.h"
-				>
+				RelativePath="gen\qpid\framing\SessionAttachBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExecutionResultBody.h"
-				>
+				RelativePath="gen\qpid\framing\SessionAttachedBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ExecutionSyncBody.h"
-				>
+				RelativePath="gen\qpid\framing\SessionCommandPointBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\FieldTable.h"
-				>
+				RelativePath="gen\qpid\framing\SessionCompletedBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\FieldValue.h"
-				>
+				RelativePath="gen\qpid\framing\SessionConfirmedBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileAckBody.h"
-				>
+				RelativePath="gen\qpid\framing\SessionDetachBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileCancelBody.h"
-				>
+				RelativePath="gen\qpid\framing\SessionDetachedBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileConsumeBody.h"
-				>
+				RelativePath="gen\qpid\framing\SessionExpectedBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileConsumeOkBody.h"
-				>
+				RelativePath="gen\qpid\framing\SessionFlushBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileDeliverBody.h"
-				>
+				RelativePath="gen\qpid\framing\SessionGapBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileOpenBody.h"
-				>
+				RelativePath="gen\qpid\framing\SessionKnownCompletedBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileOpenOkBody.h"
-				>
+				RelativePath="gen\qpid\framing\SessionRequestTimeoutBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileProperties.h"
-				>
+				RelativePath="gen\qpid\framing\SessionTimeoutBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FilePublishBody.h"
-				>
+				RelativePath="gen\qpid\framing\StreamCancelBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileQosBody.h"
-				>
+				RelativePath="gen\qpid\framing\StreamConsumeBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileQosOkBody.h"
-				>
+				RelativePath="gen\qpid\framing\StreamConsumeOkBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileRejectBody.h"
-				>
+				RelativePath="gen\qpid\framing\StreamDeliverBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileReturnBody.h"
-				>
+				RelativePath="gen\qpid\framing\StreamProperties.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FileStageBody.h"
-				>
+				RelativePath="gen\qpid\framing\StreamPublishBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\FileSysDir.h"
-				>
+				RelativePath="gen\qpid\framing\StreamQosBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\FragmentProperties.h"
-				>
+				RelativePath="gen\qpid\framing\StreamQosOkBody.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\frame_body_lists.h"
-				>
+				RelativePath="gen\qpid\framing\StreamReturnBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\frame_functors.h"
-				>
+				RelativePath="gen\qpid\framing\TxCommitBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\FrameDecoder.h"
-				>
+				RelativePath="gen\qpid\framing\TxRollbackBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\FrameDefaultVisitor.h"
-				>
+				RelativePath="gen\qpid\framing\TxSelectBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\FrameHandler.h"
-				>
+				RelativePath="gen\qpid\framing\TypeCode.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\FrameSet.h"
-				>
+				RelativePath="gen\qpid\framing\XaResult.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\Handler.h"
-				>
+				RelativePath="gen\qpid\framing\Xid.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\Header.h"
-				>
+				RelativePath="qpid\Address.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\HeaderProperties.h"
-				>
+				RelativePath="qpid\amqp_0_10\apply.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\variant.h qpid\log\Helpers.h"
-				>
+				RelativePath="qpid\amqp_0_10\Exception.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\InitiationHandler.h"
-				>
+				RelativePath="qpid\amqp_0_10\SessionHandler.h">
 			</File>
 			<File
-				RelativePath="qpid\InlineAllocator.h"
-				>
+				RelativePath="qpid\assert.h">
 			</File>
 			<File
-				RelativePath="qpid\InlineVector.h"
-				>
+				RelativePath="qpid\DataDir.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\InputHandler.h"
-				>
+				RelativePath="qpid\Exception.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\IntegerTypes.h"
-				>
+				RelativePath="qpid\framing\AccumulatedAck.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\IntegerTypes.h"
-				>
+				RelativePath="qpid\framing\AMQBody.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\Invoker.h"
-				>
+				RelativePath="qpid\framing\AMQCommandControlBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\IOHandle.h"
-				>
+				RelativePath="qpid\framing\AMQContentBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\IoHandlePrivate.h"
-				>
+				RelativePath="qpid\framing\AMQDataBlock.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\LatencyMetric.h"
-				>
+				RelativePath="qpid\framing\AMQFrame.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\LockFile.h"
-				>
+				RelativePath="qpid\framing\AMQHeaderBody.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\LockPtr.h"
-				>
+				RelativePath="qpid\framing\AMQHeartbeatBody.h">
 			</File>
 			<File
-				RelativePath="qpid\log\Logger.h"
-				>
+				RelativePath="qpid\framing\AMQMethodBody.h">
 			</File>
 			<File
-				RelativePath="qpid\management\Manageable.h"
-				>
+				RelativePath="qpid\framing\amqp_framing.h">
 			</File>
 			<File
-				RelativePath="qpid\management\ManagementObject.h"
-				>
+				RelativePath="qpid\framing\AMQP_HighestVersion.h">
 			</File>
 			<File
-				RelativePath="qpid\memory.h"
-				>
+				RelativePath="qpid\framing\amqp_types.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageAcceptBody.h"
-				>
+				RelativePath="qpid\framing\amqp_types_full.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageAcquireBody.h"
-				>
+				RelativePath="qpid\framing\Array.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageAcquireResult.h"
-				>
+				RelativePath="qpid\framing\BodyFactory.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageCancelBody.h"
-				>
+				RelativePath="qpid\framing\BodyHandler.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageFlowBody.h"
-				>
+				RelativePath="qpid\framing\Buffer.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageFlushBody.h"
-				>
+				RelativePath="qpid\framing\ChannelHandler.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageProperties.h"
-				>
+				RelativePath="qpid\framing\Endian.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageRejectBody.h"
-				>
+				RelativePath="qpid\framing\FieldTable.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageReleaseBody.h"
-				>
+				RelativePath="qpid\framing\FieldValue.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageResumeBody.h"
-				>
+				RelativePath="qpid\framing\frame_functors.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageResumeResult.h"
-				>
+				RelativePath="qpid\framing\FrameDecoder.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageSetFlowModeBody.h"
-				>
+				RelativePath="qpid\framing\FrameDefaultVisitor.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageStopBody.h"
-				>
+				RelativePath="qpid\framing\FrameHandler.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageSubscribeBody.h"
-				>
+				RelativePath="qpid\framing\FrameSet.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MessageTransferBody.h"
-				>
+				RelativePath="qpid\framing\Handler.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MethodBodyConstVisitor.h"
-				>
+				RelativePath="qpid\framing\HeaderProperties.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\MethodBodyDefaultVisitor.h"
-				>
+				RelativePath="qpid\framing\InitiationHandler.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\MethodBodyFactory.h"
-				>
+				RelativePath="qpid\framing\InputHandler.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\MethodContent.h"
-				>
+				RelativePath="qpid\framing\Invoker.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\ModelMethod.h"
-				>
+				RelativePath="qpid\framing\MethodBodyFactory.h">
 			</File>
 			<File
-				RelativePath="qpid\Modules.h"
-				>
+				RelativePath="qpid\framing\MethodContent.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Monitor.h"
-				>
+				RelativePath="qpid\framing\ModelMethod.h">
 			</File>
 			<File
-				RelativePath="qpid\Msg.h"
-				>
+				RelativePath="qpid\framing\OutputHandler.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\Mutex.h"
-				>
+				RelativePath="qpid\framing\ProtocolInitiation.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Mutex.h"
-				>
+				RelativePath="qpid\framing\ProtocolVersion.h">
 			</File>
 			<File
-				RelativePath="qpid\Options.h"
-				>
+				RelativePath="qpid\framing\Proxy.h">
 			</File>
 			<File
-				RelativePath="qpid\log\Options.h"
-				>
+				RelativePath="qpid\framing\SendContent.h">
 			</File>
 			<File
-				RelativePath="qpid\log\OstreamOutput.h"
-				>
+				RelativePath="qpid\framing\SequenceNumber.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\OutputControl.h"
-				>
+				RelativePath="qpid\framing\SequenceNumberSet.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\OutputHandler.h"
-				>
+				RelativePath="qpid\framing\SequenceSet.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\OutputTask.h"
-				>
+				RelativePath="qpid\framing\StructHelper.h">
 			</File>
 			<File
-				RelativePath="qpid\Plugin.h"
-				>
+				RelativePath="qpid\framing\TransferContent.h">
 			</File>
 			<File
-				RelativePath="qpid\pointer_to_other.h"
-				>
+				RelativePath="qpid\framing\TypeFilter.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\PollableCondition.h"
-				>
+				RelativePath="qpid\framing\Uuid.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\PollableQueue.h"
-				>
+				RelativePath="qpid\framing\variant.h qpid\log\Helpers.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Poller.h"
-				>
+				RelativePath="qpid\framing\Visitor.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\ProtocolFactory.h"
-				>
+				RelativePath="qpid\InlineAllocator.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\ProtocolInitiation.h"
-				>
+				RelativePath="qpid\InlineVector.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\ProtocolVersion.h"
-				>
+				RelativePath="qpid\log\Logger.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\Proxy.h"
-				>
+				RelativePath="qpid\log\Options.h">
 			</File>
 			<File
-				RelativePath="qpid\ptr_map.h"
-				>
+				RelativePath="qpid\log\OstreamOutput.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\QueueDeclareBody.h"
-				>
+				RelativePath="qpid\log\Selector.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\QueueDeleteBody.h"
-				>
+				RelativePath="qpid\log\SinkOptions.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\QueuePurgeBody.h"
-				>
+				RelativePath="qpid\log\Statement.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\QueueQueryBody.h"
-				>
+				RelativePath="qpid\log\windows\SinkOptions.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\QueueQueryResult.h"
-				>
+				RelativePath="qpid\management\Manageable.h">
 			</File>
 			<File
-				RelativePath="qpid\RangeSet.h"
-				>
+				RelativePath="qpid\management\ManagementObject.h">
 			</File>
 			<File
-				RelativePath="qpid\RefCounted.h"
-				>
+				RelativePath="qpid\memory.h">
 			</File>
 			<File
-				RelativePath="qpid\RefCountedBuffer.h"
-				>
+				RelativePath="qpid\Modules.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\reply_exceptions.h"
-				>
+				RelativePath="qpid\Msg.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ReplyTo.h"
-				>
+				RelativePath="qpid\Options.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Runnable.h"
-				>
+				RelativePath="qpid\Plugin.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\ScopedIncrement.h"
-				>
+				RelativePath="qpid\pointer_to_other.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\SecurityLayer.h"
-				>
+				RelativePath="qpid\ptr_map.h">
 			</File>
 			<File
-				RelativePath="qpid\log\Selector.h"
-				>
+				RelativePath="qpid\RangeSet.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Semaphore.h"
-				>
+				RelativePath="qpid\RefCounted.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\SendContent.h"
-				>
+				RelativePath="qpid\RefCountedBuffer.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\SequenceNumber.h"
-				>
+				RelativePath="qpid\Serializer.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\SequenceNumberSet.h"
-				>
+				RelativePath="qpid\SessionId.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\SequenceSet.h"
-				>
+				RelativePath="qpid\SessionState.h">
 			</File>
 			<File
-				RelativePath="qpid\Serializer.h"
-				>
+				RelativePath="qpid\shared_ptr.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\ServerInvoker.h"
-				>
+				RelativePath="qpid\SharedObject.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionAttachBody.h"
-				>
+				RelativePath="qpid\StringUtils.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionAttachedBody.h"
-				>
+				RelativePath="qpid\sys\AggregateOutput.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionCommandPointBody.h"
-				>
+				RelativePath="qpid\sys\AsynchIO.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionCompletedBody.h"
-				>
+				RelativePath="qpid\sys\AsynchIOHandler.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionConfirmedBody.h"
-				>
+				RelativePath="qpid\sys\AtomicCount.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionDetachBody.h"
-				>
+				RelativePath="qpid\sys\AtomicValue.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionDetachedBody.h"
-				>
+				RelativePath="qpid\sys\BlockingQueue.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionExpectedBody.h"
-				>
+				RelativePath="qpid\sys\Codec.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionFlushBody.h"
-				>
+				RelativePath="qpid\sys\Condition.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionGapBody.h"
-				>
+				RelativePath="qpid\sys\ConnectionCodec.h">
 			</File>
 			<File
-				RelativePath="qpid\amqp_0_10\SessionHandler.h"
-				>
+				RelativePath="qpid\sys\ConnectionInputHandler.h">
 			</File>
 			<File
-				RelativePath="qpid\SessionId.h"
-				>
+				RelativePath="qpid\sys\ConnectionInputHandlerFactory.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionKnownCompletedBody.h"
-				>
+				RelativePath="qpid\sys\ConnectionOutputHandler.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionRequestTimeoutBody.h"
-				>
+				RelativePath="qpid\sys\ConnectionOutputHandlerPtr.h">
 			</File>
 			<File
-				RelativePath="qpid\SessionState.h"
-				>
+				RelativePath="qpid\sys\CopyOnWriteArray.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\SessionTimeoutBody.h"
-				>
+				RelativePath="qpid\sys\DeletionManager.h">
 			</File>
 			<File
-				RelativePath="qpid\shared_ptr.h"
-				>
+				RelativePath="qpid\sys\Dispatcher.h">
 			</File>
 			<File
-				RelativePath="qpid\SharedObject.h"
-				>
+				RelativePath="qpid\sys\ExceptionHolder.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Shlib.h"
-				>
+				RelativePath="qpid\sys\FileSysDir.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\ShutdownHandler.h"
-				>
+				RelativePath="qpid\sys\IntegerTypes.h">
 			</File>
 			<File
-				RelativePath="qpid\log\windows\SinkOptions.h"
-				>
+				RelativePath="qpid\sys\IOHandle.h">
 			</File>
 			<File
-				RelativePath="qpid\log\SinkOptions.h"
-				>
+				RelativePath="qpid\sys\LatencyMetric.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Socket.h"
-				>
+				RelativePath="qpid\sys\LockFile.h">
 			</File>
 			<File
-				RelativePath="qpid\log\Statement.h"
-				>
+				RelativePath="qpid\sys\LockPtr.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\StateMonitor.h"
-				>
+				RelativePath="qpid\sys\Monitor.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamCancelBody.h"
-				>
+				RelativePath="qpid\sys\Mutex.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamConsumeBody.h"
-				>
+				RelativePath="qpid\sys\OutputControl.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamConsumeOkBody.h"
-				>
+				RelativePath="qpid\sys\OutputTask.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamDeliverBody.h"
-				>
+				RelativePath="qpid\sys\PollableCondition.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamProperties.h"
-				>
+				RelativePath="qpid\sys\PollableQueue.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamPublishBody.h"
-				>
+				RelativePath="qpid\sys\Poller.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamQosBody.h"
-				>
+				RelativePath="qpid\sys\ProtocolFactory.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamQosOkBody.h"
-				>
+				RelativePath="qpid\sys\Runnable.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\StreamReturnBody.h"
-				>
+				RelativePath="qpid\sys\ScopedIncrement.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\StrError.h"
-				>
+				RelativePath="qpid\sys\SecurityLayer.h">
 			</File>
 			<File
-				RelativePath="qpid\StringUtils.h"
-				>
+				RelativePath="qpid\sys\Semaphore.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\StructHelper.h"
-				>
+				RelativePath="qpid\sys\Shlib.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\SystemInfo.h"
-				>
+				RelativePath="qpid\sys\ShutdownHandler.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Thread.h"
-				>
+				RelativePath="qpid\sys\Socket.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\Time.h"
-				>
+				RelativePath="qpid\sys\StateMonitor.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Time.h"
-				>
+				RelativePath="qpid\sys\StrError.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\TimeoutHandler.h"
-				>
+				RelativePath="qpid\sys\SystemInfo.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Timer.h"
-				>
+				RelativePath="qpid\sys\Thread.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\TransferContent.h"
-				>
+				RelativePath="qpid\sys\Time.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\TxCommitBody.h"
-				>
+				RelativePath="qpid\sys\TimeoutHandler.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\TxRollbackBody.h"
-				>
+				RelativePath="qpid\sys\Timer.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\TxSelectBody.h"
-				>
+				RelativePath="qpid\sys\uuid.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\TypeCode.h"
-				>
+				RelativePath="qpid\sys\Waitable.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\TypeFilter.h"
-				>
+				RelativePath="qpid\sys\windows\AsynchIoResult.h">
 			</File>
 			<File
-				RelativePath="qpid\Url.h"
-				>
+				RelativePath="qpid\sys\windows\check.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\Uuid.h"
-				>
+				RelativePath="qpid\sys\windows\Condition.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\windows\uuid.h"
-				>
+				RelativePath="qpid\sys\windows\IntegerTypes.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\uuid.h"
-				>
+				RelativePath="qpid\sys\windows\IoHandlePrivate.h">
 			</File>
 			<File
-				RelativePath="qpid\Version.h"
-				>
+				RelativePath="qpid\sys\windows\Mutex.h">
 			</File>
 			<File
-				RelativePath="qpid\framing\Visitor.h"
-				>
+				RelativePath="qpid\sys\windows\Time.h">
 			</File>
 			<File
-				RelativePath="qpid\sys\Waitable.h"
-				>
+				RelativePath="qpid\sys\windows\uuid.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\XaResult.h"
-				>
+				RelativePath="qpid\Url.h">
 			</File>
 			<File
-				RelativePath="gen\qpid\framing\Xid.h"
-				>
+				RelativePath="qpid\Version.h">
 			</File>
 		</Filter>
 	</Files>
diff --git a/qpid/cpp/src/qpid.sln b/qpid/cpp/src/qpid.sln
index a296a13d25..46d09a2db6 100644
--- a/qpid/cpp/src/qpid.sln
+++ b/qpid/cpp/src/qpid.sln
@@ -7,22 +7,28 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # this file will be lost the next time it is generated.
 #
 # MPC Command:
-# C:\ace\MPC\mwc.pl -type vc9 -features boost=1 -static qpid.mwc
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broker", "broker.vcproj", "{09613D48-FECA-1BAD-9D20-8C374564ADCF}"
+# C:\ace\MPC\mwc.pl -type vc9 -features boost=1 qpid.mwc
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broker", "broker.vcproj", "{09613D48-FECA-1BAD-9D20-8C378F43FDD9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF} = {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}
+		{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9} = {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "client.vcproj", "{6961DBA3-FECA-1BAD-F396-8C394564ADCF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "client.vcproj", "{6961DBA3-FECA-1BAD-F396-8C398F43FDD9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF} = {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}
+		{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9} = {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmfconsole", "qmfconsole.vcproj", "{C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmfconsole", "qmfconsole.vcproj", "{C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6961DBA3-FECA-1BAD-F396-8C394564ADCF} = {6961DBA3-FECA-1BAD-F396-8C394564ADCF}
+		{6961DBA3-FECA-1BAD-F396-8C398F43FDD9} = {6961DBA3-FECA-1BAD-F396-8C398F43FDD9}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qpidbroker", "qpidbroker.vcproj", "{66213D3E-FECA-1BAD-9D20-8C378F43FDD9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{09613D48-FECA-1BAD-9D20-8C378F43FDD9} = {09613D48-FECA-1BAD-9D20-8C378F43FDD9}
+		{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9} = {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}
 	EndProjectSection
 EndProject
 Global
@@ -33,38 +39,46 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|Win32.Build.0 = Debug|Win32
-		{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|x64.ActiveCfg = Debug|x64
-		{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|x64.Build.0 = Debug|x64
-		{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Release|Win32.ActiveCfg = Release|Win32
-		{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Release|Win32.Build.0 = Release|Win32
-		{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Release|x64.ActiveCfg = Release|x64
-		{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Release|x64.Build.0 = Release|x64
-		{6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Debug|Win32.Build.0 = Debug|Win32
-		{6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Debug|x64.ActiveCfg = Debug|x64
-		{6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Debug|x64.Build.0 = Debug|x64
-		{6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Release|Win32.ActiveCfg = Release|Win32
-		{6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Release|Win32.Build.0 = Release|Win32
-		{6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Release|x64.ActiveCfg = Release|x64
-		{6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Release|x64.Build.0 = Release|x64
-		{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|Win32.Build.0 = Debug|Win32
-		{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|x64.ActiveCfg = Debug|x64
-		{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|x64.Build.0 = Debug|x64
-		{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|Win32.ActiveCfg = Release|Win32
-		{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|Win32.Build.0 = Release|Win32
-		{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|x64.ActiveCfg = Release|x64
-		{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|x64.Build.0 = Release|x64
-		{C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Debug|Win32.Build.0 = Debug|Win32
-		{C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Debug|x64.ActiveCfg = Debug|x64
-		{C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Debug|x64.Build.0 = Debug|x64
-		{C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Release|Win32.ActiveCfg = Release|Win32
-		{C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Release|Win32.Build.0 = Release|Win32
-		{C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Release|x64.ActiveCfg = Release|x64
-		{C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Release|x64.Build.0 = Release|x64
+		{09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Debug|Win32.Build.0 = Debug|Win32
+		{09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Debug|x64.ActiveCfg = Debug|x64
+		{09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Debug|x64.Build.0 = Debug|x64
+		{09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Release|Win32.ActiveCfg = Release|Win32
+		{09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Release|Win32.Build.0 = Release|Win32
+		{09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Release|x64.ActiveCfg = Release|x64
+		{09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Release|x64.Build.0 = Release|x64
+		{6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Debug|Win32.Build.0 = Debug|Win32
+		{6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Debug|x64.ActiveCfg = Debug|x64
+		{6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Debug|x64.Build.0 = Debug|x64
+		{6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Release|Win32.ActiveCfg = Release|Win32
+		{6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Release|Win32.Build.0 = Release|Win32
+		{6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Release|x64.ActiveCfg = Release|x64
+		{6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Release|x64.Build.0 = Release|x64
+		{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Debug|Win32.Build.0 = Debug|Win32
+		{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Debug|x64.ActiveCfg = Debug|x64
+		{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Debug|x64.Build.0 = Debug|x64
+		{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Release|Win32.ActiveCfg = Release|Win32
+		{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Release|Win32.Build.0 = Release|Win32
+		{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Release|x64.ActiveCfg = Release|x64
+		{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Release|x64.Build.0 = Release|x64
+		{C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Debug|Win32.Build.0 = Debug|Win32
+		{C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Debug|x64.ActiveCfg = Debug|x64
+		{C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Debug|x64.Build.0 = Debug|x64
+		{C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Release|Win32.ActiveCfg = Release|Win32
+		{C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Release|Win32.Build.0 = Release|Win32
+		{C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Release|x64.ActiveCfg = Release|x64
+		{C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Release|x64.Build.0 = Release|x64
+		{66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Debug|Win32.Build.0 = Debug|Win32
+		{66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Debug|x64.ActiveCfg = Debug|x64
+		{66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Debug|x64.Build.0 = Debug|x64
+		{66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Release|Win32.ActiveCfg = Release|Win32
+		{66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Release|Win32.Build.0 = Release|Win32
+		{66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Release|x64.ActiveCfg = Release|x64
+		{66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/qpid/cpp/src/qpidbroker.vcproj b/qpid/cpp/src/qpidbroker.vcproj
new file mode 100644
index 0000000000..40010efadf
--- /dev/null
+++ b/qpid/cpp/src/qpidbroker.vcproj
@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="qpidbroker"
+	ProjectGUID="{66213D3E-FECA-1BAD-9D20-8C378F43FDD9}"
+	RootNamespace="qpidbroker"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Debug\qpidbroker\I386"
+			ConfigurationType="1"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+				PreprocessorDefinitions="QPID_BROKER_STATIC;_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="qpidcommond.lib qpidbrokersd.lib"
+				OutputFile="$(OutDir)\qpidbroker.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="."
+			IntermediateDirectory="Debug\qpidbroker\AMD64"
+			ConfigurationType="1"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"
+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64"
+				MinimalRebuild="false"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="qpidbrokersd.lib qpidcommond.lib"
+				OutputFile="$(OutDir)\qpidbroker.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release\qpidbroker\I386"
+			ConfigurationType="1"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="qpidbrokers.lib qpidcommon.lib"
+				OutputFile="$(OutDir)\qpidbroker.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release\qpidbroker\AMD64"
+			ConfigurationType="1"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				AdditionalOptions=""
+				AdditionalIncludeDirectories=""
+				TypeLibraryName="$(InputName).tlb"
+				HeaderFileName="$(InputName).h"
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="$(BOOST_ROOT)\.,.,gen"
+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_WIN64"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,.,gen"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/machine:AMD64"
+				AdditionalDependencies="qpidbrokers.lib qpidcommon.lib"
+				OutputFile="$(OutDir)\qpidbroker.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;cxx;cc;C;c"
+			>
+			<File
+				RelativePath="qpidd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="windows\QpiddBroker.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hh"
+			>
+			<File
+				RelativePath="qpidd.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
author	Stephen D. Huston <shuston@apache.org>	2009-03-01 03:11:03 +0000
committer	Stephen D. Huston <shuston@apache.org>	2009-03-01 03:11:03 +0000
commit	64c2e417822c43a74de38a0f702ace5e95a2459f (patch)
tree	fa782ceca9131b69c62bde19de1f3aa8d8b6518d
parent	03f8b9d26654cacbb845498148659d291e209a1e (diff)
download	qpid-python-64c2e417822c43a74de38a0f702ace5e95a2459f.tar.gz