activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r648268 - in /activemq/activemq-cpp/decaf/trunk/vs2005-build: vs2005-decaf-example.vcproj vs2005-decaf.vcproj
Date Tue, 15 Apr 2008 14:38:21 GMT
Author: tabish
Date: Tue Apr 15 07:38:20 2008
New Revision: 648268

URL: http://svn.apache.org/viewvc?rev=648268&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQCPP-103

Flushing out decaf build issues on windows.

Modified:
    activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-example.vcproj
    activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj

Modified: activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-example.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-example.vcproj?rev=648268&r1=648267&r2=648268&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-example.vcproj (original)
+++ activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-example.vcproj Tue Apr 15
07:38:20 2008
@@ -129,8 +129,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;..\src\test;..\src\main;&quot;C:\Program
Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
@@ -151,10 +151,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib"
+				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program
Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -216,7 +216,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;..\src\test;..\src\main;&quot;C:\Program
Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;DECAF_DLL"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -241,7 +241,7 @@
 				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program
Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -303,7 +303,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform
SDK\Include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;..\src\test;..\src\main;&quot;C:\Program
Files\CPPUnit\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program
Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;DECAF_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -331,7 +331,7 @@
 				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunitd.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program
Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program
Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"

Modified: activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj?rev=648268&r1=648267&r2=648268&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj (original)
+++ activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj Tue Apr 15 07:38:20
2008
@@ -1068,58 +1068,6 @@
 					Name="nio"
 					>
 					<File
-						RelativePath="..\src\main\decaf\internal\util\BigInt.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\src\main\decaf\internal\util\BigInt.h"
-						>
-					</File>
-					<File
-						RelativePath="..\src\main\decaf\internal\util\BitOps.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\src\main\decaf\internal\util\BitOps.h"
-						>
-					</File>
-					<File
-						RelativePath="..\src\main\decaf\internal\util\ByteArrayAdapter.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\src\main\decaf\internal\util\ByteArrayAdapter.h"
-						>
-					</File>
-					<File
-						RelativePath="..\src\main\decaf\internal\util\FloatingPointParser.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\src\main\decaf\internal\util\FloatingPointParser.h"
-						>
-					</File>
-					<File
-						RelativePath="..\src\main\decaf\internal\util\HexStringParser.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\src\main\decaf\internal\util\HexStringParser.h"
-						>
-					</File>
-					<File
-						RelativePath="..\src\main\decaf\internal\util\NumberConverter.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\src\main\decaf\internal\util\NumberConverter.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="util"
-					>
-					<File
 						RelativePath="..\src\main\decaf\internal\nio\BufferFactory.cpp"
 						>
 					</File>
@@ -1189,6 +1137,26 @@
 					</File>
 					<File
 						RelativePath="..\src\main\decaf\internal\nio\ShortArrayBuffer.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="util"
+					>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\ByteArrayAdapter.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\ByteArrayAdapter.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\HexStringParser.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\HexStringParser.h"
 						>
 					</File>
 				</Filter>



Mime
View raw message