diff -r 62d93553489e -r adf813954344 bc.mak
--- a/bc.mak	Wed Jan 10 12:58:44 2007 +0100
+++ b/bc.mak	Wed Jan 10 12:58:48 2007 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic2/bc.mak,v 1.82 2006-12-11 11:44:33 mb Exp $
+# $Header: /cvs/stx/stx/libbasic2/bc.mak,v 1.83 2007-01-10 11:58:48 stefan Exp $
 #
 # DO NOT EDIT 
 # automagically generated from the projectDefinition: stx_libbasic2.
@@ -35,11 +35,21 @@
 
 OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
 
-ALL::   $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
+ALL::  $(ZLIB) $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll
 
 !INCLUDE $(TOP)\rules\stdRules_nt
 
 
+$(ZLIB):
+	cd $(ZLIB_DIR)
+	$(MAKE) $(MAKE_ZLIB_ARG)
+	cd $(TOP)\stx\libbasic2
+
+$(BZ2LIB):
+	cd $(BZ2LIB_DIR)
+	$(MAKE) $(MAKE_BZ2LIB_ARG) bz2.lib
+	cd $(TOP)\stx\libbasic2
+
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)ActorStream.$(O) ActorStream.$(H): ActorStream.st $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -77,6 +87,7 @@
 $(OUTDIR)Text.$(O) Text.$(H): Text.st $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)TextStream.$(O) TextStream.$(H): TextStream.st $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)TimeDuration.$(O) TimeDuration.$(H): TimeDuration.st $(INCLUDE_TOP)\stx\libbasic\Time.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractTime.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)TwoByteString.$(O) TwoByteString.$(H): TwoByteString.st $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)URI.$(O) URI.$(H): URI.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)UUID.$(O) UUID.$(H): UUID.st $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)UnboxedIntegerArray.$(O) UnboxedIntegerArray.$(H): UnboxedIntegerArray.st $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -100,8 +111,10 @@
 $(OUTDIR)SignedWordArray.$(O) SignedWordArray.$(H): SignedWordArray.st $(INCLUDE_TOP)\stx\libbasic2\UnboxedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)TimedPromise.$(O) TimedPromise.$(H): TimedPromise.st $(INCLUDE_TOP)\stx\libbasic2\Promise.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)UDSocketAddress.$(O) UDSocketAddress.$(H): UDSocketAddress.st $(INCLUDE_TOP)\stx\libbasic2\SocketAddress.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Unicode16String.$(O) Unicode16String.$(H): Unicode16String.st $(INCLUDE_TOP)\stx\libbasic\TwoByteString.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Unicode32String.$(O) Unicode32String.$(H): Unicode32String.st $(INCLUDE_TOP)\stx\libbasic2\FourByteString.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)WordArray.$(O) WordArray.$(H): WordArray.st $(INCLUDE_TOP)\stx\libbasic2\UnboxedIntegerArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)ZipStream.$(O) ZipStream.$(H): ZipStream.st $(INCLUDE_TOP)\stx\libbasic2\CompressionStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)FileURI.$(O) FileURI.$(H): FileURI.st $(INCLUDE_TOP)\stx\libbasic2\HierarchicalURI.$(H) $(INCLUDE_TOP)\stx\libbasic2\URI.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)FtpURI.$(O) FtpURI.$(H): FtpURI.st $(INCLUDE_TOP)\stx\libbasic2\HierarchicalURI.$(H) $(INCLUDE_TOP)\stx\libbasic2\URI.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)HttpURI.$(O) HttpURI.$(H): HttpURI.st $(INCLUDE_TOP)\stx\libbasic2\HierarchicalURI.$(H) $(INCLUDE_TOP)\stx\libbasic2\URI.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)