Author: tabish Date: Mon Mar 8 18:45:00 2010 New Revision: 920443 URL: http://svn.apache.org/viewvc?rev=920443&view=rev Log: Update Windows build config
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Config.h
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-unittests.vcproj
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Config.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Config.h?rev=920443&r1=920442&r2=920443&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Config.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Config.h Mon
Mar 8 18:45:00 2010
@@ -44,6 +44,7 @@
// of Windows or OS X to do this build
#if defined(_WIN32)
+
#ifndef HAVE_OBJBASE_H
#define HAVE_OBJBASE_H
#endif
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-unittests.vcproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-unittests.vcproj?rev=920443&r1=920442&r2=920443&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-unittests.vcproj
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq-unittests.vcproj
Mon Mar 8 18:45:00 2010
@@ -10850,6 +10850,62 @@
RelativePath="..\src\test\decaf\io\FilterOutputStreamTest.h"
>
</File>
+ <File
+
RelativePath="..\src\test\decaf\io\InputStreamReaderTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\io\InputStreamReaderTest.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\io\InputStreamTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\io\InputStreamTest.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\io\OutputStreamTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\io\OutputStreamTest.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\io\OutputStreamWriterTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\io\OutputStreamWriterTest.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\io\PushbackInputStreamTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\io\PushbackInputStreamTest.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\io\ReaderTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\io\ReaderTest.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\io\WriterTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\io\WriterTest.h"
+ >
+ </File>
</Filter>
<Filter
Name="lang"
@@ -11214,6 +11270,74 @@
Name="logging"
>
</Filter>
+ <Filter
+ Name="zip"
+ >
+ <File
+
RelativePath="..\src\test\decaf\util\zip\Adler32Test.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\Adler32Test.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\CheckedInputStreamTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\CheckedInputStreamTest.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\CheckedOutputStreamTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\CheckedOutputStreamTest.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\CRC32Test.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\CRC32Test.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\DeflaterOutputStreamTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\DeflaterOutputStreamTest.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\DeflaterTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\DeflaterTest.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\InflaterInputStreamTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\InflaterInputStreamTest.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\InflaterTest.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\test\decaf\util\zip\InflaterTest.h"
+ >
+ </File>
+ </Filter>
</Filter>
</Filter>
<Filter
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj?rev=920443&r1=920442&r2=920443&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj
Mon Mar 8 18:45:00 2010
@@ -22735,6 +22735,98 @@
</File>
</Filter>
</Filter>
+ <Filter
+ Name="zip"
+ >
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\adler32.c"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\compress.c"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\crc32.c"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\crc32.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\deflate.c"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\deflate.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\gzio.c"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\infback.c"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\inffast.c"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\inffast.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\inffixed.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\inflate.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\inftrees.c"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\inftrees.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\minigzip.c"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\trees.c"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\trees.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\uncompr.c"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\zconf.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\zlib.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\zutil.c"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\internal\util\zip\zutil.h"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="io"
@@ -23005,6 +23097,10 @@
>
</File>
<File
+
RelativePath="..\src\main\decaf\io\DataInput.h"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\io\DataInputStream.cpp"
>
</File>
@@ -23013,6 +23109,10 @@
>
</File>
<File
+
RelativePath="..\src\main\decaf\io\DataOutput.h"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\io\DataOutputStream.cpp"
>
</File>
@@ -23025,18 +23125,42 @@
>
</File>
<File
+
RelativePath="..\src\main\decaf\io\FilterInputStream.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\io\FilterInputStream.h"
>
</File>
<File
+
RelativePath="..\src\main\decaf\io\FilterOutputStream.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\io\FilterOutputStream.h"
>
</File>
<File
+
RelativePath="..\src\main\decaf\io\Flushable.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\io\InputStream.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\io\InputStream.h"
>
</File>
<File
+
RelativePath="..\src\main\decaf\io\InputStreamReader.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\io\InputStreamReader.h"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\io\InterruptedIOException.h"
>
</File>
@@ -23045,18 +23169,50 @@
>
</File>
<File
+
RelativePath="..\src\main\decaf\io\OutputStream.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\io\OutputStream.h"
>
</File>
<File
+
RelativePath="..\src\main\decaf\io\OutputStreamWriter.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\io\OutputStreamWriter.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\io\PushbackInputStream.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\io\PushbackInputStream.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\io\Reader.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\io\Reader.h"
>
</File>
<File
+
RelativePath="..\src\main\decaf\io\UnsupportedEncodingException.h"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\io\UTFDataFormatException.h"
>
</File>
<File
+
RelativePath="..\src\main\decaf\io\Writer.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\io\Writer.h"
>
</File>
@@ -23688,22 +23844,50 @@
Name="logging"
>
<File
+
RelativePath="..\src\main\decaf\util\logging\ConsoleHandler.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\util\logging\ConsoleHandler.h"
>
</File>
<File
+
RelativePath="..\src\main\decaf\util\logging\ErrorManager.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\logging\ErrorManager.h"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\util\logging\Filter.h"
>
</File>
<File
+
RelativePath="..\src\main\decaf\util\logging\Formatter.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\util\logging\Formatter.h"
>
</File>
<File
+
RelativePath="..\src\main\decaf\util\logging\Handler.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\util\logging\Handler.h"
>
</File>
<File
+
RelativePath="..\src\main\decaf\util\logging\Level.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\logging\Level.h"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\util\logging\Logger.cpp"
>
</File>
@@ -23736,6 +23920,10 @@
>
</File>
<File
+
RelativePath="..\src\main\decaf\util\logging\LogRecord.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\util\logging\LogRecord.h"
>
</File>
@@ -23756,6 +23944,10 @@
>
</File>
<File
+
RelativePath="..\src\main\decaf\util\logging\SimpleFormatter.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\util\logging\SimpleFormatter.h"
>
</File>
@@ -23768,9 +23960,173 @@
>
</File>
<File
+
RelativePath="..\src\main\decaf\util\logging\StreamHandler.cpp"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\util\logging\StreamHandler.h"
>
</File>
+ <File
+
RelativePath="..\src\main\decaf\util\logging\XMLFormatter.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\logging\XMLFormatter.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="zip"
+ >
+ <File
+
RelativePath="..\src\main\decaf\util\zip\Adler32.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="ReleaseDLL|Win32"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DebugDLL|Win32"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\Adler32.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\CheckedInputStream.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\CheckedInputStream.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\CheckedOutputStream.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\CheckedOutputStream.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\Checksum.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\CRC32.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="ReleaseDLL|Win32"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DebugDLL|Win32"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+
ObjectFile="$(IntDir)\$(InputName)1.obj"
+
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\CRC32.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\DataFormatException.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\Deflater.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\Deflater.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\DeflaterOutputStream.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\DeflaterOutputStream.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\Inflater.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\Inflater.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\InflaterInputStream.cpp"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\InflaterInputStream.h"
+ >
+ </File>
+ <File
+
RelativePath="..\src\main\decaf\util\zip\ZipException.h"
+ >
+ </File>
</Filter>
</Filter>
</Filter>
