Author: shuston
Date: Fri Dec 18 01:54:28 2009
New Revision: 892103

URL: http://svn.apache.org/viewvc?rev=892103&view=rev
Log:
Apply patch and correction from QPID-2260

Modified:
    qpid/trunk/qpid/wcf/QpidWcf.sln
    qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj
    qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat
    qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj

Modified: qpid/trunk/qpid/wcf/QpidWcf.sln
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/wcf/QpidWcf.sln?rev=892103&r1=892102&r2=892103&view=diff
==============================================================================
--- qpid/trunk/qpid/wcf/QpidWcf.sln (original)
+++ qpid/trunk/qpid/wcf/QpidWcf.sln Fri Dec 18 01:54:28 2009
@@ -32,97 +32,46 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Channel", 
"src\Apache\Qpid\Channel\Channel.csproj", 
"{8AABAB30-7D1E-4539-B7D1-05450262BAD2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WcfPerftest", 
"test\Apache\Qpid\Test\Channel\WcfPerftest\WcfPerftest.csproj", 
"{D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}"
-EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Any CPU = Debug|Any CPU
-               Debug|Mixed Platforms = Debug|Mixed Platforms
                Debug|Win32 = Debug|Win32
                Debug|x64 = Debug|x64
-               Debug|x86 = Debug|x86
-               Release|Any CPU = Release|Any CPU
-               Release|Mixed Platforms = Release|Mixed Platforms
                Release|Win32 = Release|Win32
                Release|x64 = Release|x64
-               Release|x86 = Release|x86
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {820BFC34-A40F-46BA-B86B-05334854CA17}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
-               {820BFC34-A40F-46BA-B86B-05334854CA17}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
-               {820BFC34-A40F-46BA-B86B-05334854CA17}.Debug|Mixed 
Platforms.ActiveCfg = Debug|Any CPU
-               {820BFC34-A40F-46BA-B86B-05334854CA17}.Debug|Mixed 
Platforms.Build.0 = Debug|Any CPU
                {820BFC34-A40F-46BA-B86B-05334854CA17}.Debug|Win32.ActiveCfg = 
Debug|Any CPU
+               {820BFC34-A40F-46BA-B86B-05334854CA17}.Debug|Win32.Build.0 = 
Debug|Any CPU
                {820BFC34-A40F-46BA-B86B-05334854CA17}.Debug|x64.ActiveCfg = 
Debug|Any CPU
-               {820BFC34-A40F-46BA-B86B-05334854CA17}.Debug|x86.ActiveCfg = 
Debug|Any CPU
-               {820BFC34-A40F-46BA-B86B-05334854CA17}.Release|Any 
CPU.ActiveCfg = Release|Any CPU
-               {820BFC34-A40F-46BA-B86B-05334854CA17}.Release|Any CPU.Build.0 
= Release|Any CPU
-               {820BFC34-A40F-46BA-B86B-05334854CA17}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
-               {820BFC34-A40F-46BA-B86B-05334854CA17}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
+               {820BFC34-A40F-46BA-B86B-05334854CA17}.Debug|x64.Build.0 = 
Debug|Any CPU
                {820BFC34-A40F-46BA-B86B-05334854CA17}.Release|Win32.ActiveCfg 
= Release|Any CPU
+               {820BFC34-A40F-46BA-B86B-05334854CA17}.Release|Win32.Build.0 = 
Release|Any CPU
                {820BFC34-A40F-46BA-B86B-05334854CA17}.Release|x64.ActiveCfg = 
