You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2009/03/01 04:11:04 UTC
svn commit: r748954 [1/3] - in /qpid/branches/qpid-1673/qpid/cpp/src:
broker.vcproj client.vcproj common.vcproj qpid.sln qpidbroker.vcproj
Author: shuston
Date: Sun Mar 1 03:11:03 2009
New Revision: 748954
URL: http://svn.apache.org/viewvc?rev=748954&view=rev
Log:
Client, common build as DLLs; broker now a lib linked with qpidbroker.exe
Added:
qpid/branches/qpid-1673/qpid/cpp/src/qpidbroker.vcproj
Modified:
qpid/branches/qpid-1673/qpid/cpp/src/broker.vcproj
qpid/branches/qpid-1673/qpid/cpp/src/client.vcproj
qpid/branches/qpid-1673/qpid/cpp/src/common.vcproj
qpid/branches/qpid-1673/qpid/cpp/src/qpid.sln
Modified: qpid/branches/qpid-1673/qpid/cpp/src/broker.vcproj
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-1673/qpid/cpp/src/broker.vcproj?rev=748954&r1=748953&r2=748954&view=diff
==============================================================================
--- qpid/branches/qpid-1673/qpid/cpp/src/broker.vcproj (original)
+++ qpid/branches/qpid-1673/qpid/cpp/src/broker.vcproj Sun Mar 1 03:11:03 2009
@@ -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>
Modified: qpid/branches/qpid-1673/qpid/cpp/src/client.vcproj
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-1673/qpid/cpp/src/client.vcproj?rev=748954&r1=748953&r2=748954&view=diff
==============================================================================
--- qpid/branches/qpid-1673/qpid/cpp/src/client.vcproj (original)
+++ qpid/branches/qpid-1673/qpid/cpp/src/client.vcproj Sun Mar 1 03:11:03 2009
@@ -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=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="CLIENT_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";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=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
- RuntimeLibrary="0"
+ PreprocessorDefinitions="CLIENT_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";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=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="CLIENT_EXPORT;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";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=\"qpidc.conf\";MODULE_DIR=\".\";NOMINMAX;WIN32_LEAN_AND_MEAN"
- RuntimeLibrary="0"
+ PreprocessorDefinitions="CLIENT_EXPORT;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;CONF_FILE=\"qpidc.conf\";MODULE_DIR=\".\";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"
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org