You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2008/04/17 22:03:51 UTC
svn commit: r649255 - in /activemq/activemq-cpp/trunk/vs2005-build:
vs2005-activemq-example.vcproj vs2005-activemq-integration-tests.vcproj
vs2005-activemq-unittests.vcproj vs2005-activemq.vcproj
Author: tabish
Date: Thu Apr 17 13:03:47 2008
New Revision: 649255
URL: http://svn.apache.org/viewvc?rev=649255&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQCPP-103
Updating AMQ-CPP to build with Decaf on windows.
Modified:
activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj
activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj
activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj
activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj
Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj?rev=649255&r1=649254&r2=649255&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj Thu Apr 17 13:03:47 2008
@@ -216,8 +216,8 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\src\examples;..\src\main;"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include";"C:\Program Files\APR\include""
- PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL"
+ AdditionalIncludeDirectories="..\src\examples;..\src\main;"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include";"C:\Program Files\APR\include";"C:\Program Files\Decaf\src\main""
+ PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\$(ProjectName)\"
@@ -239,10 +239,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib rpcrt4.lib"
+ AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib decaf.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""C:\Program Files\Microsoft Platform SDK\Lib";"D:\Program Files\Microsoft Platform SDK\Lib""
+ AdditionalLibraryDirectories=""C:\Program Files\Microsoft Platform SDK\Lib";"D:\Program Files\Microsoft Platform SDK\Lib";"C:\Program Files\Decaf\vs2005-build\ReleaseDLL";"C:\Program Files\APR\bin";"C:\Program Files\APR\lib""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
SubSystem="1"
Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj?rev=649255&r1=649254&r2=649255&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj Thu Apr 17 13:03:47 2008
@@ -216,7 +216,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""..\src\test-integration";..\src\main;"C:\Program Files\CPPUnit\include";"C:\Apps\cppunit-1.11.6\include";"E:\dev\cppunit-1.11.6\include";"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include";"C:\Program Files\Decaf\src\main";"C:\Program Files\APR\include""
- PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL"
+ PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\$(ProjectName)\"
@@ -237,9 +237,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib"
+ AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib apr-1.lib aprutil-1.lib decaf.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories=""C:\Program Files\CPPUnit\lib";"C:\Apps\cppunit-1.11.6\lib";"E:\dev\cppunit-1.11.6\lib";"C:\Program Files\Microsoft Platform SDK\Lib";"D:\Program Files\Microsoft Platform SDK\Lib""
+ AdditionalLibraryDirectories=""C:\Program Files\CPPUnit\lib";"C:\Apps\cppunit-1.11.6\lib";"E:\dev\cppunit-1.11.6\lib";"C:\Program Files\Microsoft Platform SDK\Lib";"D:\Program Files\Microsoft Platform SDK\Lib";"C:\Program Files\APR\bin";"C:\Program Files\APR\lib";"C:\Program Files\Decaf\vs2005-build\ReleaseDLL""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
SubSystem="1"
Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj?rev=649255&r1=649254&r2=649255&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj Thu Apr 17 13:03:47 2008
@@ -216,8 +216,8 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\src\test;..\src\main;"C:\Program Files\CPPUnit\include";"C:\Apps\cppunit-1.11.6\include";"E:\dev\cppunit-1.11.6\include";"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include";"C:\Program Files\APR\include""
- PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;CMS_DLL;AMQCPP_DLL"
+ AdditionalIncludeDirectories="..\src\test;..\src\main;"C:\Program Files\CPPUnit\include";"C:\Apps\cppunit-1.11.6\include";"E:\dev\cppunit-1.11.6\include";"C:\Program Files\Microsoft Platform SDK\Include";"D:\Program Files\Microsoft Platform SDK\Include";"C:\Program Files\APR\include";"C:\Program Files\Decaf\src\main""
+ PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
ObjectFile="$(IntDir)\$(ProjectName)\"
@@ -238,10 +238,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib"
+ AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib apr-1.lib aprutil-1.lib decaf.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="1"
- AdditionalLibraryDirectories=""C:\Program Files\CPPUnit\lib";"C:\Apps\cppunit-1.11.6\lib";"E:\dev\cppunit-1.11.6\lib";"C:\Program Files\Microsoft Platform SDK\Lib";"D:\Program Files\Microsoft Platform SDK\Lib""
+ AdditionalLibraryDirectories=""C:\Program Files\CPPUnit\lib";"C:\Apps\cppunit-1.11.6\lib";"E:\dev\cppunit-1.11.6\lib";"C:\Program Files\Microsoft Platform SDK\Lib";"D:\Program Files\Microsoft Platform SDK\Lib";"C:\Program Files\Decaf\vs2005-build\ReleaseDLL";"C:\Program Files\APR\bin";"C:\Program Files\APR\lib""
ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
GenerateDebugInformation="true"
SubSystem="1"
Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj?rev=649255&r1=649254&r2=649255&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj Thu Apr 17 13:03:47 2008
@@ -204,8 +204,9 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib rpcrt4.lib"
+ AdditionalDependencies="ws2_32.lib rpcrt4.lib apr-1.lib aprutil-1.lib decaf.lib"
OutputFile="$(OutDir)\activemq-cpp.dll"
+ AdditionalLibraryDirectories=""C:\Program Files\Microsoft Platform SDK\Lib";"C:\Program Files\APR\lib";"C:\Program Files\APR\bin";"C:\Program Files\Decaf\vs2005-build\ReleaseDLL""
GenerateDebugInformation="true"
/>
<Tool