Release|Any CPU
-               {820BFC34-A40F-46BA-B86B-05334854CA17}.Release|x86.ActiveCfg = 
Release|Any CPU
-               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Debug|Any CPU.ActiveCfg 
= Debug|Win32
-               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Debug|Any CPU.Build.0 = 
Debug|Win32
-               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Debug|Mixed 
Platforms.ActiveCfg = Debug|Win32
-               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Debug|Mixed 
Platforms.Build.0 = Debug|Win32
+               {820BFC34-A40F-46BA-B86B-05334854CA17}.Release|x64.Build.0 = 
Release|Any CPU
                {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Debug|Win32.ActiveCfg = 
Debug|Win32
                {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Debug|Win32.Build.0 = 
Debug|Win32
-               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Debug|x64.ActiveCfg = 
Debug|Win32
-               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Debug|x86.ActiveCfg = 
Debug|Win32
-               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Release|Any 
CPU.ActiveCfg = Release|Win32
-               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Release|Mixed 
Platforms.ActiveCfg = Release|Win32
-               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Release|Mixed 
Platforms.Build.0 = Release|Win32
+               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Debug|x64.ActiveCfg = 
Debug|x64
+               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Debug|x64.Build.0 = 
Debug|x64
                {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Release|Win32.ActiveCfg 
= Release|Win32
                {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Release|Win32.Build.0 = 
Release|Win32
-               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Release|x64.ActiveCfg = 
Release|Win32
-               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Release|x86.ActiveCfg = 
Release|Win32
-               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
-               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
-               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Debug|Mixed 
Platforms.ActiveCfg = Debug|Any CPU
-               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Debug|Mixed 
Platforms.Build.0 = Debug|Any CPU
+               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Release|x64.ActiveCfg = 
Release|x64
+               {C9B6AC75-6332-47A4-B82B-0C20E0AF2D34}.Release|x64.Build.0 = 
Release|x64
                {E2D8C779-E417-40BA-BEE1-EE034268482F}.Debug|Win32.ActiveCfg = 
Debug|Any CPU
+               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Debug|Win32.Build.0 = 
Debug|Any CPU
                {E2D8C779-E417-40BA-BEE1-EE034268482F}.Debug|x64.ActiveCfg = 
Debug|Any CPU
                {E2D8C779-E417-40BA-BEE1-EE034268482F}.Debug|x64.Build.0 = 
Debug|Any CPU
-               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Debug|x86.ActiveCfg = 
Debug|Any CPU
-               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Debug|x86.Build.0 = 
Debug|Any CPU
-               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Release|Any 
CPU.ActiveCfg = Release|Any CPU
-               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Release|Any CPU.Build.0 
= Release|Any CPU
-               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
-               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
                {E2D8C779-E417-40BA-BEE1-EE034268482F}.Release|Win32.ActiveCfg 
= Release|Any CPU
+               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Release|Win32.Build.0 = 
Release|Any CPU
                {E2D8C779-E417-40BA-BEE1-EE034268482F}.Release|x64.ActiveCfg = 
Release|Any CPU
                {E2D8C779-E417-40BA-BEE1-EE034268482F}.Release|x64.Build.0 = 
Release|Any CPU
-               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Release|x86.ActiveCfg = 
Release|Any CPU
-               {E2D8C779-E417-40BA-BEE1-EE034268482F}.Release|x86.Build.0 = 
Release|Any CPU
-               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
-               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
-               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Debug|Mixed 
Platforms.ActiveCfg = Debug|Any CPU
-               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Debug|Mixed 
Platforms.Build.0 = Debug|Any CPU
                {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Debug|Win32.ActiveCfg = 
Debug|Any CPU
+               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Debug|Win32.Build.0 = 
Debug|Any CPU
                {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Debug|x64.ActiveCfg = 
Debug|Any CPU
-               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Debug|x86.ActiveCfg = 
Debug|Any CPU
-               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Release|Any 
CPU.ActiveCfg = Release|Any CPU
-               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Release|Any CPU.Build.0 
= Release|Any CPU
-               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
-               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
+               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Debug|x64.Build.0 = 
Debug|Any CPU
                {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Release|Win32.ActiveCfg 
= Release|Any CPU
+               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Release|Win32.Build.0 = 
Release|Any CPU
                {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Release|x64.ActiveCfg = 
Release|Any CPU
-               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Release|x86.ActiveCfg = 
Release|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Debug|Mixed 
Platforms.ActiveCfg = Debug|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Debug|Mixed 
Platforms.Build.0 = Debug|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Debug|Win32.ActiveCfg = 
Debug|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Debug|x64.ActiveCfg = 
Debug|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Debug|x86.ActiveCfg = 
Debug|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Release|Any 
CPU.ActiveCfg = Release|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Release|Any CPU.Build.0 
= Release|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Release|Mixed 
Platforms.ActiveCfg = Release|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Release|Mixed 
Platforms.Build.0 = Release|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Release|Win32.ActiveCfg 
= Release|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Release|x64.ActiveCfg = 
Release|Any CPU
-               {D0F8FDE4-7AC6-4CFF-986A-50D06F7FD733}.Release|x86.ActiveCfg = 
Release|Any CPU
+               {8AABAB30-7D1E-4539-B7D1-05450262BAD2}.Release|x64.Build.0 = 
Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

Modified: qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj?rev=892103&r1=892102&r2=892103&view=diff
==============================================================================
--- qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj (original)
+++ qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj Fri Dec 18 
01:54:28 2009
@@ -153,6 +153,6 @@
 del $(AssemblyName).dll
 del $(AssemblyName).pdb
 cd "$(ProjectDir)"
-CreateNetModule.bat</PostBuildEvent>
+CreateNetModule.bat $(ConfigurationName)</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file

Modified: qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat?rev=892103&r1=892102&r2=892103&view=diff
==============================================================================
--- qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat (original)
+++ qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat Fri Dec 
18 01:54:28 2009
@@ -16,4 +16,18 @@
 REM specific language governing permissions and limitations
 REM under the License.
 
-%systemroot%\Microsoft.NET\Framework\v3.5\Csc.exe /noconfig /nowarn:1701,1702 
/errorreport:prompt /warn:4 /define:DEBUG;TRACE 
/reference:"%programfiles%\Reference 
Assemblies\Microsoft\Framework\v3.5\System.Core.dll" 
/reference:"%programfiles%\Reference 
Assemblies\Microsoft\Framework\v3.5\System.Data.DataSetExtensions.dll" 
/reference:%systemroot%\Microsoft.NET\Framework\v2.0.50727\System.Data.dll 
/reference:%systemroot%\Microsoft.NET\Framework\v2.0.50727\System.dll 
/reference:%systemroot%\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll 
/reference:"%programfiles%\Reference 
Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /debug+ /debug:full 
/filealign:512 /optimize- /out:obj\Debug\Apache.Qpid.AmqpTypes.netmodule 
/target:module *.cs
\ No newline at end of file
+if %1 == Release goto release
+
+echo generating Debug netmodule
+
+%systemroot%\Microsoft.NET\Framework\v3.5\Csc.exe /noconfig /nowarn:1701,1702 
/errorreport:prompt /warn:4 /define:DEBUG;TRACE 
/reference:"%programfiles%\Reference 
Assemblies\Microsoft\Framework\v3.5\System.Core.dll" 
/reference:"%programfiles%\Reference 
Assemblies\Microsoft\Framework\v3.5\System.Data.DataSetExtensions.dll" 
/reference:%systemroot%\Microsoft.NET\Framework\v2.0.50727\System.Data.dll 
/reference:%systemroot%\Microsoft.NET\Framework\v2.0.50727\System.dll 
/reference:%systemroot%\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll 
/reference:"%programfiles%\Reference 
Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /debug+ /debug:full 
/filealign:512 /optimize- /out:obj\Debug\Apache.Qpid.AmqpTypes.netmodule 
/target:module *.cs
+
+goto end
+
+:release
+
+echo generating Release netmodule
+
+%systemroot%\Microsoft.NET\Framework\v3.5\Csc.exe /noconfig /nowarn:1701,1702 
/errorreport:prompt /warn:4 /define:TRACE /reference:"%programfiles%\Reference 
Assemblies\Microsoft\Framework\v3.5\System.Core.dll" 
/reference:"%programfiles%\Reference 
Assemblies\Microsoft\Framework\v3.5\System.Data.DataSetExtensions.dll" 
/reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll 
/reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll 
/reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll 
/reference:"%programfiles%\Reference 
Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /debug:pdbonly 
/filealign:512 /keyfile:..\..\..\wcfnet.snk /optimize+  
/out:obj\Release\Apache.Qpid.AmqpTypes.netmodule /target:module *.cs
+
+:end
\ No newline at end of file

Modified: qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj?rev=892103&r1=892102&r2=892103&view=diff
==============================================================================
--- qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj (original)
+++ qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj Fri Dec 18 
01:54:28 2009
@@ -32,6 +32,9 @@
                <Platform
                        Name="Win32"
                />
+               <Platform
+                       Name="x64"
+               />
        </Platforms>
        <ToolFiles>
        </ToolFiles>
@@ -63,10 +66,10 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions="/FU 
Debug\Apache.Qpid.AmqpTypes.netmodule"
+                               AdditionalOptions=" /Zm1000 /wd4244 /wd4800 
/wd4355 /FU $(ConfigurationName)\Apache.Qpid.AmqpTypes.netmodule"
                                Optimization="0"
                                
AdditionalIncludeDirectories="&quot;$(QPID_BUILD_ROOT)\include&quot;;&quot;$(QPID_BUILD_ROOT)\src&quot;;..\..\..\..\..\cpp\include;..\..\..\..\..\cpp\src;&quot;$(BOOST_ROOT)&quot;"
-                               
PreprocessorDefinitions="WIN32;_DEBUG;_CRT_NONSTDC_NO_WARNINGS;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;BOOST_ALL_DYN_LINK"
+                               
PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,BOOST_ALL_DYN_LINK,_CRT_NONSTDC_NO_WARNINGS,NOMINMAX,WIN32_LEAN_AND_MEAN,_SCL_SECURE_NO_WARNINGS,HAVE_CONFIG_H"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -83,8 +86,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               
AdditionalOptions="$(QPID_BUILD_ROOT)\src\Debug\qpidcommond.lib 
$(QPID_BUILD_ROOT)\src\Debug\qpidclientd.lib 
Debug\Apache.Qpid.AmqpTypes.netmodule xolehlp.lib"
-                               AdditionalDependencies="$(NoInherit)"
+                               AdditionalOptions=" /STACK:10000000 
/machine:I386 $(ConfigurationName)\Apache.Qpid.AmqpTypes.netmodule"
+                               AdditionalDependencies="$(NOINHERIT) 
kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib 
oleaut32.lib uuid.lib comdlg32.lib advapi32.lib xolehlp.lib 
$(QPID_BUILD_ROOT)\src\Debug\qpidclientd.lib 
$(QPID_BUILD_ROOT)\src\Debug\qpidcommond.lib rpcrt4.lib ws2_32.lib "
                                OutputFile="$(OutDir)\Apache.Qpid.Interop.dll"
                                LinkIncremental="2"
                                
AdditionalLibraryDirectories="&quot;$(BOOST_ROOT)\lib&quot;"
@@ -117,7 +120,7 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       OutputDirectory="$(ProjectDir)$(ConfigurationName)"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="2"
                        CharacterSet="1"
@@ -126,6 +129,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               CommandLine="copy 
..\AmqpTypes\obj\$(ConfigurationName)\Apache.Qpid.AmqpTypes.netmodule 
$(ConfigurationName)"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -141,9 +145,12 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               AdditionalOptions=" /Zm1000 /wd4244 /wd4800 
/wd4355 /FU $(ConfigurationName)\Apache.Qpid.AmqpTypes.netmodule"
+                               
AdditionalIncludeDirectories="&quot;$(QPID_BUILD_ROOT)\include&quot;;&quot;$(QPID_BUILD_ROOT)\src&quot;;..\..\..\..\..\cpp\include;..\..\..\..\..\cpp\src;&quot;$(BOOST_ROOT)&quot;"
+                               
PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,BOOST_ALL_DYN_LINK,_CRT_NONSTDC_NO_WARNINGS,NOMINMAX,WIN32_LEAN_AND_MEAN,_SCL_SECURE_NO_WARNINGS,HAVE_CONFIG_H"
+                               Optimization="2"
                                RuntimeLibrary="2"
-                               UsePrecompiledHeader="2"
+                               UsePrecompiledHeader="0"
                                WarningLevel="3"
                                DebugInformationFormat="3"
                        />
@@ -158,9 +165,12 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(NoInherit)"
-                               LinkIncremental="1"
-                               GenerateDebugInformation="true"
+                               AdditionalOptions=" /STACK:10000000 
/machine:I386 $(ConfigurationName)\Apache.Qpid.AmqpTypes.netmodule"
+                               AdditionalDependencies="$(NOINHERIT) 
kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib 
oleaut32.lib uuid.lib comdlg32.lib advapi32.lib xolehlp.lib 
$(QPID_BUILD_ROOT)\src\Release\qpidclient.lib 
$(QPID_BUILD_ROOT)\src\Release\qpidcommon.lib rpcrt4.lib ws2_32.lib "
+                               LinkIncremental="2"
+                               OutputFile="$(OutDir)\Apache.Qpid.Interop.dll"
+                               
AdditionalLibraryDirectories="&quot;$(BOOST_ROOT)\lib&quot;"
+                               KeyFile="$(SolutionDir)\src\wcfnet.snk"
                                TargetMachine="1"
                        />
                        <Tool
@@ -185,6 +195,165 @@
                                Name="VCPostBuildEventTool"
                        />
                </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       
OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
+                       
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="1"
+                       ManagedExtensions="1"
+                       WholeProgramOptimization="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                               CommandLine="copy 
..\AmqpTypes\obj\$(ConfigurationName)\Apache.Qpid.AmqpTypes.netmodule 
$(PlatformName)\$(ConfigurationName)"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=" /Zm1000 /wd4244 /wd4800 
/wd4355 /FU 
$(PlatformName)\$(ConfigurationName)\Apache.Qpid.AmqpTypes.netmodule"
+                               Optimization="0"
+                               
AdditionalIncludeDirectories="&quot;$(QPID_BUILD_ROOT)\include&quot;;&quot;$(QPID_BUILD_ROOT)\src&quot;;..\..\..\..\..\cpp\include;..\..\..\..\..\cpp\src;&quot;$(BOOST_ROOT)&quot;"
+                               
PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,BOOST_ALL_DYN_LINK,_CRT_NONSTDC_NO_WARNINGS,NOMINMAX,WIN32_LEAN_AND_MEAN,_SCL_SECURE_NO_WARNINGS,HAVE_CONFIG_H"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions=" /STACK:10000000 
/machine:x64 /debug 
$(PlatformName)\$(ConfigurationName)\Apache.Qpid.AmqpTypes.netmodule"
+                               AdditionalDependencies="$(NoInherit) 
kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib 
oleaut32.lib uuid.lib comdlg32.lib advapi32.lib rpcrt4.lib ws2_32.lib 
xolehlp.lib $(QPID_BUILD_ROOT)\src\Debug\qpidcommond.lib 
$(QPID_BUILD_ROOT)\src\Debug\qpidclientd.lib"
+                               OutputFile="$(OutDir)\Apache.Qpid.Interop.dll"
+                               LinkIncremental="2"
+                               
AdditionalLibraryDirectories="&quot;$(BOOST_ROOT)\lib&quot;"
+                               GenerateDebugInformation="true"
+                               AssemblyDebug="1"
+                               TargetMachine="17"
+                               KeyFile="$(SolutionDir)\src\wcfnet.snk"
+                       />
+                       <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="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
+                       
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="1"
+                       ManagedExtensions="1"
+                       WholeProgramOptimization="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                               CommandLine="copy 
..\AmqpTypes\obj\$(ConfigurationName)\Apache.Qpid.AmqpTypes.netmodule 
$(PlatformName)\$(ConfigurationName)"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=" /Zm1000 /wd4244 /wd4800 
/wd4355 /FU 
$(PlatformName)\$(ConfigurationName)\Apache.Qpid.AmqpTypes.netmodule"
+                               
AdditionalIncludeDirectories="&quot;$(QPID_BUILD_ROOT)\include&quot;;&quot;$(QPID_BUILD_ROOT)\src&quot;;..\..\..\..\..\cpp\include;..\..\..\..\..\cpp\src;&quot;$(BOOST_ROOT)&quot;"
+                               
PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,BOOST_ALL_DYN_LINK,_CRT_NONSTDC_NO_WARNINGS,NOMINMAX,WIN32_LEAN_AND_MEAN,_SCL_SECURE_NO_WARNINGS,HAVE_CONFIG_H"
+                               InlineFunctionExpansion="2"
+                               Optimization="2"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions=" /STACK:10000000 
/machine:x64 
$(PlatformName)\$(ConfigurationName)\Apache.Qpid.AmqpTypes.netmodule"
+                               AdditionalDependencies="$(NoInherit) 
kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib 
oleaut32.lib uuid.lib comdlg32.lib advapi32.lib xolehlp.lib 
$(QPID_BUILD_ROOT)\src\Release\qpidclient.lib 
$(QPID_BUILD_ROOT)\src\Release\qpidcommon.lib rpcrt4.lib ws2_32.lib"
+                               LinkIncremental="2"
+                               OutputFile="$(OutDir)\Apache.Qpid.Interop.dll"
+                               
AdditionalLibraryDirectories="&quot;$(BOOST_ROOT)\lib&quot;"
+                               KeyFile="$(SolutionDir)\src\wcfnet.snk"
+                               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>
                <AssemblyReference



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:[email protected]

Reply via email to