Author: shuston
Date: Tue May 5 15:11:37 2009
New Revision: 771776
URL: http://svn.apache.org/viewvc?rev=771776&view=rev
Log:
Adjust lib settings and references to main qpid libs
Modified:
qpid/trunk/qpid/cpp/examples/qmf-agent/qmf_agent.vcproj
qpid/trunk/qpid/cpp/examples/qmf-console/qmf_console_ping.vcproj
Modified: qpid/trunk/qpid/cpp/examples/qmf-agent/qmf_agent.vcproj
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/qmf-agent/qmf_agent.vcproj?rev=771776&r1=771775&r2=771776&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/qmf-agent/qmf_agent.vcproj (original)
+++ qpid/trunk/qpid/cpp/examples/qmf-agent/qmf_agent.vcproj Tue May 5 15:11:37
2009
@@ -75,6 +75,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="qpidcommond.lib
qpidclientd.lib qmfagentd.lib"
OutputFile="$(OutDir)\qmf_agent.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -158,7 +159,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="qpidcommon.lib
qpidclient.lib qmfconsole.lib"
+ AdditionalDependencies="qpidcommon.lib
qpidclient.lib qmfagent.lib"
OutputFile="$(OutDir)\ping.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -248,7 +249,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/machine:AMD64"
- AdditionalDependencies="qpidcommond.lib
qpidclientd.lib qmfconsoled.lib"
+ AdditionalDependencies="qpidcommond.lib
qpidclientd.lib qmfagentd.lib"
OutputFile="$(OutDir)\ping.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -327,7 +328,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/machine:AMD64"
- AdditionalDependencies="qpidcommon.lib
qpidclient.lib qmfconsole.lib"
+ AdditionalDependencies="qpidcommon.lib
qpidclient.lib qmfagent.lib"
OutputFile="$(OutDir)\ping.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: qpid/trunk/qpid/cpp/examples/qmf-console/qmf_console_ping.vcproj
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/qmf-console/qmf_console_ping.vcproj?rev=771776&r1=771775&r2=771776&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/qmf-console/qmf_console_ping.vcproj (original)
+++ qpid/trunk/qpid/cpp/examples/qmf-console/qmf_console_ping.vcproj Tue May 5
15:11:37 2009
@@ -3,10 +3,10 @@
ProjectType="Visual C++"
Version="9.00"
Name="qmf_console_ping"
- ProjectGUID="{771767FB-FECA-1BAD-2E13-3FFA2B8669C3}"
+ ProjectGUID="{C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}"
RootNamespace="qmf_console_ping"
Keyword="Win32Proj"
- SignManifests="true"
+ TargetFrameworkVersion="0"
>
<Platforms>
<Platform
@@ -25,7 +25,6 @@
IntermediateDirectory="Debug\qmf_console_ping\I386"
ConfigurationType="1"
CharacterSet="0"
-
>
<Tool
Name="VCPreBuildEventTool"
@@ -52,7 +51,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,..\..\src,..\..\src\gen"
-
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -89,6 +88,9 @@
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -98,16 +100,18 @@
Name="VCFxCopTool"
/>
<Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release\qmf_console_ping\I386"
+ Name="Debug|x64"
+ OutputDirectory="."
+ IntermediateDirectory="Debug\qmf_console_ping\AMD64"
ConfigurationType="1"
CharacterSet="0"
-
>
<Tool
Name="VCPreBuildEventTool"
@@ -132,13 +136,16 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
+ Optimization="0"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,..\..\src,..\..\src\gen"
-
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
- RuntimeLibrary="2"
+
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_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"
/>
<Tool
@@ -146,7 +153,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)\.,..\..\src,..\..\src\gen"
/>
@@ -155,21 +162,23 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="qpidcommon.lib
qpidclient.lib qmfconsole.lib"
+ AdditionalOptions="/machine:AMD64"
+ AdditionalDependencies="qpidcommond.lib
qpidclientd.lib qmfconsoled.lib"
OutputFile="$(OutDir)\ping.exe"
- LinkIncremental="1"
+ LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib;..\..\src"
GenerateDebugInformation="true"
SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -179,16 +188,18 @@
Name="VCFxCopTool"
/>
<Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="."
- IntermediateDirectory="Debug\qmf_console_ping\AMD64"
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release\qmf_console_ping\I386"
ConfigurationType="1"
CharacterSet="0"
-
>
<Tool
Name="VCPreBuildEventTool"
@@ -213,16 +224,13 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,..\..\src,..\..\src\gen"
-
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_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"
/>
<Tool
@@ -230,7 +238,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)\.,..\..\src,..\..\src\gen"
/>
@@ -239,20 +247,24 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/machine:AMD64"
- AdditionalDependencies="qpidcommond.lib
qpidclientd.lib qmfconsoled.lib"
+ AdditionalDependencies="qpidcommon.lib
qpidclient.lib qmfconsole.lib"
OutputFile="$(OutDir)\ping.exe"
- LinkIncremental="2"
+ LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".;$(BOOST_ROOT)\lib;..\..\src"
GenerateDebugInformation="true"
SubSystem="1"
- TargetMachine="17"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -262,6 +274,9 @@
Name="VCFxCopTool"
/>
<Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -271,7 +286,6 @@
IntermediateDirectory="Release\qmf_console_ping\AMD64"
ConfigurationType="1"
CharacterSet="0"
-
>
<Tool
Name="VCPreBuildEventTool"
@@ -298,7 +312,7 @@
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\.,..\..\src,..\..\src\gen"
-
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
+
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;NOMINMAX;WIN32_LEAN_AND_MEAN;_SCL_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="3"
@@ -335,6 +349,9 @@
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -344,6 +361,9 @@
Name="VCFxCopTool"
/>
<Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -353,19 +373,24 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;cxx;cc;C;c">
+ Filter="cpp;cxx;cc;C;c"
+ >
<File
- RelativePath="ping.cpp">
+ RelativePath="ping.cpp"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hh">
+ Filter="h;hpp;hxx;hh"
+ >
<File
- RelativePath="ConnectionOptions.h">
+ RelativePath="ConnectionOptions.h"
+ >
</File>
<File
- RelativePath="TestOptions.h">
+ RelativePath="TestOptions.h"
+ >
</File>
</Filter>
</Files>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
